From patchwork Tue Nov 22 06:10:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9440529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 484F6605EE for ; Tue, 22 Nov 2016 06:13:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4179828452 for ; Tue, 22 Nov 2016 06:13:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 365C828469; Tue, 22 Nov 2016 06:13:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB1C728452 for ; Tue, 22 Nov 2016 06:13:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c94IM-0007bt-Eg; Tue, 22 Nov 2016 06:11:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c94IK-0007bK-T9 for xen-devel@lists.xensource.com; Tue, 22 Nov 2016 06:11:05 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 3A/42-03293-771E3385; Tue, 22 Nov 2016 06:11:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRWlGSWpSXmKPExsVyuP0Ov275Q+M IgxcrpS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8af2zvYCxaJVlzZVtjA+Fewi5GTQ0LASOLt xH9MXYxcHEICCxklvr9bwwqSYBNQldhw/RSYLSJgKTFrfRuYzSzQwCjR8CMRxBYWcJbYvvA3U JyDgwWo/sQjNpAwr4CJxI7761kh5stLXPv+DyzOKWAqse7pQSYQWwioZsr7CcwTGLkXMDKsYl QvTi0qSy3SNdJLKspMzyjJTczM0TU0MNbLTS0uTkxPzUlMKtZLzs/dxAj0bD0DA+MOxlPNzoc YJTmYlER5Dy81ihDiS8pPqcxILM6ILyrNSS0+xCjDwaEkwWv1wDhCSLAoNT21Ii0zBxhiMGkJ Dh4lEd4kkDRvcUFibnFmOkTqFKOilDivEUhCACSRUZoH1wYL60uMslLCvIwMDAxCPAWpRbmZJ ajyrxjFORiVhHnLQKbwZOaVwE1/BbSYCWixEqsByOKSRISUVAMjv0dRS/Oe27vCtVoYROy92k 0iPD/umNRw5s+DMvHVXPPDlZeKTmLf37zV5IDE3lOMobJ3BDkXyUjrZU7nuPi3NHeXcMpEw85 K22lv1k/aX/AtcbLO73c+ou+2esT+MejqdQlUeOYUKbRE99KUuCAT02/mhavST2ifP/uzSuZs eX3jhso5qReUWIozEg21mIuKEwEZVPZ2ZgIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1479795063!71494025!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24815 invoked from network); 22 Nov 2016 06:11:03 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-10.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 22 Nov 2016 06:11:03 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E2777AAD1; Tue, 22 Nov 2016 06:11:02 +0000 (UTC) From: Juergen Gross To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Date: Tue, 22 Nov 2016 07:10:56 +0100 Message-Id: <20161122061059.26058-2-jgross@suse.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161122061059.26058-1-jgross@suse.com> References: <20161122061059.26058-1-jgross@suse.com> Cc: anthony.perard@citrix.com, Juergen Gross , sstabellini@kernel.org, kraxel@redhat.com, armbru@redhat.com Subject: [Xen-devel] [PATCH v3 1/4] xen: add an own bus for xen backend devices X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add a bus for Xen backend devices in order to be able to establish a dedicated device path for pluggable devices. Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini --- hw/xen/xen_backend.c | 19 ++++++++++++++++--- include/hw/xen/xen_backend.h | 4 ++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 41ba5c5..5ad3caa 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -29,14 +29,14 @@ #include "hw/sysbus.h" #include "sysemu/char.h" #include "qemu/log.h" +#include "qapi/error.h" #include "hw/xen/xen_backend.h" #include "hw/xen/xen_pvdev.h" #include -#define TYPE_XENSYSDEV "xensysdev" - DeviceState *xen_sysdev; +BusState *xen_sysbus; /* ------------------------------------------------------------- */ @@ -528,6 +528,8 @@ int xen_be_init(void) xen_sysdev = qdev_create(NULL, TYPE_XENSYSDEV); qdev_init_nofail(xen_sysdev); + xen_sysbus = qbus_create(TYPE_XENSYSBUS, DEVICE(xen_sysdev), "xen-sysbus"); + qbus_set_bus_hotplug_handler(xen_sysbus, &error_abort); return 0; @@ -586,6 +588,15 @@ int xen_be_bind_evtchn(struct XenDevice *xendev) } +static const TypeInfo xensysbus_info = { + .name = TYPE_XENSYSBUS, + .parent = TYPE_BUS, + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } +}; + static int xen_sysdev_init(SysBusDevice *dev) { return 0; @@ -602,6 +613,7 @@ static void xen_sysdev_class_init(ObjectClass *klass, void *data) k->init = xen_sysdev_init; dc->props = xen_sysdev_properties; + dc->bus_type = TYPE_XENSYSBUS; } static const TypeInfo xensysdev_info = { @@ -613,7 +625,8 @@ static const TypeInfo xensysdev_info = { static void xenbe_register_types(void) { + type_register_static(&xensysbus_info); type_register_static(&xensysdev_info); } -type_init(xenbe_register_types); +type_init(xenbe_register_types) diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index cbda40e..38f730e 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -6,12 +6,16 @@ #include "sysemu/sysemu.h" #include "net/net.h" +#define TYPE_XENSYSDEV "xen-sysdev" +#define TYPE_XENSYSBUS "xen-sysbus" + /* variables */ extern xc_interface *xen_xc; extern xenforeignmemory_handle *xen_fmem; extern struct xs_handle *xenstore; extern const char *xen_protocol; extern DeviceState *xen_sysdev; +extern BusState *xen_sysbus; int xenstore_mkdir(char *path, int p); int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const char *val);