[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find
From: |
Paolo Bonzini |
Subject: |
[PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find |
Date: |
Mon, 12 Oct 2020 16:33:34 -0400 |
From: Maxim Levitsky <mlevitsk@redhat.com>
This change will allow us to convert the bus children list to RCU,
while not changing the logic of this function
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200913160259.32145-2-mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/scsi/scsi-bus.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 3284a5d1fb..6b1ed7ae9a 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1572,7 +1572,7 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel,
int id, int lun)
BusChild *kid;
SCSIDevice *target_dev = NULL;
- QTAILQ_FOREACH_REVERSE(kid, &bus->qbus.children, sibling) {
+ QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
DeviceState *qdev = kid->child;
SCSIDevice *dev = SCSI_DEVICE(qdev);
@@ -1580,7 +1580,15 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel,
int id, int lun)
if (dev->lun == lun) {
return dev;
}
- target_dev = dev;
+
+ /*
+ * If we don't find exact match (channel/bus/lun),
+ * we will return the first device which matches channel/bus
+ */
+
+ if (!target_dev) {
+ target_dev = dev;
+ }
}
}
return target_dev;
--
2.26.2
- [PULL 05/38] migration: Move the creation of the library to the main meson.build, (continued)
- [PULL 05/38] migration: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 06/38] io: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 08/38] authz: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 10/38] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE, Paolo Bonzini, 2020/10/12
- [PULL 09/38] qom: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 12/38] exec: split out non-softmmu-specific parts, Paolo Bonzini, 2020/10/12
- [PULL 11/38] softmmu: move more files to softmmu/, Paolo Bonzini, 2020/10/12
- [PULL 17/38] qtest: unify extra_qtest_srcs and extra_qtest_deps, Paolo Bonzini, 2020/10/12
- [PULL 15/38] docs/devel/qtest: Include protocol spec in document, Paolo Bonzini, 2020/10/12
- [PULL 18/38] docs/devel: update instruction on how to add new unit tests, Paolo Bonzini, 2020/10/12
- [PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find,
Paolo Bonzini <=
- [PULL 26/38] qtest: check that drives are really appearing and disappearing, Paolo Bonzini, 2020/10/12
- [PULL 22/38] qtest: Reintroduce qtest_qmp_receive with QMP event buffering, Paolo Bonzini, 2020/10/12
- [PULL 23/38] qtest: remove qtest_qmp_receive_success, Paolo Bonzini, 2020/10/12
- [PULL 19/38] build-sys: fix git version from -version, Paolo Bonzini, 2020/10/12
- [PULL 24/38] device-plug-test: use qtest_qmp to send the device_del command, Paolo Bonzini, 2020/10/12
- [PULL 25/38] qtest: switch users back to qtest_qmp_receive, Paolo Bonzini, 2020/10/12
- [PULL 20/38] meson.build: Re-enable KVM support for MIPS, Paolo Bonzini, 2020/10/12
- [PULL 21/38] qtest: rename qtest_qmp_receive to qtest_qmp_receive_dict, Paolo Bonzini, 2020/10/12
- [PULL 14/38] docs: Move QTest documentation to its own document, Paolo Bonzini, 2020/10/12
- [PULL 28/38] qdev: add "check if address free" callback for buses, Paolo Bonzini, 2020/10/12