From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43010 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjvfo-0002kZ-DA for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pjvfa-0003Se-2u for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:27:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PjvfZ-0003ST-Kq for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:27:57 -0500 From: Kevin Wolf Date: Mon, 31 Jan 2011 16:29:05 +0100 Message-Id: <1296487756-12553-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1296487756-12553-1-git-send-email-kwolf@redhat.com> References: <1296487756-12553-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/28] scsi hotplug: Set DriveInfo member bus correctly List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster drive_init() picks the first free bus and unit number, unless the user specifies them. This isn't a good fit for the drive_add monitor command, because there we specify the controller by PCI address instead of using bus number set by drive_init(). scsi_hot_add() takes care to replace the unit number set by drive_init() by the real one, but it neglects to replace the bus number. Thus, bus/unit in DriveInfo may be bogus. Affects drive_get() and drive_get_max_bus(). I'm not aware of anything bad happening because of that; looks like by the time we're hot-plugging, the two functions aren't used anymore. Fix it anyway. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/pci-hotplug.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 270a982..b6dcbda 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -90,6 +90,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, * specified). */ dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1); + dinfo->bus = scsibus->busnr; scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo->bdrv, dinfo->unit, false); if (!scsidev) { return -1; -- 1.7.2.3