[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] usb: Simplify the parameter parsing of the legac
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/9] usb: Simplify the parameter parsing of the legacy usb serial device |
Date: |
Mon, 29 May 2017 15:09:51 +0200 |
From: Thomas Huth <address@hidden>
Coverity complains about the current code, so let's get rid of
the now unneeded while loop and simply always emit "unrecognized
serial USB option" for all unsupported options.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-serial.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 83a4f0e6fb..76ceca1f5c 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -516,27 +516,16 @@ static USBDevice *usb_serial_init(USBBus *bus, const char
*filename)
char label[32];
static int index;
- while (*filename && *filename != ':') {
- const char *p;
-
- if (strstart(filename, "vendorid=", &p)) {
- error_report("vendorid is not supported anymore");
- return NULL;
- } else if (strstart(filename, "productid=", &p)) {
- error_report("productid is not supported anymore");
- return NULL;
- } else {
- error_report("unrecognized serial USB option %s", filename);
- return NULL;
- }
- while(*filename == ',')
- filename++;
+ if (*filename == ':') {
+ filename++;
+ } else if (*filename) {
+ error_report("unrecognized serial USB option %s", filename);
+ return NULL;
}
if (!*filename) {
error_report("character device specification needed");
return NULL;
}
- filename++;
snprintf(label, sizeof(label), "usbserial%d", index++);
cdrv = qemu_chr_new(label, filename);
--
2.9.3
- [Qemu-devel] [PULL 0/9] usb patch queue, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 3/9] usb: Deprecate HMP commands usb_add and usb_del, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 2/9] usb: Deprecate the legacy -usbdevice option, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 1/9] ehci: fix overflow in frame timer code, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 9/9] ehci: fix frame timer invocation., Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 5/9] xhci: split into multiple files, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 8/9] usb: don't wakeup during coldplug, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 4/9] usb: Simplify the parameter parsing of the legacy usb serial device,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 7/9] usb-hub: set PORT_STAT_C_SUSPEND on host-initiated wake-up, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 6/9] xhci: add CONFIG_USB_XHCI_NEC option, Gerd Hoffmann, 2017/05/29
- Re: [Qemu-devel] [PULL 0/9] usb patch queue, Stefan Hajnoczi, 2017/05/30