From 395560c8d15fb7980742990d00ae63aac87d43d6 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 10 Feb 2010 23:49:55 -0200 Subject: [PATCH] Monitor: Convert pci_device_hot_add() to cmd_new_ret() Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- hw/pci-hotplug.c | 16 +++++++++++----- qemu-monitor.hx | 2 +- sysemu.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 0fb96f06f..6cc70d52c 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -254,7 +254,7 @@ void pci_device_hot_add_print(Monitor *mon, const QObject *data) * * { "domain": 0, "bus": 0, "slot": 5, "function": 0 } */ -void pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data) +int pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data) { PCIDevice *dev = NULL; const char *pci_addr = qdict_get_str(qdict, "pci_addr"); @@ -273,20 +273,26 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data) if (!strcmp(pci_addr, "auto")) pci_addr = NULL; - if (strcmp(type, "nic") == 0) + if (strcmp(type, "nic") == 0) { dev = qemu_pci_hot_add_nic(mon, pci_addr, opts); - else if (strcmp(type, "storage") == 0) + } else if (strcmp(type, "storage") == 0) { dev = qemu_pci_hot_add_storage(mon, pci_addr, opts); - else + } else { monitor_printf(mon, "invalid type: %s\n", type); + return -1; + } if (dev) { *ret_data = qobject_from_jsonf("{ 'domain': 0, 'bus': %d, 'slot': %d, " "'function': %d }", pci_bus_num(dev->bus), PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); - } else + } else { monitor_printf(mon, "failed to add %s\n", opts); + return -1; + } + + return 0; } #endif diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 6e84f7604..2831055a7 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -857,7 +857,7 @@ ETEXI .params = "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", .help = "hot-add PCI device", .user_print = pci_device_hot_add_print, - .mhandler.cmd_new = pci_device_hot_add, + .cmd_new_ret = pci_device_hot_add, }, #endif diff --git a/sysemu.h b/sysemu.h index 9c3b28109..d41a338fe 100644 --- a/sysemu.h +++ b/sysemu.h @@ -213,7 +213,7 @@ DriveInfo *add_init_drive(const char *opts); /* pci-hotplug */ void pci_device_hot_add_print(Monitor *mon, const QObject *data); -void pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data); +int 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,