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 /qemu-monitor.hx | |
| 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 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index ff722b52f..de5b9feb4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -810,7 +810,8 @@ ETEXI .args_type = "pci_addr:s,type:s,opts:s?", .params = "auto|[[<domain>:]<bus>:]<slot> nic|storage|host [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]... [host=02:00.0[,name=string][,dma=none]", .help = "hot-add PCI device", - .mhandler.cmd = pci_device_hot_add, + .user_print = pci_device_hot_add_print, + .mhandler.cmd_new = pci_device_hot_add, }, #endif |