From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Fehlig Subject: [PATCH] [xend and libxenapi] Fix VM.get_power_state API Date: Wed, 13 Dec 2006 18:11:43 -0700 Message-ID: <4580A4CF.4010607@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000203070603020807060700" 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-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------000203070603020807060700 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Xend was returning an integer representation of the power state instead of a string representation as specified by the XenAPI spec. On the c-bindings side, the marshaling code converts the string representation to an enum value. A subsequent attempt to convert the enum from a string to an enum in xen_vm_get_power_state() was causing a seg fault in client application. This patch fixes the code paths in both xend and c-bindings. Regards, Jim --------------000203070603020807060700 Content-Type: text/x-patch; name="vm-power-state.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="vm-power-state.patch" IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIGpmZWhsaWdAamZlaGxpZzIucHJvdm8ubm92 ZWxsLmNvbQojIERhdGUgMTE2NjA1ODQwOCAyNTIwMAojIE5vZGUgSUQgNDJiNTE1Y2FlYjc4 YmM5OTIxYjE1MjZhOWE3ODE3MjRmMjMyYWZmMAojIFBhcmVudCAgMzYwZWI5OTZmYTM4MzE5 ODY3YTc0YmY1ODFjNzM0YTgwYmY2ODM5ZApGaXggVk0uZ2V0X3Bvd2VyX3N0YXRlIEFQSS4g IE9uIHRoZSB4ZW5kIHNpZGUgYW4gaW50ZWdlciByZXByZXNlbnRhdGlvbiBvZiB0aGUgcG93 ZXIgc3RhdGUgd2FzIGJlaW5nIHJldHVybmVkIGluc3RlYWQgb2YgYSBzdHJpbmcgcmVwcmVz ZW50YXRpb24gYXMgc3BlY2lmaWVkIGJ5IHRoZSBYZW5BUEkgc3BlYy4KCk9uIHRoZSBjLWJp bmRpbmdzIHNpZGUgdGhlIG1hcnNoYWxsaW5nIGNvZGUgY29udmVydHMgdGhlIHN0cmluZyBy ZXByZXNlbnRhdGlvbiB0byBhbiBlbnVtIHZhbHVlLiAgQSBzdWJzZXF1ZW50IGF0dGVtcHQg dG8gY29udmVydCB0aGUgZW51bSBmcm9tIGEgc3RyaW5nIHRvIGFuIGVudW0gd2FzIGNhdXNp bmcgYSBzZWcgZmF1bHQuCgpTaWduZWQtb2ZmLWJ5OiBKaW0gRmVobGlnIDxqZmVobGlnQG5v dmVsbC5jb20+CgpkaWZmIC1yIDM2MGViOTk2ZmEzOCAtciA0MmI1MTVjYWViNzggdG9vbHMv bGlieGVuL2luY2x1ZGUveGVuX2ludGVybmFsLmgKLS0tIGEvdG9vbHMvbGlieGVuL2luY2x1 ZGUveGVuX2ludGVybmFsLmgJV2VkIERlYyAxMyAxNjoxMzoyNiAyMDA2ICswMDAwCisrKyBi L3Rvb2xzL2xpYnhlbi9pbmNsdWRlL3hlbl9pbnRlcm5hbC5oCVdlZCBEZWMgMTMgMTg6MDY6 NDggMjAwNiAtMDcwMApAQCAtMTI4LDcgKzEyOCw2IEBAIHhlbl9lbnVtX2xvb2t1cF8oeGVu X3Nlc3Npb24gKnNlc3Npb24sIGMKICAgICB4ZW5fZW51bV9sb29rdXBfKHNlc3Npb25fXywg c3RyX18sIGxvb2t1cF90YWJsZV9fLCAgXAogICAgICAgICAgICAgICAgICAgICAgc2l6ZW9m KGxvb2t1cF90YWJsZV9fKSAvICAgICAgICAgICBcCiAgICAgICAgICAgICAgICAgICAgICBz aXplb2YobG9va3VwX3RhYmxlX19bMF0pKSAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogCiAjZGVmaW5lIFhF Tl9BTExPQyh0eXBlX18pICAgICAgICAgICAgICAgICAgICAgICBcCiB0eXBlX18gKiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCmRpZmYgLXIgMzYwZWI5OTZm YTM4IC1yIDQyYjUxNWNhZWI3OCB0b29scy9saWJ4ZW4vc3JjL3hlbl92bS5jCi0tLSBhL3Rv b2xzL2xpYnhlbi9zcmMveGVuX3ZtLmMJV2VkIERlYyAxMyAxNjoxMzoyNiAyMDA2ICswMDAw CisrKyBiL3Rvb2xzL2xpYnhlbi9zcmMveGVuX3ZtLmMJV2VkIERlYyAxMyAxODowNjo0OCAy MDA2IC0wNzAwCkBAIC0zMjgsOSArMzI4LDcgQEAgeGVuX3ZtX2dldF9wb3dlcl9zdGF0ZSh4 ZW5fc2Vzc2lvbiAqc2VzcwogICAgICAgICB9OwogCiAgICAgYWJzdHJhY3RfdHlwZSByZXN1 bHRfdHlwZSA9IHhlbl92bV9wb3dlcl9zdGF0ZV9hYnN0cmFjdF90eXBlXzsKLSAgICBjaGFy ICpyZXN1bHRfc3RyID0gTlVMTDsKICAgICBYRU5fQ0FMTF8oIlZNLmdldF9wb3dlcl9zdGF0 ZSIpOwotICAgICpyZXN1bHQgPSB4ZW5fdm1fcG93ZXJfc3RhdGVfZnJvbV9zdHJpbmcoc2Vz c2lvbiwgcmVzdWx0X3N0cik7CiAgICAgcmV0dXJuIHNlc3Npb24tPm9rOwogfQogCmRpZmYg LXIgMzYwZWI5OTZmYTM4IC1yIDQyYjUxNWNhZWI3OCB0b29scy9weXRob24veGVuL3hlbmQv WGVuZEFQSS5weQotLS0gYS90b29scy9weXRob24veGVuL3hlbmQvWGVuZEFQSS5weQlXZWQg RGVjIDEzIDE2OjEzOjI2IDIwMDYgKzAwMDAKKysrIGIvdG9vbHMvcHl0aG9uL3hlbi94ZW5k L1hlbmRBUEkucHkJV2VkIERlYyAxMyAxODowNjo0OCAyMDA2IC0wNzAwCkBAIC02NTUsNyAr NjU1LDcgQEAgY2xhc3MgWGVuZEFQSToKICAgICAjIGF0dHJpYnV0ZXMgKHJvKQogICAgIGRl ZiBWTV9nZXRfcG93ZXJfc3RhdGUoc2VsZiwgc2Vzc2lvbiwgdm1fcmVmKToKICAgICAgICAg ZG9tID0gWGVuZERvbWFpbi5pbnN0YW5jZSgpLmdldF92bV9ieV91dWlkKHZtX3JlZikKLSAg ICAgICAgcmV0dXJuIHhlbl9hcGlfc3VjY2Vzcyhkb20uc3RhdGUpCisgICAgICAgIHJldHVy biB4ZW5fYXBpX3N1Y2Nlc3MoZG9tLmdldF9wb3dlcl9zdGF0ZSgpKQogICAgIAogICAgIGRl ZiBWTV9nZXRfcmVzaWRlbnRfb24oc2VsZiwgc2Vzc2lvbiwgdm1fcmVmKToKICAgICAgICAg cmV0dXJuIHhlbl9hcGlfc3VjY2VzcyhYZW5kTm9kZS5pbnN0YW5jZSgpLnV1aWQpCg== --------------000203070603020807060700 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 --------------000203070603020807060700--