From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v3.1 10/15] xen/x86: split Dom0 build into PV and PVHv2 Date: Sat, 29 Oct 2016 10:59:56 +0200 Message-ID: <1477731601-10926-11-git-send-email-roger.pau@citrix.com> References: <1477731601-10926-1-git-send-email-roger.pau@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 1c0PVI-00021O-0x for xen-devel@lists.xenproject.org; Sat, 29 Oct 2016 09:00:40 +0000 In-Reply-To: <1477731601-10926-1-git-send-email-roger.pau@citrix.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, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U3BsaXQgdGhlIERvbTAgYnVpbGRlciBpbnRvIHR3byBkaWZmZXJlbnQgZnVuY3Rpb25zLCBvbmUg Zm9yIFBWIChhbmQgY2xhc3NpYwpQVkgpLCBhbmQgYW5vdGhlciBvbmUgZm9yIFBWSHYyLiBJbnRy b2R1Y2UgYSBuZXcgY29tbWFuZCBsaW5lIHBhcmFtZXRlcgpjYWxsZWQgJ2RvbTAnIHRoYXQgY2Fu IGJlIHVzZWQgdG8gcmVxdWVzdCB0aGUgY3JlYXRpb24gb2YgYSBQVkh2MiBEb20wIGJ5CnNldHRp bmcgdGhlICdodm0nIHN1Yi1vcHRpb24uCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOp IDxyb2dlci5wYXVAY2l0cml4LmNvbT4KLS0tCkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3Vz ZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0K Q2hhbmdlcyBzaW5jZSB2MjoKIC0gRml4IGNvZGluZyBzdHlsZS4KIC0gSW50cm9kdWNlIGEgbmV3 IGRvbTAgb3B0aW9uIHRoYXQgYWxsb3dzIHBhc3Npbmcgc2V2ZXJhbCBwYXJhbWV0ZXJzLgogICBD dXJyZW50bHkgc3VwcG9ydGVkIG9uZXMgYXJlIGh2bSBhbmQgc2hhZG93LgoKQ2hhbmdlcyBzaW5j ZSBSRkM6CiAtIEFkZCBkb2N1bWVudGF0aW9uIGZvciB0aGUgbmV3IGNvbW1hbmQgbGluZSBvcHRp b24uCiAtIFNpbXBsaWZ5IHRoZSBsb2dpYyBpbiBjb25zdHJ1Y3RfZG9tMC4KLS0tCiBkb2NzL21p c2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93biB8IDE3ICsrKysrKysrKysrKysrKysKIHhlbi9h cmNoL3g4Ni9kb21haW5fYnVpbGQuYyAgICAgICAgIHwgMjggKysrKysrKysrKysrKysrKysrKysr Ky0tLS0KIHhlbi9hcmNoL3g4Ni9zZXR1cC5jICAgICAgICAgICAgICAgIHwgMzkgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9zZXR1cC5o ICAgICAgICAgfCAgNiArKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgODYgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5t YXJrZG93biBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCmluZGV4IDg3YzMw MjMuLjAwNmU5MGMgMTAwNjQ0Ci0tLSBhL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtk b3duCisrKyBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCkBAIC02NTYsNiAr NjU2LDIzIEBAIGFmZmluaXRpZXMgdG8gcHJlZmVyIGJ1dCBiZSBub3QgbGltaXRlZCB0byB0aGUg c3BlY2lmaWVkIG5vZGUocykuCiAKIFBpbiBkb20wIHZjcHVzIHRvIHRoZWlyIHJlc3BlY3RpdmUg cGNwdXMKIAorIyMjIGRvbTAKKz4gYD0gTGlzdCBvZiBbIGh2bSB8IHNoYWRvdyBdYAorCis+IFN1 Yi1vcHRpb25zOgorCis+IGBodm1gCisKKz4gRGVmYXVsdDogYGZhbHNlYAorCitGbGFnIHRoYXQg bWFrZXMgYSBkb20wIGJvb3QgaW4gUFZIdjIgbW9kZS4KKworPiBgc2hhZG93YAorCis+IERlZmF1 bHQ6IGBmYWxzZWAKKworRmxhZyB0aGF0IG1ha2VzIGEgZG9tMCB1c2Ugc2hhZG93IHBhZ2luZy4K KwogIyMjIGRvbTBwdmgKID4gYD0gPGJvb2xlYW4+YAogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvZG9tYWluX2J1aWxkLmMgYi94ZW4vYXJjaC94ODYvZG9tYWluX2J1aWxkLmMKaW5kZXggMWU1 NTdiOS4uMmM5ZWJmMiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2RvbWFpbl9idWlsZC5jCisr KyBiL3hlbi9hcmNoL3g4Ni9kb21haW5fYnVpbGQuYwpAQCAtMTkxLDEwICsxOTEsOCBAQCBzdHJ1 Y3QgdmNwdSAqX19pbml0IGFsbG9jX2RvbTBfdmNwdTAoc3RydWN0IGRvbWFpbiAqZG9tMCkKIH0K IAogI2lmZGVmIENPTkZJR19TSEFET1dfUEFHSU5HCi1zdGF0aWMgYm9vbF90IF9faW5pdGRhdGEg b3B0X2RvbTBfc2hhZG93OworYm9vbCBfX2luaXRkYXRhIG9wdF9kb20wX3NoYWRvdzsKIGJvb2xl YW5fcGFyYW0oImRvbTBfc2hhZG93Iiwgb3B0X2RvbTBfc2hhZG93KTsKLSNlbHNlCi0jZGVmaW5l IG9wdF9kb20wX3NoYWRvdyAwCiAjZW5kaWYKIAogc3RhdGljIGNoYXIgX19pbml0ZGF0YSBvcHRf ZG9tMF9pb3BvcnRzX2Rpc2FibGVbMjAwXSA9ICIiOwpAQCAtOTUxLDcgKzk0OSw3IEBAIHN0YXRp YyBpbnQgX19pbml0IHNldHVwX3Blcm1pc3Npb25zKHN0cnVjdCBkb21haW4gKmQpCiAgICAgcmV0 dXJuIHJjOwogfQogCi1pbnQgX19pbml0IGNvbnN0cnVjdF9kb20wKAorc3RhdGljIGludCBfX2lu aXQgY29uc3RydWN0X2RvbTBfcHYoCiAgICAgc3RydWN0IGRvbWFpbiAqZCwKICAgICBjb25zdCBt b2R1bGVfdCAqaW1hZ2UsIHVuc2lnbmVkIGxvbmcgaW1hZ2VfaGVhZHJvb20sCiAgICAgbW9kdWxl X3QgKmluaXRyZCwKQEAgLTE2NTUsNiArMTY1MywyOCBAQCBvdXQ6CiAgICAgcmV0dXJuIHJjOwog fQogCitzdGF0aWMgaW50IF9faW5pdCBjb25zdHJ1Y3RfZG9tMF9odm0oc3RydWN0IGRvbWFpbiAq ZCwgY29uc3QgbW9kdWxlX3QgKmltYWdlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkIGxvbmcgaW1hZ2VfaGVhZHJvb20sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbW9kdWxlX3QgKmluaXRyZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB2b2lkICooKmJvb3RzdHJhcF9tYXApKGNvbnN0IG1vZHVsZV90ICop LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXIgKmNtZGxpbmUpCit7 CisKKyAgICBwcmludGsoIioqIEJ1aWxkaW5nIGEgUFZIIERvbTAgKipcbiIpOworCisgICAgcmV0 dXJuIDA7Cit9CisKK2ludCBfX2luaXQgY29uc3RydWN0X2RvbTAoc3RydWN0IGRvbWFpbiAqZCwg Y29uc3QgbW9kdWxlX3QgKmltYWdlLAorICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBsb25nIGltYWdlX2hlYWRyb29tLCBtb2R1bGVfdCAqaW5pdHJkLAorICAgICAgICAgICAgICAg ICAgICAgICAgICB2b2lkICooKmJvb3RzdHJhcF9tYXApKGNvbnN0IG1vZHVsZV90ICopLAorICAg ICAgICAgICAgICAgICAgICAgICAgICBjaGFyICpjbWRsaW5lKQoreworCisgICAgcmV0dXJuIChp c19odm1fZG9tYWluKGQpID8gY29uc3RydWN0X2RvbTBfaHZtIDogY29uc3RydWN0X2RvbTBfcHYp CisgICAgICAgICAgIChkLCBpbWFnZSwgaW1hZ2VfaGVhZHJvb20sIGluaXRyZCxib290c3RyYXBf bWFwLCBjbWRsaW5lKTsKK30KKwogLyoKICAqIExvY2FsIHZhcmlhYmxlczoKICAqIG1vZGU6IEMK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9zZXR1cC5jIGIveGVuL2FyY2gveDg2L3NldHVwLmMK aW5kZXggNzJlN2YyNC4uNjRkNGM4OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3NldHVwLmMK KysrIGIveGVuL2FyY2gveDg2L3NldHVwLmMKQEAgLTY3LDYgKzY3LDE2IEBAIHVuc2lnbmVkIGxv bmcgX19yZWFkX21vc3RseSBjcjRfcHYzMl9tYXNrOwogc3RhdGljIGJvb2xfdCBfX2luaXRkYXRh IG9wdF9kb20wcHZoOwogYm9vbGVhbl9wYXJhbSgiZG9tMHB2aCIsIG9wdF9kb20wcHZoKTsKIAor LyoKKyAqIExpc3Qgb2YgcGFyYW1ldGVycyB0aGF0IGFmZmVjdCBEb20wIGNyZWF0aW9uOgorICoK KyAqICAtIGh2bSAgICAgICAgICAgICAgIENyZWF0ZSBhIFBWSHYyIERvbTAuCisgKiAgLSBzaGFk b3cgICAgICAgICAgICBVc2Ugc2hhZG93IHBhZ2luZyBmb3IgRG9tMC4KKyAqLworc3RhdGljIHZv aWQgcGFyc2VfZG9tMF9wYXJhbShjaGFyICpzKTsKK2N1c3RvbV9wYXJhbSgiZG9tMCIsIHBhcnNl X2RvbTBfcGFyYW0pOworc3RhdGljIGJvb2wgX19pbml0ZGF0YSBkb20wX2h2bTsKKwogLyogKioq KiBMaW51eCBjb25maWcgb3B0aW9uOiBwcm9wYWdhdGVkIHRvIGRvbWFpbjAuICovCiAvKiAiYWNw aT1vZmYiOiAgICBTaXNhYmxlcyBib3RoIEFDUEkgdGFibGUgcGFyc2luZyBhbmQgaW50ZXJwcmV0 ZXIuICovCiAvKiAiYWNwaT1mb3JjZSI6ICBPdmVycmlkZSB0aGUgZGlzYWJsZSBibGFja2xpc3Qu ICAgICAgICAgICAgICAgICAgICovCkBAIC0xODcsNiArMTk3LDI3IEBAIHN0YXRpYyB2b2lkIF9f aW5pdCBwYXJzZV9hY3BpX3BhcmFtKGNoYXIgKnMpCiAgICAgfQogfQogCitzdGF0aWMgdm9pZCBf X2luaXQgcGFyc2VfZG9tMF9wYXJhbShjaGFyICpzKQoreworICAgIGNoYXIgKnNzOworCisgICAg ZG8geworCisgICAgICAgIHNzID0gc3RyY2hyKHMsICcsJyk7CisgICAgICAgIGlmICggc3MgKQor ICAgICAgICAgICAgKnNzID0gJ1wwJzsKKworICAgICAgICBpZiAoICFzdHJjbXAocywgImh2bSIp ICkKKyAgICAgICAgICAgIGRvbTBfaHZtID0gdHJ1ZTsKKyNpZmRlZiBDT05GSUdfU0hBRE9XX1BB R0lORworICAgICAgICBlbHNlIGlmICggIXN0cmNtcChzLCAic2hhZG93IikgKQorICAgICAgICAg ICAgb3B0X2RvbTBfc2hhZG93ID0gdHJ1ZTsKKyNlbmRpZgorCisgICAgICAgIHMgPSBzcyArIDE7 CisgICAgfSB3aGlsZSAoIHNzICk7Cit9CisKIHN0YXRpYyBjb25zdCBtb2R1bGVfdCAqX19pbml0 ZGF0YSBpbml0aWFsX2ltYWdlczsKIHN0YXRpYyB1bnNpZ25lZCBpbnQgX19pbml0ZGF0YSBucl9p bml0aWFsX2ltYWdlczsKIApAQCAtMTU0Myw2ICsxNTc0LDE0IEBAIHZvaWQgX19pbml0IG5vcmV0 dXJuIF9fc3RhcnRfeGVuKHVuc2lnbmVkIGxvbmcgbWJpX3ApCiAgICAgaWYgKCBvcHRfZG9tMHB2 aCApCiAgICAgICAgIGRvbWNyX2ZsYWdzIHw9IERPTUNSRl9wdmggfCBET01DUkZfaGFwOwogCisg ICAgaWYgKCBkb20wX2h2bSApCisgICAgeworICAgICAgICBkb21jcl9mbGFncyB8PSBET01DUkZf aHZtIHwKKyAgICAgICAgICAgICAgICAgICAgICAgKChodm1fZnVuY3MuaGFwX3N1cHBvcnRlZCAm JiAhb3B0X2RvbTBfc2hhZG93KSA/CisgICAgICAgICAgICAgICAgICAgICAgICAgRE9NQ1JGX2hh cCA6IDApOworICAgICAgICBjb25maWcuZW11bGF0aW9uX2ZsYWdzID0gWEVOX1g4Nl9FTVVfTEFQ SUN8WEVOX1g4Nl9FTVVfSU9BUElDOworICAgIH0KKwogICAgIC8qIENyZWF0ZSBpbml0aWFsIGRv bWFpbiAwLiAqLwogICAgIGRvbTAgPSBkb21haW5fY3JlYXRlKDAsIGRvbWNyX2ZsYWdzLCAwLCAm Y29uZmlnKTsKICAgICBpZiAoIElTX0VSUihkb20wKSB8fCAoYWxsb2NfZG9tMF92Y3B1MChkb20w KSA9PSBOVUxMKSApCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3NldHVwLmggYi94 ZW4vaW5jbHVkZS9hc20teDg2L3NldHVwLmgKaW5kZXggYzY1Yjc5Yy4uYzQxNzlkMSAxMDA2NDQK LS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9zZXR1cC5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14 ODYvc2V0dXAuaApAQCAtNTcsNCArNTcsMTAgQEAgZXh0ZXJuIHVpbnQ4X3Qga2JkX3NoaWZ0X2Zs YWdzOwogZXh0ZXJuIHVuc2lnbmVkIGxvbmcgaGlnaG1lbV9zdGFydDsKICNlbmRpZgogCisjaWZk ZWYgQ09ORklHX1NIQURPV19QQUdJTkcKK2V4dGVybiBib29sIG9wdF9kb20wX3NoYWRvdzsKKyNl bHNlCisjZGVmaW5lIG9wdF9kb20wX3NoYWRvdyAwCisjZW5kaWYKKwogI2VuZGlmCi0tIAoyLjcu NCAoQXBwbGUgR2l0LTY2KQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=