From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH v2 14/21] x86/xen: split suspend.c for PV and PVHVM guests Date: Thu, 2 Mar 2017 18:53:50 +0100 Message-ID: <20170302175357.8222-15-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.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 1cjUvs-0003j9-79 for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:28 +0000 In-Reply-To: <20170302175357.8222-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 U2xpdCB0aGUgY29kZSBpbiBzdXNwZW5kLmMgaW50byBzdXNwZW5kX3B2LmMgYW5kIHN1c3BlbmRf aHZtLmMuCgpSZXZpZXdlZC1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBWaXRhbHkgS3V6bmV0c292IDx2a3V6bmV0c0ByZWRoYXQuY29tPgotLS0KIGFy Y2gveDg2L3hlbi9NYWtlZmlsZSAgICAgIHwgIDMgKystCiBhcmNoL3g4Ni94ZW4vc3VzcGVuZC5j ICAgICB8IDU0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IGFyY2gveDg2L3hlbi9zdXNwZW5kX2h2bS5jIHwgMjIgKysrKysrKysrKysrKysrKysrKwogYXJj aC94ODYveGVuL3N1c3BlbmRfcHYuYyAgfCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiBhcmNoL3g4Ni94ZW4veGVuLW9wcy5oICAgICB8IDEzICsrKysrKysrKysrCiA1 IGZpbGVzIGNoYW5nZWQsIDgxIGluc2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQogY3JlYXRl IG1vZGUgMTAwNjQ0IGFyY2gveDg2L3hlbi9zdXNwZW5kX2h2bS5jCiBjcmVhdGUgbW9kZSAxMDA2 NDQgYXJjaC94ODYveGVuL3N1c3BlbmRfcHYuYwoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9N YWtlZmlsZSBiL2FyY2gveDg2L3hlbi9NYWtlZmlsZQppbmRleCA4ZGExY2E5Li5jZjhkNmM1IDEw MDY0NAotLS0gYS9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUKKysrIGIvYXJjaC94ODYveGVuL01ha2Vm aWxlCkBAIC0xNSw3ICsxNSw4IEBAIG9iai15CQk6PSBlbmxpZ2h0ZW4ubyBzZXR1cC5vIG11bHRp Y2FsbHMubyBtbXUubyBpcnEubyBcCiAJCQlncmFudC10YWJsZS5vIHN1c3BlbmQubyBwbGF0Zm9y bS1wY2ktdW5wbHVnLm8gXAogCQkJcDJtLm8gYXBpYy5vIHBtdS5vIGVubGlnaHRlbl9wdi5vIG1t dV9wdi5vCiAKLW9iai0kKENPTkZJR19YRU5fUFZIVk0pCQkrPSBlbmxpZ2h0ZW5faHZtLm8gbW11 X2h2bS5vCitvYmotJChDT05GSUdfWEVOX1BWSFZNKQkJKz0gZW5saWdodGVuX2h2bS5vIG1tdV9o dm0ubyBzdXNwZW5kX2h2bS5vCitvYmotJChDT05GSUdfWEVOX1BWKQkJCSs9IHN1c3BlbmRfcHYu bwogb2JqLSQoQ09ORklHX1hFTl9QVkgpCQkJKz0gZW5saWdodGVuX3B2aC5vCiAKIG9iai0kKENP TkZJR19FVkVOVF9UUkFDSU5HKSArPSB0cmFjZS5vCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4v c3VzcGVuZC5jIGIvYXJjaC94ODYveGVuL3N1c3BlbmQuYwppbmRleCA3ZjY2NGM0Li5kNmIxNjgw IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni94ZW4vc3VzcGVuZC5jCisrKyBiL2FyY2gveDg2L3hlbi9z dXNwZW5kLmMKQEAgLTE0LDYwICsxNCw2IEBACiAjaW5jbHVkZSAibW11LmgiCiAjaW5jbHVkZSAi cG11LmgiCiAKLXN0YXRpYyB2b2lkIHhlbl9wdl9wcmVfc3VzcGVuZCh2b2lkKQotewotCXhlbl9t bV9waW5fYWxsKCk7Ci0KLQl4ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuID0gbWZuX3RvX3Bmbih4 ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuKTsKLQl4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21V Lm1mbiA9Ci0JCW1mbl90b19wZm4oeGVuX3N0YXJ0X2luZm8tPmNvbnNvbGUuZG9tVS5tZm4pOwot Ci0JQlVHX09OKCFpcnFzX2Rpc2FibGVkKCkpOwotCi0JSFlQRVJWSVNPUl9zaGFyZWRfaW5mbyA9 ICZ4ZW5fZHVtbXlfc2hhcmVkX2luZm87Ci0JaWYgKEhZUEVSVklTT1JfdXBkYXRlX3ZhX21hcHBp bmcoZml4X3RvX3ZpcnQoRklYX1BBUkFWSVJUX0JPT1RNQVApLAotCQkJCQkgX19wdGVfbWEoMCks IDApKQotCQlCVUcoKTsKLX0KLQotc3RhdGljIHZvaWQgeGVuX2h2bV9wb3N0X3N1c3BlbmQoaW50 IHN1c3BlbmRfY2FuY2VsbGVkKQotewotI2lmZGVmIENPTkZJR19YRU5fUFZIVk0KLQlpbnQgY3B1 OwotCWlmICghc3VzcGVuZF9jYW5jZWxsZWQpCi0JICAgIHhlbl9odm1faW5pdF9zaGFyZWRfaW5m bygpOwotCXhlbl9jYWxsYmFja192ZWN0b3IoKTsKLQl4ZW5fdW5wbHVnX2VtdWxhdGVkX2Rldmlj ZXMoKTsKLQlpZiAoeGVuX2ZlYXR1cmUoWEVORkVBVF9odm1fc2FmZV9wdmNsb2NrKSkgewotCQlm b3JfZWFjaF9vbmxpbmVfY3B1KGNwdSkgewotCQkJeGVuX3NldHVwX3J1bnN0YXRlX2luZm8oY3B1 KTsKLQkJfQotCX0KLSNlbmRpZgotfQotCi1zdGF0aWMgdm9pZCB4ZW5fcHZfcG9zdF9zdXNwZW5k KGludCBzdXNwZW5kX2NhbmNlbGxlZCkKLXsKLQl4ZW5fYnVpbGRfbWZuX2xpc3RfbGlzdCgpOwot Ci0JeGVuX3NldHVwX3NoYXJlZF9pbmZvKCk7Ci0KLQlpZiAoc3VzcGVuZF9jYW5jZWxsZWQpIHsK LQkJeGVuX3N0YXJ0X2luZm8tPnN0b3JlX21mbiA9Ci0JCQlwZm5fdG9fbWZuKHhlbl9zdGFydF9p bmZvLT5zdG9yZV9tZm4pOwotCQl4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21VLm1mbiA9Ci0J CQlwZm5fdG9fbWZuKHhlbl9zdGFydF9pbmZvLT5jb25zb2xlLmRvbVUubWZuKTsKLQl9IGVsc2Ug ewotI2lmZGVmIENPTkZJR19TTVAKLQkJQlVHX09OKHhlbl9jcHVfaW5pdGlhbGl6ZWRfbWFwID09 IE5VTEwpOwotCQljcHVtYXNrX2NvcHkoeGVuX2NwdV9pbml0aWFsaXplZF9tYXAsIGNwdV9vbmxp bmVfbWFzayk7Ci0jZW5kaWYKLQkJeGVuX3ZjcHVfcmVzdG9yZSgpOwotCX0KLQotCXhlbl9tbV91 bnBpbl9hbGwoKTsKLX0KLQogdm9pZCB4ZW5fYXJjaF9wcmVfc3VzcGVuZCh2b2lkKQogewogCWlm ICh4ZW5fcHZfZG9tYWluKCkpCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vc3VzcGVuZF9odm0u YyBiL2FyY2gveDg2L3hlbi9zdXNwZW5kX2h2bS5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjAxYWZjYWQKLS0tIC9kZXYvbnVsbAorKysgYi9hcmNoL3g4Ni94ZW4vc3VzcGVu ZF9odm0uYwpAQCAtMCwwICsxLDIyIEBACisjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KKworI2lu Y2x1ZGUgPHhlbi94ZW4uaD4KKyNpbmNsdWRlIDx4ZW4vZmVhdHVyZXMuaD4KKyNpbmNsdWRlIDx4 ZW4vaW50ZXJmYWNlL2ZlYXR1cmVzLmg+CisKKyNpbmNsdWRlICJ4ZW4tb3BzLmgiCisKK3ZvaWQg eGVuX2h2bV9wb3N0X3N1c3BlbmQoaW50IHN1c3BlbmRfY2FuY2VsbGVkKQoreworCWludCBjcHU7 CisKKwlpZiAoIXN1c3BlbmRfY2FuY2VsbGVkKQorCQl4ZW5faHZtX2luaXRfc2hhcmVkX2luZm8o KTsKKwl4ZW5fY2FsbGJhY2tfdmVjdG9yKCk7CisJeGVuX3VucGx1Z19lbXVsYXRlZF9kZXZpY2Vz KCk7CisJaWYgKHhlbl9mZWF0dXJlKFhFTkZFQVRfaHZtX3NhZmVfcHZjbG9jaykpIHsKKwkJZm9y X2VhY2hfb25saW5lX2NwdShjcHUpIHsKKwkJCXhlbl9zZXR1cF9ydW5zdGF0ZV9pbmZvKGNwdSk7 CisJCX0KKwl9Cit9CmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vc3VzcGVuZF9wdi5jIGIvYXJj aC94ODYveGVuL3N1c3BlbmRfcHYuYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li40OTZkZWNjYQotLS0gL2Rldi9udWxsCisrKyBiL2FyY2gveDg2L3hlbi9zdXNwZW5kX3B2LmMK QEAgLTAsMCArMSw0NCBAQAorI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisKKyNpbmNsdWRlIDxh c20veGVuL2h5cGVyY2FsbC5oPgorI2luY2x1ZGUgPGFzbS94ZW4vcGFnZS5oPgorCisjaW5jbHVk ZSAieGVuLW9wcy5oIgorCit2b2lkIHhlbl9wdl9wcmVfc3VzcGVuZCh2b2lkKQoreworCXhlbl9t bV9waW5fYWxsKCk7CisKKwl4ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuID0gbWZuX3RvX3Bmbih4 ZW5fc3RhcnRfaW5mby0+c3RvcmVfbWZuKTsKKwl4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21V Lm1mbiA9CisJCW1mbl90b19wZm4oeGVuX3N0YXJ0X2luZm8tPmNvbnNvbGUuZG9tVS5tZm4pOwor CisJQlVHX09OKCFpcnFzX2Rpc2FibGVkKCkpOworCisJSFlQRVJWSVNPUl9zaGFyZWRfaW5mbyA9 ICZ4ZW5fZHVtbXlfc2hhcmVkX2luZm87CisJaWYgKEhZUEVSVklTT1JfdXBkYXRlX3ZhX21hcHBp bmcoZml4X3RvX3ZpcnQoRklYX1BBUkFWSVJUX0JPT1RNQVApLAorCQkJCQkgX19wdGVfbWEoMCks IDApKQorCQlCVUcoKTsKK30KKwordm9pZCB4ZW5fcHZfcG9zdF9zdXNwZW5kKGludCBzdXNwZW5k X2NhbmNlbGxlZCkKK3sKKwl4ZW5fYnVpbGRfbWZuX2xpc3RfbGlzdCgpOworCisJeGVuX3NldHVw X3NoYXJlZF9pbmZvKCk7CisKKwlpZiAoc3VzcGVuZF9jYW5jZWxsZWQpIHsKKwkJeGVuX3N0YXJ0 X2luZm8tPnN0b3JlX21mbiA9CisJCQlwZm5fdG9fbWZuKHhlbl9zdGFydF9pbmZvLT5zdG9yZV9t Zm4pOworCQl4ZW5fc3RhcnRfaW5mby0+Y29uc29sZS5kb21VLm1mbiA9CisJCQlwZm5fdG9fbWZu KHhlbl9zdGFydF9pbmZvLT5jb25zb2xlLmRvbVUubWZuKTsKKwl9IGVsc2UgeworI2lmZGVmIENP TkZJR19TTVAKKwkJQlVHX09OKHhlbl9jcHVfaW5pdGlhbGl6ZWRfbWFwID09IE5VTEwpOworCQlj cHVtYXNrX2NvcHkoeGVuX2NwdV9pbml0aWFsaXplZF9tYXAsIGNwdV9vbmxpbmVfbWFzayk7Cisj ZW5kaWYKKwkJeGVuX3ZjcHVfcmVzdG9yZSgpOworCX0KKworCXhlbl9tbV91bnBpbl9hbGwoKTsK K30KZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi94ZW4tb3BzLmggYi9hcmNoL3g4Ni94ZW4veGVu LW9wcy5oCmluZGV4IDdiYWViMDQuLmVkN2FkYTIgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi94 ZW4tb3BzLmgKKysrIGIvYXJjaC94ODYveGVuL3hlbi1vcHMuaApAQCAtMTUzLDUgKzE1MywxOCBA QCBleHRlcm4gaW50IHhlbl9jcHVocF9zZXR1cChpbnQgKCpjcHVfdXBfcHJlcGFyZV9jYikodW5z aWduZWQgaW50KSwKIAogZXh0ZXJuIHZvaWQgeGVuX3JlYm9vdChpbnQgcmVhc29uKTsKIGV4dGVy biB2b2lkIHhlbl9lbWVyZ2VuY3lfcmVzdGFydCh2b2lkKTsKKyNpZmRlZiBDT05GSUdfWEVOX1BW CitleHRlcm4gdm9pZCB4ZW5fcHZfcHJlX3N1c3BlbmQodm9pZCk7CitleHRlcm4gdm9pZCB4ZW5f cHZfcG9zdF9zdXNwZW5kKGludCBzdXNwZW5kX2NhbmNlbGxlZCk7CisjZWxzZQorc3RhdGljIGlu bGluZSB2b2lkIHhlbl9wdl9wcmVfc3VzcGVuZCh2b2lkKSB7fQorc3RhdGljIGlubGluZSB2b2lk IHhlbl9wdl9wb3N0X3N1c3BlbmQoaW50IHN1c3BlbmRfY2FuY2VsbGVkKSB7fQorI2VuZGlmCisK KyNpZmRlZiBDT05GSUdfWEVOX1BWSFZNCitleHRlcm4gdm9pZCB4ZW5faHZtX3Bvc3Rfc3VzcGVu ZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpOworI2Vsc2UKK3N0YXRpYyBpbmxpbmUgdm9pZCB4ZW5f aHZtX3Bvc3Rfc3VzcGVuZChpbnQgc3VzcGVuZF9jYW5jZWxsZWQpIHt9CisjZW5kaWYKIAogI2Vu ZGlmIC8qIFhFTl9PUFNfSCAqLwotLSAKMi45LjMKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK