From patchwork Mon Sep 17 10:00:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 184379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B1ED02C0086 for ; Mon, 17 Sep 2012 20:56:50 +1000 (EST) Received: from localhost ([::1]:35972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY9F-0007zG-Ix for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 06:01:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8U-0006CO-4X for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:01:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDY8M-00052E-Pa for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:01:02 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:24506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8M-00050P-Jb for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:00:54 -0400 Received: from eusync3.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAH003HXNUF9R80@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:01:27 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.14]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MAH00DV7NT8FQ90@eusync3.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:00:52 +0100 (BST) From: Evgeny Voevodin To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2012 14:00:34 +0400 Message-id: <1347876042-22609-5-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> References: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.14 Cc: peter.maydell@linaro.org, kyungmin.park@samsung.com, aliguori@us.ibm.com, Evgeny Voevodin Subject: [Qemu-devel] [RFC v2 04/12] hw/qdev-properties.c: Add "transport" property. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Virtio back-end devices can be plugged into both transports: VIRTIO_PCI and VIRTIO_MMIO. In order to choose the desired transport we have a property "transport" in every back-end state struct. By specifying -device virtio-blk-pci user chooses VIRTIO_PCI transport and "transport" property is set automatically. But in order to provide full control to user we need to have "transport" property available to be set through command line: -device virtio-pci,id=virtio-pci.0 -device virtio-blk,transport=virtio-pci.0,... Signed-off-by: Evgeny Voevodin --- hw/qdev-properties.c | 29 +++++++++++++++++++++++++++++ hw/qdev.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8aca0d4..4226a02 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -2,6 +2,7 @@ #include "qdev.h" #include "qerror.h" #include "blockdev.h" +#include "virtio-transport.h" #include "hw/block-common.h" #include "net/hub.h" @@ -526,6 +527,34 @@ PropertyInfo qdev_prop_drive = { .release = release_drive, }; +/* --- virtio transport --- */ + +static int parse_transport(DeviceState *dev, const char *str, void **ptr) +{ + VirtIOTransportLink *trl; + + trl = virtio_find_transport(str); + + if (trl == NULL) { + return -ENOENT; + } + + *ptr = trl; + + return 0; +} + +static void set_transport(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + set_pointer(obj, v, opaque, parse_transport, name, errp); +} + +PropertyInfo qdev_prop_transport = { + .name = "transport", + .set = set_transport, +}; + /* --- character device --- */ static int parse_chr(DeviceState *dev, const char *str, void **ptr) diff --git a/hw/qdev.h b/hw/qdev.h index d699194..bd6aa6e 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -233,6 +233,7 @@ extern PropertyInfo qdev_prop_macaddr; extern PropertyInfo qdev_prop_losttickpolicy; extern PropertyInfo qdev_prop_bios_chs_trans; extern PropertyInfo qdev_prop_drive; +extern PropertyInfo qdev_prop_transport; extern PropertyInfo qdev_prop_netdev; extern PropertyInfo qdev_prop_vlan; extern PropertyInfo qdev_prop_pci_devfn; @@ -294,6 +295,8 @@ extern PropertyInfo qdev_prop_pci_host_devaddr; DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NetClientState*) #define DEFINE_PROP_DRIVE(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockDriverState *) +#define DEFINE_PROP_TRANSPORT(_n, _s, _f) \ + DEFINE_PROP(_n, _s, _f, qdev_prop_transport, VirtIOTransportLink *) #define DEFINE_PROP_MACADDR(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr) #define DEFINE_PROP_LOSTTICKPOLICY(_n, _s, _f, _d) \