From a62acdc0cc5308706e2503557a09828979b59a12 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 26 Jun 2009 00:04:10 +0200 Subject: monitor: Make pci_add device options truely optional Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- hw/pci-hotplug.c | 4 ++++ qemu-monitor.hx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index f7d38a7..d0f2911 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -153,6 +153,10 @@ void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type, pci_addr += 9; } + if (!opts) { + opts = ""; + } + if (!strcmp(pci_addr, "auto")) pci_addr = NULL; diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 932a013..a87530c 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|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, + { "pci_add", "sss?", pci_device_hot_add, "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, #endif STEXI @item pci_add -- cgit v1.1