From patchwork Thu Oct 8 21:35:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 35539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0174AB7B65 for ; Fri, 9 Oct 2009 09:06:23 +1100 (EST) Received: from localhost ([127.0.0.1]:51442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw17s-0008Pb-7v for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 18:06:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw0f0-0001Pq-1c for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw0eu-0001Ju-Nc for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:28 -0400 Received: from [199.232.76.173] (port=34353 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw0et-0001GT-Ii for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59481) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw0er-00031C-SA for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:22 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98LaLig009277; Thu, 8 Oct 2009 17:36:21 -0400 Received: from localhost (vpn-13-37.rdu.redhat.com [10.11.13.37]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n98LaJJi023668; Thu, 8 Oct 2009 17:36:20 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 18:35:46 -0300 Message-Id: <1255037747-3340-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> References: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 09/10] monitor: Convert pci_device_hot_add() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Return a QDict with the following device information: - "domain": domain number - "bus": bus number - "slot": slot number - "function": function number This commit should not change user output, the following is an example of the returned QDict: { "domain": 0, "bus": 0, "slot": 5, "function": 0 } Please, note that this is only in case of success. In error conditions the handler still calls monitor_printf() directly, as errors are not being converted yet. Signed-off-by: Luiz Capitulino --- hw/pci-hotplug.c | 40 ++++++++++++++++++++++++++++++++++++---- qemu-monitor.hx | 3 ++- sysemu.h | 3 ++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index ccd2cf3..3234265 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -33,6 +33,7 @@ #include "scsi-disk.h" #include "virtio-blk.h" #include "qemu-config.h" +#include "qmisc.h" #if defined(TARGET_I386) || defined(TARGET_X86_64) static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, @@ -177,7 +178,36 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, return dev; } -void pci_device_hot_add(Monitor *mon, const QDict *qdict) +void pci_add_user_print(Monitor *mon, const QObject *data) +{ + QDict *qdict; + + assert(qobject_type(data) == QTYPE_QDICT); + qdict = qobject_to_qdict(data); + + monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n", + (int) qdict_get_int(qdict, "domain"), + (int) qdict_get_int(qdict, "bus"), + (int) qdict_get_int(qdict, "slot"), + (int) qdict_get_int(qdict, "function")); + +} + +/** + * pci_device_hot_add(): Hot add PCI device + * + * Return a QDict with the following device information: + * + * - "domain": domain number + * - "bus": bus number + * - "slot": slot number + * - "function": function number + * + * Example: + * + * { "domain": 0, "bus": 0, "slot": 5, "function": 0 } + */ +void 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"); @@ -204,9 +234,11 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict) monitor_printf(mon, "invalid type: %s\n", type); if (dev) { - monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n", - 0, pci_bus_num(dev->bus), PCI_SLOT(dev->devfn), - PCI_FUNC(dev->devfn)); + *ret_data = qobject_from_fmt(" { s:i, s:i, s:i, s:i }", + "domain", 0, "bus", pci_bus_num(dev->bus), + "slot", PCI_SLOT(dev->devfn), + "function", PCI_FUNC(dev->devfn)); + assert(*ret_data != NULL); } else monitor_printf(mon, "failed to add %s\n", opts); } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 41fbfd3..37dc863 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -801,7 +801,8 @@ ETEXI .args_type = "pci_addr:s,type:s,opts:s?", .params = "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", .help = "hot-add PCI device", - .mhandler.cmd = pci_device_hot_add, + .user_print = pci_add_user_print, + .mhandler.cmd_new = pci_device_hot_add, }, #endif diff --git a/sysemu.h b/sysemu.h index 763861d..17b91c4 100644 --- a/sysemu.h +++ b/sysemu.h @@ -208,7 +208,8 @@ DriveInfo *add_init_drive(const char *opts); void destroy_nic(dev_match_fn *match_fn, void *arg); /* pci-hotplug */ -void pci_device_hot_add(Monitor *mon, const QDict *qdict); +void pci_add_user_print(Monitor *mon, const QObject *data); +void 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);