From mboxrd@z Thu Jan 1 00:00:00 1970 From: aq Subject: [PATCH] xm --version Date: Sun, 5 Jun 2005 22:54:43 -0500 Message-ID: <9cde8bff05060520541e98d473@mail.gmail.com> Reply-To: aq Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_3470_1558580.1118030083659" 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_3470_1558580.1118030083659 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This patch adds to xm a long-missing function: showing xen version and few extra information (thanks go to Keir and Mark for some suggestions). Here is the ouput of "xm info" after applying the patch (against -unstable ChangeSet@1.1677): --- #xm info system : Linux host : ubuntu xen_release : 3.0-devel xen_compile_by : root@localdomain xen_compiler : gcc version 3.3.5 (Debian 1:3.3.5-8ubuntu2) xen_compile_date : Mon Jun 6 00:30:22 EST 2005 dom0_release : 2.6.11.10-xen0 dom0_version : #3 Mon Jun 6 00:32:05 EST 2005 machine : i686 cores : 1 hyperthreads_per_core : 1 cpu_mhz : 1094 memory : 511 free_memory : 122 ---- You get the point. And here is what the patch does: - extend xen_version hypercall. the new hypercall keeps the old behavior if executing it with 0 as its parameter. But if give it the address of version_op_t structure (see version.h in the patch), it returns extra stuffs like xen_extraversion, compile date, compiler, etc... - libxc now has a new function to get xen version (and stuffs):=20 xc_xen_version() - extend python wrapper for xc_xen_version() and use it in XendNode.py to get xen version and stuffs. Any comment? Signed-off-by: Nguyen Anh Quynh # diffstat xminfo2.patch=20 tools/libxc/xc.h | 11 +++++++++++ tools/libxc/xc_misc.c | 18 ++++++++++++++++++ tools/python/xen/lowlevel/xc/xc.c | 29 +++++++++++++++++++++++++++++ tools/python/xen/xend/XendNode.py | 12 ++++++++---- xen/common/kernel.c | 22 ++++++++++++++++++---- xen/include/public/version.h | 22 ++++++++++++++++++++++ 6 files changed, 106 insertions(+), 8 deletions(-) ------=_Part_3470_1558580.1118030083659 Content-Type: text/x-patch; name="xminfo2.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xminfo2.patch" ZGlmZiAtTnVycCAtWCBkb250ZGlmZi54ZW4geGVuby10b2RheS90b29scy9saWJ4Yy94Yy5oIHhl bm8uMDYwNi90b29scy9saWJ4Yy94Yy5oCi0tLSB4ZW5vLXRvZGF5L3Rvb2xzL2xpYnhjL3hjLmgJ MjAwNS0wNi0wNiAxMTo1NDoyOS4xNjA2NjY4NDggLTA1MDAKKysrIHhlbm8uMDYwNi90b29scy9s aWJ4Yy94Yy5oCTIwMDUtMDYtMDYgMTI6MzI6MjYuMjEwNTAyNjU2IC0wNTAwCkBAIC0yNSw2ICsy NSw3IEBAIHR5cGVkZWYgaW50NjRfdCAgICAgICAgICAgIHM2NDsKICNpbmNsdWRlIDx4ZW4vZG9t MF9vcHMuaD4KICNpbmNsdWRlIDx4ZW4vZXZlbnRfY2hhbm5lbC5oPgogI2luY2x1ZGUgPHhlbi9z Y2hlZF9jdGwuaD4KKyNpbmNsdWRlIDx4ZW4vdmVyc2lvbi5oPgogCiAvKgogICogIERFRklOSVRJ T05TIEZPUiBDUFUgQkFSUklFUlMKQEAgLTUwNSw0ICs1MDYsMTQgQEAgbG9uZyB4Y19nZXRfdG90 X3BhZ2VzKGludCB4Y19oYW5kbGUsIHUzMgogLyogRXhlY3V0ZSBhIHByaXZpbGVnZWQgZG9tMCBv cGVyYXRpb24uICovCiBpbnQgeGNfZG9tMF9vcChpbnQgeGNfaGFuZGxlLCBkb20wX29wX3QgKm9w KTsKIAorLyogVGhpcyBzdHJ1Y3QgaXMgZm9yIGxpYnhjIHRvIGdldCB4ZW4gdmVyc2lvbiBhbmQg ZXh0cmEgc3R1ZmZzLiAqLyAKK3R5cGVkZWYgdmVyc2lvbl9vcF90IHhjX3ZlcnNpb25fdDsKKwor LyoqCisgKiBHZXQgeGVuIHZlcnNpb24gCisgKgorICogQHJldHVybiBhIGxvbmcgdmFsdWUgd2hp Y2ggZW5jb2RlcyBYRU5fVkVSU0lPTiBhbmQgWEVOX1NVQlZFUlNJT04gb24gc3VjY2VzcywgLTEg b24gZmFpbHVyZS4KKyAqLworbG9uZyB4Y194ZW5fdmVyc2lvbihpbnQgeGNfaGFuZGxlLCB4Y192 ZXJzaW9uX3QgKnZlcnNpb24pOyAKKyAKICNlbmRpZiAvKiBfX1hDX0hfXyAqLwpkaWZmIC1OdXJw IC1YIGRvbnRkaWZmLnhlbiB4ZW5vLXRvZGF5L3Rvb2xzL2xpYnhjL3hjX21pc2MuYyB4ZW5vLjA2 MDYvdG9vbHMvbGlieGMveGNfbWlzYy5jCi0tLSB4ZW5vLXRvZGF5L3Rvb2xzL2xpYnhjL3hjX21p c2MuYwkyMDA1LTA2LTA2IDExOjU0OjI5LjE2ODY2NTYzMiAtMDUwMAorKysgeGVuby4wNjA2L3Rv b2xzL2xpYnhjL3hjX21pc2MuYwkyMDA1LTA2LTA2IDEyOjE4OjExLjE3NjQ4NzU4NCAtMDUwMApA QCAtMTMwLDMgKzEzMCwyMSBAQCBpbnQgeGNfbXNyX3dyaXRlKGludCB4Y19oYW5kbGUsIGludCBj cHVfCiAgICAgCiAgICAgcmV0dXJuIHJjOwogfQorCitsb25nIHhjX3hlbl92ZXJzaW9uKGludCB4 Y19oYW5kbGUsIHhjX3ZlcnNpb25fdCAqdikKK3sKKyAgICBsb25nIHJldDsKKyAgICBwcml2Y21k X2h5cGVyY2FsbF90IGh5cGVyY2FsbDsKKworICAgIGh5cGVyY2FsbC5vcCA9IF9fSFlQRVJWSVNP Ul94ZW5fdmVyc2lvbjsKKyAgICBoeXBlcmNhbGwuYXJnWzBdID0gKHVuc2lnbmVkIGxvbmcpdjsK KworICAgIGlmICgocmV0ID0gZG9feGVuX2h5cGVyY2FsbCh4Y19oYW5kbGUsICZoeXBlcmNhbGwp KSA8IDApCisgICAgeworICAgICAgICBpZiAoZXJybm8gPT0gRUFDQ0VTKQorICAgICAgICAgICAg UEVSUk9SKCJDb3VsZCBub3Qgb2J0YWluIHhlbiB2ZXJzaW9uIik7CisgICAgICAgIHJldHVybiAt MTsKKyAgICB9CisKKyAgICByZXR1cm4gcmV0OworfQpkaWZmIC1OdXJwIC1YIGRvbnRkaWZmLnhl biB4ZW5vLXRvZGF5L3Rvb2xzL3B5dGhvbi94ZW4vbG93bGV2ZWwveGMveGMuYyB4ZW5vLjA2MDYv dG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94Yy94Yy5jCi0tLSB4ZW5vLXRvZGF5L3Rvb2xzL3B5 dGhvbi94ZW4vbG93bGV2ZWwveGMveGMuYwkyMDA1LTA2LTA2IDExOjU0OjI5LjE5NzY2MTIyNCAt MDUwMAorKysgeGVuby4wNjA2L3Rvb2xzL3B5dGhvbi94ZW4vbG93bGV2ZWwveGMveGMuYwkyMDA1 LTA2LTA2IDEyOjM5OjE4LjgyNjc3NTQ0OCAtMDUwMApAQCAtODI3LDYgKzgyNywyOSBAQCBzdGF0 aWMgUHlPYmplY3QgKnB5eGNfZG9tYWluX21lbW9yeV9pbmNyCiAgICAgcmV0dXJuIHplcm87CiB9 CiAKK3N0YXRpYyBQeU9iamVjdCAqcHl4Y194ZW5fdmVyc2lvbihQeU9iamVjdCAqc2VsZiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFB5T2JqZWN0ICphcmdzLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUHlPYmplY3QgKmt3ZHMpCit7CisgICAgeGNf dmVyc2lvbl90IHY7CisgICAgbG9uZyByZXQ7CisgICAgWGNPYmplY3QgKnhjID0gKFhjT2JqZWN0 ICopc2VsZjsKKworICAgIGlmICghUHlBcmdfUGFyc2VUdXBsZShhcmdzLCAiIikpCisgICAgICAg IHJldHVybiBOVUxMOworICAgIAorICAgIGlmICgocmV0ID0geGNfeGVuX3ZlcnNpb24oeGMtPnhj X2hhbmRsZSwgJnYpKSA9PSAtMSkKKyAgICAgICAgcmV0dXJuIFB5RXJyX1NldEZyb21FcnJubyh4 Y19lcnJvcik7CisKKyAgICByZXR1cm4gUHlfQnVpbGRWYWx1ZSgie3M6aSxzOmksczpzLHM6cyxz OnMsczpzLHM6c30iLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAidmVyc2lvbiIsIHJldCA+ PiAxNiwgCisgICAgICAgICAgICAgICAgICAgICAgICAgInN1YnZlcnNpb24iLCByZXQgJiAweEZG RkYsCisgICAgICAgICAgICAgICAgICAgICAgICAgImV4dHJhdmVyc2lvbiIsIHYuZXh0cmF2ZXJz aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICJjb21waWxlX2J5Iiwgdi5jb21waWxlX2J5 LAorICAgICAgICAgICAgICAgICAgICAgICAgICJjb21waWxlX2RvbWFpbiIsIHYuY29tcGlsZV9k b21haW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgImNvbXBpbGVyIiwgdi5jb21waWxlciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAiY29tcGlsZV9kYXRlIiwgdi5jb21waWxlX2RhdGUp OworfQogCiBzdGF0aWMgUHlNZXRob2REZWYgcHl4Y19tZXRob2RzW10gPSB7CiAgICAgeyAiaGFu ZGxlIiwKQEAgLTExMTAsNiArMTEzMywxMiBAQCBzdGF0aWMgUHlNZXRob2REZWYgcHl4Y19tZXRo b2RzW10gPSB7CiAgICAgICAiIG1lbV9rYiBbbG9uZ106IC5cbiIKICAgICAgICJSZXR1cm5zOiBb aW50XSAwIG9uIHN1Y2Nlc3M7IC0xIG9uIGVycm9yLlxuIiB9LAogCisgICAgeyAieGVuX3ZlcnNp b24iLCAKKyAgICAgIChQeUNGdW5jdGlvbilweXhjX3hlbl92ZXJzaW9uLCAKKyAgICAgICBNRVRI X0tFWVdPUkRTLCAiXG4iCisgICAgICAiR2V0IFhlbiB2ZXJzaW9uXG4iCisgICAgICAiUmV0dXJu czogW2RpY3RdIHhlbiB2ZXJzaW9uIGFuZCBleHRyYSBzdHVmZnMgb24gc3VjY2VzczsgZW1wdHkg bGlzdCBvbiBlcnJvci5cbiIgfSwKKwogICAgIHsgTlVMTCwgTlVMTCwgMCwgTlVMTCB9CiB9Owog CmRpZmYgLU51cnAgLVggZG9udGRpZmYueGVuIHhlbm8tdG9kYXkvdG9vbHMvcHl0aG9uL3hlbi94 ZW5kL1hlbmROb2RlLnB5IHhlbm8uMDYwNi90b29scy9weXRob24veGVuL3hlbmQvWGVuZE5vZGUu cHkKLS0tIHhlbm8tdG9kYXkvdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmROb2RlLnB5CTIwMDUt MDUtMjggMTI6MTk6NTcuMDAwMDAwMDAwIC0wNTAwCisrKyB4ZW5vLjA2MDYvdG9vbHMvcHl0aG9u L3hlbi94ZW5kL1hlbmROb2RlLnB5CTIwMDUtMDYtMDYgMTI6MTg6MTEuMTc5NDg3MTI4IC0wNTAw CkBAIC0zNSwxMCArMzUsMTUgQEAgY2xhc3MgWGVuZE5vZGU6CiAKICAgICBkZWYgbm9kZWluZm8o c2VsZik6CiAgICAgICAgIChzeXMsIGhvc3QsIHJlbCwgdmVyLCBtY2gpID0gb3MudW5hbWUoKQor ICAgICAgICB4ZW5fdmVyID0gc2VsZi54Yy54ZW5fdmVyc2lvbigpCiAgICAgICAgIHJldHVybiBb WydzeXN0ZW0nLCAgc3lzXSwKLSAgICAgICAgICAgICAgICBbJ2hvc3QnLCAgICBob3N0XSwKLSAg ICAgICAgICAgICAgICBbJ3JlbGVhc2UnLCByZWxdLAotICAgICAgICAgICAgICAgIFsndmVyc2lv bicsIHZlcl0sCisgICAgICAgICAgICAgICAgWydob3N0JywgaG9zdF0sCisgICAgICAgICAgICAg ICAgWyd4ZW5fcmVsZWFzZScsICIlaS4laSVzIiAlKHhlbl92ZXJbJ3ZlcnNpb24nXSwgeGVuX3Zl clsnc3VidmVyc2lvbiddLCB4ZW5fdmVyWydleHRyYXZlcnNpb24nXSldLAorICAgICAgICAgICAg ICAgIFsneGVuX2NvbXBpbGVfYnknLCAiJXNAJXMiICUoeGVuX3ZlclsnY29tcGlsZV9ieSddLCB4 ZW5fdmVyWydjb21waWxlX2RvbWFpbiddKV0sCisgICAgICAgICAgICAgICAgWyd4ZW5fY29tcGls ZXInLCB4ZW5fdmVyWydjb21waWxlciddXSwKKyAgICAgICAgICAgICAgICBbJ3hlbl9jb21waWxl X2RhdGUnLCB4ZW5fdmVyWydjb21waWxlX2RhdGUnXV0sCisgICAgICAgICAgICAgICAgWydkb20w X3JlbGVhc2UnLCByZWxdLAorICAgICAgICAgICAgICAgIFsnZG9tMF92ZXJzaW9uJywgdmVyXSwK ICAgICAgICAgICAgICAgICBbJ21hY2hpbmUnLCBtY2hdXQogCiAgICAgZGVmIHBoeXNpbmZvKHNl bGYpOgpAQCAtNTAsNyArNTUsNiBAQCBjbGFzcyBYZW5kTm9kZToKICAgICAgICAgICAgICAgICBb J2ZyZWVfbWVtb3J5JywgcGluZm9bJ2ZyZWVfcGFnZXMnXS8yNTZdXQogICAgICAgICByZXR1cm4g aW5mbwogICAgICAgICAKLSAgICAgICAgCiAKIGRlZiBpbnN0YW5jZSgpOgogICAgIGdsb2JhbCBp bnN0CmRpZmYgLU51cnAgLVggZG9udGRpZmYueGVuIHhlbm8tdG9kYXkveGVuL2NvbW1vbi9rZXJu ZWwuYyB4ZW5vLjA2MDYveGVuL2NvbW1vbi9rZXJuZWwuYwotLS0geGVuby10b2RheS94ZW4vY29t bW9uL2tlcm5lbC5jCTIwMDUtMDYtMDYgMTE6NTQ6MjkuNDc3NjE4NjY0IC0wNTAwCisrKyB4ZW5v LjA2MDYveGVuL2NvbW1vbi9rZXJuZWwuYwkyMDA1LTA2LTA2IDEyOjE4OjExLjE4MDQ4Njk3NiAt MDUwMApAQCAtMTUsNiArMTUsOSBAQAogI2luY2x1ZGUgPHhlbi9zY2hlZC5oPgogI2luY2x1ZGUg PGFzbS9jdXJyZW50Lmg+CiAKKyNpbmNsdWRlIDxwdWJsaWMvdmVyc2lvbi5oPgorI2luY2x1ZGUg PHhlbi9zdHJpbmcuaD4KKwogdm9pZCBjbWRsaW5lX3BhcnNlKGNoYXIgKmNtZGxpbmUpCiB7CiAg ICAgY2hhciBvcHRbMTAwXSwgKm9wdHZhbCwgKnAgPSBjbWRsaW5lLCAqcTsKQEAgLTgzLDExICs4 NiwyMiBAQCB2b2lkIGNtZGxpbmVfcGFyc2UoY2hhciAqY21kbGluZSkKICAqIFNpbXBsZSBoeXBl cmNhbGxzLgogICovCiAKLWxvbmcgZG9feGVuX3ZlcnNpb24oaW50IGNtZCkKK2xvbmcgZG9feGVu X3ZlcnNpb24odmVyc2lvbl9vcF90ICpvcCkKIHsKLSAgICBpZiAoIGNtZCAhPSAwICkKLSAgICAg ICAgcmV0dXJuIC1FTk9TWVM7Ci0gICAgcmV0dXJuIChYRU5fVkVSU0lPTjw8MTYpIHwgKFhFTl9T VUJWRVJTSU9OKTsKKyAgICB2ZXJzaW9uX29wX3Qgdm9wOworICAgIGlmIChvcCAhPSBOVUxMKSAg LyogcmV0dXJuIGV4dHJhIHN0dWZmcyAqLyAKKyAgICB7CisgICAgICAgIGlmIChjb3B5X2Zyb21f dXNlcigmdm9wLCBvcCwgc2l6ZW9mKHZvcCkpICE9IDApCisgICAgICAgICAgICByZXR1cm4gLUVG QVVMVDsKKyAgICAgICAgc3RybmNweSh2b3AuZXh0cmF2ZXJzaW9uLCBYRU5fRVhUUkFWRVJTSU9O LCBzaXplb2Yodm9wLmV4dHJhdmVyc2lvbikpOworICAgICAgICBzdHJuY3B5KHZvcC5jb21waWxl X2J5LCBYRU5fQ09NUElMRV9CWSwgc2l6ZW9mKHZvcC5jb21waWxlX2J5KSk7CisgICAgICAgIHN0 cm5jcHkodm9wLmNvbXBpbGVfZG9tYWluLCBYRU5fQ09NUElMRV9ET01BSU4sIHNpemVvZih2b3Au Y29tcGlsZV9kb21haW4pKTsKKyAgICAgICAgc3RybmNweSh2b3AuY29tcGlsZXIsIFhFTl9DT01Q SUxFUiwgc2l6ZW9mKHZvcC5jb21waWxlcikpOworICAgICAgICBzdHJuY3B5KHZvcC5jb21waWxl X2RhdGUsIFhFTl9DT01QSUxFX0RBVEUsIHNpemVvZih2b3AuY29tcGlsZV9kYXRlKSk7CisgICAg ICAgIGlmIChjb3B5X3RvX3VzZXIob3AsICZ2b3AsIHNpemVvZih2b3ApKSAhPSAwKQorICAgICAg ICAgICAgcmV0dXJuIC1FRkFVTFQ7CisgICAgfQorICAgIHJldHVybiAoWEVOX1ZFUlNJT048PDE2 KSB8IChYRU5fU1VCVkVSU0lPTik7IC8qIGFsd2F5cyByZXR1cm4gdmVyc2lvbiAmIHN1YnZlcnNp b24gKi8gCiB9CiAKIGxvbmcgZG9fdm1fYXNzaXN0KHVuc2lnbmVkIGludCBjbWQsIHVuc2lnbmVk IGludCB0eXBlKQpkaWZmIC1OdXJwIC1YIGRvbnRkaWZmLnhlbiB4ZW5vLXRvZGF5L3hlbi9pbmNs dWRlL3B1YmxpYy92ZXJzaW9uLmggeGVuby4wNjA2L3hlbi9pbmNsdWRlL3B1YmxpYy92ZXJzaW9u LmgKLS0tIHhlbm8tdG9kYXkveGVuL2luY2x1ZGUvcHVibGljL3ZlcnNpb24uaAkxOTY5LTEyLTMx IDE5OjAwOjAwLjAwMDAwMDAwMCAtMDUwMAorKysgeGVuby4wNjA2L3hlbi9pbmNsdWRlL3B1Ymxp Yy92ZXJzaW9uLmgJMjAwNS0wNi0wNiAxMjoxODoxMS4xODE0ODY4MjQgLTA1MDAKQEAgLTAsMCAr MSwyMiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogdmVyc2lvbi5oCisgKiAKKyAqIFhl biBleHRyYXZlcnNpb24gYW5kIHN0dWZmcy4KKyAqIAorICogQ29weXJpZ2h0IChjKSAyMDA1LCBO Z3V5ZW4gQW5oIFF1eW5oIDxhcXV5bmhAZ21haWwuY29tPgorICovCisKKyNpZm5kZWYgX19YRU5f UFVCTElDX1ZFUlNJT05fSF9fCisjZGVmaW5lIF9fWEVOX1BVQkxJQ19WRVJTSU9OX0hfXworCisv KiBUaGlzIHN0cnVjdCBpcyBmb3IgeGVuIGh5cGVyY2FsbCBvbmx5LiBVc3VhbGx5IHlvdSBkb250 IG5lZWQgaXQuICovIAordHlwZWRlZiBzdHJ1Y3QgX3ZlcnNpb25fb3Bfc3QgCit7CisgICAgY2hh ciBleHRyYXZlcnNpb25bOF07ICAgICAgICAgICAvKiAgMCAqLworICAgIGNoYXIgY29tcGlsZV9i eVsxNl07ICAgICAgICAgICAgLyogIDggKi8KKyAgICBjaGFyIGNvbXBpbGVfZG9tYWluWzMyXTsg ICAgICAgIC8qIDI0ICovCisgICAgY2hhciBjb21waWxlcls2NF07ICAgICAgICAgICAgICAvKiA1 NiAqLworICAgIGNoYXIgY29tcGlsZV9kYXRlWzMyXTsgICAgICAgICAgLyogMTIwICovCit9IFBB Q0tFRCB2ZXJzaW9uX29wX3Q7ICAvKiAxNTIgYnl0ZXMgKi8KKworI2VuZGlmIC8qIF9fWEVOX1BV QkxJQ19WRVJTSU9OX0hfXyAqLwo= ------=_Part_3470_1558580.1118030083659 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_3470_1558580.1118030083659--