[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 03/10] scsi/scsi_bus: switch search direction in scsi_device_f
From: |
Paolo Bonzini |
Subject: |
[PATCH v6 03/10] scsi/scsi_bus: switch search direction in scsi_device_find |
Date: |
Fri, 2 Oct 2020 19:35:51 +0200 |
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 94921c04b1..69d7c3f90c 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1571,7 +1571,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);
@@ -1579,7 +1579,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
- [PATCH v6 00/10] Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread, Paolo Bonzini, 2020/10/02
- [PATCH v6 01/10] qdev: add "check if address free" callback for buses, Paolo Bonzini, 2020/10/02
- [PATCH v6 02/10] scsi: switch to bus->check_address, Paolo Bonzini, 2020/10/02
- [PATCH v6 04/10] device_core: use drain_call_rcu in in qmp_device_add, Paolo Bonzini, 2020/10/02
- [PATCH v6 03/10] scsi/scsi_bus: switch search direction in scsi_device_find,
Paolo Bonzini <=
- [PATCH v6 05/10] device-core: use RCU for list of children of a bus, Paolo Bonzini, 2020/10/02
- [PATCH v6 06/10] device-core: use atomic_set on .realized property, Paolo Bonzini, 2020/10/02
- [PATCH v6 07/10] scsi/scsi-bus: scsi_device_find: don't return unrealized devices, Paolo Bonzini, 2020/10/02
- [PATCH v6 10/10] scsi/scsi_bus: fix races in REPORT LUNS, Paolo Bonzini, 2020/10/02
- [PATCH v6 08/10] scsi/scsi_bus: Add scsi_device_get, Paolo Bonzini, 2020/10/02
- [PATCH v6 09/10] virtio-scsi: use scsi_device_get, Paolo Bonzini, 2020/10/02
- Re: [PATCH v6 00/10] Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread, no-reply, 2020/10/03