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/ide/cmd646.c | 4 ++-- hw/ide/piix.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'hw/ide') diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 3b7c60608..e1e626e2a 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -245,7 +245,7 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, { PCIDevice *dev; - dev = pci_create(bus, -1, "CMD646 IDE"); + dev = pci_create(bus, -1, "cmd646-ide"); qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled); qdev_init_nofail(&dev->qdev); @@ -254,7 +254,7 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, static PCIDeviceInfo cmd646_ide_info[] = { { - .qdev.name = "CMD646 IDE", + .qdev.name = "cmd646-ide", .qdev.size = sizeof(PCIIDEState), .init = pci_cmd646_ide_initfn, .qdev.props = (Property[]) { diff --git a/hw/ide/piix.c b/hw/ide/piix.c index ec93f29b5..de3648023 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -161,7 +161,7 @@ void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) { PCIDevice *dev; - dev = pci_create_simple(bus, devfn, "PIIX3 IDE"); + dev = pci_create_simple(bus, devfn, "piix3-ide"); pci_ide_create_devs(dev, hd_table); } @@ -171,18 +171,18 @@ void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) { PCIDevice *dev; - dev = pci_create_simple(bus, devfn, "PIIX4 IDE"); + dev = pci_create_simple(bus, devfn, "piix4-ide"); pci_ide_create_devs(dev, hd_table); } static PCIDeviceInfo piix_ide_info[] = { { - .qdev.name = "PIIX3 IDE", + .qdev.name = "piix3-ide", .qdev.size = sizeof(PCIIDEState), .qdev.no_user = 1, .init = pci_piix3_ide_initfn, },{ - .qdev.name = "PIIX4 IDE", + .qdev.name = "piix4-ide", .qdev.size = sizeof(PCIIDEState), .qdev.no_user = 1, .init = pci_piix4_ide_initfn, -- cgit v1.2.3