[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/32] lsi: avoid redundant tests of s->current != N
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/32] lsi: avoid redundant tests of s->current != NULL |
Date: |
Fri, 27 Jul 2012 17:02:32 +0200 |
Simplify the code by checking against req->hba_private directly,
and asserting that it is non-NULL before a command is completed
or canceled.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/lsi53c895a.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 078ab6d..5f6cb17 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -706,7 +706,7 @@ static void lsi_command_complete(SCSIRequest *req, uint32_t
status, size_t resid
lsi_set_phase(s, PHASE_ST);
}
- if (s->current && req == s->current->req) {
+ if (req->hba_private == s->current) {
req->hba_private = NULL;
lsi_request_free(s, s->current);
scsi_req_unref(req);
@@ -720,7 +720,8 @@ static void lsi_transfer_data(SCSIRequest *req, uint32_t
len)
LSIState *s = DO_UPCAST(LSIState, dev.qdev, req->bus->qbus.parent);
int out;
- if (s->waiting == 1 || !s->current || req->hba_private != s->current ||
+ assert(req->hba_private);
+ if (s->waiting == 1 || req->hba_private != s->current ||
(lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON))) {
if (lsi_queue_req(s, req, len)) {
return;
--
1.7.10.4
- [Qemu-devel] [PULL 00/32] SCSI patches for 2012-08-27, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 03/32] lsi: use qdev_reset_all, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 02/32] megasas: fix misuse of scsi_req_abort, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 01/32] megasas: Replace trace_megasas_dcmd_dump_frame(), Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 05/32] lsi: avoid redundant tests of s->current != NULL,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/32] scsi-block: remove properties that are not relevant for passthrough, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 04/32] lsi: introduce lsi_request_free, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 09/32] scsi-disk: make discard asynchronous, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 07/32] cutils: add strpadcpy(), Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 10/32] scsi-disk: move all non-DMA commands to scsi_disk_emulate_command, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 11/32] scsi-disk: split scsi-disk reqops, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 13/32] scsi-disk: support emulated TO_DEV requests, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 08/32] scsi-disk: let the user customize vendor and product name, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 14/32] scsi-disk: adjust offsets in MODE SENSE by 2, Paolo Bonzini, 2012/07/27
- [Qemu-devel] [PATCH 17/32] scsi-disk: support toggling the write cache, Paolo Bonzini, 2012/07/27