diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-30 14:59:33 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-30 14:59:33 +0300 |
| commit | 286b9f0ff3aabe4ef31557edeaa2691a7634b95a (patch) | |
| tree | a2ed92a7f3cbac7c1c7c447d3bf1290b28d77c91 /qemu-monitor.hx | |
| parent | Merge commit '8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0' into upstream-merge (diff) | |
| parent | monitor: Make pci_add device options truely optional (diff) | |
| download | qemu-kvm-286b9f0ff3aabe4ef31557edeaa2691a7634b95a.tar.gz qemu-kvm-286b9f0ff3aabe4ef31557edeaa2691a7634b95a.tar.bz2 qemu-kvm-286b9f0ff3aabe4ef31557edeaa2691a7634b95a.zip | |
Merge commit 'a62acdc0cc5308706e2503557a09828979b59a12' into upstream-merge
* commit 'a62acdc0cc5308706e2503557a09828979b59a12':
monitor: Make pci_add device options truely optional
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 66f06a1bd..32fe673dd 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -506,7 +506,7 @@ Add drive to PCI storage controller. ETEXI #if defined(TARGET_I386) - { "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" }, + { "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 |