falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: Simplify the parameter parsing of the legacy usb serial device 

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 <thuth@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1495177204-16808-1-git-send-email-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Thomas Huth 2017-05-19 09:00:04 +02:00 committed by Gerd Hoffmann
parent b813bed1ab
commit e14935df26
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/usb/dev-serial.c
View File

@ -516,27 +516,16 @@ static USBDevice *usb_serial_init(USBBus *bus, const char *filename)
char label[32]; char label[32];
static int index; static int index;
while (*filename && *filename != ':') { if (*filename == ':') {
const char *p; filename++;
} else if (*filename) {
if (strstart(filename, "vendorid=", &p)) { error_report("unrecognized serial USB option %s", filename);
error_report("vendorid is not supported anymore"); return NULL;
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) { if (!*filename) {
error_report("character device specification needed"); error_report("character device specification needed");
return NULL; return NULL;
} }
filename++;
snprintf(label, sizeof(label), "usbserial%d", index++); snprintf(label, sizeof(label), "usbserial%d", index++);
cdrv = qemu_chr_new(label, filename); cdrv = qemu_chr_new(label, filename);