From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN1Xe-00048O-H2 for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN1Xc-0002qK-Dn for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:22 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:48507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN1Xc-0002ps-1Z for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:20 -0400 Received: from blackfin.pond.sub.org (p5B32D5F1.dip.t-dialin.net [91.50.213.241]) by oxygen.pond.sub.org (Postfix) with ESMTPA id B688D2DD4A2 for ; Thu, 19 May 2011 13:37:17 +0200 (CEST) From: Markus Armbruster Date: Thu, 19 May 2011 13:37:16 +0200 Message-Id: <1305805037-17752-4-git-send-email-armbru@redhat.com> In-Reply-To: <1305805037-17752-1-git-send-email-armbru@redhat.com> References: <1305805037-17752-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] virtio-serial: Turn props any virtio-serial-bus device must have into bus props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, alevy@redhat.com, kraxel@redhat.com Signed-off-by: Markus Armbruster --- 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 de539c4..9185140 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -117,9 +117,7 @@ static VirtIOSerialPortInfo virtconsole_info = { .exit = virtconsole_exitfn, .qdev.props = (Property[]) { DEFINE_PROP_UINT8("is_console", VirtConsole, port.is_console, 1), - 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(), }, }; @@ -152,9 +150,7 @@ static VirtIOSerialPortInfo virtserialport_info = { .init = virtserialport_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 bd3121e..a7d6b2b 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -642,6 +642,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 VirtIOSerialBus *virtser_bus_new(DeviceState *dev) -- 1.7.2.3