diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index e8c066adff25086e71179e7299b9bbf77c542382..a3559d1fcdab550ac1a75f14baeea952d485226f 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -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;