From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLcT-0002ED-49 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:57 -0500 Received: from [199.232.76.173] (port=52973 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLcS-0002Dm-28 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLcG-0000SJ-De for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:55 -0500 Received: from mx20.gnu.org ([199.232.41.8]:5317) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLcC-0000Qy-KY for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:41 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkLcA-00017i-Pq for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:39 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 6E4682E2B00 for ; Wed, 24 Feb 2010 18:56:03 +0100 (CET) From: Markus Armbruster Date: Wed, 24 Feb 2010 18:55:26 +0100 Message-Id: <1267034160-3517-15-git-send-email-armbru@redhat.com> In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 14/48] error: Don't abuse qemu_error() for non-error in scsi_hot_add() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Commit 30d335d6 converted an informational message from monitor_printf() to qemu_error(), probably because the latter doesn't need a mon argument. A later commit will make qemu_error() print additional stuff that is only appropriate for proper errors, and then this will break. Clean it up. Signed-off-by: Markus Armbruster --- hw/pci-hotplug.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 215dc42..aa7e870 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -73,7 +73,8 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, return pci_nic_init(&nd_table[ret], "rtl8139", devaddr); } -static int scsi_hot_add(DeviceState *adapter, DriveInfo *dinfo, int printinfo) +static int scsi_hot_add(Monitor *mon, DeviceState *adapter, + DriveInfo *dinfo, int printinfo) { SCSIBus *scsibus; SCSIDevice *scsidev; @@ -97,7 +98,7 @@ static int scsi_hot_add(DeviceState *adapter, DriveInfo *dinfo, int printinfo) dinfo->unit = scsidev->id; if (printinfo) - qemu_error("OK bus %d, unit %d", scsibus->busnr, scsidev->id); + monitor_printf(mon, "OK bus %d, unit %d", scsibus->busnr, scsidev->id); return 0; } @@ -131,7 +132,7 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) monitor_printf(mon, "no pci device with address %s\n", pci_addr); goto err; } - if (scsi_hot_add(&dev->qdev, dinfo, 1) != 0) { + if (scsi_hot_add(mon, &dev->qdev, dinfo, 1) != 0) { goto err; } break; @@ -203,7 +204,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, if (qdev_init(&dev->qdev) < 0) dev = NULL; if (dev && dinfo) { - if (scsi_hot_add(&dev->qdev, dinfo, 0) != 0) { + if (scsi_hot_add(mon, &dev->qdev, dinfo, 0) != 0) { qdev_unplug(&dev->qdev); dev = NULL; } -- 1.6.6