summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-05-19 13:37:16 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-23 11:20:41 -0500
commitd6cca4b048c5b63547d5c09fb47a10f0057b88bf (patch)
treec3fc8608da318ca9fa912bb1722cbe3d9de46895
parentvirtio-serial: Clean up virtser_bus_dev_print() output (diff)
downloadqemu-kvm-d6cca4b048c5b63547d5c09fb47a10f0057b88bf.tar.gz
qemu-kvm-d6cca4b048c5b63547d5c09fb47a10f0057b88bf.tar.bz2
qemu-kvm-d6cca4b048c5b63547d5c09fb47a10f0057b88bf.zip
virtio-serial: Turn props any virtio-serial-bus device must have into bus props
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/virtio-console.c4
-rw-r--r--hw/virtio-serial-bus.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 7ebfa2651..fe5e188bf 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -139,9 +139,7 @@ static VirtIOSerialPortInfo virtconsole_info = {
.init = virtconsole_initfn,
.exit = virtconsole_exitfn,
.qdev.props = (Property[]) {
- DEFINE_PROP_UINT32("nr", VirtConsole, port.id, VIRTIO_CONSOLE_BAD_ID),
DEFINE_PROP_CHR("chardev", VirtConsole, chr),
- DEFINE_PROP_STRING("name", VirtConsole, port.name),
DEFINE_PROP_END_OF_LIST(),
},
};
@@ -158,9 +156,7 @@ static VirtIOSerialPortInfo virtserialport_info = {
.init = virtconsole_initfn,
.exit = virtconsole_exitfn,
.qdev.props = (Property[]) {
- DEFINE_PROP_UINT32("nr", VirtConsole, port.id, VIRTIO_CONSOLE_BAD_ID),
DEFINE_PROP_CHR("chardev", VirtConsole, chr),
- DEFINE_PROP_STRING("name", VirtConsole, port.name),
DEFINE_PROP_END_OF_LIST(),
},
};
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index e7e12f092..c5eb93109 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -668,6 +668,11 @@ static struct BusInfo virtser_bus_info = {
.name = "virtio-serial-bus",
.size = sizeof(VirtIOSerialBus),
.print_dev = virtser_bus_dev_print,
+ .props = (Property[]) {
+ DEFINE_PROP_UINT32("nr", VirtIOSerialPort, id, VIRTIO_CONSOLE_BAD_ID),
+ DEFINE_PROP_STRING("name", VirtIOSerialPort, name),
+ DEFINE_PROP_END_OF_LIST()
+ }
};
static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)