From 556cd09885bec3f69ba78228fe4e46dc1dad145b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 9 Dec 2009 17:07:53 +0100 Subject: qdev: Replace device names containing whitespace Device names with whitespace require quoting in the shell and in the monitor. Some of the offenders are also overly long. Some have a more convenient alias, some don't. The place for verbose device names is DeviceInfo member desc. The name should be short & sweet. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- hw/usb-serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'hw/usb-serial.c') diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 14e410ed9..2775cf0f0 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -577,7 +577,7 @@ static USBDevice *usb_serial_init(const char *filename) if (!cdrv) return NULL; - dev = usb_create(NULL /* FIXME */, "QEMU USB Serial"); + dev = usb_create(NULL /* FIXME */, "usb-serial"); qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); if (vendorid) qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid); @@ -597,7 +597,7 @@ static USBDevice *usb_braille_init(const char *unused) if (!cdrv) return NULL; - dev = usb_create(NULL /* FIXME */, "QEMU USB Braille"); + dev = usb_create(NULL /* FIXME */, "usb-braille"); qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); qdev_init(&dev->qdev); @@ -606,8 +606,7 @@ static USBDevice *usb_braille_init(const char *unused) static struct USBDeviceInfo serial_info = { .product_desc = "QEMU USB Serial", - .qdev.name = "QEMU USB Serial", - .qdev.alias = "usb-serial", + .qdev.name = "usb-serial", .qdev.size = sizeof(USBSerialState), .init = usb_serial_initfn, .handle_packet = usb_generic_handle_packet, @@ -627,8 +626,7 @@ static struct USBDeviceInfo serial_info = { static struct USBDeviceInfo braille_info = { .product_desc = "QEMU USB Braille", - .qdev.name = "QEMU USB Braille", - .qdev.alias = "usb-braille", + .qdev.name = "usb-braille", .qdev.size = sizeof(USBSerialState), .init = usb_serial_initfn, .handle_packet = usb_generic_handle_packet, -- cgit v1.2.3