From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v2 5/9] libxl: Rearrange qemu upstream disk argument code Date: Mon, 21 Mar 2016 18:16:57 +0000 Message-ID: <1458584221-24426-6-git-send-email-george.dunlap@citrix.com> References: <1458584221-24426-1-git-send-email-george.dunlap@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458584221-24426-1-git-send-email-george.dunlap@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.xen.org Cc: Anthony Perard , Ian Jackson , Wei Liu , George Dunlap , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org UmVvcmdhbml6ZSB0aGUgcWVtdXUgZGlzayBhcmd1bWVudCBjb2RlIHRvIG1ha2UgYSBjbGVhbiBz ZXBhcmF0aW9uCmJldHdlZW4gZmluZGluZyBhIGZpbGUgdG8gdXNlLCBhbmQgY29uc3RydWN0aW5n IHRoZSBwYXJhbWV0ZXJzOgoKKiBSZW5hbWUgcGRldl9wYXRoIHRvIHRhcmdldF9wYXRoCgoqIE9u bHkgdXNlIHFlbXVfZGlza19mb3JtYXRfc3RyaW5nKCkgaW4gY2lyY3Vtc3RhbmNlcyB3aGVyZSBx ZW11IG1heQpiZSBpbnRlcnByZXRpbmcgdGhlIGRpc2sgKGkuZS4sIGJhY2tlbmQ9PVFESVNLKS4g IEluIGFsbCBvdGhlciBjYXNlcywKaXQgc2hvdWxkIHVzZSBSQVcuCgoqIFNoYXJlIGFzIG11Y2gg YXMgcG9zc2libGUgYmV0d2VlbiB0aGUgaXNfY2Ryb20gcGF0aCBhbmQgdGhlIG5vcm1hbApwYXRo LgoKVGhpcyBpcyBtYWlubHkgcHJlcCBmb3Igc2hhcmluZyB0aGUgbG9jYWwgcGF0aCBmaW5kZXIg d2l0aCB0aGUKYm9vdGxvYWRlcjsgYnV0IGl0IGRvZXMgYWxsb3cgY2Ryb21zIHRvIHVzZSBhbnkg YmFja2VuZCB0aGF0IGEgbm9ybWFsCmRpc2sgY2FuIHVzZS4gUHJldmlvdXNseSB0aGlzIHdhcyBs aW1pdGVkIHRvIFJBVyBmaWxlcyBvciB0aGluZ3MgdGhhdApxZW11IGNvdWxkIGhhbmRsZSBkaXJl Y3RseTsgYXMgb2YgdGhpcyBjaGFuZ2VzZXQsIGl0IG5vdyBpbmNsdWRlcyB0YXAKZGlza3M7IGFu ZCBpbiBmdXR1cmUgY2hhbmdlc2V0cyBpdCB3aWxsIGluY2x1ZGUgYmFja2VuZHMgd2l0aCBjdXN0 b20KYmxvY2sgc2NyaXB0cy4KCk5CIHRoYXQgdGhpcyByZXRhaW5zIGFuIGV4aXN0aW5nIGJ1Zywg dGhhdCBkaXNrcyB3aXRoIGN1c3RvbSBibG9jawpzY3JpcHRzIG9yIG5vbi1kb20wIGJhY2tlbmRz IHdpbGwgaGF2ZSB0aGUgYm9ndXMgcGRldl9wYXRoIHBhc3NlZCBpbgp0byBxZW11LCBtb3N0IGxp a2VseSByZXN1bHRpbmcgaW4gcWVtdSBleGl0aW5nIHdpdGggYW4gZXJyb3IuICBUaGlzCndpbGwg YmUgZml4ZWQgaW4gZm9sbG93LXVwIHBhdGNoZXMuCgpTaWduZWQtb2ZmLWJ5OiBHZW9yZ2UgRHVu bGFwIDxnZW9yZ2UuZHVubGFwQGNpdHJpeC5jb20+Ci0tLQpDaGFuZ2VzIHNpbmNlIHYxOgotIE1v dmUgcWVtdXUgZGlzayBhcmd1bWVudCByZWZhY3RvcmluZyBpbnRvIGEgc2VwYXJhdGUgcGF0Y2gK CkNDOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdl aS5saXUyQGNpdHJpeC5jb20+CkNDOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHN0ZWZhbm8uc3RhYmVs bGluaUBjaXRyaXguY29tPgpDQzogQW50aG9ueSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJp eC5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfZG0uYyB8IDYxICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzUgaW5z ZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGli eGxfZG0uYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKaW5kZXggNGFjYTM4ZS4uZGZjZjE0MSAx MDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZG0uYworKysgYi90b29scy9saWJ4bC9saWJ4 bF9kbS5jCkBAIC0xMTYxLDkgKzExNjEsOSBAQCBzdGF0aWMgaW50IGxpYnhsX19idWlsZF9kZXZp Y2VfbW9kZWxfYXJnc19uZXcobGlieGxfX2djICpnYywKICAgICAgICAgICAgIGludCBkaXNrLCBw YXJ0OwogICAgICAgICAgICAgaW50IGRldl9udW1iZXIgPQogICAgICAgICAgICAgICAgIGxpYnhs X19kZXZpY2VfZGlza19kZXZfbnVtYmVyKGRpc2tzW2ldLnZkZXYsICZkaXNrLCAmcGFydCk7Ci0g ICAgICAgICAgICBjb25zdCBjaGFyICpmb3JtYXQgPSBxZW11X2Rpc2tfZm9ybWF0X3N0cmluZyhk aXNrc1tpXS5mb3JtYXQpOworICAgICAgICAgICAgY29uc3QgY2hhciAqZm9ybWF0OwogICAgICAg ICAgICAgY2hhciAqZHJpdmU7Ci0gICAgICAgICAgICBjb25zdCBjaGFyICpwZGV2X3BhdGg7Cisg ICAgICAgICAgICBjb25zdCBjaGFyICp0YXJnZXRfcGF0aDsKIAogICAgICAgICAgICAgaWYgKGRl dl9udW1iZXIgPT0gLTEpIHsKICAgICAgICAgICAgICAgICBMT0coV0FSTiwgInVuYWJsZSB0byBk ZXRlcm1pbmUiIiBkaXNrIG51bWJlciBmb3IgJXMiLApAQCAtMTE3MSwyMiArMTE3MSwyMiBAQCBz dGF0aWMgaW50IGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWxfYXJnc19uZXcobGlieGxfX2djICpn YywKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgaWYgKGRpc2tzW2ldLmlzX2Nkcm9tKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGRpc2tzW2ld LmZvcm1hdCA9PSBMSUJYTF9ESVNLX0ZPUk1BVF9FTVBUWSkKLSAgICAgICAgICAgICAgICAgICAg ZHJpdmUgPSBsaWJ4bF9fc3ByaW50ZgotICAgICAgICAgICAgICAgICAgICAgICAgKGdjLCAiaWY9 aWRlLGluZGV4PSVkLHJlYWRvbmx5PSVzLG1lZGlhPWNkcm9tLGNhY2hlPXdyaXRlYmFjayxpZD1p ZGUtJWkiLAotICAgICAgICAgICAgICAgICAgICAgICAgIGRpc2ssIGRpc2tzW2ldLnJlYWR3cml0 ZSA/ICJvZmYiIDogIm9uIiwgZGV2X251bWJlcik7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAg ICAgICAgICAgICAgICAgICBkcml2ZSA9IGxpYnhsX19zcHJpbnRmCi0gICAgICAgICAgICAgICAg ICAgICAgICAoZ2MsICJmaWxlPSVzLGlmPWlkZSxpbmRleD0lZCxyZWFkb25seT0lcyxtZWRpYT1j ZHJvbSxmb3JtYXQ9JXMsY2FjaGU9d3JpdGViYWNrLGlkPWlkZS0laSIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgZGlza3NbaV0ucGRldl9wYXRoLCBkaXNrLCBkaXNrc1tpXS5yZWFkd3JpdGUg PyAib2ZmIiA6ICJvbiIsIGZvcm1hdCwgZGV2X251bWJlcik7Ci0gICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgIGlmIChkaXNrc1tpXS5mb3JtYXQgPT0gTElCWExfRElTS19GT1JN QVRfRU1QVFkpIHsKKyAgICAgICAgICAgIC8qIAorICAgICAgICAgICAgICogSWYgcWVtdSBpc24n dCBkb2luZyB0aGUgaW50ZXJwcmV0aW5nLCB0aGUgcGFyYW1ldGVyIGlzCisgICAgICAgICAgICAg KiBhbHdheXMgcmF3CisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgIGlmIChkaXNrc1tpXS5i YWNrZW5kID09IExJQlhMX0RJU0tfQkFDS0VORF9RRElTSykKKyAgICAgICAgICAgICAgICBmb3Jt YXQgPSBxZW11X2Rpc2tfZm9ybWF0X3N0cmluZyhkaXNrc1tpXS5mb3JtYXQpOworICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgIGZvcm1hdCA9IHFlbXVfZGlza19mb3JtYXRfc3RyaW5n KExJQlhMX0RJU0tfRk9STUFUX1JBVyk7CisKKyAgICAgICAgICAgIGlmIChkaXNrc1tpXS5mb3Jt YXQgPT0gTElCWExfRElTS19GT1JNQVRfRU1QVFkpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWRp c2tzW2ldLmlzX2Nkcm9tKSB7CiAgICAgICAgICAgICAgICAgICAgIExPRyhXQVJOLCAiY2Fubm90 IHN1cHBvcnQiIiBlbXB0eSBkaXNrIGZvcm1hdCBmb3IgJXMiLAogICAgICAgICAgICAgICAgICAg ICAgICAgZGlza3NbaV0udmRldik7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgICAgIH0KLQorICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBp ZiAoZm9ybWF0ID09IE5VTEwpIHsKICAgICAgICAgICAgICAgICAgICAgTE9HKFdBUk4sCiAgICAg ICAgICAgICAgICAgICAgICAgICAidW5hYmxlIHRvIGRldGVybWluZSIiIGRpc2sgaW1hZ2UgZm9y bWF0ICVzIiwKQEAgLTExOTQsMTQgKzExOTQsMjIgQEAgc3RhdGljIGludCBsaWJ4bF9fYnVpbGRf ZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlmIChkaXNr c1tpXS5iYWNrZW5kID09IExJQlhMX0RJU0tfQkFDS0VORF9UQVApIHsKLSAgICAgICAgICAgICAg ICAgICAgZm9ybWF0ID0gcWVtdV9kaXNrX2Zvcm1hdF9zdHJpbmcoTElCWExfRElTS19GT1JNQVRf UkFXKTsKLSAgICAgICAgICAgICAgICAgICAgcGRldl9wYXRoID0gbGlieGxfX2Jsa3RhcF9kZXZw YXRoKGdjLCBkaXNrc1tpXS5wZGV2X3BhdGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNrc1tpXS5mb3JtYXQpOwotICAgICAgICAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIHBkZXZfcGF0aCA9IGRpc2tzW2ldLnBk ZXZfcGF0aDsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKGRpc2tzW2ld LmJhY2tlbmQgPT0gTElCWExfRElTS19CQUNLRU5EX1RBUCkKKyAgICAgICAgICAgICAgICAgICAg dGFyZ2V0X3BhdGggPSBsaWJ4bF9fYmxrdGFwX2RldnBhdGgoZ2MsIGRpc2tzW2ldLnBkZXZfcGF0 aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGlza3NbaV0uZm9ybWF0KTsKKyAgICAgICAgICAgICAgICBlbHNlICAgICAKKyAgICAgICAg ICAgICAgICAgICAgdGFyZ2V0X3BhdGggPSBkaXNrc1tpXS5wZGV2X3BhdGg7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGlmIChkaXNrc1tpXS5pc19jZHJvbSkgeworICAgICAgICAgICAg ICAgIGRyaXZlID0gbGlieGxfX3NwcmludGYoZ2MsCisgICAgICAgICAgICAgICAgICAgICAgICAg ImlmPWlkZSxpbmRleD0lZCxyZWFkb25seT0lcyxtZWRpYT1jZHJvbSxjYWNoZT13cml0ZWJhY2ss aWQ9aWRlLSVpIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICBkaXNrLCBkaXNrc1tpXS5yZWFk d3JpdGUgPyAib2ZmIiA6ICJvbiIsIGRldl9udW1iZXIpOwogCisgICAgICAgICAgICAgICAgaWYg KHRhcmdldF9wYXRoKQorICAgICAgICAgICAgICAgICAgICBkcml2ZSA9IGxpYnhsX19zcHJpbnRm KGdjLCAiJXMsZmlsZT0lcyxmb3JtYXQ9JXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRyaXZlLCB0YXJnZXRfcGF0aCwgZm9ybWF0KTsKKyAgICAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLyoKICAgICAgICAgICAgICAgICAgKiBFeHBsaWNp dCBzZCBkaXNrcyBhcmUgcGFzc2VkIHRocm91Z2ggYXMgaXMuCiAgICAgICAgICAgICAgICAgICoK QEAgLTEyMDksOSArMTIxNywxMCBAQCBzdGF0aWMgaW50IGxpYnhsX19idWlsZF9kZXZpY2VfbW9k ZWxfYXJnc19uZXcobGlieGxfX2djICpnYywKICAgICAgICAgICAgICAgICAgKiBoZFthLWRdIGFu ZCBpZ25vcmUgdGhlIHJlc3QuCiAgICAgICAgICAgICAgICAgICovCiAgICAgICAgICAgICAgICAg aWYgKHN0cm5jbXAoZGlza3NbaV0udmRldiwgInNkIiwgMikgPT0gMCkgewotICAgICAgICAgICAg ICAgICAgICBkcml2ZSA9IGxpYnhsX19zcHJpbnRmCi0gICAgICAgICAgICAgICAgICAgICAgICAo Z2MsICJmaWxlPSVzLGlmPXNjc2ksYnVzPTAsdW5pdD0lZCxmb3JtYXQ9JXMscmVhZG9ubHk9JXMs Y2FjaGU9d3JpdGViYWNrIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBwZGV2X3BhdGgsIGRp c2ssIGZvcm1hdCwgZGlza3NbaV0ucmVhZHdyaXRlID8gIm9mZiIgOiAib24iKTsKKyAgICAgICAg ICAgICAgICAgICAgZHJpdmUgPSBsaWJ4bF9fc3ByaW50ZihnYywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgImZpbGU9JXMsaWY9c2NzaSxidXM9MCx1bml0PSVkLGZvcm1hdD0lcyxyZWFk b25seT0lcyxjYWNoZT13cml0ZWJhY2siLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 YXJnZXRfcGF0aCwgZGlzaywgZm9ybWF0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk aXNrc1tpXS5yZWFkd3JpdGUgPyAib2ZmIiA6ICJvbiIpOwogICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAoc3RybmNtcChkaXNrc1tpXS52ZGV2LCAieHZkIiwgMykgPT0gMCkgewogICAgICAgICAg ICAgICAgICAgICAvKgogICAgICAgICAgICAgICAgICAgICAgKiBEbyBub3QgYWRkIGFueSBlbXVs YXRlZCBkaXNrIHdoZW4gUFYgZGlzayBhcmUKQEAgLTEyMjUsNyArMTIzNCw3IEBAIHN0YXRpYyBp bnQgbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbF9hcmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGZsZXhhcnJheV92YXBwZW5k KGRtX2FyZ3MsICItZHJpdmUiLAogICAgICAgICAgICAgICAgICAgICAgICAgR0NTUFJJTlRGKCJm aWxlPSVzLGlmPW5vbmUsaWQ9YWhjaWRpc2stJWQsZm9ybWF0PSVzLGNhY2hlPXdyaXRlYmFjayIs Ci0gICAgICAgICAgICAgICAgICAgICAgICBwZGV2X3BhdGgsIGRpc2ssIGZvcm1hdCksCisgICAg ICAgICAgICAgICAgICAgICAgICB0YXJnZXRfcGF0aCwgZGlzaywgZm9ybWF0KSwKICAgICAgICAg ICAgICAgICAgICAgICAgICItZGV2aWNlIiwgR0NTUFJJTlRGKCJpZGUtaGQsYnVzPWFoY2kwLiVk LHVuaXQ9MCxkcml2ZT1haGNpZGlzay0lZCIsCiAgICAgICAgICAgICAgICAgICAgICAgICBkaXNr LCBkaXNrKSwgTlVMTCk7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMTIzNiw3 ICsxMjQ1LDcgQEAgc3RhdGljIGludCBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3 KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAg ICAgZHJpdmUgPSBsaWJ4bF9fc3ByaW50ZgogICAgICAgICAgICAgICAgICAgICAgICAgKGdjLCAi ZmlsZT0lcyxpZj1pZGUsaW5kZXg9JWQsbWVkaWE9ZGlzayxmb3JtYXQ9JXMsY2FjaGU9d3JpdGVi YWNrIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBwZGV2X3BhdGgsIGRpc2ssIGZvcm1hdCk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgdGFyZ2V0X3BhdGgsIGRpc2ssIGZvcm1hdCk7CiAg ICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7IC8q IERvIG5vdCBlbXVsYXRlIHRoaXMgZGlzayAqLwogICAgICAgICAgICAgICAgIH0KLS0gCjIuMS40 CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRl dmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVu Lm9yZy94ZW4tZGV2ZWwK