From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50111 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJWVf-0000ym-KC for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJWGW-0006p7-Sp for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:42 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44345) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJWGW-0006oS-F6 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 14:32:40 -0400 Received: from blackfin.pond.sub.org (pD9E39C24.dip.t-dialin.net [217.227.156.36]) by oxygen.pond.sub.org (Postfix) with ESMTPA id A52B6276D3E for ; Tue, 1 Jun 2010 20:32:37 +0200 (CEST) From: Markus Armbruster Date: Tue, 1 Jun 2010 20:32:35 +0200 Message-Id: <1275417155-28244-15-git-send-email-armbru@redhat.com> In-Reply-To: <1275417155-28244-1-git-send-email-armbru@redhat.com> References: <1275417155-28244-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 14/14] scsi: Fix info qtree for scsi-disk.ver List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com Show the actual default value instead of when the property has not been set. Signed-off-by: Markus Armbruster --- 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; -- 1.6.6.1