From patchwork Mon Oct 9 16:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9993835 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 EBFCC60230 for ; Mon, 9 Oct 2017 16:03:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD48728560 for ; Mon, 9 Oct 2017 16:03:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF5A92870E; Mon, 9 Oct 2017 16:03:54 +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 8325328560 for ; Mon, 9 Oct 2017 16:03:54 +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 1e1aVJ-0007sf-6z; Mon, 09 Oct 2017 16:02:05 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1aVH-0007pa-DO for xen-devel@lists.xenproject.org; Mon, 09 Oct 2017 16:02:03 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id 30/21-14596-A7D9BD95; Mon, 09 Oct 2017 16:02:02 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXrdy7u1 Ig6dTRCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozGv4+ZCm5yVBxrd25gvMnWxcjJISHgL3Fu 1gxGEJtNQFeiactfsLiIgLRE/5x29i5GLg5mgflMEofnLWYFSQgLeEqsPXSFCcRmEVCR6PnXA 9bAK+Ah0ff0JwvEUDmJ88d/MoPYnCD1s6cB1XBwCAHV/FkQDmGqScxdHw/RKShxcuYTsE5mAQ mJgy9eME9g5J2FJDULSWoBI9MqRo3i1KKy1CJdQ3O9pKLM9IyS3MTMHF1DAzO93NTi4sT01Jz EpGK95PzcTYzAwGEAgh2MtzcGHGKU5GBSEuWdN+N2pBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ 3hdzgHKCRanpqRVpmTnAEIZJS3DwKInwzp4NlOYtLkjMLc5Mh0idYtTl6Lh59w+TEEtefl6ql DhvBcgMAZCijNI8uBGweLrEKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlYd5HIFN4MvNK4Da9Aj qCCegIxuIbIEeUJCKkpBoYWedLPDLWcWRf0Pvu3O538hN1j3c2iMSefP5S/4HkrEcyotaTdLc Gc/za9e/+DnP5o3lGuX+u/5iTfKa8Wl/6k0ZuWpOU6etQ8eN8Ozfv0vz/YdKTQtl3tUrbc+7/ LLac9PejybKw3AuPzrTmOt9buOHFclOFnYsYb4kXp/ffvS89N+nverWrVkosxRmJhlrMRcWJA PoZwQ6iAgAA X-Env-Sender: prvs=4484f2008=Ian.Jackson@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1507564919!106225024!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34993 invoked from network); 9 Oct 2017 16:02:00 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Oct 2017 16:02:00 -0000 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972893" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:38 +0100 Message-ID: <1507564902-9000-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 4/8] xen: destroy_hvm_domain: Move reason into a variable 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 We are going to want to reuse this. No functional change. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- hw/i386/xen/xen-hvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 7b60ec6..83420cd 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1387,12 +1387,13 @@ void destroy_hvm_domain(bool reboot) xc_interface *xc_handle; int sts; + unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; + xc_handle = xc_interface_open(0, 0, 0); if (xc_handle == NULL) { fprintf(stderr, "Cannot acquire xenctrl handle\n"); } else { - sts = xc_domain_shutdown(xc_handle, xen_domid, - reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff); + sts = xc_domain_shutdown(xc_handle, xen_domid, reason); if (sts != 0) { fprintf(stderr, "xc_domain_shutdown failed to issue %s, " "sts %d, %s\n", reboot ? "reboot" : "poweroff",