From: Dan Magenheimer Subject: [PATCH] tmem/xentop: add useful tmem output to xentop Date: Tue, 8 Dec 2009 16:56:58 -0800 (PST) Message-ID: <1dd4ede4-8937-45ed-ae8e-ccb11ae29f3a@default> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__126032026021716222abhmt014.oracle.com" 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 (E-mail)" List-Id: xen-devel@lists.xenproject.org --__126032026021716222abhmt014.oracle.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Report a few key per-domain tmem statistics in xentop. Signed-off-by: Dan Magenheimer diff -r 7f611de6b93c tools/xenstat/libxenstat/src/xenstat.c --- a/tools/xenstat/libxenstat/src/xenstat.c=09Tue Dec 08 14:14:27 2009 +00= 00 +++ b/tools/xenstat/libxenstat/src/xenstat.c=09Tue Dec 08 17:16:29 2009 -07= 00 @@ -131,6 +131,32 @@ void xenstat_uninit(xenstat_handle * han =09} } =20 +static inline unsigned long long parse(char *s, char *match) +{ +=09char *s1 =3D strstr(s,match); +=09unsigned long long ret; + +=09if ( s1 =3D=3D NULL ) +=09=09return 0LL; +=09s1 +=3D 2; +=09if ( *s1++ !=3D ':' ) +=09=09return 0LL; +=09sscanf(s1,"%llu",&ret); +=09return ret; +} + +void domain_get_tmem_stats(xenstat_handle * handle, xenstat_domain * domai= n) +{ +=09char buffer[4096]; + +=09xc_tmem_control(handle->xc_handle,-1,TMEMC_LIST,domain->id, + sizeof(buffer),-1,-1,buffer); +=09domain->tmem_stats.curr_eph_pages =3D parse(buffer,"Ec"); +=09domain->tmem_stats.succ_eph_gets =3D parse(buffer,"Ge"); +=09domain->tmem_stats.succ_pers_puts =3D parse(buffer,"Pp"); +=09domain->tmem_stats.succ_pers_gets =3D parse(buffer,"Gp"); +} + xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags= ) { #define DOMAIN_CHUNK_SIZE 256 @@ -232,11 +258,13 @@ xenstat_node *xenstat_get_node(xenstat_h =09=09=09domain->networks =3D NULL; =09=09=09domain->num_vbds =3D 0; =09=09=09domain->vbds =3D NULL; +=09=09=09domain_get_tmem_stats(handle,domain); =20 =09=09=09domain++; =09=09=09node->num_domains++; =09=09} =09} while (new_domains =3D=3D DOMAIN_CHUNK_SIZE); + =20 =09/* Run all the extra data collectors requested */ =09node->flags =3D 0; @@ -674,6 +702,40 @@ unsigned long long xenstat_vbd_wr_sects( =09return vbd->wr_sects; } =20 +/* + * Tmem functions + */ + +xenstat_tmem *xenstat_domain_tmem(xenstat_domain * domain) +{ +=09return &domain->tmem_stats; +} + +/* Get the current number of ephemeral pages */ +unsigned long long xenstat_tmem_curr_eph_pages(xenstat_tmem *tmem) +{ +=09return tmem->curr_eph_pages; +} + +/* Get the number of successful ephemeral gets */ +unsigned long long xenstat_tmem_succ_eph_gets(xenstat_tmem *tmem) +{ +=09return tmem->succ_eph_gets; +} + +/* Get the number of successful persistent puts */ +unsigned long long xenstat_tmem_succ_pers_puts(xenstat_tmem *tmem) +{ +=09return tmem->succ_pers_puts; +} + +/* Get the number of successful persistent gets */ +unsigned long long xenstat_tmem_succ_pers_gets(xenstat_tmem *tmem) +{ +=09return tmem->succ_pers_gets; +} + + static char *xenstat_get_domain_name(xenstat_handle *handle, unsigned int = domain_id) { =09char path[80], *vmpath; diff -r 7f611de6b93c tools/xenstat/libxenstat/src/xenstat.h --- a/tools/xenstat/libxenstat/src/xenstat.h=09Tue Dec 08 14:14:27 2009 +00= 00 +++ b/tools/xenstat/libxenstat/src/xenstat.h=09Tue Dec 08 17:16:29 2009 -07= 00 @@ -27,6 +27,7 @@ typedef struct xenstat_vcpu xenstat_vcpu typedef struct xenstat_vcpu xenstat_vcpu; typedef struct xenstat_network xenstat_network; typedef struct xenstat_vbd xenstat_vbd; +typedef struct xenstat_tmem xenstat_tmem; =20 /* Initialize the xenstat library. Returns a handle to be used with * subsequent calls to the xenstat library, or NULL if an error occurs. */ @@ -132,6 +133,9 @@ xenstat_vbd *xenstat_domain_vbd(xenstat_ xenstat_vbd *xenstat_domain_vbd(xenstat_domain * domain, =09=09=09=09 unsigned int vbd); =20 +/* Get the tmem information for a given domain */ +xenstat_tmem *xenstat_domain_tmem(xenstat_domain * domain); + /* * VCPU functions - extract information from a xenstat_vcpu */ @@ -189,4 +193,12 @@ unsigned long long xenstat_vbd_rd_sects( unsigned long long xenstat_vbd_rd_sects(xenstat_vbd * vbd); unsigned long long xenstat_vbd_wr_sects(xenstat_vbd * vbd); =20 +/* + * Tmem functions - extract tmem information + */ +unsigned long long xenstat_tmem_curr_eph_pages(xenstat_tmem *tmem); +unsigned long long xenstat_tmem_succ_eph_gets(xenstat_tmem *tmem); +unsigned long long xenstat_tmem_succ_pers_puts(xenstat_tmem *tmem); +unsigned long long xenstat_tmem_succ_pers_gets(xenstat_tmem *tmem); + #endif /* XENSTAT_H */ diff -r 7f611de6b93c tools/xenstat/libxenstat/src/xenstat_priv.h --- a/tools/xenstat/libxenstat/src/xenstat_priv.h=09Tue Dec 08 14:14:27 200= 9 +0000 +++ b/tools/xenstat/libxenstat/src/xenstat_priv.h=09Tue Dec 08 17:16:29 200= 9 -0700 @@ -52,6 +52,13 @@ struct xenstat_node { =09long freeable_mb; }; =20 +struct xenstat_tmem { +=09unsigned long long curr_eph_pages; +=09unsigned long long succ_eph_gets; +=09unsigned long long succ_pers_puts; +=09unsigned long long succ_pers_gets; +}; + struct xenstat_domain { =09unsigned int id; =09char *name; @@ -66,6 +73,7 @@ struct xenstat_domain { =09xenstat_network *networks;=09/* Array of length num_networks */ =09unsigned int num_vbds; =09xenstat_vbd *vbds; +=09xenstat_tmem tmem_stats; }; =20 struct xenstat_vcpu { diff -r 7f611de6b93c tools/xenstat/xentop/xentop.c --- a/tools/xenstat/xentop/xentop.c=09Tue Dec 08 14:14:27 2009 +0000 +++ b/tools/xenstat/xentop/xentop.c=09Tue Dec 08 17:16:29 2009 -0700 @@ -202,6 +202,7 @@ int show_vcpus =3D 0; int show_vcpus =3D 0; int show_networks =3D 0; int show_vbds =3D 0; +int show_tmem =3D 0; int repeat_header =3D 0; int show_full_name =3D 0; #define PROMPT_VAL_LEN 80 @@ -353,6 +354,9 @@ static int handle_key(int ch) =09=09=09break; =09=09case 'b': case 'B': =09=09=09show_vbds ^=3D 1; +=09=09=09break; +=09=09case 't': case 'T': +=09=09=09show_tmem ^=3D 1; =09=09=09break; =09=09case 'r': case 'R': =09=09=09repeat_header ^=3D 1; @@ -889,6 +893,11 @@ void do_bottom_line(void) =09=09attr_addstr(show_vbds ? COLOR_PAIR(1) : 0, "ds"); =09=09addstr(" "); =20 +=09=09/* tmem */ +=09=09addch(A_REVERSE | 'T'); +=09=09attr_addstr(show_tmem ? COLOR_PAIR(1) : 0, "mem"); +=09=09addstr(" "); + =20 =09=09/* vcpus */ =09=09addch(A_REVERSE | 'V'); @@ -1018,6 +1027,23 @@ void do_vbd(xenstat_domain *domain) =09} } =20 +/* Output all tmem information */ +void do_tmem(xenstat_domain *domain) +{ +=09xenstat_tmem *tmem =3D xenstat_domain_tmem(domain); +=09unsigned long long curr_eph_pages =3D xenstat_tmem_curr_eph_pages(tmem)= ; +=09unsigned long long succ_eph_gets =3D xenstat_tmem_succ_eph_gets(tmem); +=09unsigned long long succ_pers_puts =3D xenstat_tmem_succ_pers_puts(tmem)= ; +=09unsigned long long succ_pers_gets =3D xenstat_tmem_succ_pers_gets(tmem)= ; + +=09if (curr_eph_pages | succ_eph_gets | succ_pers_puts | succ_pers_gets) +=09=09print("Tmem: Curr eph pages: %8llu Succ eph gets: %8llu " +=09 "Succ pers puts: %8llu Succ pers gets: %8llu\n", +=09=09=09curr_eph_pages, succ_eph_gets, +=09=09=09succ_pers_puts, succ_pers_gets); + +} + static void top(void) { =09xenstat_domain **domains; @@ -1064,6 +1090,8 @@ static void top(void) =09=09=09do_network(domains[i]); =09=09if (show_vbds) =09=09=09do_vbd(domains[i]); +=09=09if (show_tmem) +=09=09=09do_tmem(domains[i]); =09} =20 =09if (!batch) @@ -1139,6 +1167,9 @@ int main(int argc, char **argv) =09=09case 'f': =09=09=09show_full_name =3D 1; =09=09=09break; +=09=09case 't': +=09=09=09show_tmem =3D 1; +=09=09=09break; =09=09} =09} --__126032026021716222abhmt014.oracle.com Content-Type: application/octet-stream; name="tmem-xentop2.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="tmem-xentop2.patch" ZGlmZiAtciA3ZjYxMWRlNmI5M2MgdG9vbHMveGVuc3RhdC9saWJ4ZW5zdGF0L3NyYy94ZW5zdGF0 LmMKLS0tIGEvdG9vbHMveGVuc3RhdC9saWJ4ZW5zdGF0L3NyYy94ZW5zdGF0LmMJVHVlIERlYyAw OCAxNDoxNDoyNyAyMDA5ICswMDAwCisrKyBiL3Rvb2xzL3hlbnN0YXQvbGlieGVuc3RhdC9zcmMv eGVuc3RhdC5jCVR1ZSBEZWMgMDggMTc6MTY6MjkgMjAwOSAtMDcwMApAQCAtMTMxLDYgKzEzMSwz MiBAQCB2b2lkIHhlbnN0YXRfdW5pbml0KHhlbnN0YXRfaGFuZGxlICogaGFuCiAJfQogfQogCitz dGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcgbG9uZyBwYXJzZShjaGFyICpzLCBjaGFyICptYXRj aCkKK3sKKwljaGFyICpzMSA9IHN0cnN0cihzLG1hdGNoKTsKKwl1bnNpZ25lZCBsb25nIGxvbmcg cmV0OworCisJaWYgKCBzMSA9PSBOVUxMICkKKwkJcmV0dXJuIDBMTDsKKwlzMSArPSAyOworCWlm ICggKnMxKysgIT0gJzonICkKKwkJcmV0dXJuIDBMTDsKKwlzc2NhbmYoczEsIiVsbHUiLCZyZXQp OworCXJldHVybiByZXQ7Cit9CisKK3ZvaWQgZG9tYWluX2dldF90bWVtX3N0YXRzKHhlbnN0YXRf aGFuZGxlICogaGFuZGxlLCB4ZW5zdGF0X2RvbWFpbiAqIGRvbWFpbikKK3sKKwljaGFyIGJ1ZmZl cls0MDk2XTsKKworCXhjX3RtZW1fY29udHJvbChoYW5kbGUtPnhjX2hhbmRsZSwtMSxUTUVNQ19M SVNULGRvbWFpbi0+aWQsCisgICAgICAgICAgICAgICAgICAgICAgICBzaXplb2YoYnVmZmVyKSwt MSwtMSxidWZmZXIpOworCWRvbWFpbi0+dG1lbV9zdGF0cy5jdXJyX2VwaF9wYWdlcyA9IHBhcnNl KGJ1ZmZlciwiRWMiKTsKKwlkb21haW4tPnRtZW1fc3RhdHMuc3VjY19lcGhfZ2V0cyA9IHBhcnNl KGJ1ZmZlciwiR2UiKTsKKwlkb21haW4tPnRtZW1fc3RhdHMuc3VjY19wZXJzX3B1dHMgPSBwYXJz ZShidWZmZXIsIlBwIik7CisJZG9tYWluLT50bWVtX3N0YXRzLnN1Y2NfcGVyc19nZXRzID0gcGFy c2UoYnVmZmVyLCJHcCIpOworfQorCiB4ZW5zdGF0X25vZGUgKnhlbnN0YXRfZ2V0X25vZGUoeGVu c3RhdF9oYW5kbGUgKiBoYW5kbGUsIHVuc2lnbmVkIGludCBmbGFncykKIHsKICNkZWZpbmUgRE9N QUlOX0NIVU5LX1NJWkUgMjU2CkBAIC0yMzIsMTEgKzI1OCwxMyBAQCB4ZW5zdGF0X25vZGUgKnhl bnN0YXRfZ2V0X25vZGUoeGVuc3RhdF9oCiAJCQlkb21haW4tPm5ldHdvcmtzID0gTlVMTDsKIAkJ CWRvbWFpbi0+bnVtX3ZiZHMgPSAwOwogCQkJZG9tYWluLT52YmRzID0gTlVMTDsKKwkJCWRvbWFp bl9nZXRfdG1lbV9zdGF0cyhoYW5kbGUsZG9tYWluKTsKIAogCQkJZG9tYWluKys7CiAJCQlub2Rl LT5udW1fZG9tYWlucysrOwogCQl9CiAJfSB3aGlsZSAobmV3X2RvbWFpbnMgPT0gRE9NQUlOX0NI VU5LX1NJWkUpOworCiAKIAkvKiBSdW4gYWxsIHRoZSBleHRyYSBkYXRhIGNvbGxlY3RvcnMgcmVx dWVzdGVkICovCiAJbm9kZS0+ZmxhZ3MgPSAwOwpAQCAtNjc0LDYgKzcwMiw0MCBAQCB1bnNpZ25l ZCBsb25nIGxvbmcgeGVuc3RhdF92YmRfd3Jfc2VjdHMoCiAJcmV0dXJuIHZiZC0+d3Jfc2VjdHM7 CiB9CiAKKy8qCisgKiBUbWVtIGZ1bmN0aW9ucworICovCisKK3hlbnN0YXRfdG1lbSAqeGVuc3Rh dF9kb21haW5fdG1lbSh4ZW5zdGF0X2RvbWFpbiAqIGRvbWFpbikKK3sKKwlyZXR1cm4gJmRvbWFp bi0+dG1lbV9zdGF0czsKK30KKworLyogR2V0IHRoZSBjdXJyZW50IG51bWJlciBvZiBlcGhlbWVy YWwgcGFnZXMgKi8KK3Vuc2lnbmVkIGxvbmcgbG9uZyB4ZW5zdGF0X3RtZW1fY3Vycl9lcGhfcGFn ZXMoeGVuc3RhdF90bWVtICp0bWVtKQoreworCXJldHVybiB0bWVtLT5jdXJyX2VwaF9wYWdlczsK K30KKworLyogR2V0IHRoZSBudW1iZXIgb2Ygc3VjY2Vzc2Z1bCBlcGhlbWVyYWwgZ2V0cyAqLwor dW5zaWduZWQgbG9uZyBsb25nIHhlbnN0YXRfdG1lbV9zdWNjX2VwaF9nZXRzKHhlbnN0YXRfdG1l bSAqdG1lbSkKK3sKKwlyZXR1cm4gdG1lbS0+c3VjY19lcGhfZ2V0czsKK30KKworLyogR2V0IHRo ZSBudW1iZXIgb2Ygc3VjY2Vzc2Z1bCBwZXJzaXN0ZW50IHB1dHMgKi8KK3Vuc2lnbmVkIGxvbmcg bG9uZyB4ZW5zdGF0X3RtZW1fc3VjY19wZXJzX3B1dHMoeGVuc3RhdF90bWVtICp0bWVtKQorewor CXJldHVybiB0bWVtLT5zdWNjX3BlcnNfcHV0czsKK30KKworLyogR2V0IHRoZSBudW1iZXIgb2Yg c3VjY2Vzc2Z1bCBwZXJzaXN0ZW50IGdldHMgKi8KK3Vuc2lnbmVkIGxvbmcgbG9uZyB4ZW5zdGF0 X3RtZW1fc3VjY19wZXJzX2dldHMoeGVuc3RhdF90bWVtICp0bWVtKQoreworCXJldHVybiB0bWVt LT5zdWNjX3BlcnNfZ2V0czsKK30KKworCiBzdGF0aWMgY2hhciAqeGVuc3RhdF9nZXRfZG9tYWlu X25hbWUoeGVuc3RhdF9oYW5kbGUgKmhhbmRsZSwgdW5zaWduZWQgaW50IGRvbWFpbl9pZCkKIHsK IAljaGFyIHBhdGhbODBdLCAqdm1wYXRoOwpkaWZmIC1yIDdmNjExZGU2YjkzYyB0b29scy94ZW5z dGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXQuaAotLS0gYS90b29scy94ZW5zdGF0L2xpYnhlbnN0 YXQvc3JjL3hlbnN0YXQuaAlUdWUgRGVjIDA4IDE0OjE0OjI3IDIwMDkgKzAwMDAKKysrIGIvdG9v bHMveGVuc3RhdC9saWJ4ZW5zdGF0L3NyYy94ZW5zdGF0LmgJVHVlIERlYyAwOCAxNzoxNjoyOSAy MDA5IC0wNzAwCkBAIC0yNyw2ICsyNyw3IEBAIHR5cGVkZWYgc3RydWN0IHhlbnN0YXRfdmNwdSB4 ZW5zdGF0X3ZjcHUKIHR5cGVkZWYgc3RydWN0IHhlbnN0YXRfdmNwdSB4ZW5zdGF0X3ZjcHU7CiB0 eXBlZGVmIHN0cnVjdCB4ZW5zdGF0X25ldHdvcmsgeGVuc3RhdF9uZXR3b3JrOwogdHlwZWRlZiBz dHJ1Y3QgeGVuc3RhdF92YmQgeGVuc3RhdF92YmQ7Cit0eXBlZGVmIHN0cnVjdCB4ZW5zdGF0X3Rt ZW0geGVuc3RhdF90bWVtOwogCiAvKiBJbml0aWFsaXplIHRoZSB4ZW5zdGF0IGxpYnJhcnkuICBS ZXR1cm5zIGEgaGFuZGxlIHRvIGJlIHVzZWQgd2l0aAogICogc3Vic2VxdWVudCBjYWxscyB0byB0 aGUgeGVuc3RhdCBsaWJyYXJ5LCBvciBOVUxMIGlmIGFuIGVycm9yIG9jY3Vycy4gKi8KQEAgLTEz Miw2ICsxMzMsOSBAQCB4ZW5zdGF0X3ZiZCAqeGVuc3RhdF9kb21haW5fdmJkKHhlbnN0YXRfCiB4 ZW5zdGF0X3ZiZCAqeGVuc3RhdF9kb21haW5fdmJkKHhlbnN0YXRfZG9tYWluICogZG9tYWluLAog CQkJCSAgICB1bnNpZ25lZCBpbnQgdmJkKTsKIAorLyogR2V0IHRoZSB0bWVtIGluZm9ybWF0aW9u IGZvciBhIGdpdmVuIGRvbWFpbiAqLworeGVuc3RhdF90bWVtICp4ZW5zdGF0X2RvbWFpbl90bWVt KHhlbnN0YXRfZG9tYWluICogZG9tYWluKTsKKwogLyoKICAqIFZDUFUgZnVuY3Rpb25zIC0gZXh0 cmFjdCBpbmZvcm1hdGlvbiBmcm9tIGEgeGVuc3RhdF92Y3B1CiAgKi8KQEAgLTE4OSw0ICsxOTMs MTIgQEAgdW5zaWduZWQgbG9uZyBsb25nIHhlbnN0YXRfdmJkX3JkX3NlY3RzKAogdW5zaWduZWQg bG9uZyBsb25nIHhlbnN0YXRfdmJkX3JkX3NlY3RzKHhlbnN0YXRfdmJkICogdmJkKTsKIHVuc2ln bmVkIGxvbmcgbG9uZyB4ZW5zdGF0X3ZiZF93cl9zZWN0cyh4ZW5zdGF0X3ZiZCAqIHZiZCk7CiAK Ky8qCisgKiBUbWVtIGZ1bmN0aW9ucyAtIGV4dHJhY3QgdG1lbSBpbmZvcm1hdGlvbgorICovCit1 bnNpZ25lZCBsb25nIGxvbmcgeGVuc3RhdF90bWVtX2N1cnJfZXBoX3BhZ2VzKHhlbnN0YXRfdG1l bSAqdG1lbSk7Cit1bnNpZ25lZCBsb25nIGxvbmcgeGVuc3RhdF90bWVtX3N1Y2NfZXBoX2dldHMo eGVuc3RhdF90bWVtICp0bWVtKTsKK3Vuc2lnbmVkIGxvbmcgbG9uZyB4ZW5zdGF0X3RtZW1fc3Vj Y19wZXJzX3B1dHMoeGVuc3RhdF90bWVtICp0bWVtKTsKK3Vuc2lnbmVkIGxvbmcgbG9uZyB4ZW5z dGF0X3RtZW1fc3VjY19wZXJzX2dldHMoeGVuc3RhdF90bWVtICp0bWVtKTsKKwogI2VuZGlmIC8q IFhFTlNUQVRfSCAqLwpkaWZmIC1yIDdmNjExZGU2YjkzYyB0b29scy94ZW5zdGF0L2xpYnhlbnN0 YXQvc3JjL3hlbnN0YXRfcHJpdi5oCi0tLSBhL3Rvb2xzL3hlbnN0YXQvbGlieGVuc3RhdC9zcmMv eGVuc3RhdF9wcml2LmgJVHVlIERlYyAwOCAxNDoxNDoyNyAyMDA5ICswMDAwCisrKyBiL3Rvb2xz L3hlbnN0YXQvbGlieGVuc3RhdC9zcmMveGVuc3RhdF9wcml2LmgJVHVlIERlYyAwOCAxNzoxNjoy OSAyMDA5IC0wNzAwCkBAIC01Miw2ICs1MiwxMyBAQCBzdHJ1Y3QgeGVuc3RhdF9ub2RlIHsKIAls b25nIGZyZWVhYmxlX21iOwogfTsKIAorc3RydWN0IHhlbnN0YXRfdG1lbSB7CisJdW5zaWduZWQg bG9uZyBsb25nIGN1cnJfZXBoX3BhZ2VzOworCXVuc2lnbmVkIGxvbmcgbG9uZyBzdWNjX2VwaF9n ZXRzOworCXVuc2lnbmVkIGxvbmcgbG9uZyBzdWNjX3BlcnNfcHV0czsKKwl1bnNpZ25lZCBsb25n IGxvbmcgc3VjY19wZXJzX2dldHM7Cit9OworCiBzdHJ1Y3QgeGVuc3RhdF9kb21haW4gewogCXVu c2lnbmVkIGludCBpZDsKIAljaGFyICpuYW1lOwpAQCAtNjYsNiArNzMsNyBAQCBzdHJ1Y3QgeGVu c3RhdF9kb21haW4gewogCXhlbnN0YXRfbmV0d29yayAqbmV0d29ya3M7CS8qIEFycmF5IG9mIGxl bmd0aCBudW1fbmV0d29ya3MgKi8KIAl1bnNpZ25lZCBpbnQgbnVtX3ZiZHM7CiAJeGVuc3RhdF92 YmQgKnZiZHM7CisJeGVuc3RhdF90bWVtIHRtZW1fc3RhdHM7CiB9OwogCiBzdHJ1Y3QgeGVuc3Rh dF92Y3B1IHsKZGlmZiAtciA3ZjYxMWRlNmI5M2MgdG9vbHMveGVuc3RhdC94ZW50b3AveGVudG9w LmMKLS0tIGEvdG9vbHMveGVuc3RhdC94ZW50b3AveGVudG9wLmMJVHVlIERlYyAwOCAxNDoxNDoy NyAyMDA5ICswMDAwCisrKyBiL3Rvb2xzL3hlbnN0YXQveGVudG9wL3hlbnRvcC5jCVR1ZSBEZWMg MDggMTc6MTY6MjkgMjAwOSAtMDcwMApAQCAtMjAyLDYgKzIwMiw3IEBAIGludCBzaG93X3ZjcHVz ID0gMDsKIGludCBzaG93X3ZjcHVzID0gMDsKIGludCBzaG93X25ldHdvcmtzID0gMDsKIGludCBz aG93X3ZiZHMgPSAwOworaW50IHNob3dfdG1lbSA9IDA7CiBpbnQgcmVwZWF0X2hlYWRlciA9IDA7 CiBpbnQgc2hvd19mdWxsX25hbWUgPSAwOwogI2RlZmluZSBQUk9NUFRfVkFMX0xFTiA4MApAQCAt MzUzLDYgKzM1NCw5IEBAIHN0YXRpYyBpbnQgaGFuZGxlX2tleShpbnQgY2gpCiAJCQlicmVhazsK IAkJY2FzZSAnYic6IGNhc2UgJ0InOgogCQkJc2hvd192YmRzIF49IDE7CisJCQlicmVhazsKKwkJ Y2FzZSAndCc6IGNhc2UgJ1QnOgorCQkJc2hvd190bWVtIF49IDE7CiAJCQlicmVhazsKIAkJY2Fz ZSAncic6IGNhc2UgJ1InOgogCQkJcmVwZWF0X2hlYWRlciBePSAxOwpAQCAtODg5LDYgKzg5Mywx MSBAQCB2b2lkIGRvX2JvdHRvbV9saW5lKHZvaWQpCiAJCWF0dHJfYWRkc3RyKHNob3dfdmJkcyA/ IENPTE9SX1BBSVIoMSkgOiAwLCAiZHMiKTsKIAkJYWRkc3RyKCIgICIpOwogCisJCS8qIHRtZW0g Ki8KKwkJYWRkY2goQV9SRVZFUlNFIHwgJ1QnKTsKKwkJYXR0cl9hZGRzdHIoc2hvd190bWVtID8g Q09MT1JfUEFJUigxKSA6IDAsICJtZW0iKTsKKwkJYWRkc3RyKCIgICIpOworCiAKIAkJLyogdmNw dXMgKi8KIAkJYWRkY2goQV9SRVZFUlNFIHwgJ1YnKTsKQEAgLTEwMTgsNiArMTAyNywyMyBAQCB2 b2lkIGRvX3ZiZCh4ZW5zdGF0X2RvbWFpbiAqZG9tYWluKQogCX0KIH0KIAorLyogT3V0cHV0IGFs bCB0bWVtIGluZm9ybWF0aW9uICovCit2b2lkIGRvX3RtZW0oeGVuc3RhdF9kb21haW4gKmRvbWFp bikKK3sKKwl4ZW5zdGF0X3RtZW0gKnRtZW0gPSB4ZW5zdGF0X2RvbWFpbl90bWVtKGRvbWFpbik7 CisJdW5zaWduZWQgbG9uZyBsb25nIGN1cnJfZXBoX3BhZ2VzID0geGVuc3RhdF90bWVtX2N1cnJf ZXBoX3BhZ2VzKHRtZW0pOworCXVuc2lnbmVkIGxvbmcgbG9uZyBzdWNjX2VwaF9nZXRzID0geGVu c3RhdF90bWVtX3N1Y2NfZXBoX2dldHModG1lbSk7CisJdW5zaWduZWQgbG9uZyBsb25nIHN1Y2Nf cGVyc19wdXRzID0geGVuc3RhdF90bWVtX3N1Y2NfcGVyc19wdXRzKHRtZW0pOworCXVuc2lnbmVk IGxvbmcgbG9uZyBzdWNjX3BlcnNfZ2V0cyA9IHhlbnN0YXRfdG1lbV9zdWNjX3BlcnNfZ2V0cyh0 bWVtKTsKKworCWlmIChjdXJyX2VwaF9wYWdlcyB8IHN1Y2NfZXBoX2dldHMgfCBzdWNjX3BlcnNf cHV0cyB8IHN1Y2NfcGVyc19nZXRzKQorCQlwcmludCgiVG1lbTogIEN1cnIgZXBoIHBhZ2VzOiAl OGxsdSAgIFN1Y2MgZXBoIGdldHM6ICU4bGx1ICAgIgorCSAgICAgICAgICAgICAgIlN1Y2MgcGVy cyBwdXRzOiAlOGxsdSAgIFN1Y2MgcGVycyBnZXRzOiAlOGxsdVxuIiwKKwkJCWN1cnJfZXBoX3Bh Z2VzLCBzdWNjX2VwaF9nZXRzLAorCQkJc3VjY19wZXJzX3B1dHMsIHN1Y2NfcGVyc19nZXRzKTsK KworfQorCiBzdGF0aWMgdm9pZCB0b3Aodm9pZCkKIHsKIAl4ZW5zdGF0X2RvbWFpbiAqKmRvbWFp bnM7CkBAIC0xMDY0LDYgKzEwOTAsOCBAQCBzdGF0aWMgdm9pZCB0b3Aodm9pZCkKIAkJCWRvX25l dHdvcmsoZG9tYWluc1tpXSk7CiAJCWlmIChzaG93X3ZiZHMpCiAJCQlkb192YmQoZG9tYWluc1tp XSk7CisJCWlmIChzaG93X3RtZW0pCisJCQlkb190bWVtKGRvbWFpbnNbaV0pOwogCX0KIAogCWlm ICghYmF0Y2gpCkBAIC0xMTM5LDYgKzExNjcsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAJCWNhc2UgJ2YnOgogCQkJc2hvd19mdWxsX25hbWUgPSAxOwogCQkJYnJlYWs7CisJ CWNhc2UgJ3QnOgorCQkJc2hvd190bWVtID0gMTsKKwkJCWJyZWFrOwogCQl9CiAJfQogCg== --__126032026021716222abhmt014.oracle.com 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 --__126032026021716222abhmt014.oracle.com--