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:
e3f4d32
)
hw/usb/dev-storage.c: fix compile warning because of MARU define
author
Igor Mitsyanko
<i.mitsyanko@samsung.com>
Thu, 28 Jun 2012 15:01:21 +0000
(19:01 +0400)
committer
Evgeny Voevodin
<e.voevodin@samsung.com>
Fri, 6 Jul 2012 08:01:05 +0000
(12:01 +0400)
Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
hw/usb/dev-storage.c
patch
|
blob
|
history
diff --git
a/hw/usb/dev-storage.c
b/hw/usb/dev-storage.c
index 1e88fad36cbb3dd5ea865b74dd0a247bf2498ae0..978c8a56248ad88703a070631b08a63c8e9387b6 100644
(file)
--- a/
hw/usb/dev-storage.c
+++ b/
hw/usb/dev-storage.c
@@
-590,8
+590,10
@@
static USBDevice *usb_msd_init(USBBus *bus, const char *filename)
QemuOpts *opts;
DriveInfo *dinfo;
USBDevice *dev;
+#ifndef CONFIG_MARU
const char *p1;
char fmt[32];
+#endif
/* parse -usbdevice disk: syntax into drive opts */
snprintf(id, sizeof(id), "usb%d", nr++);