diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
| commit | 8bdb1d64b87089b23d18d02efbbbd85d44151742 (patch) | |
| tree | e9cb246a234f120fddf1d801d529b5f93b073616 /sysemu.h | |
| parent | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-merge (diff) | |
| parent | PCI: Convert pci_device_hot_add() to QObject (diff) | |
| download | qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.gz qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.bz2 qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.zip | |
Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-merge
* commit '1c1d7bda2cd507aec72057a1c16094541add9dd6':
PCI: Convert pci_device_hot_add() to QObject
char: Convert qemu_chr_info() to QObject
block: Convert bdrv_info_stats() to QObject
block: Convert bdrv_info() to QObject
migration: Convert do_info_migrate() to QObject
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -218,7 +218,8 @@ void qemu_system_cpu_hot_add(int cpu, int state); DriveInfo *add_init_drive(const char *opts); /* pci-hotplug */ -void pci_device_hot_add(Monitor *mon, const QDict *qdict); +void pci_device_hot_add_print(Monitor *mon, const QObject *data); +void pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data); 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, |