From patchwork Mon Sep 9 03:28:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Jinsong" X-Patchwork-Id: 273481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 58AA32C0127 for ; Mon, 9 Sep 2013 13:28:57 +1000 (EST) Received: from localhost ([::1]:48255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VIs9n-0000Re-8J for incoming@patchwork.ozlabs.org; Sun, 08 Sep 2013 23:28:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VIs9O-0000RQ-Qi for qemu-devel@nongnu.org; Sun, 08 Sep 2013 23:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VIs9J-0002v7-PL for qemu-devel@nongnu.org; Sun, 08 Sep 2013 23:28:30 -0400 Received: from mga03.intel.com ([143.182.124.21]:40422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VIs9J-0002uw-D4 for qemu-devel@nongnu.org; Sun, 08 Sep 2013 23:28:25 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 08 Sep 2013 20:28:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,866,1371106800"; d="scan'208,223";a="357651606" Received: from fmsmsx104.amr.corp.intel.com ([10.19.9.35]) by azsmga001.ch.intel.com with ESMTP; 08 Sep 2013 20:28:23 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX104.amr.corp.intel.com (10.19.9.35) with Microsoft SMTP Server (TLS) id 14.3.123.3; Sun, 8 Sep 2013 20:28:23 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.123.3; Sun, 8 Sep 2013 20:28:23 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.117]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.12]) with mapi id 14.03.0123.003; Mon, 9 Sep 2013 11:28:21 +0800 From: "Liu, Jinsong" To: Paolo Bonzini , Anthony PERARD , Stefano Stabellini Thread-Topic: [PATCH V3 2/2] qemu: Add qemu xen logic for Xen HVM S3 resume Thread-Index: Ac6tDKHHYF9B0Fn/RTuHATJLq/4l+Q== Date: Mon, 9 Sep 2013 03:28:21 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 143.182.124.21 Cc: George Dunlap , "qemu-devel@nongnu.org" , Ian Campbell , "xen-devel@lists.xen.org" Subject: [Qemu-devel] [PATCH V3 2/2] qemu: Add qemu xen logic for Xen HVM S3 resume X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From 63668de43b6512c1db06405b0d2d1e0a0c68244b Mon Sep 17 00:00:00 2001 From: Liu Jinsong Date: Sun, 8 Sep 2013 00:39:45 +0800 Subject: [PATCH V3 2/2] qemu: Add qemu xen logic for Xen HVM S3 resume This patch is qemu patch 2 to fix Xen HVM S3 bug, adding qemu xen logic. When qemu wakeup, qemu xen logic is notified and hypercall to xen hypervisor to unpause domain. Signed-off-by: Liu Jinsong Reviewed-by: Anthony PERARD --- xen-all.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen-all.c b/xen-all.c index eb13111..388d311 100644 --- a/xen-all.c +++ b/xen-all.c @@ -98,6 +98,7 @@ typedef struct XenIOState { Notifier exit; Notifier suspend; + Notifier wakeup; } XenIOState; /* Xen specific function for piix pci */ @@ -1059,6 +1060,11 @@ static void xen_read_physmap(XenIOState *state) free(entries); } +static void xen_wakeup_notifier(Notifier *notifier, void *data) +{ + xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); +} + int xen_hvm_init(void) { int i, rc; @@ -1088,6 +1094,9 @@ int xen_hvm_init(void) state->suspend.notify = xen_suspend_notifier; qemu_register_suspend_notifier(&state->suspend); + state->wakeup.notify = xen_wakeup_notifier; + qemu_register_wakeup_notifier(&state->wakeup); + xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn); DPRINTF("shared page at pfn %lx\n", ioreq_pfn); state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,