From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 3/3] libxl: update vcpus bitmap in retrieved guest config Date: Tue, 7 Jun 2016 12:24:02 +0100 Message-ID: <1465298642-5356-4-git-send-email-wei.liu2@citrix.com> References: <1465298642-5356-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.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAF79-000120-BV for xen-devel@lists.xenproject.org; Tue, 07 Jun 2016 11:24:07 +0000 In-Reply-To: <1465298642-5356-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 , Stefano Stabellini , Ian Jackson , Jan Beulich List-Id: xen-devel@lists.xenproject.org Li4uIGJlY2F1c2UgdGhlIGF2YWlsYWJsZSB2Y3B1IGJpdG1hcCBjYW4gY2hhbmdlIGR1cmluZyBk b21haW4gbGlmZSB0aW1lCmR1ZSB0byBjcHUgaG90cGx1ZyBhbmQgdW5wbHVnLgoKRm9yIFFFTVUg dXBzdHJlYW0sIHdlIGludGVycm9nYXRlIFFFTVUgZm9yIHRoZSBudW1iZXIgb2YgdmNwdXMuIEZv cgpvdGhlcnMsIHdlIGxvb2sgZGlyZWN0bHkgaW50byB4ZW5zdG9yZSBmb3IgaW5mb3JtYXRpb24u CgpSZXBvcnRlZC1ieTogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpTaWduZWQtb2Zm LWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHRvb2xzL2xpYnhsL2xpYnhs LmMgfCA5MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogMSBmaWxlIGNoYW5nZWQsIDkxIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS90b29s cy9saWJ4bC9saWJ4bC5jIGIvdG9vbHMvbGlieGwvbGlieGwuYwppbmRleCAwMDZiODNmLi40Zjhi NjYzIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xp YnhsLmMKQEAgLTcyMjIsNiArNzIyMiw1NyBAQCB2b2lkIGxpYnhsX21hY19jb3B5KGxpYnhsX2N0 eCAqY3R4LCBsaWJ4bF9tYWMgKmRzdCwgbGlieGxfbWFjICpzcmMpCiAgICAgICAgICgqZHN0KVtp XSA9ICgqc3JjKVtpXTsKIH0KIAorc3RhdGljIGludCBsaWJ4bF9fdXBkYXRlX2F2YWlsX3ZjcHVz X3FtcChsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IG1heF92Y3B1cywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfYml0bWFwICptYXApCit7CisgICAg dW5zaWduZWQgaW50IGNvdW50LCBpOworICAgIGludCByYzsKKworICAgIC8qIEZvciBRRU1VIHVw c3RyZWFtIHdlIGFsd2F5cyBuZWVkIHRvIHJldHVybiB0aGUgbnVtYmVyCisgICAgICogb2YgY3B1 cyBwcmVzZW50IHRvIFFFTVUgd2hldGhlciB0aGV5IGFyZSBvbmxpbmUgb3Igbm90OworICAgICAq IG90aGVyd2lzZSBRRU1VIHdvbid0IGFjY2VwdCB0aGUgc2F2ZWQgc3RhdGUuCisgICAgICovCisg ICAgcmMgPSBsaWJ4bF9fcW1wX3F1ZXJ5X2NwdXMoZ2MsIGRvbWlkLCAmY291bnQpOworICAgIGlm IChyYykgeworICAgICAgICBMT0coRVJST1IsICJmYWlsIHRvIGdldCBudW1iZXIgb2YgY3B1cyBm b3IgZG9tYWluICVkIiwgZG9taWQpOworICAgICAgICBnb3RvIG91dDsKKyAgICB9CisKKyAgICBm b3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykKKyAgICAgICAgbGlieGxfYml0bWFwX3NldChtYXAs IGkpOworCisgICAgcmMgPSAwOworb3V0OgorICAgIHJldHVybiByYzsKK30KKworc3RhdGljIGlu dCBsaWJ4bF9fdXBkYXRlX2F2YWlsX3ZjcHVzX3hlbnN0b3JlKGxpYnhsX19nYyAqZ2MsIHVpbnQz Ml90IGRvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGludCBtYXhfdmNwdXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGlieGxfYml0bWFwICptYXApCit7CisgICAgaW50IHJjOworICAgIHVu c2lnbmVkIGludCBpOworICAgIGNvbnN0IGNoYXIgKmRvbXBhdGg7CisKKyAgICBkb21wYXRoID0g bGlieGxfX3hzX2dldF9kb21wYXRoKGdjLCBkb21pZCk7CisgICAgaWYgKCFkb21wYXRoKSB7Cisg ICAgICAgIHJjID0gRVJST1JfRkFJTDsKKyAgICAgICAgZ290byBvdXQ7CisgICAgfQorCisgICAg Zm9yIChpID0gMDsgaSA8IG1heF92Y3B1czsgaSsrKSB7CisgICAgICAgIGNvbnN0IGNoYXIgKnBh dGggPSBHQ1NQUklOVEYoIiVzL2NwdS8ldS9hdmFpbGFiaWxpdHkiLCBkb21wYXRoLCBpKTsKKyAg ICAgICAgY29uc3QgY2hhciAqY29udGVudCA9IGxpYnhsX194c19yZWFkKGdjLCBYQlRfTlVMTCwg cGF0aCk7CisgICAgICAgIGlmICghc3RybmNtcChjb250ZW50LCAib25saW5lIiwgc3RybGVuKCJv bmxpbmUiKSkpCisgICAgICAgICAgICBsaWJ4bF9iaXRtYXBfc2V0KG1hcCwgaSk7CisgICAgfQor CisgICAgcmMgPSAwOworb3V0OgorICAgIHJldHVybiByYzsKK30KKwogaW50IGxpYnhsX3JldHJp ZXZlX2RvbWFpbl9jb25maWd1cmF0aW9uKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9kb21haW5fY29u ZmlnICpkX2NvbmZpZykKIHsKQEAgLTcyNzAsNiArNzMyMSw0NiBAQCBpbnQgbGlieGxfcmV0cmll dmVfZG9tYWluX2NvbmZpZ3VyYXRpb24obGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkLAog ICAgICAgICBsaWJ4bF9kb21pbmZvX2Rpc3Bvc2UoJmluZm8pOwogICAgIH0KIAorICAgIC8qIFZD UFVzICovCisgICAgeworICAgICAgICBsaWJ4bF9iaXRtYXAgKm1hcCA9ICZkX2NvbmZpZy0+Yl9p bmZvLmF2YWlsX3ZjcHVzOworICAgICAgICB1bnNpZ25lZCBpbnQgbWF4X3ZjcHVzID0gZF9jb25m aWctPmJfaW5mby5tYXhfdmNwdXM7CisKKyAgICAgICAgbGlieGxfYml0bWFwX2Rpc3Bvc2UobWFw KTsKKyAgICAgICAgbGlieGxfYml0bWFwX2luaXQobWFwKTsKKyAgICAgICAgbGlieGxfYml0bWFw X2FsbG9jKENUWCwgbWFwLCBtYXhfdmNwdXMpOworICAgICAgICBsaWJ4bF9iaXRtYXBfc2V0X25v bmUobWFwKTsKKworICAgICAgICBzd2l0Y2ggKGRfY29uZmlnLT5iX2luZm8udHlwZSkgeworICAg ICAgICBjYXNlIExJQlhMX0RPTUFJTl9UWVBFX0hWTToKKyAgICAgICAgICAgIHN3aXRjaCAoZF9j b25maWctPmJfaW5mby5kZXZpY2VfbW9kZWxfdmVyc2lvbikgeworICAgICAgICAgICAgY2FzZSBM SUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9RRU1VX1hFTjoKKyAgICAgICAgICAgICAgICByYyA9 IGxpYnhsX191cGRhdGVfYXZhaWxfdmNwdXNfcW1wKGdjLCBkb21pZCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heF92Y3B1cywgbWFwKTsKKyAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVM X1ZFUlNJT05fUUVNVV9YRU5fVFJBRElUSU9OQUw6CisgICAgICAgICAgICBjYXNlIExJQlhMX0RF VklDRV9NT0RFTF9WRVJTSU9OX05PTkU6CisgICAgICAgICAgICAgICAgcmMgPSBsaWJ4bF9fdXBk YXRlX2F2YWlsX3ZjcHVzX3hlbnN0b3JlKGdjLCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF4X3ZjcHVzLCBtYXApOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGFi b3J0KCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBM SUJYTF9ET01BSU5fVFlQRV9QVjoKKyAgICAgICAgICAgIHJjID0gbGlieGxfX3VwZGF0ZV9hdmFp bF92Y3B1c194ZW5zdG9yZShnYywgZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbWF4X3ZjcHVzLCBtYXApOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBhYm9ydCgpOworICAgICAgICB9CisK KyAgICAgICAgaWYgKHJjKSB7CisgICAgICAgICAgICBMT0coRVJST1IsICJmYWlsIHRvIHVwZGF0 ZSBhdmFpbGFibGUgY3B1IG1hcCBmb3IgZG9tYWluICVkIiwgZG9taWQpOworICAgICAgICAgICAg Z290byBvdXQ7CisgICAgICAgIH0KKyAgICB9CisKICAgICAvKiBNZW1vcnkgbGltaXRzOgogICAg ICAqCiAgICAgICogQ3VycmVudGx5IHRoZXJlIGFyZSB0aHJlZSBtZW1vcnkgbGltaXRzOgotLSAK Mi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0 cy54ZW4ub3JnL3hlbi1kZXZlbAo=