From patchwork Thu May 16 09:11:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10946083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE8186C5 for ; Thu, 16 May 2019 09:13:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFB1F28B13 for ; Thu, 16 May 2019 09:13:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAFC228A6D; Thu, 16 May 2019 09:13:37 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 145CC28A6D for ; Thu, 16 May 2019 09:13:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hRCQp-0006Lf-Ld; Thu, 16 May 2019 09:12:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hRCQo-0006La-DE for xen-devel@lists.xenproject.org; Thu, 16 May 2019 09:12:06 +0000 X-Inumbo-ID: a9e605ca-77ba-11e9-ac7b-8b35b6a581f0 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a9e605ca-77ba-11e9-ac7b-8b35b6a581f0; Thu, 16 May 2019 09:12:01 +0000 (UTC) Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=wei.liu2@citrix.com; spf=SoftFail smtp.mailfrom=wei.liu2@citrix.com; spf=None smtp.helo=postmaster@MIAPEX02MSOL02.citrite.net Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of wei.liu2@citrix.com) identity=pra; client-ip=23.29.105.83; receiver=esa3.hc3370-68.iphmx.com; envelope-from="wei.liu2@citrix.com"; x-sender="wei.liu2@citrix.com"; x-conformance=sidf_compatible Received-SPF: SoftFail (esa3.hc3370-68.iphmx.com: domain of wei.liu2@citrix.com is inclined to not designate 23.29.105.83 as permitted sender) identity=mailfrom; client-ip=23.29.105.83; receiver=esa3.hc3370-68.iphmx.com; envelope-from="wei.liu2@citrix.com"; x-sender="wei.liu2@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 include:spf.citrix.com include:spf2.citrix.com include:ironport.citrix.com exists:%{i}._spf.mta.salesforce.com ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@MIAPEX02MSOL02.citrite.net) identity=helo; client-ip=23.29.105.83; receiver=esa3.hc3370-68.iphmx.com; envelope-from="wei.liu2@citrix.com"; x-sender="postmaster@MIAPEX02MSOL02.citrite.net"; x-conformance=sidf_compatible IronPort-SDR: UTtV3BoIHK++TLGmnLMT6o7Uv9A1hX9z7Fvi4H/LtbR7qcIh3YlH35vYQf4IaJUJx4z+BVe6yQ 5NBQh+eMugbR3+zTRkJaZ5V/ZfBMyZ4udw0Chyq0wjL8I2LJq6Eepo50CUgxT3Ip7LAyhciX34 EpZ7gD1qCgRhe1q7mCAWu2m62uhuD+wGTDTX6bK7USNwe3Rm/d3M5s53WfCzBYejDYpR8LHpXC H+YCtH1rOmpjMhpJ/wrDpfgmJlG3AqwGkTj/RBc3y41MlRqMM2JLIThooRdY7qHPb1t9qGA30X Zow= X-SBRS: 2.7 X-MesageID: 514485 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 23.29.105.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.60,476,1549947600"; d="scan'208";a="514485" From: Wei Liu To: Date: Thu, 16 May 2019 10:11:53 +0100 Message-ID: <20190516091153.31502-1-wei.liu2@citrix.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] libxl: fix regression introduced in 5c883cf036cf 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: Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Two lines were erroneously deleted during rebase which caused domain destruction to fail. Signed-off-by: Wei Liu Tested-by: Juergen Gross Reviewed-by: Juergen Gross Acked-by: Ian Jackson --- Sorry my usual test script failed to catch this. --- tools/libxl/libxl_device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index f8340ba815..db6c0203b7 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -734,6 +734,11 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) uint32_t domid; int libxl_only = dev->backend_kind == LIBXL__DEVICE_KIND_NONE; + if (!libxl_only) { + be_path = libxl__device_backend_path(gc, dev); + fe_path = libxl__device_frontend_path(gc, dev); + } + rc = libxl__get_domid(gc, &domid); if (rc) goto out;