From patchwork Fri Jun 4 16:33:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [19/27] scsi: Fix info qtree for scsi-disk.ver Date: Fri, 04 Jun 2010 06:33:07 -0000 From: Kevin Wolf X-Patchwork-Id: 54645 Message-Id: <1275669195-28312-20-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Show the actual default value instead of when the property has not been set. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/scsi-disk.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index e8c066a..a3559d1 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;