From 6bcfd3db479e3ed7d203cca282e3fbeea1dc75b6 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Thu, 22 Dec 2011 05:01:59 +0100 Subject: [PATCH 07/10] virtio-serial: Turn props any virtio-serial-bus device must have into bus props RH-Author: Amit Shah Message-id: <1cd7fd4944f09eb63245a7003ba8ce735fb9412a.1324529974.git.amit.shah@redhat.com> Patchwork-id: 35925 O-Subject: [RHEL6.3 qemu-kvm PATCH 07/10] virtio-serial: Turn props any virtio-serial-bus device must have into bus props Bugzilla: 769528 RH-Acked-by: Paolo Bonzini RH-Acked-by: Gerd Hoffmann RH-Acked-by: Markus Armbruster From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori (cherry picked from commit d6cca4b048c5b63547d5c09fb47a10f0057b88bf) Signed-off-by: Amit Shah --- hw/virtio-console.c | 4 ---- hw/virtio-serial-bus.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) Signed-off-by: Michal Novotny --- hw/virtio-console.c | 4 ---- hw/virtio-serial-bus.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index ac9bc57..8bf1cab 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -161,9 +161,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(), }, }; @@ -180,9 +178,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 7ab6011..ba53b7f 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -717,6 +717,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) -- 1.7.7.4