From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH 2/2] libxl: fix UUID usage on FreeBSD Date: Tue, 12 Jan 2016 14:14:27 +0100 Message-ID: <1452604467-65746-3-git-send-email-roger.pau@citrix.com> References: <1452604467-65746-1-git-send-email-roger.pau@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.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aIymS-0005hs-Lj for xen-devel@lists.xenproject.org; Tue, 12 Jan 2016 13:14:36 +0000 In-Reply-To: <1452604467-65746-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne List-Id: xen-devel@lists.xenproject.org bGlieGwgbWFrZXMgdGhlIGFzc3VtdGlvbiB0aGF0IGxpYnhsX3V1aWQgPT0gdXVpZF90LCBhbmQg dGhhdCB1dWlkX3QgY2FuIGJlCmZyZWVseSB1c2VkIGFzIGEgYnl0ZSBhcnJheS4gVGhpcyBpcyBu b3QgdHJ1ZSBvbiBGcmVlQlNEIChhbmQgTmV0QlNECnRvbywgbm90IHN1cmUgYWJvdXQgb3RoZXIg QlNEIFVVSUQgaW1wbGVtZW50YXRpb25zKSwgd2hlcmUgdGhlIGludGVybmFscyBvZgp1dWlkIGRv bid0IG1hdGNoIHdoYXQgbGlieGwgZXhwZWN0cyBhcyBhIGJ5dGUgYXJyYXkgYmVjYXVzZSBvZiBl bmRpYW5uZXNzCmlzc3Vlcy4KCkZpeCB0aGlzIGJ5IGNvbnZlcnRpbmcgdGhlIGxpYnhsX3V1aWQg dHlwZSB0byBhIHN0cnVjdCB3aXRoIGFuIGludGVybmFsCnV1aWRfdCBmaWVsZCBhbmQgYSBieXRl LWFycmF5LiBBbHNvIGludHJvZHVjZSBhIG5ldyBmdW5jdGlvbiB0aGF0IHNob3VsZCBiZQp1c2Vk IGluIG9yZGVyIHRvIGxvYWQgYSBieXRlIGFycmF5IGludG8gYSB1dWlkX3Qgc3RydWN0LgoKU2ln bmVkLW9mZi1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+Ci0tLQog dG9vbHMvbGlieGwvbGlieGwuYyAgICAgIHwgIDIgKy0KIHRvb2xzL2xpYnhsL2xpYnhsLmggICAg ICB8ICA5ICsrKysrKysrKwogdG9vbHMvbGlieGwvbGlieGxfdXVpZC5jIHwgMjIgKysrKysrKysr KysrKysrKysrKy0tLQogdG9vbHMvbGlieGwvbGlieGxfdXVpZC5oIHwgIDMgKystCiA0IGZpbGVz IGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv dG9vbHMvbGlieGwvbGlieGwuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKaW5kZXggOTIwNzYyMS4u YWUwOGIyZiAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGwuYworKysgYi90b29scy9saWJ4 bC9saWJ4bC5jCkBAIC02MTYsNyArNjE2LDcgQEAgc3RhdGljIHZvaWQgeGNpbmZvMnhsaW5mbyhs aWJ4bF9jdHggKmN0eCwKIHsKICAgICBzaXplX3Qgc2l6ZTsKIAotICAgIG1lbWNweSgmKHhsaW5m by0+dXVpZCksIHhjaW5mby0+aGFuZGxlLCBzaXplb2YoeGVuX2RvbWFpbl9oYW5kbGVfdCkpOwor ICAgIGxpYnhsX3V1aWRfZnJvbV9ieXRlYXJyYXkoJnhsaW5mby0+dXVpZCwgeGNpbmZvLT5oYW5k bGUpOwogICAgIHhsaW5mby0+ZG9taWQgPSB4Y2luZm8tPmRvbWFpbjsKICAgICB4bGluZm8tPnNz aWRyZWYgPSB4Y2luZm8tPnNzaWRyZWY7CiAgICAgaWYgKGxpYnhsX2ZsYXNrX3NpZF90b19jb250 ZXh0KGN0eCwgeGxpbmZvLT5zc2lkcmVmLApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGwu aCBiL3Rvb2xzL2xpYnhsL2xpYnhsLmgKaW5kZXggMDU2MDZhNy4uODc2ZmNhOCAxMDA2NDQKLS0t IGEvdG9vbHMvbGlieGwvbGlieGwuaAorKysgYi90b29scy9saWJ4bC9saWJ4bC5oCkBAIC04Njcs NiArODY3LDE1IEBAIHZvaWQgbGlieGxfbWFjX2NvcHkobGlieGxfY3R4ICpjdHgsIGxpYnhsX21h YyAqZHN0LCBsaWJ4bF9tYWMgKnNyYyk7CiAgKi8KICNkZWZpbmUgTElCWExfSEFWRV9ERVZJQ0Vf TU9ERUxfVkVSU0lPTl9OT05FIDEKIAorLyoKKyAqIExJQlhMX0hBVkVfVVVJRF9GUk9NX0JZVEVB UlJBWQorICoKKyAqIEluIHRoZSBjYXNlIHRoYXQgTElCWExfSEFWRV9VVUlEX0ZST01fQllURUFS UkFZIGlzIHNldCBsaWJ4bAorICogcHJvdmlkZXMgYSBmdW5jdGlvbiAobGlieGxfdXVpZF9mcm9t X2J5dGVhcnJheSkgdG8gY29udmVydCBhbgorICogb2N0ZXQgc3RyZWFtIGludG8gYSBVVUlELgor ICovCisjZGVmaW5lIExJQlhMX0hBVkVfVVVJRF9GUk9NX0JZVEVBUlJBWSAxCisKIHR5cGVkZWYg Y2hhciAqKmxpYnhsX3N0cmluZ19saXN0Owogdm9pZCBsaWJ4bF9zdHJpbmdfbGlzdF9kaXNwb3Nl KGxpYnhsX3N0cmluZ19saXN0ICpzbCk7CiBpbnQgbGlieGxfc3RyaW5nX2xpc3RfbGVuZ3RoKGNv bnN0IGxpYnhsX3N0cmluZ19saXN0ICpzbCk7CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4 bF91dWlkLmMgYi90b29scy9saWJ4bC9saWJ4bF91dWlkLmMKaW5kZXggN2Q0YTAzMi4uZjU2NmY1 MCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfdXVpZC5jCisrKyBiL3Rvb2xzL2xpYnhs L2xpYnhsX3V1aWQuYwpAQCAtMzMsNiArMzMsMTIgQEAgaW50IGxpYnhsX3V1aWRfZnJvbV9zdHJp bmcobGlieGxfdXVpZCAqdXVpZCwgY29uc3QgY2hhciAqaW4pCiAgICAgIHJldHVybiB1dWlkX3Bh cnNlKGluLCB1dWlkLT51dWlkKTsKIH0KIAoraW50IGxpYnhsX3V1aWRfZnJvbV9ieXRlYXJyYXko bGlieGxfdXVpZCAqdXVpZCwgY29uc3QgdWludDhfdCAqcmF3KQoreworICAgIG1lbWNweSh1dWlk LCByYXcsIHNpemVvZigqdXVpZCkpOworICAgIHJldHVybiAwOworfQorCiB2b2lkIGxpYnhsX3V1 aWRfY29weShsaWJ4bF9jdHggKmN0eF9vcHQsIGxpYnhsX3V1aWQgKmRzdCwKICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGxpYnhsX3V1aWQgKnNyYykKIHsKQEAgLTcyLDkgKzc4LDkgQEAgdm9p ZCBsaWJ4bF91dWlkX2dlbmVyYXRlKGxpYnhsX3V1aWQgKnV1aWQpCiB7CiAgICAgdWludDMyX3Qg c3RhdHVzOwogCi0gICAgQlVJTERfQlVHX09OKHNpemVvZihsaWJ4bF91dWlkKSAhPSBzaXplb2Yo dXVpZF90KSk7CiAgICAgdXVpZF9jcmVhdGUoJnV1aWQtPnV1aWQsICZzdGF0dXMpOwogICAgIGFz c2VydChzdGF0dXMgPT0gdXVpZF9zX29rKTsKKyAgICB1dWlkX2VuY19iZSh1dWlkLT51dWlkX3Jh dywgJnV1aWQtPnV1aWQpOwogfQogCiAjaWZkZWYgX19GcmVlQlNEX18KQEAgLTg1LDYgKzkxLDgg QEAgaW50IGxpYnhsX3V1aWRfZnJvbV9zdHJpbmcobGlieGxfdXVpZCAqdXVpZCwgY29uc3QgY2hh ciAqaW4pCiAgICAgdXVpZF9mcm9tX3N0cmluZyhpbiwgJnV1aWQtPnV1aWQsICZzdGF0dXMpOwog ICAgIGlmIChzdGF0dXMgIT0gdXVpZF9zX29rKQogICAgICAgICByZXR1cm4gLTE7CisgICAgdXVp ZF9lbmNfYmUodXVpZC0+dXVpZF9yYXcsICZ1dWlkLT51dWlkKTsKKwogICAgIHJldHVybiAwOwog fQogI2Vsc2UKQEAgLTEwMSwxNSArMTA5LDIzIEBAIGludCBsaWJ4bF91dWlkX2Zyb21fc3RyaW5n KGxpYnhsX3V1aWQgKnV1aWQsIGNvbnN0IGNoYXIgKmluKQogI3VuZGVmIExJQlhMX19VVUlEX1BU UlMKICNlbmRpZgogCitpbnQgbGlieGxfdXVpZF9mcm9tX2J5dGVhcnJheShsaWJ4bF91dWlkICp1 dWlkLCBjb25zdCB1aW50OF90ICpyYXcpCit7CisgICAgdXVpZF9kZWNfbGUocmF3LCAmdXVpZC0+ dXVpZCk7CisgICAgdXVpZF9lbmNfYmUodXVpZC0+dXVpZF9yYXcsICZ1dWlkLT51dWlkKTsKKwor ICAgIHJldHVybiAwOworfQorCiB2b2lkIGxpYnhsX3V1aWRfY29weShsaWJ4bF9jdHggKmN0eF9v cHQsIGxpYnhsX3V1aWQgKmRzdCwKICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX3V1 aWQgKnNyYykKIHsKLSAgICBtZW1jcHkoJmRzdC0+dXVpZCwgJnNyYy0+dXVpZCwgc2l6ZW9mKGRz dC0+dXVpZCkpOworICAgIG1lbWNweShkc3QsIHNyYywgc2l6ZW9mKCpkc3QpKTsKIH0KIAogdm9p ZCBsaWJ4bF91dWlkX2NsZWFyKGxpYnhsX3V1aWQgKnV1aWQpCiB7Ci0gICAgbWVtc2V0KCZ1dWlk LT51dWlkLCAwLCBzaXplb2YodXVpZC0+dXVpZCkpOworICAgIG1lbXNldCh1dWlkLCAwLCBzaXpl b2YoKnV1aWQpKTsKIH0KIAogI2lmZGVmIF9fRnJlZUJTRF9fCmRpZmYgLS1naXQgYS90b29scy9s aWJ4bC9saWJ4bF91dWlkLmggYi90b29scy9saWJ4bC9saWJ4bF91dWlkLmgKaW5kZXggYzUwNDFj Ny4uZDg0ZTNkMSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfdXVpZC5oCisrKyBiL3Rv b2xzL2xpYnhsL2xpYnhsX3V1aWQuaApAQCAtNDIsNyArNDIsNyBAQCB0eXBlZGVmIHN0cnVjdCB7 CiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRlIDxhc3NlcnQuaD4KIAotdHlwZWRlZiB1bmlv biB7Cit0eXBlZGVmIHN0cnVjdCB7CiAgICAgdXVpZF90IHV1aWQ7CiAgICAgdWludDhfdCB1dWlk X3Jhd1sxNl07CiB9IGxpYnhsX3V1aWQ7CkBAIC03Myw2ICs3Myw3IEBAIHZvaWQgbGlieGxfdXVp ZF9jbGVhcihsaWJ4bF91dWlkICp1dWlkKTsKIGludCBsaWJ4bF91dWlkX2NvbXBhcmUoY29uc3Qg bGlieGxfdXVpZCAqdXVpZDEsIGNvbnN0IGxpYnhsX3V1aWQgKnV1aWQyKTsKIGNvbnN0IHVpbnQ4 X3QgKmxpYnhsX3V1aWRfYnl0ZWFycmF5X2NvbnN0KGNvbnN0IGxpYnhsX3V1aWQgKnV1aWQpOwog dWludDhfdCAqbGlieGxfdXVpZF9ieXRlYXJyYXkobGlieGxfdXVpZCAqdXVpZCk7CitpbnQgbGli eGxfdXVpZF9mcm9tX2J5dGVhcnJheShsaWJ4bF91dWlkICp1dWlkLCBjb25zdCB1aW50OF90ICpy YXcpOwogCiAjZW5kaWYgLyogX19MSUJYTF9VVUlEX0hfXyAqLwogCi0tIAoxLjkuNSAoQXBwbGUg R2l0LTUwLjMpCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8v bGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK