From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH 5/5] x86/xen: split suspend.c for PV and PVHVM guests Date: Fri, 24 Feb 2017 17:14:40 +0100 Message-ID: <20170224161440.2136-6-vkuznets@redhat.com> References: <20170224161440.2136-1-vkuznets@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chIWG-0005XA-Fu for xen-devel@lists.xenproject.org; Fri, 24 Feb 2017 16:14:56 +0000 In-Reply-To: <20170224161440.2136-1-vkuznets@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org R2V0IHJlYWQgb2YgI2lmZGVmcyBpbiBzdXNwZW5kLmMgYnkgc3BsaXR0aW5nIHRoZSBjb2RlIGlu dG8Kc3VzcGVuZF9wdi5jIGFuZCBzdXNwZW5kX2h2bS5jLgoKU2lnbmVkLW9mZi1ieTogVml0YWx5 IEt1em5ldHNvdiA8dmt1em5ldHNAcmVkaGF0LmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vTWFrZWZp bGUgICAgICB8ICA0ICsrLS0KIGFyY2gveDg2L3hlbi9zdXNwZW5kLmMgICAgIHwgNTggLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogYXJjaC94ODYveGVuL3N1 c3BlbmRfaHZtLmMgfCAyMiArKysrKysrKysrKysrKysrKysKIGFyY2gveDg2L3hlbi9zdXNwZW5k X3B2LmMgIHwgNDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGFyY2gveDg2 L3hlbi94ZW4tb3BzLmggICAgIHwgMTQgKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgODIg aW5zZXJ0aW9ucygrKSwgNjAgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgYXJjaC94 ODYveGVuL3N1c3BlbmRfaHZtLmMKIGNyZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3g4Ni94ZW4vc3Vz cGVuZF9wdi5jCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL01ha2VmaWxlIGIvYXJjaC94ODYv eGVuL01ha2VmaWxlCmluZGV4IDEwMjY0ZWQuLmM1MjkxZjQgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2 L3hlbi9NYWtlZmlsZQorKysgYi9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUKQEAgLTE2LDggKzE2LDgg QEAgb2JqLXkJCTo9IGVubGlnaHRlbi5vIG11bHRpY2FsbHMubyBcCiAJCQltbXUubwogCiBvYmot JChDT05GSUdfWEVOX1BWKQkJKz0gZW5saWdodGVuX3B2Lm8gc2V0dXAubyBtbXVfcHYubyBwMm0u byBcCi0JCQkJCWFwaWMubyBwbXUubwotb2JqLSQoQ09ORklHX1hFTl9QVkhWTSkJCSs9IGVubGln aHRlbl9odm0ubyBtbXVfaHZtLm8KKwkJCQkJYXBpYy5vIHBtdS5vIHN1c3BlbmRfcHYubworb2Jq LSQoQ09ORklHX1hFTl9QVkhWTSkJCSs9IGVubGlnaHRlbl9odm0ubyBtbXVfaHZtLm8gc3VzcGVu ZF9odm0ubwogb2JqLSQoQ09ORklHX1hFTl9QVkgpCQkrPSBlbmxpZ2h0ZW5fcHZoLm8KIAogb2Jq LSQoQ09ORklHX0VWRU5UX1RSQUNJTkcpICs9IHRyYWNlLm8KZGlmZiAtLWdpdCBhL2FyY2gveDg2 L3hlbi9zdXNwZW5kLmMgYi9hcmNoL3g4Ni94ZW4vc3VzcGVuZC5jCmluZGV4IDM3ZjYzNGYuLmQ2 YjE2ODAgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9zdXNwZW5kLmMKKysrIGIvYXJjaC94ODYv eGVuL3N1c3BlbmQuYwpAQCAtMTQsNjQgKzE0LDYgQEAKICNpbmNsdWRlICJtbXUuaCIKICNpbmNs dWRlICJwbXUuaCIKIAotc3RhdGljIHZvaWQgeGVuX3B2X3ByZV9zdXNwZW5kKHZvaWQpCi17Ci0j aWZkZWYgQ09ORklHX1hFTl9QVgotCXhlbl9tbV9waW5fYWxsKCk7Ci0KLQl4ZW5fc3RhcnRfaW5m by0+c3RvcmVfbWZuID0gbWZuX3RvX3Bmbih4ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuKTsKLQl4 ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21VLm1mbiA9Ci0JCW1mbl90b19wZm4oeGVuX3N0YXJ0 X2luZm8tPmNvbnNvbGUuZG9tVS5tZm4pOwotCi0JQlVHX09OKCFpcnFzX2Rpc2FibGVkKCkpOwot Ci0JSFlQRVJWSVNPUl9zaGFyZWRfaW5mbyA9ICZ4ZW5fZHVtbXlfc2hhcmVkX2luZm87Ci0JaWYg KEhZUEVSVklTT1JfdXBkYXRlX3ZhX21hcHBpbmcoZml4X3RvX3ZpcnQoRklYX1BBUkFWSVJUX0JP T1RNQVApLAotCQkJCQkgX19wdGVfbWEoMCksIDApKQotCQlCVUcoKTsKLSNlbmRpZgotfQotCi1z dGF0aWMgdm9pZCB4ZW5faHZtX3Bvc3Rfc3VzcGVuZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpCi17 Ci0jaWZkZWYgQ09ORklHX1hFTl9QVkhWTQotCWludCBjcHU7Ci0JaWYgKCFzdXNwZW5kX2NhbmNl bGxlZCkKLQkgICAgeGVuX2h2bV9pbml0X3NoYXJlZF9pbmZvKCk7Ci0JeGVuX2NhbGxiYWNrX3Zl Y3RvcigpOwotCXhlbl91bnBsdWdfZW11bGF0ZWRfZGV2aWNlcygpOwotCWlmICh4ZW5fZmVhdHVy ZShYRU5GRUFUX2h2bV9zYWZlX3B2Y2xvY2spKSB7Ci0JCWZvcl9lYWNoX29ubGluZV9jcHUoY3B1 KSB7Ci0JCQl4ZW5fc2V0dXBfcnVuc3RhdGVfaW5mbyhjcHUpOwotCQl9Ci0JfQotI2VuZGlmCi19 Ci0KLXN0YXRpYyB2b2lkIHhlbl9wdl9wb3N0X3N1c3BlbmQoaW50IHN1c3BlbmRfY2FuY2VsbGVk KQotewotI2lmZGVmIENPTkZJR19YRU5fUFYKLQl4ZW5fYnVpbGRfbWZuX2xpc3RfbGlzdCgpOwot Ci0JeGVuX3NldHVwX3NoYXJlZF9pbmZvKCk7Ci0KLQlpZiAoc3VzcGVuZF9jYW5jZWxsZWQpIHsK LQkJeGVuX3N0YXJ0X2luZm8tPnN0b3JlX21mbiA9Ci0JCQlwZm5fdG9fbWZuKHhlbl9zdGFydF9p bmZvLT5zdG9yZV9tZm4pOwotCQl4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21VLm1mbiA9Ci0J CQlwZm5fdG9fbWZuKHhlbl9zdGFydF9pbmZvLT5jb25zb2xlLmRvbVUubWZuKTsKLQl9IGVsc2Ug ewotI2lmZGVmIENPTkZJR19TTVAKLQkJQlVHX09OKHhlbl9jcHVfaW5pdGlhbGl6ZWRfbWFwID09 IE5VTEwpOwotCQljcHVtYXNrX2NvcHkoeGVuX2NwdV9pbml0aWFsaXplZF9tYXAsIGNwdV9vbmxp bmVfbWFzayk7Ci0jZW5kaWYKLQkJeGVuX3ZjcHVfcmVzdG9yZSgpOwotCX0KLQotCXhlbl9tbV91 bnBpbl9hbGwoKTsKLSNlbmRpZgotfQotCiB2b2lkIHhlbl9hcmNoX3ByZV9zdXNwZW5kKHZvaWQp CiB7CiAJaWYgKHhlbl9wdl9kb21haW4oKSkKZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9zdXNw ZW5kX2h2bS5jIGIvYXJjaC94ODYveGVuL3N1c3BlbmRfaHZtLmMKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMDFhZmNhZAotLS0gL2Rldi9udWxsCisrKyBiL2FyY2gveDg2L3hl bi9zdXNwZW5kX2h2bS5jCkBAIC0wLDAgKzEsMjIgQEAKKyNpbmNsdWRlIDxsaW51eC90eXBlcy5o PgorCisjaW5jbHVkZSA8eGVuL3hlbi5oPgorI2luY2x1ZGUgPHhlbi9mZWF0dXJlcy5oPgorI2lu Y2x1ZGUgPHhlbi9pbnRlcmZhY2UvZmVhdHVyZXMuaD4KKworI2luY2x1ZGUgInhlbi1vcHMuaCIK Kwordm9pZCB4ZW5faHZtX3Bvc3Rfc3VzcGVuZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpCit7CisJ aW50IGNwdTsKKworCWlmICghc3VzcGVuZF9jYW5jZWxsZWQpCisJCXhlbl9odm1faW5pdF9zaGFy ZWRfaW5mbygpOworCXhlbl9jYWxsYmFja192ZWN0b3IoKTsKKwl4ZW5fdW5wbHVnX2VtdWxhdGVk X2RldmljZXMoKTsKKwlpZiAoeGVuX2ZlYXR1cmUoWEVORkVBVF9odm1fc2FmZV9wdmNsb2NrKSkg eworCQlmb3JfZWFjaF9vbmxpbmVfY3B1KGNwdSkgeworCQkJeGVuX3NldHVwX3J1bnN0YXRlX2lu Zm8oY3B1KTsKKwkJfQorCX0KK30KZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9zdXNwZW5kX3B2 LmMgYi9hcmNoL3g4Ni94ZW4vc3VzcGVuZF9wdi5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjQ5NmRlY2NhCi0tLSAvZGV2L251bGwKKysrIGIvYXJjaC94ODYveGVuL3N1c3Bl bmRfcHYuYwpAQCAtMCwwICsxLDQ0IEBACisjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KKworI2lu Y2x1ZGUgPGFzbS94ZW4vaHlwZXJjYWxsLmg+CisjaW5jbHVkZSA8YXNtL3hlbi9wYWdlLmg+CisK KyNpbmNsdWRlICJ4ZW4tb3BzLmgiCisKK3ZvaWQgeGVuX3B2X3ByZV9zdXNwZW5kKHZvaWQpCit7 CisJeGVuX21tX3Bpbl9hbGwoKTsKKworCXhlbl9zdGFydF9pbmZvLT5zdG9yZV9tZm4gPSBtZm5f dG9fcGZuKHhlbl9zdGFydF9pbmZvLT5zdG9yZV9tZm4pOworCXhlbl9zdGFydF9pbmZvLT5jb25z b2xlLmRvbVUubWZuID0KKwkJbWZuX3RvX3Bmbih4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21V Lm1mbik7CisKKwlCVUdfT04oIWlycXNfZGlzYWJsZWQoKSk7CisKKwlIWVBFUlZJU09SX3NoYXJl ZF9pbmZvID0gJnhlbl9kdW1teV9zaGFyZWRfaW5mbzsKKwlpZiAoSFlQRVJWSVNPUl91cGRhdGVf dmFfbWFwcGluZyhmaXhfdG9fdmlydChGSVhfUEFSQVZJUlRfQk9PVE1BUCksCisJCQkJCSBfX3B0 ZV9tYSgwKSwgMCkpCisJCUJVRygpOworfQorCit2b2lkIHhlbl9wdl9wb3N0X3N1c3BlbmQoaW50 IHN1c3BlbmRfY2FuY2VsbGVkKQoreworCXhlbl9idWlsZF9tZm5fbGlzdF9saXN0KCk7CisKKwl4 ZW5fc2V0dXBfc2hhcmVkX2luZm8oKTsKKworCWlmIChzdXNwZW5kX2NhbmNlbGxlZCkgeworCQl4 ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuID0KKwkJCXBmbl90b19tZm4oeGVuX3N0YXJ0X2luZm8t PnN0b3JlX21mbik7CisJCXhlbl9zdGFydF9pbmZvLT5jb25zb2xlLmRvbVUubWZuID0KKwkJCXBm bl90b19tZm4oeGVuX3N0YXJ0X2luZm8tPmNvbnNvbGUuZG9tVS5tZm4pOworCX0gZWxzZSB7Cisj aWZkZWYgQ09ORklHX1NNUAorCQlCVUdfT04oeGVuX2NwdV9pbml0aWFsaXplZF9tYXAgPT0gTlVM TCk7CisJCWNwdW1hc2tfY29weSh4ZW5fY3B1X2luaXRpYWxpemVkX21hcCwgY3B1X29ubGluZV9t YXNrKTsKKyNlbmRpZgorCQl4ZW5fdmNwdV9yZXN0b3JlKCk7CisJfQorCisJeGVuX21tX3VucGlu X2FsbCgpOworfQpkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL3hlbi1vcHMuaCBiL2FyY2gveDg2 L3hlbi94ZW4tb3BzLmgKaW5kZXggMmIxNjJmNi4uZTkwNDQxNSAxMDA2NDQKLS0tIGEvYXJjaC94 ODYveGVuL3hlbi1vcHMuaAorKysgYi9hcmNoL3g4Ni94ZW4veGVuLW9wcy5oCkBAIC0xNDgsNCAr MTQ4LDE4IEBAIF9fdmlzaWJsZSB2b2lkIHhlbl9hZGp1c3RfZXhjZXB0aW9uX2ZyYW1lKHZvaWQp OwogCiBleHRlcm4gaW50IHhlbl9wYW5pY19oYW5kbGVyX2luaXQodm9pZCk7CiAKKyNpZmRlZiBD T05GSUdfWEVOX1BWCitleHRlcm4gdm9pZCB4ZW5fcHZfcHJlX3N1c3BlbmQodm9pZCk7CitleHRl cm4gdm9pZCB4ZW5fcHZfcG9zdF9zdXNwZW5kKGludCBzdXNwZW5kX2NhbmNlbGxlZCk7CisjZWxz ZQorc3RhdGljIGlubGluZSB2b2lkIHhlbl9wdl9wcmVfc3VzcGVuZCh2b2lkKSB7fQorc3RhdGlj IGlubGluZSB2b2lkIHhlbl9wdl9wb3N0X3N1c3BlbmQoaW50IHN1c3BlbmRfY2FuY2VsbGVkKSB7 fQorI2VuZGlmCisKKyNpZmRlZiBDT05GSUdfWEVOX1BWSFZNCitleHRlcm4gdm9pZCB4ZW5faHZt X3Bvc3Rfc3VzcGVuZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpOworI2Vsc2UKK3N0YXRpYyBpbmxp bmUgdm9pZCB4ZW5faHZtX3Bvc3Rfc3VzcGVuZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpIHt9Cisj ZW5kaWYKKwogI2VuZGlmIC8qIFhFTl9PUFNfSCAqLwotLSAKMi45LjMKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK