Commit cd723b85 authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

scsi-disk: Cleaning up around tray open state 



Even if tray is not open, it can be empty (blk_is_inserted() == false).
Handle both cases correctly by replacing the s->tray_open checks with
blk_is_available(), which is an AND of the two.

Also simplify successive checks of them into blk_is_available(), in a
couple cases.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <1473848224-24809-2-git-send-email-famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 083d012a

hw/scsi/scsi-disk.c

+8 −14
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static void scsi_read_data(SCSIRequest *req) 
        return;

    }



    if (s->tray_open) {

    if (!blk_is_available(req->dev->conf.blk)) {

        scsi_read_complete(r, -ENOMEDIUM);

        return;

    }
@@ -519,7 +519,7 @@ static void scsi_write_data(SCSIRequest *req) 
        scsi_write_complete_noio(r, 0);

        return;

    }

    if (s->tray_open) {

    if (!blk_is_available(req->dev->conf.blk)) {

        scsi_write_complete_noio(r, -ENOMEDIUM);

        return;

    }
@@ -792,10 +792,7 @@ static inline bool media_is_dvd(SCSIDiskState *s) 
    if (s->qdev.type != TYPE_ROM) {

        return false;

    }

    if (!blk_is_inserted(s->qdev.conf.blk)) {

        return false;

    }

    if (s->tray_open) {

    if (!blk_is_available(s->qdev.conf.blk)) {

        return false;

    }

    blk_get_geometry(s->qdev.conf.blk, &nb_sectors);
@@ -808,10 +805,7 @@ static inline bool media_is_cd(SCSIDiskState *s) 
    if (s->qdev.type != TYPE_ROM) {

        return false;

    }

    if (!blk_is_inserted(s->qdev.conf.blk)) {

        return false;

    }

    if (s->tray_open) {

    if (!blk_is_available(s->qdev.conf.blk)) {

        return false;

    }

    blk_get_geometry(s->qdev.conf.blk, &nb_sectors);
@@ -875,7 +869,7 @@ static int scsi_read_dvd_structure(SCSIDiskState *s, SCSIDiskReq *r, 
    }



    if (format != 0xff) {

        if (s->tray_open || !blk_is_inserted(s->qdev.conf.blk)) {

        if (!blk_is_available(s->qdev.conf.blk)) {

            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));

            return -1;

        }
@@ -1857,7 +1851,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) 
        break;



    default:

        if (s->tray_open || !blk_is_inserted(s->qdev.conf.blk)) {

        if (!blk_is_available(s->qdev.conf.blk)) {

            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));

            return 0;

        }
@@ -1886,7 +1880,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) 
    memset(outbuf, 0, r->buflen);

    switch (req->cmd.buf[0]) {

    case TEST_UNIT_READY:

        assert(!s->tray_open && blk_is_inserted(s->qdev.conf.blk));

        assert(blk_is_available(s->qdev.conf.blk));

        break;

    case INQUIRY:

        buflen = scsi_disk_emulate_inquiry(req, outbuf);
@@ -2126,7 +2120,7 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf) 


    command = buf[0];



    if (s->tray_open || !blk_is_inserted(s->qdev.conf.blk)) {

    if (!blk_is_available(s->qdev.conf.blk)) {

        scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));

        return 0;

    }