From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 2/3] libxl: update vcpus bitmap in retrieved guest config Date: Wed, 8 Jun 2016 15:28:45 +0100 Message-ID: <1465396126-27426-3-git-send-email-wei.liu2@citrix.com> References: <1465396126-27426-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.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAeoQ-0003uS-74 for xen-devel@lists.xenproject.org; Wed, 08 Jun 2016 14:50:30 +0000 In-Reply-To: <1465396126-27426-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 , Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org Li4uIGJlY2F1c2UgdGhlIGF2YWlsYWJsZSB2Y3B1IGJpdG1hcCBjYW4gY2hhbmdlIGR1cmluZyBk b21haW4gbGlmZSB0aW1lCmR1ZSB0byBjcHUgaG90cGx1ZyBhbmQgdW5wbHVnLgoKRm9yIFFFTVUg dXBzdHJlYW0sIHdlIGludGVycm9nYXRlIFFFTVUgZm9yIHRoZSBudW1iZXIgb2YgdmNwdXMuIEZv cgpvdGhlcnMsIHdlIGxvb2sgZGlyZWN0bHkgaW50byB4ZW5zdG9yZSBmb3IgaW5mb3JtYXRpb24u CgpSZXBvcnRlZC1ieTogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpTaWduZWQtb2Zm LWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHRvb2xzL2xpYnhsL2xpYnhs LmMgfCA4NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogMSBmaWxlIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS90b29s cy9saWJ4bC9saWJ4bC5jIGIvdG9vbHMvbGlieGwvbGlieGwuYwppbmRleCAwMDZiODNmLi4wMjcw NmFiIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xp YnhsLmMKQEAgLTcyMjIsNiArNzIyMiw1MyBAQCB2b2lkIGxpYnhsX21hY19jb3B5KGxpYnhsX2N0 eCAqY3R4LCBsaWJ4bF9tYWMgKmRzdCwgbGlieGxfbWFjICpzcmMpCiAgICAgICAgICgqZHN0KVtp XSA9ICgqc3JjKVtpXTsKIH0KIAorc3RhdGljIGludCBsaWJ4bF9fdXBkYXRlX2F2YWlsX3ZjcHVz X3FtcChsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IG1heF92Y3B1cywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfYml0bWFwICptYXApCit7CisgICAg aW50IHJjOworCisgICAgLyogRm9yIFFFTVUgdXBzdHJlYW0gd2UgYWx3YXlzIG5lZWQgdG8gcmV0 dXJuIHRoZSBudW1iZXIKKyAgICAgKiBvZiBjcHVzIHByZXNlbnQgdG8gUUVNVSB3aGV0aGVyIHRo ZXkgYXJlIG9ubGluZSBvciBub3Q7CisgICAgICogb3RoZXJ3aXNlIFFFTVUgd29uJ3QgYWNjZXB0 IHRoZSBzYXZlZCBzdGF0ZS4KKyAgICAgKi8KKyAgICByYyA9IGxpYnhsX19xbXBfcXVlcnlfY3B1 cyhnYywgZG9taWQsIG1hcCk7CisgICAgaWYgKHJjKSB7CisgICAgICAgIExPRyhFUlJPUiwgImZh aWwgdG8gZ2V0IG51bWJlciBvZiBjcHVzIGZvciBkb21haW4gJWQiLCBkb21pZCk7CisgICAgICAg IGdvdG8gb3V0OworICAgIH0KKworICAgIHJjID0gMDsKK291dDoKKyAgICByZXR1cm4gcmM7Cit9 CisKK3N0YXRpYyBpbnQgbGlieGxfX3VwZGF0ZV9hdmFpbF92Y3B1c194ZW5zdG9yZShsaWJ4bF9f Z2MgKmdjLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbWF4X3ZjcHVzLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX2JpdG1hcCAqbWFwKQoreworICAgIGlu dCByYzsKKyAgICB1bnNpZ25lZCBpbnQgaTsKKyAgICBjb25zdCBjaGFyICpkb21wYXRoOworCisg ICAgZG9tcGF0aCA9IGxpYnhsX194c19nZXRfZG9tcGF0aChnYywgZG9taWQpOworICAgIGlmICgh ZG9tcGF0aCkgeworICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CisgICAgICAgIGdvdG8gb3V0Owor ICAgIH0KKworICAgIGZvciAoaSA9IDA7IGkgPCBtYXhfdmNwdXM7IGkrKykgeworICAgICAgICBj b25zdCBjaGFyICpwYXRoID0gR0NTUFJJTlRGKCIlcy9jcHUvJXUvYXZhaWxhYmlsaXR5IiwgZG9t cGF0aCwgaSk7CisgICAgICAgIGNvbnN0IGNoYXIgKmNvbnRlbnQgPSBsaWJ4bF9feHNfcmVhZChn YywgWEJUX05VTEwsIHBhdGgpOworICAgICAgICBpZiAoIXN0cm5jbXAoY29udGVudCwgIm9ubGlu ZSIsIHN0cmxlbigib25saW5lIikpKQorICAgICAgICAgICAgbGlieGxfYml0bWFwX3NldChtYXAs IGkpOworICAgIH0KKworICAgIHJjID0gMDsKK291dDoKKyAgICByZXR1cm4gcmM7Cit9CisKIGlu dCBsaWJ4bF9yZXRyaWV2ZV9kb21haW5fY29uZmlndXJhdGlvbihsaWJ4bF9jdHggKmN0eCwgdWlu dDMyX3QgZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGli eGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcpCiB7CkBAIC03MjcwLDYgKzczMTcsNDYgQEAgaW50 IGxpYnhsX3JldHJpZXZlX2RvbWFpbl9jb25maWd1cmF0aW9uKGxpYnhsX2N0eCAqY3R4LCB1aW50 MzJfdCBkb21pZCwKICAgICAgICAgbGlieGxfZG9taW5mb19kaXNwb3NlKCZpbmZvKTsKICAgICB9 CiAKKyAgICAvKiBWQ1BVcyAqLworICAgIHsKKyAgICAgICAgbGlieGxfYml0bWFwICptYXAgPSAm ZF9jb25maWctPmJfaW5mby5hdmFpbF92Y3B1czsKKyAgICAgICAgdW5zaWduZWQgaW50IG1heF92 Y3B1cyA9IGRfY29uZmlnLT5iX2luZm8ubWF4X3ZjcHVzOworCisgICAgICAgIGxpYnhsX2JpdG1h cF9kaXNwb3NlKG1hcCk7CisgICAgICAgIGxpYnhsX2JpdG1hcF9pbml0KG1hcCk7CisgICAgICAg IGxpYnhsX2JpdG1hcF9hbGxvYyhDVFgsIG1hcCwgbWF4X3ZjcHVzKTsKKyAgICAgICAgbGlieGxf Yml0bWFwX3NldF9ub25lKG1hcCk7CisKKyAgICAgICAgc3dpdGNoIChkX2NvbmZpZy0+Yl9pbmZv LnR5cGUpIHsKKyAgICAgICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9IVk06CisgICAgICAgICAg ICBzd2l0Y2ggKGRfY29uZmlnLT5iX2luZm8uZGV2aWNlX21vZGVsX3ZlcnNpb24pIHsKKyAgICAg ICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU46CisgICAgICAg ICAgICAgICAgcmMgPSBsaWJ4bF9fdXBkYXRlX2F2YWlsX3ZjcHVzX3FtcChnYywgZG9taWQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhfdmNw dXMsIG1hcCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExJQlhM X0RFVklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOgorICAgICAgICAgICAg Y2FzZSBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9OT05FOgorICAgICAgICAgICAgICAgIHJj ID0gbGlieGxfX3VwZGF0ZV9hdmFpbF92Y3B1c194ZW5zdG9yZShnYywgZG9taWQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heF92Y3B1 cywgbWFwKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICBhYm9ydCgpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIGNhc2UgTElCWExfRE9NQUlOX1RZUEVfUFY6CisgICAgICAgICAgICByYyA9IGxpYnhs X191cGRhdGVfYXZhaWxfdmNwdXNfeGVuc3RvcmUoZ2MsIGRvbWlkLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heF92Y3B1cywgbWFwKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgYWJvcnQoKTsK KyAgICAgICAgfQorCisgICAgICAgIGlmIChyYykgeworICAgICAgICAgICAgTE9HKEVSUk9SLCAi ZmFpbCB0byB1cGRhdGUgYXZhaWxhYmxlIGNwdSBtYXAgZm9yIGRvbWFpbiAlZCIsIGRvbWlkKTsK KyAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICB9CisgICAgfQorCiAgICAgLyogTWVtb3J5 IGxpbWl0czoKICAgICAgKgogICAgICAqIEN1cnJlbnRseSB0aGVyZSBhcmUgdGhyZWUgbWVtb3J5 IGxpbWl0czoKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK