diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-10-06 10:34:05 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-06 10:34:05 +0200 |
| commit | ac7e70d61b19ae6971d98424b248b137fbc96272 (patch) | |
| tree | 58f5ea42056064ecde22b561716307dd96b03886 /sysemu.h | |
| parent | Merge commit 'e3936fa574d9fbe241acdc76b5195b048567537e' into upstream-merge (diff) | |
| parent | pci: windup acpi-based hotplug (diff) | |
| download | qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.tar.gz qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.tar.bz2 qemu-kvm-ac7e70d61b19ae6971d98424b248b137fbc96272.zip | |
Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-merge
* commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de':
pci: windup acpi-based hotplug
pci: hotplug windup
scsi: hotplug windup
usb: hotplug windup
qdev hotplug: infrastructure and monitor commands.
switch qemu-config to qemu_error
usb: hook unplug into qdev, cleanups + fixes.
Conflicts:
hw/acpi.c
hw/pc.c
hw/pc.h
hw/pci-hotplug.c
sysemu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -204,9 +204,6 @@ extern DriveInfo *drive_init(QemuOpts *arg, void *machine, int *fatal_error); /* acpi */ void qemu_system_cpu_hot_add(int cpu, int state); -typedef void (*qemu_system_device_hot_add_t)(int pcibus, int slot, int state); -void qemu_system_device_hot_add_register(qemu_system_device_hot_add_t callback); -void qemu_system_device_hot_add(int pcibus, int slot, int state); /* device-hotplug */ @@ -221,7 +218,7 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict); void drive_hot_add(Monitor *mon, const QDict *qdict); void pci_device_hot_remove(Monitor *mon, const char *pci_addr); void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict); -void pci_device_hot_remove_success(int pcibus, int slot); +void pci_device_hot_remove_success(PCIDevice *dev); /* serial ports */ |