From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v3 4/5] libxl: update vcpus bitmap in retrieved guest config Date: Wed, 15 Jun 2016 10:31:41 +0100 Message-ID: <1465983102-19308-5-git-send-email-wei.liu2@citrix.com> References: <1465983102-19308-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bD7Aw-0001sc-Fi for xen-devel@lists.xenproject.org; Wed, 15 Jun 2016 09:31:54 +0000 In-Reply-To: <1465983102-19308-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Anthony PERARD , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org Li4uIGJlY2F1c2UgdGhlIGF2YWlsYWJsZSB2Y3B1IGJpdG1hcCBjYW4gY2hhbmdlIGR1cmluZyBk b21haW4gbGlmZSB0aW1lCmR1ZSB0byBjcHUgaG90cGx1ZyBhbmQgdW5wbHVnLgoKRm9yIFFFTVUg dXBzdHJlYW0sIHdlIGludGVycm9nYXRlIFFFTVUgZm9yIHRoZSBudW1iZXIgb2YgdmNwdXMuIEZv cgpvdGhlcnMsIHdlIGxvb2sgZGlyZWN0bHkgaW50byB4ZW5zdG9yZSBmb3IgaW5mb3JtYXRpb24u CgpSZXBvcnRlZC1ieTogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpTaWduZWQtb2Zm LWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KQ2M6IElhbiBKYWNrc29uIDxp YW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogQW50aG9ueSBQRVJBUkQgPGFudGhvbnkucGVy YXJkQGNpdHJpeC5jb20+Cgp2MzoKMS4gRml4IGluZGVudGF0aW9uIG9mIGFib3J0LgoyLiBVc2Ug c3RyY21wIGluc3RlYWQgb2Ygc3RybmNtcC4KLS0tCiB0b29scy9saWJ4bC9saWJ4bC5jIHwgOTYg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEg ZmlsZSBjaGFuZ2VkLCA5NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwv bGlieGwuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKaW5kZXggNjVhZjllZS4uYjc0OGJmMSAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGwuYworKysgYi90b29scy9saWJ4bC9saWJ4bC5jCkBA IC03MjQ2LDYgKzcyNDYsNTMgQEAgdm9pZCBsaWJ4bF9tYWNfY29weShsaWJ4bF9jdHggKmN0eCwg bGlieGxfbWFjICpkc3QsIGxpYnhsX21hYyAqc3JjKQogICAgICAgICAoKmRzdClbaV0gPSAoKnNy YylbaV07CiB9CiAKK3N0YXRpYyBpbnQgbGlieGxfX3VwZGF0ZV9hdmFpbF92Y3B1c19xbXAobGli eGxfX2djICpnYywgdWludDMyX3QgZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGludCBtYXhfdmNwdXMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX2JpdG1hcCAqbWFwKQoreworICAgIGludCByYzsK KworICAgIC8qIEZvciBRRU1VIHVwc3RyZWFtIHdlIGFsd2F5cyBuZWVkIHRvIHJldHVybiB0aGUg bnVtYmVyCisgICAgICogb2YgY3B1cyBwcmVzZW50IHRvIFFFTVUgd2hldGhlciB0aGV5IGFyZSBv bmxpbmUgb3Igbm90OworICAgICAqIG90aGVyd2lzZSBRRU1VIHdvbid0IGFjY2VwdCB0aGUgc2F2 ZWQgc3RhdGUuCisgICAgICovCisgICAgcmMgPSBsaWJ4bF9fcW1wX3F1ZXJ5X2NwdXMoZ2MsIGRv bWlkLCBtYXApOworICAgIGlmIChyYykgeworICAgICAgICBMT0coRVJST1IsICJmYWlsIHRvIGdl dCBudW1iZXIgb2YgY3B1cyBmb3IgZG9tYWluICVkIiwgZG9taWQpOworICAgICAgICBnb3RvIG91 dDsKKyAgICB9CisKKyAgICByYyA9IDA7CitvdXQ6CisgICAgcmV0dXJuIHJjOworfQorCitzdGF0 aWMgaW50IGxpYnhsX191cGRhdGVfYXZhaWxfdmNwdXNfeGVuc3RvcmUobGlieGxfX2djICpnYywg dWludDMyX3QgZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdW5zaWduZWQgaW50IG1heF92Y3B1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsaWJ4bF9iaXRtYXAgKm1hcCkKK3sKKyAgICBpbnQgcmM7Cisg ICAgdW5zaWduZWQgaW50IGk7CisgICAgY29uc3QgY2hhciAqZG9tcGF0aDsKKworICAgIGRvbXBh dGggPSBsaWJ4bF9feHNfZ2V0X2RvbXBhdGgoZ2MsIGRvbWlkKTsKKyAgICBpZiAoIWRvbXBhdGgp IHsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91dDsKKyAgICB9CisK KyAgICBmb3IgKGkgPSAwOyBpIDwgbWF4X3ZjcHVzOyBpKyspIHsKKyAgICAgICAgY29uc3QgY2hh ciAqcGF0aCA9IEdDU1BSSU5URigiJXMvY3B1LyV1L2F2YWlsYWJpbGl0eSIsIGRvbXBhdGgsIGkp OworICAgICAgICBjb25zdCBjaGFyICpjb250ZW50ID0gbGlieGxfX3hzX3JlYWQoZ2MsIFhCVF9O VUxMLCBwYXRoKTsKKyAgICAgICAgaWYgKCFzdHJjbXAoY29udGVudCwgIm9ubGluZSIpKQorICAg ICAgICAgICAgbGlieGxfYml0bWFwX3NldChtYXAsIGkpOworICAgIH0KKworICAgIHJjID0gMDsK K291dDoKKyAgICByZXR1cm4gcmM7Cit9CisKIGludCBsaWJ4bF9yZXRyaWV2ZV9kb21haW5fY29u ZmlndXJhdGlvbihsaWJ4bF9jdHggKmN0eCwgdWludDMyX3QgZG9taWQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcp CiB7CkBAIC03Mjk0LDYgKzczNDEsNTUgQEAgaW50IGxpYnhsX3JldHJpZXZlX2RvbWFpbl9jb25m aWd1cmF0aW9uKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgbGlieGxf ZG9taW5mb19kaXNwb3NlKCZpbmZvKTsKICAgICB9CiAKKyAgICAvKiBWQ1BVcyAqLworICAgIHsK KyAgICAgICAgbGlieGxfYml0bWFwICptYXAgPSAmZF9jb25maWctPmJfaW5mby5hdmFpbF92Y3B1 czsKKyAgICAgICAgdW5zaWduZWQgaW50IG1heF92Y3B1cyA9IGRfY29uZmlnLT5iX2luZm8ubWF4 X3ZjcHVzOworICAgICAgICBsaWJ4bF9kZXZpY2VfbW9kZWxfdmVyc2lvbiB2ZXJzaW9uOworCisg ICAgICAgIGxpYnhsX2JpdG1hcF9kaXNwb3NlKG1hcCk7CisgICAgICAgIGxpYnhsX2JpdG1hcF9p bml0KG1hcCk7CisgICAgICAgIGxpYnhsX2JpdG1hcF9hbGxvYyhDVFgsIG1hcCwgbWF4X3ZjcHVz KTsKKyAgICAgICAgbGlieGxfYml0bWFwX3NldF9ub25lKG1hcCk7CisKKyAgICAgICAgLyogSWYg dGhlIHVzZXIgZGlkIG5vdCBleHBsaWNpdGx5IHNwZWNpZnkgYSBkZXZpY2UgbW9kZWwKKyAgICAg ICAgICogdmVyc2lvbiwgd2UgbmVlZCB0byB1c2UgdGhlIHNhbWUgbG9naWMgdXNlZCBkdXJpbmcg ZG9tYWluCisgICAgICAgICAqIGNyZWF0aW9uIHRvIGRlcml2ZSB0aGUgZGV2aWNlIG1vZGVsIHZl cnNpb24uCisgICAgICAgICAqLworICAgICAgICB2ZXJzaW9uID0gZF9jb25maWctPmJfaW5mby5k ZXZpY2VfbW9kZWxfdmVyc2lvbjsKKyAgICAgICAgaWYgKHZlcnNpb24gPT0gTElCWExfREVWSUNF X01PREVMX1ZFUlNJT05fVU5LTk9XTikKKyAgICAgICAgICAgIHZlcnNpb24gPSBsaWJ4bF9fZ2V0 X2RldmljZV9tb2RlbF92ZXJzaW9uKGdjLCAmZF9jb25maWctPmJfaW5mbyk7CisKKyAgICAgICAg c3dpdGNoIChkX2NvbmZpZy0+Yl9pbmZvLnR5cGUpIHsKKyAgICAgICAgY2FzZSBMSUJYTF9ET01B SU5fVFlQRV9IVk06CisgICAgICAgICAgICBzd2l0Y2ggKHZlcnNpb24pIHsKKyAgICAgICAgICAg IGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU46CisgICAgICAgICAgICAg ICAgcmMgPSBsaWJ4bF9fdXBkYXRlX2F2YWlsX3ZjcHVzX3FtcChnYywgZG9taWQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhfdmNwdXMsIG1h cCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExJQlhMX0RFVklD RV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOgorICAgICAgICAgICAgY2FzZSBM SUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9OT05FOgorICAgICAgICAgICAgICAgIHJjID0gbGli eGxfX3VwZGF0ZV9hdmFpbF92Y3B1c194ZW5zdG9yZShnYywgZG9taWQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heF92Y3B1cywgbWFw KTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAg ICAgICAgICAgYWJvcnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIExJQlhMX0RPTUFJTl9UWVBFX1BWOgorICAgICAgICAgICAgcmMgPSBsaWJ4bF9f dXBkYXRlX2F2YWlsX3ZjcHVzX3hlbnN0b3JlKGdjLCBkb21pZCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhfdmNwdXMsIG1hcCk7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGFib3J0KCk7Cisg ICAgICAgIH0KKworICAgICAgICBpZiAocmMpIHsKKyAgICAgICAgICAgIExPRyhFUlJPUiwgImZh aWwgdG8gdXBkYXRlIGF2YWlsYWJsZSBjcHUgbWFwIGZvciBkb21haW4gJWQiLCBkb21pZCk7Cisg ICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8qIE1lbW9yeSBs aW1pdHM6CiAgICAgICoKICAgICAgKiBDdXJyZW50bHkgdGhlcmUgYXJlIHRocmVlIG1lbW9yeSBs aW1pdHM6Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==