From patchwork Fri Oct 16 15:23:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 36241 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 DD21AB7BCC for ; Sat, 17 Oct 2009 02:48:28 +1100 (EST) Received: from localhost ([127.0.0.1]:47516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myp2W-0007Ba-Mf for incoming@patchwork.ozlabs.org; Fri, 16 Oct 2009 11:48:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MyofB-0007Y0-Ap for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Myof6-0007QC-6l for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:16 -0400 Received: from [199.232.76.173] (port=55652 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myof5-0007Os-JP for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29816) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Myof5-0007YF-5e for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:11 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFOAk0018293 for ; Fri, 16 Oct 2009 11:24:10 -0400 Received: from localhost (vpn-13-155.rdu.redhat.com [10.11.13.155]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFO8tE023368 for ; Fri, 16 Oct 2009 11:24:09 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2009 12:23:48 -0300 Message-Id: <1255706631-3742-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> References: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 6/9] monitor: Convert do_pci_device_hot_remove() 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 Errors are still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino --- hw/pci-hotplug.c | 3 ++- qemu-monitor.hx | 3 ++- sysemu.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 35fa290..ad9893a 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -230,7 +230,8 @@ void pci_device_hot_remove(Monitor *mon, const char *pci_addr) qdev_unplug(&d->qdev); } -void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict) +void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, + QObject **ret_data) { pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr")); } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 41fbfd3..4610ad4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -816,7 +816,8 @@ ETEXI .args_type = "pci_addr:s", .params = "[[:]:]", .help = "hot remove PCI device", - .mhandler.cmd = do_pci_device_hot_remove, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_pci_device_hot_remove, }, #endif diff --git a/sysemu.h b/sysemu.h index 763861d..d91ef67 100644 --- a/sysemu.h +++ b/sysemu.h @@ -211,7 +211,8 @@ void destroy_nic(dev_match_fn *match_fn, void *arg); void pci_device_hot_add(Monitor *mon, const QDict *qdict); 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); +void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict, + QObject **ret_data); void pci_device_hot_remove_success(PCIDevice *dev); /* serial ports */