From patchwork Tue Oct 18 01:53:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 9381083 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 AD49F6086B for ; Tue, 18 Oct 2016 01:59:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 966B328CB7 for ; Tue, 18 Oct 2016 01:59:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 898C428CDF; Tue, 18 Oct 2016 01:59:57 +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 F3A0328CB7 for ; Tue, 18 Oct 2016 01:59:56 +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 1bwJem-0002th-Ly; Tue, 18 Oct 2016 01:57:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwJel-0002sl-HJ for xen-devel@lists.xen.org; Tue, 18 Oct 2016 01:57:31 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id A6/16-28857-A8185085; Tue, 18 Oct 2016 01:57:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsVykCGBTberkTX CoP8Mn8WSj4tZHBg9ju7+zRTAGMWamZeUX5HAmvH/fFTBc96K5XfMGxg/c3UxcnEICUxglHi/ axprFyMnh4SAjsSXSY+YQGwhgd2MErP/SELY+RLbp65mB7HZBEIl2rfPAKsXEZCWuPb5MiPII GaBc4wSLfNbwRLCApESh073AyU4OFgEVCU2PM4BCfMK+Eks+TebHWKXnMS2LXsYQWxOAX+Jza ufsELs8pNYdGkXG0S9oMTJmU9YQMYwC6hLrJ8nBBLmF1CS2Lb+Mlgrs4C8RPPW2cwTGAVnIem YhdAxC0nVAkbmVYwaxalFZalFuobmeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsY geHKAAQ7GG9vDDjEKMnBpCTKO6+INUKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBC9nA1BOsCg1P bUiLTMHGDkwaQkOHiURXkmQNG9xQWJucWY6ROoUo6KUOK8USEIAJJFRmgfXBovWS4yyUsK8jE CHCPEUpBblZpagyr9iFOdgVBLm1QaZwpOZVwI3/RXQYiagxefyWEAWlyQipKQaGPtY71UcLV/ bITs/pk7LouPcofaGqndnJxbZ+TyXmNaxYKX1v4Nb/uzbHtg5x4dF60TDBYakjJSW7z0vXu/Z GPiirHhhT/OX8xtbGhOzcze8vrXM/X84R4638Ku00q23Ctf5bt+tl7bmqcmBVaIdfzunTnef9 +drZ82aCLU9D+xVxI9IX5jvqanEUpyRaKjFXFScCACZimkv0QIAAA== X-Env-Sender: marmarek@mimuw.edu.pl X-Msg-Ref: server-15.tower-27.messagelabs.com!1476755849!12984519!1 X-Originating-IP: [193.0.96.6] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38662 invoked from network); 18 Oct 2016 01:57:30 -0000 Received: from mail.mimuw.edu.pl (HELO mail.mimuw.edu.pl) (193.0.96.6) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 18 Oct 2016 01:57:30 -0000 Received: from localhost (localhost [127.0.0.1]) by duch.mimuw.edu.pl (Postfix) with ESMTP id C1F35240; Tue, 18 Oct 2016 03:57:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at mimuw.edu.pl Received: from mail.mimuw.edu.pl ([193.0.96.6]) by localhost (mail.mimuw.edu.pl [127.0.0.1]) (amavisd-new, port 10028) with ESMTP id JMCBV67anDHW; Tue, 18 Oct 2016 03:57:28 +0200 (CEST) Received: by duch.mimuw.edu.pl (Postfix, from userid 1575) id BC3E9229; Tue, 18 Oct 2016 03:57:26 +0200 (CEST) From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xen.org Date: Tue, 18 Oct 2016 03:53:32 +0200 Message-Id: <1476755613-3921-3-git-send-email-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1476755613-3921-1-git-send-email-marmarek@invisiblethingslab.com> References: <1476755613-3921-1-git-send-email-marmarek@invisiblethingslab.com> MIME-Version: 1.0 Organization: Invisible Things Lab Cc: Wei Liu , Ian Jackson , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Samuel Thibault Subject: [Xen-devel] [PATCH 2/3] libxl: attach PCI device to qemu only after setting pciback/pcifront 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP When qemu is running in stubdomain, handling "pci-ins" command will fail if pcifront is not initialized already. Fix this by sending such command only after confirming that pciback/front is running. It is possible to handle this case in mini-os code, by delaying "pci-ins" handling until pcifront_thread finishes devices discovery. But the same problem most likely will apply to any other stubdomain implementations when they come (Rumprun, Linux) - so better handle this at libxl level. Signed-off-by: Marek Marczykowski-Górecki --- tools/libxl/libxl_pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2ae1bc4..3805d30 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1195,6 +1195,7 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide { libxl_ctx *ctx = libxl__gc_owner(gc); unsigned int orig_vdev, pfunc_mask; + char *be_path; libxl_device_pci *assigned; int num_assigned, i, rc; int stubdomid = 0; @@ -1249,6 +1250,14 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide rc = do_pci_add(gc, stubdomid, &pcidev_s, 0); if ( rc ) goto out; + /* wait for the device actually being connected, otherwise device model + * running there will fail to find the device */ + be_path = libxl__sprintf(gc, "%s/backend/pci/%d/0", + libxl__xs_get_dompath(gc, 0), stubdomid); + rc = libxl__wait_for_backend(gc, be_path, + GCSPRINTF("%d", XenbusStateConnected)); + if ( rc ) + goto out; } orig_vdev = pcidev->vdevfn & ~7U;