From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzmOL-0004cO-QL for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzmOK-00050z-Sq for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:25 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:9557) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzmOK-0004yD-MX for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:24 -0400 From: Ian Jackson Date: Wed, 4 Oct 2017 17:18:07 +0100 Message-ID: <1507133891-26013-5-git-send-email-ian.jackson@eu.citrix.com> In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 4/8] xen: destroy_hvm_domain: Move reason into a variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, Juergen Gross , Stefano Stabellini , Ian Jackson , xen-devel@nongnu.org, Ian Jackson 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", -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 4/8] xen: destroy_hvm_domain: Move reason into a variable Date: Wed, 4 Oct 2017 17:18:07 +0100 Message-ID: <1507133891-26013-5-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzmOM-00079b-7m for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 16:19:26 +0000 In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, xen-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org V2UgYXJlIGdvaW5nIHRvIHdhbnQgdG8gcmV1c2UgdGhpcy4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdl LgoKU2lnbmVkLW9mZi1ieTogSWFuIEphY2tzb24gPElhbi5KYWNrc29uQGV1LmNpdHJpeC5jb20+ ClJldmlld2VkLWJ5OiBBbnRob255IFBFUkFSRCA8YW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4K LS0tCiBody9pMzg2L3hlbi94ZW4taHZtLmMgfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2kzODYveGVuL3hl bi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCA3YjYwZWM2Li44MzQyMGNkIDEw MDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94ZW4veGVuLWh2 bS5jCkBAIC0xMzg3LDEyICsxMzg3LDEzIEBAIHZvaWQgZGVzdHJveV9odm1fZG9tYWluKGJvb2wg cmVib290KQogICAgIHhjX2ludGVyZmFjZSAqeGNfaGFuZGxlOwogICAgIGludCBzdHM7CiAKKyAg ICB1bnNpZ25lZCBpbnQgcmVhc29uID0gcmVib290ID8gU0hVVERPV05fcmVib290IDogU0hVVERP V05fcG93ZXJvZmY7CisKICAgICB4Y19oYW5kbGUgPSB4Y19pbnRlcmZhY2Vfb3BlbigwLCAwLCAw KTsKICAgICBpZiAoeGNfaGFuZGxlID09IE5VTEwpIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIs ICJDYW5ub3QgYWNxdWlyZSB4ZW5jdHJsIGhhbmRsZVxuIik7CiAgICAgfSBlbHNlIHsKLSAgICAg ICAgc3RzID0geGNfZG9tYWluX3NodXRkb3duKHhjX2hhbmRsZSwgeGVuX2RvbWlkLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVib290ID8gU0hVVERPV05fcmVib290IDogU0hV VERPV05fcG93ZXJvZmYpOworICAgICAgICBzdHMgPSB4Y19kb21haW5fc2h1dGRvd24oeGNfaGFu ZGxlLCB4ZW5fZG9taWQsIHJlYXNvbik7CiAgICAgICAgIGlmIChzdHMgIT0gMCkgewogICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJ4Y19kb21haW5fc2h1dGRvd24gZmFpbGVkIHRvIGlzc3Vl ICVzLCAiCiAgICAgICAgICAgICAgICAgICAgICJzdHMgJWQsICVzXG4iLCByZWJvb3QgPyAicmVi b290IiA6ICJwb3dlcm9mZiIsCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=