[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/14] scsi: Fix info qtree for scsi-disk.ver
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 14/14] scsi: Fix info qtree for scsi-disk.ver |
Date: |
Fri, 28 May 2010 15:38:55 +0200 |
Show the actual default value instead of <null> when the property has
not been set.
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/14] Block-related fixes and cleanups, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 09/14] qdev: New qdev_prop_set_string(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 06/14] ide: Split ide_init1() off ide_init2(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 08/14] ide: Split non-qdev code off ide_init2(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 10/14] qdev: Don't leak string property value on hot unplug, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 07/14] ide: Change ide_init_drive() to require valid dinfo argument, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 05/14] ide: Remove redundant IDEState member conf, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 11/14] ide: Turn drive serial into a qdev property ide-drive.serial, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 14/14] scsi: Fix info qtree for scsi-disk.ver,
Markus Armbruster <=
- [Qemu-devel] [PATCH 13/14] scsi: Turn drive serial into a qdev property scsi-disk.serial, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 02/14] blockdev: Belatedly remove driveopts, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 01/14] blockdev: Belatedly remove MAX_DRIVES, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 12/14] ide: Fix info qtree for ide-drive.ver, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 04/14] ide: Remove useless IDEDeviceInfo members unit, drive, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 03/14] usb: Remove unused usb_device_add() parameter is_hotplug, Markus Armbruster, 2010/05/28
- [Qemu-devel] Re: [PATCH 00/14] Block-related fixes and cleanups, Gerd Hoffmann, 2010/05/31