projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e1f956
)
scsi: fix incorrect ?: use
author
Blue Swirl
<blauwirbel@gmail.com>
Fri, 4 Dec 2009 18:08:59 +0000
(18:08 +0000)
committer
Blue Swirl
<blauwirbel@gmail.com>
Fri, 4 Dec 2009 18:08:59 +0000
(18:08 +0000)
Fixes OpenBSD build.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
hw/scsi-disk.c
patch
|
blob
|
history
diff --git
a/hw/scsi-disk.c
b/hw/scsi-disk.c
index
642d791
..
2e7a57b
100644
(file)
--- a/
hw/scsi-disk.c
+++ b/
hw/scsi-disk.c
@@
-346,7
+346,8
@@
static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
case 0x80: /* Device serial number, optional */
{
- const char *serial = req->dev->dinfo->serial ?: "0";
+ const char *serial = req->dev->dinfo->serial ?
+ req->dev->dinfo->serial : "0";
int l = strlen(serial);
if (l > req->cmd.xfer)