Commit 8f6e699d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

lsi: avoid redundant tests of s->current != NULL 



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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d2a9998f

hw/lsi53c895a.c

+3 −2
Original line number Diff line number Diff line
@@ -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;