From mboxrd@z Thu Jan 1 00:00:00 1970 From: aq Subject: [PATCH] rename some xsenstore library functions Date: Fri, 10 Jun 2005 08:01:09 -0500 Message-ID: <9cde8bff0506100601e88f42e@mail.gmail.com> Reply-To: aq Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_1120_15785230.1118408469445" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Dev List-Id: xen-devel@lists.xenproject.org ------=_Part_1120_15785230.1118408469445 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Some functions of xenstore library dont have xs_ as prefix. This patch fixes the problem. Signed-off-by: Nguyen Anh Quynh # diffstat xenstore3.patch=20 fake_libxc.c | 2 +- xenstored_core.c | 18 +++++++++--------- xenstored_test.h | 2 +- xs.c | 14 +++++++------- xs_lib.c | 8 ++++---- xs_lib.h | 8 ++++---- xs_random.c | 8 ++++---- xs_test.c | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) ------=_Part_1120_15785230.1118408469445 Content-Type: text/x-patch; name="xenstore3.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xenstore3.patch" PT09PT0gdG9vbHMveGVuc3RvcmUvZmFrZV9saWJ4Yy5jIDEuMSB2cyBlZGl0ZWQgPT09PT0KLS0t IDEuMS90b29scy94ZW5zdG9yZS9mYWtlX2xpYnhjLmMJMjAwNS0wNi0wNyAwNTo1NzoyNyAtMDU6 MDAKKysrIGVkaXRlZC90b29scy94ZW5zdG9yZS9mYWtlX2xpYnhjLmMJMjAwNS0wNi0xMCAwNDow OToxNiAtMDU6MDAKQEAgLTcxLDcgKzcxLDcgQEAKIAkJcmV0dXJuIGZkOwogCiAJbWVtc2V0KHBh Z2UsIDAsIHNpemVvZihwYWdlKSk7Ci0JaWYgKCF3cml0ZV9hbGwoZmQsIHBhZ2UsIHNpemVvZihw YWdlKSkpCisJaWYgKCF4c193cml0ZV9hbGwoZmQsIHBhZ2UsIHNpemVvZihwYWdlKSkpCiAJCWJh cmZfcGVycm9yKCJGYWlsZWQgdG8gd3JpdGUgL3RtcC94Y21hcCBwYWdlIik7CiAJCiAJcmV0dXJu IGZkOwo9PT09PSB0b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29yZS5jIDEuMSB2cyBlZGl0ZWQg PT09PT0KLS0tIDEuMS90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29yZS5jCTIwMDUtMDYtMDcg MDU6NTc6MjggLTA1OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2NvcmUu YwkyMDA1LTA2LTEwIDA1OjI4OjQ5IC0wNTowMApAQCAtODEsNyArODEsNyBAQAogCQllcnJubyA9 IEVOT1NQQzsKIAkJcmV0dXJuIGZhbHNlOwogCX0KLQlyZXR1cm4gd3JpdGVfYWxsKGZkLCBjb250 ZW50cywgbGVuKTsKKwlyZXR1cm4geHNfd3JpdGVfYWxsKGZkLCBjb250ZW50cywgbGVuKTsKIH0K IAogaW50IHRlc3RfbWtkaXIoY29uc3QgY2hhciAqZGlyLCBpbnQgcGVybXMpOwpAQCAtNDQzLDkg KzQ0Myw5IEBACiAJaWYgKCFzdHJpbmdzKQogCQlyZXR1cm4gTlVMTDsKIAotCSpudW0gPSBjb3Vu dF9zdHJpbmdzKHN0cmluZ3MsIHNpemUpOworCSpudW0gPSB4c19jb3VudF9zdHJpbmdzKHN0cmlu Z3MsIHNpemUpOwogCXJldCA9IHRhbGxvY19hcnJheShub2RlLCBzdHJ1Y3QgeHNfcGVybWlzc2lv bnMsICpudW0pOwotCWlmICghc3RyaW5nc190b19wZXJtcyhyZXQsICpudW0sIHN0cmluZ3MpKQor CWlmICgheHNfc3RyaW5nc190b19wZXJtcyhyZXQsICpudW0sIHN0cmluZ3MpKQogCQljb3JydXB0 KE5VTEwsICJQZXJtaXNzaW9ucyBjb3JydXB0IGZvciAlcyIsIG5vZGUpOwogCiAJcmV0dXJuIHJl dDsKQEAgLTQ2MCw3ICs0NjAsNyBAQAogCWNoYXIgYnVmZmVyW01BWF9TVFJMRU4oZG9taWRfdCkg KyAxXTsKIAogCWZvciAoKmxlbiA9IDAsIGkgPSAwOyBpIDwgbnVtOyBpKyspIHsKLQkJaWYgKCFw ZXJtX3RvX3N0cmluZygmcGVybXNbaV0sIGJ1ZmZlcikpCisJCWlmICgheHNfcGVybV90b19zdHJp bmcoJnBlcm1zW2ldLCBidWZmZXIpKQogCQkJcmV0dXJuIE5VTEw7CiAKIAkJc3RyaW5ncyA9IHRh bGxvY19yZWFsbG9jKG5vZGUsIHN0cmluZ3MsIGNoYXIsCkBAIC01MDYsNyArNTA2LDcgQEAKIAlp ZiAoIWZkKQogCQlyZXR1cm4gTlVMTDsKIAl0YWxsb2Nfc2V0X2Rlc3RydWN0b3IodG1wcGF0aCwg ZGVzdHJveV9wYXRoKTsKLQlpZiAoIXdyaXRlX2FsbCgqZmQsIGNvbnRlbnRzLCBsZW4pKQorCWlm ICgheHNfd3JpdGVfYWxsKCpmZCwgY29udGVudHMsIGxlbikpCiAJCXJldHVybiBOVUxMOwogCiAJ cmV0dXJuIHRtcHBhdGg7CkBAIC03MjEsMTQgKzcyMSwxNCBAQAogCXBlcm1zdHIgPSBwZXJtc190 b19zdHJpbmdzKGRpciwgJnBlcm1zLCAxLCAmbGVuKTsKIAlmZCA9IHRhbGxvY19vcGVuKG5vZGVf cGVybWZpbGUoY29ubi0+dHJhbnNhY3Rpb24sIG5vZGUpLAogCQkJIE9fV1JPTkxZfE9fQ1JFQVR8 T19FWENMLCAwNjQwKTsKLQlpZiAoIWZkIHx8ICF3cml0ZV9hbGwoKmZkLCBwZXJtc3RyLCBsZW4p KQorCWlmICghZmQgfHwgIXhzX3dyaXRlX2FsbCgqZmQsIHBlcm1zdHIsIGxlbikpCiAJCXJldHVy biBmYWxzZTsKIAogCWlmIChkYXRhKSB7CiAJCWNoYXIgKmRhdGFwYXRoID0gbm9kZV9kYXRhZmls ZShjb25uLT50cmFuc2FjdGlvbiwgbm9kZSk7CiAKIAkJZmQgPSB0YWxsb2Nfb3BlbihkYXRhcGF0 aCwgT19XUk9OTFl8T19DUkVBVHxPX0VYQ0wsIDA2NDApOwotCQlpZiAoIWZkIHx8ICF3cml0ZV9h bGwoKmZkLCBkYXRhLCBkYXRhbGVuKSkKKwkJaWYgKCFmZCB8fCAheHNfd3JpdGVfYWxsKCpmZCwg ZGF0YSwgZGF0YWxlbikpCiAJCQlyZXR1cm4gZmFsc2U7CiAJfQogCkBAIC04NzgsNyArODc4LDcg QEAKIAljaGFyICpub2RlOwogCXN0cnVjdCB4c19wZXJtaXNzaW9ucyAqcGVybXM7CiAKLQludW0g PSBjb3VudF9zdHJpbmdzKGluLT5idWZmZXIsIGluLT51c2VkKTsKKwludW0gPSB4c19jb3VudF9z dHJpbmdzKGluLT5idWZmZXIsIGluLT51c2VkKTsKIAlpZiAobnVtIDwgMikKIAkJcmV0dXJuIHNl bmRfZXJyb3IoY29ubiwgRUlOVkFMKTsKIApAQCAtODk4LDcgKzg5OCw3IEBACiAJCXJldHVybiBz ZW5kX2Vycm9yKGNvbm4sIGVycm5vKTsKIAogCXBlcm1zID0gdGFsbG9jX2FycmF5KG5vZGUsIHN0 cnVjdCB4c19wZXJtaXNzaW9ucywgbnVtKTsKLQlpZiAoIXN0cmluZ3NfdG9fcGVybXMocGVybXMs IG51bSwgaW4tPmJ1ZmZlcikpCisJaWYgKCF4c19zdHJpbmdzX3RvX3Blcm1zKHBlcm1zLCBudW0s IGluLT5idWZmZXIpKQogCQlyZXR1cm4gc2VuZF9lcnJvcihjb25uLCBlcnJubyk7CiAKIAlpZiAo IXNldF9wZXJtcyhjb25uLT50cmFuc2FjdGlvbiwgbm9kZSwgcGVybXMsIG51bSkpCj09PT09IHRv b2xzL3hlbnN0b3JlL3hlbnN0b3JlZF90ZXN0LmggMS4xIHZzIGVkaXRlZCA9PT09PQotLS0gMS4x L3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlZF90ZXN0LmgJMjAwNS0wNi0wNyAwNTo1NzoyOCAtMDU6 MDAKKysrIGVkaXRlZC90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfdGVzdC5oCTIwMDUtMDYtMTAg MDQ6MzE6NDAgLTA1OjAwCkBAIC0yMSw3ICsyMSw3IEBACiAKICNpZmRlZiBURVNUSU5HCiBib29s IHRlc3Rfd3JpdGVfYWxsKGludCBmZCwgdm9pZCAqY29udGVudHMsIHVuc2lnbmVkIGludCBsZW4p OwotI2RlZmluZSB3cml0ZV9hbGwgdGVzdF93cml0ZV9hbGwKKyNkZWZpbmUgeHNfd3JpdGVfYWxs IHRlc3Rfd3JpdGVfYWxsCiAKIGludCB0ZXN0X21rZGlyKGNvbnN0IGNoYXIgKmRpciwgaW50IHBl cm1zKTsKICNkZWZpbmUgbWtkaXIgdGVzdF9ta2Rpcgo9PT09PSB0b29scy94ZW5zdG9yZS94cy5j IDEuMSB2cyBlZGl0ZWQgPT09PT0KLS0tIDEuMS90b29scy94ZW5zdG9yZS94cy5jCTIwMDUtMDYt MDcgMDU6NTc6MjkgLTA1OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUveHMuYwkyMDA1LTA2 LTEwIDA1OjIyOjUwIC0wNTowMApAQCAtMTE4LDcgKzExOCw3IEBACiAKICNpZmRlZiBYU1RFU1QK ICNkZWZpbmUgcmVhZF9hbGwgcmVhZF9hbGxfY2hvaWNlCi0jZGVmaW5lIHdyaXRlX2FsbCB3cml0 ZV9hbGxfY2hvaWNlCisjZGVmaW5lIHhzX3dyaXRlX2FsbCB3cml0ZV9hbGxfY2hvaWNlCiAjZW5k aWYKIAogc3RhdGljIGludCBnZXRfZXJyb3IoY29uc3QgY2hhciAqZXJyb3JzdHJpbmcpCkBAIC0x NzksMTEgKzE3OSwxMSBAQAogCWlnbm9yZXBpcGUuc2FfZmxhZ3MgPSAwOwogCXNpZ2FjdGlvbihT SUdQSVBFLCAmaWdub3JlcGlwZSwgJm9sZGFjdCk7CiAKLQlpZiAoIXdyaXRlX2FsbChoLT5mZCwg Jm1zZywgc2l6ZW9mKG1zZykpKQorCWlmICgheHNfd3JpdGVfYWxsKGgtPmZkLCAmbXNnLCBzaXpl b2YobXNnKSkpCiAJCWdvdG8gZmFpbDsKIAogCWZvciAoaSA9IDA7IGkgPCBudW1fdmVjczsgaSsr KQotCQlpZiAoIXdyaXRlX2FsbChoLT5mZCwgaW92ZWNbaV0uaW92X2Jhc2UsIGlvdmVjW2ldLmlv dl9sZW4pKQorCQlpZiAoIXhzX3dyaXRlX2FsbChoLT5mZCwgaW92ZWNbaV0uaW92X2Jhc2UsIGlv dmVjW2ldLmlvdl9sZW4pKQogCQkJZ290byBmYWlsOwogCiAJLyogV2F0Y2hlcyBjYW4gaGF2ZSBm aXJlZCBiZWZvcmUgcmVwbHkgY29tZXM6IGRhZW1vbiBkZXRlY3RzCkBAIC0yNTMsNyArMjUzLDcg QEAKIAkJcmV0dXJuIE5VTEw7CiAKIAkvKiBDb3VudCB0aGUgc3RyaW5ncy4gKi8KLQkqbnVtID0g Y291bnRfc3RyaW5ncyhzdHJpbmdzLCBsZW4pOworCSpudW0gPSB4c19jb3VudF9zdHJpbmdzKHN0 cmluZ3MsIGxlbik7CiAKIAkvKiBUcmFuc2ZlciB0byBvbmUgYmlnIGFsbG9jIGZvciBlYXN5IGZy ZWVpbmcuICovCiAJcmV0ID0gbWFsbG9jKCpudW0gKiBzaXplb2YoY2hhciAqKSArIGxlbik7CkBA IC0zNDIsNyArMzQyLDcgQEAKIAkJcmV0dXJuIE5VTEw7CiAKIAkvKiBDb3VudCB0aGUgc3RyaW5n czogZWFjaCBvbmUgcGVybXMgdGhlbiBkb21pZC4gKi8KLQkqbnVtID0gY291bnRfc3RyaW5ncyhz dHJpbmdzLCBsZW4pOworCSpudW0gPSB4c19jb3VudF9zdHJpbmdzKHN0cmluZ3MsIGxlbik7CiAK IAkvKiBUcmFuc2ZlciB0byBvbmUgYmlnIGFsbG9jIGZvciBlYXN5IGZyZWVpbmcuICovCiAJcmV0 ID0gbWFsbG9jKCpudW0gKiBzaXplb2Yoc3RydWN0IHhzX3Blcm1pc3Npb25zKSk7CkBAIC0zNTEs NyArMzUxLDcgQEAKIAkJcmV0dXJuIE5VTEw7CiAJfQogCi0JaWYgKCFzdHJpbmdzX3RvX3Blcm1z KHJldCwgKm51bSwgc3RyaW5ncykpIHsKKwlpZiAoIXhzX3N0cmluZ3NfdG9fcGVybXMocmV0LCAq bnVtLCBzdHJpbmdzKSkgewogCQlmcmVlX25vX2Vycm5vKHJldCk7CiAJCXJldCA9IE5VTEw7CiAJ fQpAQCAtMzc2LDcgKzM3Niw3IEBACiAJZm9yIChpID0gMDsgaSA8IG51bV9wZXJtczsgaSsrKSB7 CiAJCWNoYXIgYnVmZmVyW01BWF9TVFJMRU4oZG9taWRfdCkrMV07CiAKLQkJaWYgKCFwZXJtX3Rv X3N0cmluZygmcGVybXNbaV0sIGJ1ZmZlcikpCisJCWlmICgheHNfcGVybV90b19zdHJpbmcoJnBl cm1zW2ldLCBidWZmZXIpKQogCQkJZ290byB1bndpbmQ7CiAKIAkJaW92W2krMV0uaW92X2Jhc2Ug PSBzdHJkdXAoYnVmZmVyKTsKPT09PT0gdG9vbHMveGVuc3RvcmUveHNfbGliLmMgMS4xIHZzIGVk aXRlZCA9PT09PQotLS0gMS4xL3Rvb2xzL3hlbnN0b3JlL3hzX2xpYi5jCTIwMDUtMDYtMDcgMDU6 NTc6MjkgLTA1OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUveHNfbGliLmMJMjAwNS0wNi0x MCAwNTozMDozMiAtMDU6MDAKQEAgLTQ4LDcgKzQ4LDcgQEAKIH0KIAogLyogU2ltcGxlIHJvdXRp bmVzIGZvciB3cml0aW5nIHRvIHNvY2tldHMsIGV0Yy4gKi8KLWJvb2wgd3JpdGVfYWxsKGludCBm ZCwgY29uc3Qgdm9pZCAqZGF0YSwgdW5zaWduZWQgaW50IGxlbikKK2Jvb2wgeHNfd3JpdGVfYWxs KGludCBmZCwgY29uc3Qgdm9pZCAqZGF0YSwgdW5zaWduZWQgaW50IGxlbikKIHsKIAl3aGlsZSAo bGVuKSB7CiAJCWludCBkb25lOwpAQCAtNjYsNyArNjYsNyBAQAogfQogCiAvKiBDb252ZXJ0IHN0 cmluZ3MgdG8gcGVybWlzc2lvbnMuICBGYWxzZSBpZiBhIHByb2JsZW0uICovCi1ib29sIHN0cmlu Z3NfdG9fcGVybXMoc3RydWN0IHhzX3Blcm1pc3Npb25zICpwZXJtcywgdW5zaWduZWQgaW50IG51 bSwKK2Jvb2wgeHNfc3RyaW5nc190b19wZXJtcyhzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgKnBlcm1z LCB1bnNpZ25lZCBpbnQgbnVtLAogCQkgICAgICBjb25zdCBjaGFyICpzdHJpbmdzKQogewogCWNv bnN0IGNoYXIgKnA7CkBAIC0xMDQsNyArMTA0LDcgQEAKIH0KIAogLyogQ29udmVydCBwZXJtaXNz aW9ucyB0byBhIHN0cmluZyAodXAgdG8gbGVuIE1BWF9TVFJMRU4oZG9taWRfdCkrMSkuICovCi1i b29sIHBlcm1fdG9fc3RyaW5nKGNvbnN0IHN0cnVjdCB4c19wZXJtaXNzaW9ucyAqcGVybSwgY2hh ciAqYnVmZmVyKQorYm9vbCB4c19wZXJtX3RvX3N0cmluZyhjb25zdCBzdHJ1Y3QgeHNfcGVybWlz c2lvbnMgKnBlcm0sIGNoYXIgKmJ1ZmZlcikKIHsKIAlzd2l0Y2ggKHBlcm0tPnBlcm1zKSB7CiAJ Y2FzZSBYU19QRVJNX1dSSVRFOgpAQCAtMTI4LDcgKzEyOCw3IEBACiB9CiAKIC8qIEdpdmVuIGEg c3RyaW5nIGFuZCBhIGxlbmd0aCwgY291bnQgaG93IG1hbnkgc3RyaW5ncyAobnVsIHRlcm1zKS4g Ki8KLXVuc2lnbmVkIGludCBjb3VudF9zdHJpbmdzKGNvbnN0IGNoYXIgKnN0cmluZ3MsIHVuc2ln bmVkIGludCBsZW4pCit1bnNpZ25lZCBpbnQgeHNfY291bnRfc3RyaW5ncyhjb25zdCBjaGFyICpz dHJpbmdzLCB1bnNpZ25lZCBpbnQgbGVuKQogewogCXVuc2lnbmVkIGludCBudW07CiAJY29uc3Qg Y2hhciAqcDsKPT09PT0gdG9vbHMveGVuc3RvcmUveHNfbGliLmggMS4xIHZzIGVkaXRlZCA9PT09 PQotLS0gMS4xL3Rvb2xzL3hlbnN0b3JlL3hzX2xpYi5oCTIwMDUtMDYtMDcgMDU6NTc6MjkgLTA1 OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUveHNfbGliLmgJMjAwNS0wNi0xMCAwNDozMToz NSAtMDU6MDAKQEAgLTQ4LDE2ICs0OCwxNiBAQAogY29uc3QgY2hhciAqeHNfZGFlbW9uX3RyYW5z YWN0aW9ucyh2b2lkKTsKIAogLyogU2ltcGxlIHdyaXRlIGZ1bmN0aW9uOiBsb29wcyBmb3IgeW91 LiAqLwotYm9vbCB3cml0ZV9hbGwoaW50IGZkLCBjb25zdCB2b2lkICpkYXRhLCB1bnNpZ25lZCBp bnQgbGVuKTsKK2Jvb2wgeHNfd3JpdGVfYWxsKGludCBmZCwgY29uc3Qgdm9pZCAqZGF0YSwgdW5z aWduZWQgaW50IGxlbik7CiAKIC8qIENvbnZlcnQgc3RyaW5ncyB0byBwZXJtaXNzaW9ucy4gIEZh bHNlIGlmIGEgcHJvYmxlbS4gKi8KLWJvb2wgc3RyaW5nc190b19wZXJtcyhzdHJ1Y3QgeHNfcGVy bWlzc2lvbnMgKnBlcm1zLCB1bnNpZ25lZCBpbnQgbnVtLAorYm9vbCB4c19zdHJpbmdzX3RvX3Bl cm1zKHN0cnVjdCB4c19wZXJtaXNzaW9ucyAqcGVybXMsIHVuc2lnbmVkIGludCBudW0sCiAJCSAg ICAgIGNvbnN0IGNoYXIgKnN0cmluZ3MpOwogCiAvKiBDb252ZXJ0IHBlcm1pc3Npb25zIHRvIGEg c3RyaW5nICh1cCB0byBsZW4gTUFYX1NUUkxFTihkb21pZF90KSsxKS4gKi8KLWJvb2wgcGVybV90 b19zdHJpbmcoY29uc3Qgc3RydWN0IHhzX3Blcm1pc3Npb25zICpwZXJtLCBjaGFyICpidWZmZXIp OworYm9vbCB4c19wZXJtX3RvX3N0cmluZyhjb25zdCBzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgKnBl cm0sIGNoYXIgKmJ1ZmZlcik7CiAKIC8qIEdpdmVuIGEgc3RyaW5nIGFuZCBhIGxlbmd0aCwgY291 bnQgaG93IG1hbnkgc3RyaW5ncyAobnVsIHRlcm1zKS4gKi8KLXVuc2lnbmVkIGludCBjb3VudF9z dHJpbmdzKGNvbnN0IGNoYXIgKnN0cmluZ3MsIHVuc2lnbmVkIGludCBsZW4pOwordW5zaWduZWQg aW50IHhzX2NvdW50X3N0cmluZ3MoY29uc3QgY2hhciAqc3RyaW5ncywgdW5zaWduZWQgaW50IGxl bik7CiAKICNlbmRpZiAvKiBfWFNfTElCX0ggKi8KPT09PT0gdG9vbHMveGVuc3RvcmUveHNfcmFu ZG9tLmMgMS4xIHZzIGVkaXRlZCA9PT09PQotLS0gMS4xL3Rvb2xzL3hlbnN0b3JlL3hzX3JhbmRv bS5jCTIwMDUtMDYtMDcgMDU6NTc6MjkgLTA1OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUv eHNfcmFuZG9tLmMJMjAwNS0wNi0xMCAwNTozMjoxOCAtMDU6MDAKQEAgLTIyMywxMCArMjIzLDEw IEBACiAJCXJlbGVhc2VfZmlsZShwZXJtcywgc2l6ZSk7CiAJCXJldHVybiByZXQ7CiAJfQotCSpu dW0gPSBjb3VudF9zdHJpbmdzKHBlcm1zLCBzaXplKTsKKwkqbnVtID0geHNfY291bnRfc3RyaW5n cyhwZXJtcywgc2l6ZSk7CiAKIAlyZXQgPSBuZXdfYXJyYXkoc3RydWN0IHhzX3Blcm1pc3Npb25z LCAqbnVtKTsKLQlpZiAoIXN0cmluZ3NfdG9fcGVybXMocmV0LCAqbnVtLCBwZXJtcykpCisJaWYg KCF4c19zdHJpbmdzX3RvX3Blcm1zKHJldCwgKm51bSwgcGVybXMpKQogCQliYXJmKCJSZWFkaW5n IHBlcm1pc3Npb25zIGZyb20gJXMiLCBwZXJtZmlsZSk7CiAJcmVsZWFzZV9maWxlKHBlcm1zLCBz aXplKTsKIAlyZXR1cm4gcmV0OwpAQCAtMjY3LDcgKzI2Nyw3IEBACiAJZm9yIChpID0gMDsgaSA8 IG51bTsgaSsrKSB7CiAJCWNoYXIgYnVmZmVyWzEwMF07CiAKLQkJaWYgKCFwZXJtX3RvX3N0cmlu ZygmcGVybXNbaV0sIGJ1ZmZlcikpIHsKKwkJaWYgKCF4c19wZXJtX3RvX3N0cmluZygmcGVybXNb aV0sIGJ1ZmZlcikpIHsKIAkJCWludCBzYXZlZF9lcnJubyA9IGVycm5vOwogCQkJY2xvc2UoZmQp OwogCQkJZXJybm8gPSBzYXZlZF9lcnJubzsKQEAgLTUzNiw3ICs1MzYsNyBAQAogCQlyZXQgPSB0 YWxsb2NfYXNwcmludGZfYXBwZW5kKHJldCwgIiVzJXM6ICIsIHNwYWNpbmcsIGRpcltpXSk7CiAJ CWZvciAoaiA9IDA7IGogPCBudW1wZXJtczsgaisrKSB7CiAJCQljaGFyIGJ1ZmZlclsxMDBdOwot CQkJaWYgKCFwZXJtX3RvX3N0cmluZygmcGVybXNbal0sIGJ1ZmZlcikpCisJCQlpZiAoIXhzX3Bl cm1fdG9fc3RyaW5nKCZwZXJtc1tqXSwgYnVmZmVyKSkKIAkJCQliYXJmKCJwZXJtIHRvIHN0cmlu ZyIpOwogCQkJcmV0ID0gdGFsbG9jX2FzcHJpbnRmX2FwcGVuZChyZXQsICIlcyAiLCBidWZmZXIp OwogCQl9Cj09PT09IHRvb2xzL3hlbnN0b3JlL3hzX3Rlc3QuYyAxLjEgdnMgZWRpdGVkID09PT09 Ci0tLSAxLjEvdG9vbHMveGVuc3RvcmUveHNfdGVzdC5jCTIwMDUtMDYtMDcgMDU6NTc6MjkgLTA1 OjAwCisrKyBlZGl0ZWQvdG9vbHMveGVuc3RvcmUveHNfdGVzdC5jCTIwMDUtMDYtMTAgMDU6MzI6 MTggLTA1OjAwCkBAIC0xNTMsNyArMTUzLDcgQEAKIHsKIAlpZiAoZmQgPT0gLTIpCiAJCXJldHVy biB3cml0ZV9hbGxfc2htZW0oZmQsIGRhdGEsIGxlbik7Ci0JcmV0dXJuIHdyaXRlX2FsbChmZCwg ZGF0YSwgbGVuKTsKKwlyZXR1cm4geHNfd3JpdGVfYWxsKGZkLCBkYXRhLCBsZW4pOwogfQogCiAv KiBXZSB3YW50IGFjY2VzcyB0byBpbnRlcm5hbCBmdW5jdGlvbnMuICovCkBAIC00OTEsNyArNDkx LDcgQEAKIAkJcHJpbnRmKCIlcyVzOiAiLCBzcGFjaW5nLCBkaXJbaV0pOwogCQlmb3IgKGogPSAw OyBqIDwgbnVtcGVybXM7IGorKykgewogCQkJY2hhciBidWZmZXJbMTAwXTsKLQkJCWlmICghcGVy bV90b19zdHJpbmcoJnBlcm1zW2pdLCBidWZmZXIpKQorCQkJaWYgKCF4c19wZXJtX3RvX3N0cmlu ZygmcGVybXNbal0sIGJ1ZmZlcikpCiAJCQkJYmFyZigicGVybSB0byBzdHJpbmciKTsKIAkJCXBy aW50ZigiJXMgIiwgYnVmZmVyKTsKIAkJfQo= ------=_Part_1120_15785230.1118408469445 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------=_Part_1120_15785230.1118408469445--