[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] scsi hotplug: Set DriveInfo member bus correc
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 01/10] scsi hotplug: Set DriveInfo member bus correctly |
Date: |
Thu, 27 Jan 2011 13:29:08 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/10] -drive/drive_add fixes and cleanups, Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 03/10] blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h, Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 01/10] scsi hotplug: Set DriveInfo member bus correctly,
Markus Armbruster <=
- [Qemu-devel] [PATCH 02/10] blockdev: New drive_get_next(), replacing qdev_init_bdrv(), Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 08/10] blockdev: New drive_get_by_index(), Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 07/10] blockdev: Factor drive_index_to_{bus, unit}_id out of drive_init(), Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 06/10] blockdev: Replace drive_add()'s fmt, ... by optstr parameter, Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 09/10] blockdev: Reject multiple definitions for the same drive, Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 05/10] blockdev: Make drive_add() take explicit type, index parameters, Markus Armbruster, 2011/01/27
- [Qemu-devel] [PATCH 04/10] blockdev: Put BlockInterfaceType names and max_devs in tables, Markus Armbruster, 2011/01/27