From patchwork Wed Jul 6 14:55:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9216481 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 4F13D60467 for ; Wed, 6 Jul 2016 14:59:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 411A124B5E for ; Wed, 6 Jul 2016 14:59:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35E8C24DA2; Wed, 6 Jul 2016 14:59:10 +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 9EF1224B5E for ; Wed, 6 Jul 2016 14:59:09 +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 1bKoEo-00031d-IB; Wed, 06 Jul 2016 14:55:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKoEm-000305-Rf for xen-devel@lists.xen.org; Wed, 06 Jul 2016 14:55:40 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id F8/5A-01707-BEB1D775; Wed, 06 Jul 2016 14:55:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVyuP0Ov+4r6dp wg/NTBCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oz+jbtZCzZqVvx8dZapgfGzXBcjJ4eEgJHE 24n/mLoYuTiEBBYySlxf3coEkmATUJXYcP0UK4gtIiAtce3zZUYQm1kgVOLku3vMILawQLTE5 MNz2UFsFqD6fdcbwep5Bewkpv28wASxQE7i+szpYDangL3EsxstYPVCQDXn3k9lncDIvYCRYR WjenFqUVlqka6RXlJRZnpGSW5iZo6uoaGJXm5qcXFiempOYlKxXnJ+7iZGoHcZgGAHY8sc50O MkhxMSqK8LN+qw4X4kvJTKjMSizPii0pzUosPMcpwcChJ8M6Sqg0XEixKTU+tSMvMAYYZTFqC g0dJhNccJM1bXJCYW5yZDpE6xagoJc57DiQhAJLIKM2Da4OF9iVGWSlhXkagQ4R4ClKLcjNLU OVfMYpzMCoJ80aBTOHJzCuBm/4KaDET0OKfLtUgi0sSEVJSDYxKX0oybL512plyzn9uwH+85r zCrBOqhc/FOF+ZcuyvPit8K7D26/SihPRok5fpcbzFy18yWyTem3HCdhubi2wbh9TXf4fZzJb X5rhU7J8ZFNSrEXsl6IX0nZYihniNleGWwkv5Ni17wm88j/vb9byeH9rXXjq15MlcVt665+il 0zKq7nEi15VYijMSDbWYi4oTAW7c4JpoAgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1467816937!52231344!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46567 invoked from network); 6 Jul 2016 14:55:38 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-5.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 6 Jul 2016 14:55:38 -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 7B6B0AC92; Wed, 6 Jul 2016 14:55:37 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xen.org Date: Wed, 6 Jul 2016 16:55:32 +0200 Message-Id: <1467816934-7183-3-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1467816934-7183-1-git-send-email-jgross@suse.com> References: <1467816934-7183-1-git-send-email-jgross@suse.com> Cc: Juergen Gross , wei.liu2@citrix.com, ian.jackson@eu.citrix.com Subject: [Xen-devel] [PATCH v2 2/4] libxl: refactor domcreate_attach_pci() to use device type framework 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 Signed-off-by: Juergen Gross Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 54 ++++++-------------------------------------- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_pci.c | 32 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 47 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5e05f6f..354c73f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -742,10 +742,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, int ret); -static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, - int ret); -static void domcreate_attach_dtdev(libxl__egc *egc, - libxl__domain_create_state *dcs); +static void domcreate_attach_dtdev(libxl__egc *egc, libxl__multidev *multidev, + int ret); static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -1406,6 +1404,7 @@ static const struct libxl_device_type *device_type_tbl[] = { &libxl__vtpm_devtype, &libxl__usbctrl_devtype, &libxl__usbdev_devtype, + &libxl__pcidev_devtype, }; static void domcreate_attach_devices(libxl__egc *egc, @@ -1440,7 +1439,7 @@ static void domcreate_attach_devices(libxl__egc *egc, return; } - domcreate_attach_pci(egc, multidev, 0); + domcreate_attach_dtdev(egc, multidev, 0); return; error_out: @@ -1480,52 +1479,13 @@ error_out: domcreate_complete(egc, dcs, ret); } -static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, - int ret) -{ - libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); - STATE_AO_GC(dcs->ao); - int i; - int domid = dcs->guest_domid; - - /* convenience aliases */ - libxl_domain_config *const d_config = dcs->guest_config; - - if (ret) { - goto error_out; - } - - for (i = 0; i < d_config->num_pcidevs; i++) { - ret = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); - if (ret < 0) { - LOG(ERROR, "libxl_device_pci_add failed: %d", ret); - goto error_out; - } - } - - if (d_config->num_pcidevs > 0) { - ret = libxl__create_pci_backend(gc, domid, d_config->pcidevs, - d_config->num_pcidevs); - if (ret < 0) { - LOG(ERROR, "libxl_create_pci_backend failed: %d", ret); - goto error_out; - } - } - - domcreate_attach_dtdev(egc, dcs); - return; - -error_out: - assert(ret); - domcreate_complete(egc, dcs, ret); -} - static void domcreate_attach_dtdev(libxl__egc *egc, - libxl__domain_create_state *dcs) + libxl__multidev *multidev, + int ret) { + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); STATE_AO_GC(dcs->ao); int i; - int ret; int domid = dcs->guest_domid; /* convenience aliases */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d16161a..79ce392 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3408,6 +3408,7 @@ extern const struct libxl_device_type libxl__nic_devtype; extern const struct libxl_device_type libxl__vtpm_devtype; extern const struct libxl_device_type libxl__usbctrl_devtype; extern const struct libxl_device_type libxl__usbdev_devtype; +extern const struct libxl_device_type libxl__pcidev_devtype; /*----- Domain destruction -----*/ /* Domain destruction has been split into two functions: diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 236bdd0..9676687 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1291,6 +1291,36 @@ out: return rc; } +static void libxl__add_pcidevs(libxl__egc *egc, libxl__ao *ao, uint32_t domid, + libxl_domain_config *d_config, + libxl__multidev *multidev) +{ + AO_GC; + libxl__ao_device *aodev = libxl__multidev_prepare(multidev); + int i, rc = 0; + + for (i = 0; i < d_config->num_pcidevs; i++) { + rc = libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1); + if (rc < 0) { + LOG(ERROR, "libxl_device_pci_add failed: %d", rc); + goto out; + } + } + + if (d_config->num_pcidevs > 0) { + rc = libxl__create_pci_backend(gc, domid, d_config->pcidevs, + d_config->num_pcidevs); + if (rc < 0) { + LOG(ERROR, "libxl_create_pci_backend failed: %d", rc); + goto out; + } + } + +out: + aodev->rc = rc; + aodev->callback(egc, aodev); +} + static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int force) { @@ -1668,6 +1698,8 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, return 0; } +DEFINE_DEVICE_TYPE_STRUCT(pcidev); + /* * Local variables: * mode: C