Commit 552fee93 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

scsi: Fix info qtree for scsi-disk.ver 



Show the actual default value instead of <null> when the property has
not been set.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a0fef654

hw/scsi-disk.c

+5 −2
Original line number Diff line number Diff line
@@ -462,8 +462,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) 
    }

    memcpy(&outbuf[8], "QEMU    ", 8);

    memset(&outbuf[32], 0, 4);

    memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION,

           MIN(4, strlen(s->version ? s->version : QEMU_VERSION)));

    memcpy(&outbuf[32], s->version, MIN(4, strlen(s->version)));

    /*

     * We claim conformance to SPC-3, which is required for guests

     * to ask for modern features like READ CAPACITY(16) or the
@@ -1066,6 +1065,10 @@ static int scsi_disk_initfn(SCSIDevice *dev) 
        }

    }



    if (!s->version) {

        s->version = qemu_strdup(QEMU_VERSION);

    }



    if (bdrv_is_sg(s->bs)) {

        error_report("scsi-disk: unwanted /dev/sg*");

        return -1;