From: Anthony PERARD Subject: [RFC 4/4] HACK libxl_exec: Check QEMU status via QMP instead of xenstore Date: Mon, 26 Mar 2018 19:34:01 +0100 Message-ID: <20180326183401.17249-5-anthony.perard@citrix.com> References: <20180326183401.17249-1-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1f0WxJ-0000eC-6T for xen-devel@lists.xenproject.org; Mon, 26 Mar 2018 18:34:53 +0000 In-Reply-To: <20180326183401.17249-1-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Anthony PERARD , Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRoIGlzIG1vcmUgb2YgYSBwcm9mIG9mIGNvbmNlcHQgcmVhdGhlciB0aGFuIGEgcGF0 Y2ggYXMgdGhpcwp3b3VsZCBicmVhayBxZW11LXRyYWQuCgpXaGVuIHFlbXUgaXMgcmVzdHJpY3Rl ZCwgdGhlIHFlbXUgb24gdGhlIHJlY2VpdmluZyBzaWRlIGNhbm4ndCB3cml0ZQphbnl0aGluZyB0 byB4ZW5zdG9yZSBvbmNlIHRoZSBtaWdyYXRpb24gaXMgc3RhcnRlZC4gU28gaXQgY2Fubid0IHRl bGwKbGlieGwgdGhhdCBpdCBpcyByZWFkeSB0byBjb250aW51ZSBydW5uaW5nIHRoZSBndWVzdC4K CkZvciBsaWJ4bCwgdGhlIG9ubHkgd2F5IHRvIGZpbmQgb3V0IGlmIHFlbXUgaXMgcmVhZHkgb24g bWlncmF0ZS9yZXN0b3JlLAppdCBpcyB0byBjb25uZWN0IHRvIHRoZSBRTVAgc29ja2V0IGFuZCBy dW4gInF1ZXJ5LXN0YXR1cyIuCgpUaGlzIHBhdGNoIHN1Y2NlZWQgaW4gaW1wbGVtZW50aW5nIHRo YXQsIGJ1dCBRTVAgZG9lc24ndCBmaXQgd2VsbCB3aXRoCnRoZSBsaWJ4bF9fZXZfKiBpbmZyYXN0 cnVjdHVyZS4gT25lIG1haW4gaXNzdWUgd291bGQgYmUgcW1wX29wZW4oKSwgaXQKdHJpZXMgdG8g Y29ubmVjdCB0byB0aGUgUU1QIHNvY2tldCBkdXJpbmcgNSBzZWNvbmRzIHdpdGhvdXQgZXZlciBn aXZpbmcKYmFjayB0aGUgaGFuZCB0byBsaWJ4bC4KCkFsc28gcmlnaHQgbm93LCB4c3dhaXQgaXMg ZGlzYWJsZWQsIGJ1dCBsaWJ4bCBjb3VsZCBjaGVjayBib3RoCnhlbnN0b3JlIGFuZCBRTVAgYXQg dGhlIHNhbWUgdGltZS4KClNpZ25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBl cmFyZEBjaXRyaXguY29tPgotLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2RtLmMgICAgICAgfCAgMyAr KwogdG9vbHMvbGlieGwvbGlieGxfZXhlYy5jICAgICB8IDk1ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tCiB0b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oIHwg MTQgKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMDUgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9kbS5jIGIvdG9vbHMvbGlieGwv bGlieGxfZG0uYwppbmRleCBhM2NkZGNlOGI3Li40MzMxNGUzMzA5IDEwMDY0NAotLS0gYS90b29s cy9saWJ4bC9saWJ4bF9kbS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKQEAgLTIzNTAs NiArMjM1MCw5IEBAIHJldHJ5X3RyYW5zYWN0aW9uOgogICAgIHNwYXduLT5mYWlsdXJlX2NiID0g ZGV2aWNlX21vZGVsX3N0YXJ0dXBfZmFpbGVkOwogICAgIHNwYXduLT5kZXRhY2hlZF9jYiA9IGRl dmljZV9tb2RlbF9kZXRhY2hlZDsKIAorICAgIC8vIEhBQ0ssIGRpc2FibGUgeGVuc3RvcmUgd2F0 Y2gsIHdpbGwgaW5zdGVhZCB1c2UgUU1QCisgICAgc3Bhd24tPnhzcGF0aCA9IE5VTEw7CisKICAg ICByYyA9IGxpYnhsX19zcGF3bl9zcGF3bihlZ2MsIHNwYXduKTsKICAgICBpZiAocmMgPCAwKQog ICAgICAgICBnb3RvIG91dF9jbG9zZTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2V4 ZWMuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2V4ZWMuYwppbmRleCAwMmU2YzkxN2YwLi4yYjVkYjUx OTdhIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9leGVjLmMKKysrIGIvdG9vbHMvbGli eGwvbGlieGxfZXhlYy5jCkBAIC0yNzQsNiArMjc0LDU4IEBAIHZvaWQgbGlieGxfX3NwYXduX2lu aXQobGlieGxfX3NwYXduX3N0YXRlICpzcykKICAgICBsaWJ4bF9feHN3YWl0X2luaXQoJnNzLT54 c3dhaXQpOwogfQogCitzdGF0aWMgdm9pZCBxbXB3YWl0X2NhbGxiYWNrKGxpYnhsX19lZ2MgKmVn YywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2V2X3RpbWUgKmV2LAorICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgdGltZXZhbCAqcmVxdWVzdGVkX2FicywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHJjKQoreworICAgIGxpYnhsX19zcGF3bl9z dGF0ZSAqc3MgPSBDT05UQUlORVJfT0YoZXYsICpzcywgcW1wd2FpdC5xbXBfZXYpOworICAgIGxp YnhsX19kbV9zcGF3bl9zdGF0ZSAqZG1zcyA9IENPTlRBSU5FUl9PRihzcywgKmRtc3MsIHNwYXdu KTsKKyAgICBTVEFURV9BT19HQyhzcy0+YW8pOworCisgICAgaWYgKHJjID09IEVSUk9SX1RJTUVE T1VUKSAvKiBBcyBpbnRlbmRlZCAqLworICAgICAgICByYyA9IDA7CisgICAgZWxzZQorICAgICAg ICBnb3RvIG91dF9lcnI7CisKKyAgICByYyA9IGxpYnhsX19xbXBfcXVlcnlfc3RhdHVzKGdjLCBk bXNzLT5ndWVzdF9kb21pZCwgInJ1bm5pbmciKTsKKworICAgIGlmIChyYykgeworICAgICAgICAv KiByZXRyeSBRTVAgY29ubmVjdGlvbiBsYXRlciAqLworICAgICAgICBsaWJ4bF9fZXZfdGltZV9y ZWdpc3Rlcl9yZWwoc3MtPmFvLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZXYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxbXB3YWl0X2NhbGxiYWNr LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTAwKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIGxpYnhsX19zcGF3bl9pbml0aWF0ZV9kZXRhY2goZ2MsIHNzKTsK KyAgICByZXR1cm47CitvdXRfZXJyOgorICAgIExPRyhERUJVRywgInFtcHdhaXQgZmFpbHVyZTog JWQiLCByYyk7CisgICAgc3MtPmZhaWx1cmVfY2IoZWdjLCBzcywgcmMpOworfQorCitzdGF0aWMg dm9pZCBxbXB3YWl0X3JlcG9ydF9lcnJvcihsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19xbXB3YWl0 X3N0YXRlICpxbXB3YSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHJjKQor eworICAgIGxpYnhsX19zcGF3bl9zdGF0ZSAqc3MgPSBDT05UQUlORVJfT0YocW1wd2EsICpzcywg cW1wd2FpdCk7CisgICAgRUdDX0dDOworICAgIGxpYnhsX19ldl90aW1lX2RlcmVnaXN0ZXIoZ2Ms ICZxbXB3YS0+dGltZV9ldik7CisgICAgbGlieGxfX2V2X3RpbWVfZGVyZWdpc3RlcihnYywgJnFt cHdhLT5xbXBfZXYpOworICAgIHFtcHdhLT5jYWxsYmFjayhlZ2MsICZzcy0+eHN3YWl0LCByYywg MCk7Cit9CisKK3N0YXRpYyB2b2lkIHFtcHdhaXRfdGltZW91dF9jYWxsYmFjayhsaWJ4bF9fZWdj ICplZ2MsIGxpYnhsX19ldl90aW1lICpldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3Qgc3RydWN0IHRpbWV2YWwgKnJlcXVlc3RlZF9hYnMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGludCByYykKK3sKKyAgICBFR0NfR0M7CisgICAgbGlieGxfX3FtcHdhaXRfc3Rh dGUgKnFtcHdhID0gQ09OVEFJTkVSX09GKGV2LCAqcW1wd2EsIHRpbWVfZXYpOworICAgIExPRyhE RUJVRywgIiVzOiBxbXB3YWl0IHRpbWVvdXQiLCBxbXB3YS0+d2hhdCk7CisgICAgcW1wd2FpdF9y ZXBvcnRfZXJyb3IoZWdjLCBxbXB3YSwgcmMpOworfQorCiBpbnQgbGlieGxfX3NwYXduX3NwYXdu KGxpYnhsX19lZ2MgKmVnYywgbGlieGxfX3NwYXduX3N0YXRlICpzcykKIHsKICAgICBTVEFURV9B T19HQyhzcy0+YW8pOwpAQCAtMjg0LDEzICszMzYsMzUgQEAgaW50IGxpYnhsX19zcGF3bl9zcGF3 bihsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19zcGF3bl9zdGF0ZSAqc3MpCiAgICAgbGlieGxfX3Nw YXduX2luaXQoc3MpOwogICAgIHNzLT5yYyA9IHNzLT5kZXRhY2hpbmcgPSAwOwogCi0gICAgc3Mt Pnhzd2FpdC5hbyA9IGFvOwotICAgIHNzLT54c3dhaXQud2hhdCA9IEdDU1BSSU5URigiJXMgc3Rh cnR1cCIsIHNzLT53aGF0KTsKLSAgICBzcy0+eHN3YWl0LnBhdGggPSBzcy0+eHNwYXRoOwotICAg IHNzLT54c3dhaXQudGltZW91dF9tcyA9IHNzLT50aW1lb3V0X21zOwotICAgIHNzLT54c3dhaXQu Y2FsbGJhY2sgPSBzcGF3bl93YXRjaF9ldmVudDsKLSAgICByYyA9IGxpYnhsX194c3dhaXRfc3Rh cnQoZ2MsICZzcy0+eHN3YWl0KTsKLSAgICBpZiAocmMpIGdvdG8gb3V0X2VycjsKKyAgICBpZiAo c3MtPnhzcGF0aCkgeworICAgICAgICBzcy0+eHN3YWl0LmFvID0gYW87CisgICAgICAgIHNzLT54 c3dhaXQud2hhdCA9IEdDU1BSSU5URigiJXMgc3RhcnR1cCIsIHNzLT53aGF0KTsKKyAgICAgICAg c3MtPnhzd2FpdC5wYXRoID0gc3MtPnhzcGF0aDsKKyAgICAgICAgc3MtPnhzd2FpdC50aW1lb3V0 X21zID0gc3MtPnRpbWVvdXRfbXM7CisgICAgICAgIHNzLT54c3dhaXQuY2FsbGJhY2sgPSBzcGF3 bl93YXRjaF9ldmVudDsKKyAgICAgICAgcmMgPSBsaWJ4bF9feHN3YWl0X3N0YXJ0KGdjLCAmc3Mt Pnhzd2FpdCk7CisgICAgICAgIGlmIChyYykgZ290byBvdXRfZXJyOworICAgIH0gZWxzZSB7Cisg ICAgICAgIGxpYnhsX19xbXB3YWl0X3N0YXRlICpxbXB3YSA9ICZzcy0+cW1wd2FpdDsKKworICAg ICAgICBzcy0+cW1wd2FpdC5hbyA9IGFvOworICAgICAgICBzcy0+cW1wd2FpdC53aGF0ID0gR0NT UFJJTlRGKCIlcyBzdGFydHVwIChRTVApIiwgc3MtPndoYXQpOworICAgICAgICAvKnNzLT5xbXB3 YWl0Lmd1ZXN0X2RvbWlkID0gOyovCisgICAgICAgIHNzLT5xbXB3YWl0LnRpbWVvdXRfbXMgPSBz cy0+dGltZW91dF9tczsKKyAgICAgICAgc3MtPnFtcHdhaXQuY2FsbGJhY2sgPSBzcGF3bl93YXRj aF9ldmVudDsKKworICAgICAgICBsaWJ4bF9fZXZfdGltZV9pbml0KCZxbXB3YS0+dGltZV9ldik7 CisgICAgICAgIGxpYnhsX19ldl90aW1lX2luaXQoJnFtcHdhLT5xbXBfZXYpOworCisgICAgICAg IHJjID0gbGlieGxfX2V2X3RpbWVfcmVnaXN0ZXJfcmVsKHFtcHdhLT5hbywgJnFtcHdhLT50aW1l X2V2LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxbXB3YWl0X3Rp bWVvdXRfY2FsbGJhY2ssCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHFtcHdhLT50aW1lb3V0X21zKTsKKyAgICAgICAgaWYgKHJjKSBnb3RvIG91dF9lcnI7CisKKyAg ICAgICAgcmMgPSBsaWJ4bF9fZXZfdGltZV9yZWdpc3Rlcl9yZWwoc3MtPmFvLCAmcW1wd2EtPnFt cF9ldiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcW1wd2FpdF9j YWxsYmFjaywgMTAwKTsKKyAgICAgICAgaWYgKHJjKSBnb3RvIG91dF9lcnI7CisgICAgfQogCiAg ICAgcGlkX3QgbWlkZGxlID0gbGlieGxfX2V2X2NoaWxkX2ZvcmsoZ2MsICZzcy0+bWlkLCBzcGF3 bl9taWRkbGVfZGVhdGgpOwogICAgIGlmIChtaWRkbGUgPT0tMSkgeyByYyA9IEVSUk9SX0ZBSUw7 IGdvdG8gb3V0X2VycjsgfQpAQCAtMzQzLDEwICs0MTcsMTYgQEAgaW50IGxpYnhsX19zcGF3bl9z cGF3bihsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19zcGF3bl9zdGF0ZSAqc3MpCiAgICAgcmV0dXJu IHJjOwogfQogCitzdGF0aWMgdm9pZCBsaWJ4bF9fcW1wd2FpdF9zdG9wKGxpYnhsX19nYyAqZ2Ms IGxpYnhsX19xbXB3YWl0X3N0YXRlICpxbXB3YSkKK3sKKyAgICBsaWJ4bF9fZXZfdGltZV9kZXJl Z2lzdGVyKGdjLCAmcW1wd2EtPnRpbWVfZXYpOworICAgIGxpYnhsX19ldl90aW1lX2RlcmVnaXN0 ZXIoZ2MsICZxbXB3YS0+cW1wX2V2KTsKK30KIHN0YXRpYyB2b2lkIHNwYXduX2NsZWFudXAobGli eGxfX2djICpnYywgbGlieGxfX3NwYXduX3N0YXRlICpzcykKIHsKICAgICBhc3NlcnQoIWxpYnhs X19ldl9jaGlsZF9pbnVzZSgmc3MtPm1pZCkpOwogICAgIGxpYnhsX194c3dhaXRfc3RvcChnYywg JnNzLT54c3dhaXQpOworICAgIGxpYnhsX19xbXB3YWl0X3N0b3AoZ2MsICZzcy0+cW1wd2FpdCk7 CiB9CiAKIHN0YXRpYyB2b2lkIHNwYXduX2RldGFjaChsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fc3Bh d25fc3RhdGUgKnNzKQpAQCAtMzU5LDYgKzQzOSw3IEBAIHN0YXRpYyB2b2lkIHNwYXduX2RldGFj aChsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fc3Bhd25fc3RhdGUgKnNzKQogICAgIGFzc2VydChsaWJ4 bF9fZXZfY2hpbGRfaW51c2UoJnNzLT5taWQpKTsKICAgICBhc3NlcnQoc3MtPmRldGFjaGluZyB8 fCBzcy0+cmMpOwogICAgIGxpYnhsX194c3dhaXRfc3RvcChnYywgJnNzLT54c3dhaXQpOworICAg IGxpYnhsX19xbXB3YWl0X3N0b3AoZ2MsICZzcy0+cW1wd2FpdCk7CiAKICAgICBwaWRfdCBjaGls ZCA9IHNzLT5taWQucGlkOwogICAgIHIgPSBraWxsKGNoaWxkLCBTSUdLSUxMKTsKZGlmZiAtLWdp dCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmggYi90b29scy9saWJ4bC9saWJ4bF9pbnRl cm5hbC5oCmluZGV4IGQ1ZTk4MTE0ZDYuLmZkZWVlYjVmNDUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xp YnhsL2xpYnhsX2ludGVybmFsLmgKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaApA QCAtMTU1MCw2ICsxNTUwLDE5IEBAIHR5cGVkZWYgdm9pZCBsaWJ4bF9fc3Bhd25fY29uZmlybV9j YihsaWJ4bF9fZWdjKiwgbGlieGxfX3NwYXduX3N0YXRlKiwKICAqLwogdHlwZWRlZiB2b2lkIGxp YnhsX19zcGF3bl9kZXRhY2hlZF9jYihsaWJ4bF9fZWdjKiwgbGlieGxfX3NwYXduX3N0YXRlKik7 CiAKKy8vIHN0cnVjdCB1c2UgZm9yIGNhbGxpbmcgdGhlIFFNUCBjb21tYW5kICJxdWVyeS1zdGF0 dXMiIG9mIGEgc3RhcnRpbmcgUUVNVS4KK3R5cGVkZWYgc3RydWN0IGxpYnhsX19xbXB3YWl0X3N0 YXRlIHsKKyAgICAvKiBjYWxsZXIgbXVzdCBmaWxsIHRoZXNlIGluLCBhbmQgdGhleSBtdXN0IGFs bCByZW1haW4gdmFsaWQgKi8KKyAgICBsaWJ4bF9fYW8gKmFvOworICAgIGNvbnN0IGNoYXIgKndo YXQ7IC8qIGZvciBlcnJvciBtc2dzOiBub3VuIHBocmFzZSwgd2hhdCB3ZSdyZSB3YWl0aW5nIGZv ciAqLworICAgIGludCBndWVzdF9kb21pZDsKKyAgICBpbnQgdGltZW91dF9tczsgLyogYXMgZm9y IHBvbGwoMikgKi8KKyAgICAvKiByZW1haW5pbmcgZmllbGRzIGFyZSBwcml2YXRlIHRvIHFtcHdh aXQgKi8KKyAgICBsaWJ4bF9fZXZfdGltZSB0aW1lX2V2OworICAgIGxpYnhsX19ldl90aW1lIHFt cF9ldjsKKyAgICBsaWJ4bF9feHN3YWl0X2NhbGxiYWNrICpjYWxsYmFjazsKK30gbGlieGxfX3Ft cHdhaXRfc3RhdGU7CisKIHN0cnVjdCBsaWJ4bF9fc3Bhd25fc3RhdGUgewogICAgIC8qIG11c3Qg YmUgZmlsbGVkIGluIGJ5IHVzZXIgYW5kIHJlbWFpbiB2YWxpZCAqLwogICAgIGxpYnhsX19hbyAq YW87CkBAIC0xNTY3LDYgKzE1ODAsNyBAQCBzdHJ1Y3QgbGlieGxfX3NwYXduX3N0YXRlIHsKICAg ICBpbnQgcmM7IC8qIG1pZ2h0IGJlIG5vbi0wIHdoZW5ldmVyIHdlIGFyZSBub3QgSWRsZSAqLwog ICAgIGxpYnhsX19ldl9jaGlsZCBtaWQ7IC8qIGFsd2F5cyBpbiB1c2Ugd2hlbmV2ZXIgd2UgYXJl IG5vdCBJZGxlICovCiAgICAgbGlieGxfX3hzd2FpdF9zdGF0ZSB4c3dhaXQ7CisgICAgbGlieGxf X3FtcHdhaXRfc3RhdGUgcW1wd2FpdDsKIH07CiAKIHN0YXRpYyBpbmxpbmUgaW50IGxpYnhsX19z cGF3bl9pbnVzZShjb25zdCBsaWJ4bF9fc3Bhd25fc3RhdGUgKnNzKQotLSAKQW50aG9ueSBQRVJB UkQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs