From patchwork Wed Mar 18 16:51:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11445729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4118414DD for ; Wed, 18 Mar 2020 16:53:24 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1ACCE20757 for ; Wed, 18 Mar 2020 16:53:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aepfle.de header.i=@aepfle.de header.b="YaUeqYjl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1ACCE20757 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jEbvI-00034O-KR; Wed, 18 Mar 2020 16:52:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jEbvG-00034J-Ip for xen-devel@lists.xenproject.org; Wed, 18 Mar 2020 16:52:03 +0000 X-Inumbo-ID: c8dea8ea-6938-11ea-bec1-bc764e2007e4 Received: from mo6-p00-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5300::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c8dea8ea-6938-11ea-bec1-bc764e2007e4; Wed, 18 Mar 2020 16:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1584550319; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=xDgpVcbzapP21ijAN3+ec8LB3Fi9zhIlDcJVbBf3Tbs=; b=YaUeqYjl5vDdzcQsALnieImI385ZnOCxrkEJ6g4ng7qCqwA5tLXKx+0LchIEROUFPy e0xe41aKxamlhw/tLfUmFKpuZsSA8pLPQICx4LGSZGTS7S1s4JjeGl0YZBBcYoCIzWvO Ik+P3QvJXquXEafcFocKhFQYO2/iu7zJMMYawFoQE1GJEgxpTi6V/7FJtOy662HhNutD WqvphwPxV3per+fQu66xc6vw/HNW/lQUVjNmVTDZW+gjBlUaqwi2YLVZf0QUTJS+nkBu im+wtPHCLlBa06SzY+Iwq2shaTFdnOIKT9h+SLWe6QRYWZKqaC0Cl26tfxM06UwzMlbb pyDA== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS329Ojw==" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 46.2.0 DYNA|AUTH) with ESMTPSA id u021a0w2IGpwIyV (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Wed, 18 Mar 2020 17:51:58 +0100 (CET) From: Olaf Hering To: Ian Jackson , Wei Liu , Anthony PERARD , xen-devel@lists.xenproject.org Date: Wed, 18 Mar 2020 17:51:51 +0100 Message-Id: <20200318165151.21443-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v1] libxl: Fix xl shutdown for HVM without PV drivers 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: Olaf Hering Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A return value of zero means no PV drivers. Restore a hunk which was removed. Fixes commit b183e180bce93037d3ef385a8c2338bbfb7f23d9 Signed-off-by: Olaf Hering Acked-by: Wei Liu --- tools/libxl/libxl_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c index 41d08394f3..fef2cd4e13 100644 --- a/tools/libxl/libxl_domain.c +++ b/tools/libxl/libxl_domain.c @@ -774,6 +774,9 @@ int libxl__domain_pvcontrol(libxl__egc *egc, libxl__xswait_state *pvcontrol, if (rc < 0) return rc; + if (!rc) + return ERROR_NOPARAVIRT; + shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return ERROR_FAIL;