From nobody Tue Feb 10 11:56:09 2026 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1568475622; cv=none; d=zoho.com; s=zohoarc; b=VXXow0DRPmDimfoIOScmk9DrJaJhtjegb/MZ8KYt4Ow2EaRDndG36XANIrmQ8Sslf4n4AWxFi+uQGzIOADGsM9rSVhhBOoKztkkIuMraISczmVdeZONz5FBwoJKbU2EB3UbbUv0i1Rrr9wvuMfQFpIjrt0hKYqABbhRKk2txVb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568475622; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OK504If/E4jS5xTO7QNeSk79LNhfvUDG6U5Zwx2uErU=; b=XesPKf8pcx0uxtb038jahPWbt3Op8wGbY+zNrxkNPLtsxPh2wdLeyC2WDJ+uU5+IWh1F6fUtnQAe6FjfpBfAjouhULwZpuZYlJL7DBkjxTEb9uPKPA+rGwq8uPsY0xUM8n3PzM2JwpXABioyaILaNapOE2xQlCqdnCJkkCmmWlU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 156847562284023.632822496110748; Sat, 14 Sep 2019 08:40:22 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i9A7Z-0001I7-Rg; Sat, 14 Sep 2019 15:37:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i9A7Z-0001Hp-1w for xen-devel@lists.xenproject.org; Sat, 14 Sep 2019 15:37:57 +0000 Received: from wout1-smtp.messagingengine.com (unknown [64.147.123.24]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 97b91ad6-d705-11e9-b299-bc764e2007e4; Sat, 14 Sep 2019 15:37:43 +0000 (UTC) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 75C095EC; Sat, 14 Sep 2019 11:37:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 14 Sep 2019 11:37:42 -0400 Received: from localhost.localdomain (ip5b412221.dynamic.kabel-deutschland.de [91.65.34.33]) by mail.messagingengine.com (Postfix) with ESMTPA id 1A959D60057; Sat, 14 Sep 2019 11:37:41 -0400 (EDT) X-Inumbo-ID: 97b91ad6-d705-11e9-b299-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=pjHm9ceYnWR9V0AqmOopig5VJRNLK4kBvvWCoPBaS OE=; b=Nd4aqdNR3MKd/juF+oLWzbBC66eg0AFv7ZXCl0mL7Iso96F7bWzqv55T0 Xc5g798TcWibDU8UZGQgnaocSDjmuShrMF1m3MzSYp/h4AMLhaqHkH7K9Scg9cHN +rxF8vRZTM/ISz+J9wEr6OkxXngcLCg3McAQRU0Bsb0YP0FcyXhEVLE0Ii+S/h2j WepKNrsb25j4oQ1oGWGsqPaQ13VcIAaC+B2GFyx7zqKG3CDLxWypKA5mbn7JeQpa 7NxsLiXguNtTYa2I/Qoyw14LwPOjD+6reJacVlAoYsJk9tfHXSFZg5lTVvAshYhH aDsssXmVA91TvaUB67UTvIw0uSihQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrtdelgdeludcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghrvghk ucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesihhnvh hishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucfkphepledurdeihedrfeegrdef feenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghksehinhhvihhsihgslh gvthhhihhnghhslhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Date: Sat, 14 Sep 2019 17:37:18 +0200 Message-Id: <206c62834cf039074d95c869eebdec333471bf1f.1568475323.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v6 3/6] libxl: don't try to manipulate json config for stubdomain X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Ian Jackson , Wei Liu , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Wei Liu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Stubdomain do not have it's own config file - its configuration is derived from target domains. Do not try to manipulate it when attaching PCI device. This bug prevented starting HVM with stubdomain and PCI passthrough device attached. Signed-off-by: Marek Marczykowski-G=C3=B3recki Acked-by: Wei Liu --- Changes in v3: - skip libxl__dm_check_start too, as stubdomain is guaranteed to be running at this stage already - do not init d_config at all, as it is used only for json manipulation Changes in v4: - adjust comment style --- tools/libxl/libxl_pci.c | 50 ++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 578535f..d26fc9a 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -120,10 +120,14 @@ static int libxl__device_pci_add_xenstore(libxl__gc *= gc, uint32_t domid, libxl_d libxl_domain_config d_config; libxl_device_pci pcidev_saved; libxl__domain_userdata_lock *lock =3D NULL; + bool is_stubdomain =3D libxl_is_stubdom(CTX, domid, NULL); =20 - libxl_domain_config_init(&d_config); - libxl_device_pci_init(&pcidev_saved); - libxl_device_pci_copy(CTX, &pcidev_saved, pcidev); + /* Stubdomain doesn't have own config. */ + if (!is_stubdomain) { + libxl_domain_config_init(&d_config); + libxl_device_pci_init(&pcidev_saved); + libxl_device_pci_copy(CTX, &pcidev_saved, pcidev); + } =20 be_path =3D libxl__domain_device_backend_path(gc, 0, domid, 0, LIBXL__DEVICE_KIND_PCI); @@ -152,27 +156,35 @@ static int libxl__device_pci_add_xenstore(libxl__gc *= gc, uint32_t domid, libxl_d GCNEW(device); libxl__device_from_pcidev(gc, domid, pcidev, device); =20 - lock =3D libxl__lock_domain_userdata(gc, domid); - if (!lock) { - rc =3D ERROR_LOCK_FAIL; - goto out; - } + /*=20 + * Stubdomin config is derived from its target domain, it doesn't have + * its own file. + */ + if (!is_stubdomain) { + lock =3D libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc =3D ERROR_LOCK_FAIL; + goto out; + } =20 - rc =3D libxl__get_domain_configuration(gc, domid, &d_config); - if (rc) goto out; + rc =3D libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; =20 - device_add_domain_config(gc, &d_config, &libxl__pcidev_devtype, - &pcidev_saved); + device_add_domain_config(gc, &d_config, &libxl__pcidev_devtype, + &pcidev_saved); =20 - rc =3D libxl__dm_check_start(gc, &d_config, domid); - if (rc) goto out; + rc =3D libxl__dm_check_start(gc, &d_config, domid); + if (rc) goto out; + } =20 for (;;) { rc =3D libxl__xs_transaction_start(gc, &t); if (rc) goto out; =20 - rc =3D libxl__set_domain_configuration(gc, domid, &d_config); - if (rc) goto out; + if (lock) { + rc =3D libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } =20 libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, ba= ck)); =20 @@ -184,8 +196,10 @@ static int libxl__device_pci_add_xenstore(libxl__gc *g= c, uint32_t domid, libxl_d out: libxl__xs_transaction_abort(gc, &t); if (lock) libxl__unlock_domain_userdata(lock); - libxl_device_pci_dispose(&pcidev_saved); - libxl_domain_config_dispose(&d_config); + if (!is_stubdomain) { + libxl_device_pci_dispose(&pcidev_saved); + libxl_domain_config_dispose(&d_config); + } return rc; } =20 --=20 git-series 0.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel