diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-30 14:56:33 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-30 14:56:33 +0300 |
| commit | f21dd80aea0fff462ca0708977626ef0c05b81c9 (patch) | |
| tree | 2a23799fa8b12eace48e78a8bcb137f8ffe77979 /qemu-monitor.hx | |
| parent | Merge commit '5f87762742923e42114ed49c96251a245f109147' into upstream-merge (diff) | |
| parent | monitor: Drop pci_addr prefix from hotplug commands (diff) | |
| download | qemu-kvm-f21dd80aea0fff462ca0708977626ef0c05b81c9.tar.gz qemu-kvm-f21dd80aea0fff462ca0708977626ef0c05b81c9.tar.bz2 qemu-kvm-f21dd80aea0fff462ca0708977626ef0c05b81c9.zip | |
Merge commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf' into upstream-merge
* commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf':
monitor: Drop pci_addr prefix from hotplug commands
qcow2: Cache refcount blocks during snapshot creation
block-raw: Allow pread beyond the end of growable images
make tags useful for block drivers and hardaware devices
Substitute ifdef CONFIG_FOO by sound-obj-
Conflicts:
hw/pci-hotplug.c
hw/pci.c
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index b5a2c36e0..66f06a1bd 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -493,7 +493,7 @@ Set maximum tolerated downtime (in seconds) for migration. ETEXI #if defined(TARGET_I386) - { "drive_add", "ss", drive_hot_add, "pci_addr=[[<domain>:]<bus>:]<slot>\n" + { "drive_add", "ss", drive_hot_add, "[[<domain>:]<bus>:]<slot>\n" "[file=file][,if=type][,bus=n]\n" "[,unit=m][,media=d][index=i]\n" "[,cyls=c,heads=h,secs=s[,trans=t]]\n" @@ -506,7 +506,7 @@ Add drive to PCI storage controller. ETEXI #if defined(TARGET_I386) - { "pci_add", "sss", pci_device_hot_add, "pci_addr=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]", "hot-add PCI device" }, + { "pci_add", "sss", pci_device_hot_add, "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]", "hot-add PCI device" }, #endif STEXI @item pci_add @@ -514,7 +514,7 @@ Hot-add PCI device. ETEXI #if defined(TARGET_I386) - { "pci_del", "s", pci_device_hot_remove, "pci_addr=[[<domain>:]<bus>:]<slot>", "hot remove PCI device" }, + { "pci_del", "s", pci_device_hot_remove, "[[<domain>:]<bus>:]<slot>", "hot remove PCI device" }, #endif STEXI @item pci_del |