aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-12-15 11:43:02 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-18 11:26:28 -0600
commiteba6fe8732cb5109b6fcf6a973d8959827eb7af4 (patch)
tree4bbb98f16f0975e6108084fa00b32854e77add1b
parent42be86ce95db944910005aa981a8e9ae5e01b05a (diff)
usb-host: check mon before using it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--usb-linux.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/usb-linux.c b/usb-linux.c
index 105ce88f3c..88728e927e 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1206,7 +1206,8 @@ static int usb_host_read_file(char *line, size_t line_size, const char *device_f
ret = 1;
#if 0
} else {
- monitor_printf(mon, "husb: could not open %s\n", filename);
+ if (mon)
+ monitor_printf(mon, "husb: could not open %s\n", filename);
#endif
}
@@ -1339,15 +1340,17 @@ static int usb_host_scan(void *opaque, USBScanFunc *func)
}
found_devices:
if (!usb_fs_type) {
- monitor_printf(mon, "husb: unable to access USB devices\n");
+ if (mon)
+ monitor_printf(mon, "husb: unable to access USB devices\n");
return -ENOENT;
}
/* the module setting (used later for opening devices) */
usb_host_device_path = qemu_mallocz(strlen(devpath)+1);
strcpy(usb_host_device_path, devpath);
- monitor_printf(mon, "husb: using %s file-system with %s\n",
- fs_type[usb_fs_type], usb_host_device_path);
+ if (mon)
+ monitor_printf(mon, "husb: using %s file-system with %s\n",
+ fs_type[usb_fs_type], usb_host_device_path);
}
switch (usb_fs_type) {