From: "Charles Coffing" Subject: [PATCH] clean up parsing of /proc/xen/balloon in xend Date: Thu, 09 Mar 2006 19:19:59 -0500 Message-ID: <441063AC.D169.003C.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartC5E09C3F.0__=" 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@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=__PartC5E09C3F.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline The attached patch cleans up the parsing of /proc/xen/balloon that occurs in xend. Currently, the parsing is hard-coded; it expects that the desired number is on the first line. My patch is more robust; it lets values be retrieved by a label. It also exposes a few functions to retrieve the current allocation and the target allocation. By abstracting this a little better, I'll be able to address a few other issues in subsequent patches. Mostly, this allows for better error checking and guidance for the user. For example, by exposing get_dom0_current_alloc(), we can (elsewhere, in a later patch) calculate how large of a VM could potentially be started. This is useful, as it lets simple VM-creation GUIs guide the user towards reasonable memory values for new VMs. Signed-off-by: Charles Coffing --=__PartC5E09C3F.0__= Content-Type: application/octet-stream; name="proc-xen-balloon.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="proc-xen-balloon.diff" SW5kZXg6IHhlbi11bnN0YWJsZS90b29scy9weXRob24veGVuL3hlbmQvYmFsbG9vbi5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSB4ZW4tdW5zdGFibGUub3JpZy90b29scy9weXRob24veGVuL3hlbmQvYmFsbG9v bi5weQorKysgeGVuLXVuc3RhYmxlL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9iYWxsb29uLnB5CkBA IC0yNyw3ICsyNyw4IEBAIGZyb20gWGVuZExvZ2dpbmcgaW1wb3J0IGxvZwogZnJvbSBYZW5kRXJy b3IgaW1wb3J0IFZtRXJyb3IKIAogCi1QUk9DX1hFTl9CQUxMT09OID0gIi9wcm9jL3hlbi9iYWxs b29uIgorUFJPQ19YRU5fQkFMTE9PTiA9ICcvcHJvYy94ZW4vYmFsbG9vbicKKwogQkFMTE9PTl9P VVRfU0xBQ0sgPSAxICMgTWlCLiAgV2UgbmVlZCB0aGlzIGJlY2F1c2UgdGhlIHBoeXNpbmZvIGRl dGFpbHMgYXJlCiAgICAgICAgICAgICAgICAgICAgICAgIyByb3VuZGVkLgogUkVUUllfTElNSVQg PSAxMApAQCAtMzksNiArNDAsNDcgQEAgUkVUUllfTElNSVQgPSAxMAogIyBzdWNoIHJlcXVpcmVt ZW50cy4KIFNMRUVQX1RJTUVfR1JPV1RIID0gMC4xCiAKKyMgQSBtYXBwaW5nIGJldHdlZW4gZWFz eS10by1yZW1lbWJlciBsYWJlbHMgYW5kIHRoZSBtb3JlIHZlcmJvc2UKKyMgbGFiZWwgYWN0dWFs bHkgc2hvd24gaW4gdGhlIFBST0NfWEVOX0JBTExPT04gZmlsZS4KK2xhYmVscyA9IHsgJ2N1cnJl bnQnICAgICAgOiAnQ3VycmVudCBhbGxvY2F0aW9uJywKKyAgICAgICAgICAgJ3RhcmdldCcgICAg ICAgOiAnUmVxdWVzdGVkIHRhcmdldCcsCisgICAgICAgICAgICdsb3ctYmFsbG9vbicgIDogJ0xv dy1tZW0gYmFsbG9vbicsCisgICAgICAgICAgICdoaWdoLWJhbGxvb24nIDogJ0hpZ2gtbWVtIGJh bGxvb24nLAorICAgICAgICAgICAnbGltaXQnICAgICAgICA6ICdYZW4gaGFyZCBsaW1pdCcgfQor CitkZWYgX2dldF9wcm9jX2JhbGxvb24obGFiZWwpOgorICAgICIiIlJldHVybnMgdGhlIHZhbHVl IGZvciB0aGUgbmFtZWQgbGFiZWwuICBSZXR1cm5zIE5vbmUgaWYgdGhlIGxhYmVsIHdhcworICAg ICAgIG5vdCBmb3VuZCBvciB0aGUgdmFsdWUgd2FzIG5vbi1udW1lcmljLiIiIgorCisgICAgZiA9 IGZpbGUoUFJPQ19YRU5fQkFMTE9PTiwgJ3InKQorICAgIHRyeToKKyAgICAgICAgZm9yIGxpbmUg aW4gZjoKKyAgICAgICAgICAgIGtleXZhbHVlID0gbGluZS5zcGxpdCgnOicpCisgICAgICAgICAg ICBpZiBrZXl2YWx1ZVswXSA9PSBsYWJlbDoKKyAgICAgICAgICAgICAgICB2YWx1ZXMgPSBrZXl2 YWx1ZVsxXS5zcGxpdCgpCisgICAgICAgICAgICAgICAgaWYgdmFsdWVzWzBdLmlzZGlnaXQoKToK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGludCh2YWx1ZXNbMF0pCisgICAgICAgICAgICAg ICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgcmV0dXJu IE5vbmUKKyAgICBmaW5hbGx5OgorICAgICAgICBmLmNsb3NlKCkKKworZGVmIGdldF9kb20wX2N1 cnJlbnRfYWxsb2MoKToKKyAgICAiIiJSZXR1cm5zIHRoZSBjdXJyZW50IG1lbW9yeSBhbGxvY2F0 aW9uIChpbiBNaUIpIG9mIGRvbTAuIiIiCisKKyAgICBrYiA9IF9nZXRfcHJvY19iYWxsb29uKGxh YmVsc1snY3VycmVudCddKQorICAgIGlmIGtiID09IE5vbmU6CisgICAgICAgIHJhaXNlIFZtRXJy b3IoJ0ZhaWxlZCB0byBxdWVyeSBjdXJyZW50IG1lbW9yeSBhbGxvY2F0aW9uIG9mIGRvbTAuJykK KyAgICByZXR1cm4ga2IgLyAxMDI0CisKK2RlZiBnZXRfZG9tMF90YXJnZXRfYWxsb2MoKToKKyAg ICAiIiJSZXR1cm5zIHRoZSB0YXJnZXQgbWVtb3J5IGFsbG9jYXRpb24gKGluIE1pQikgb2YgZG9t MC4iIiIKKworICAgIGtiID0gX2dldF9wcm9jX2JhbGxvb24obGFiZWxzWyd0YXJnZXQnXSkKKyAg ICBpZiBrYiA9PSBOb25lOgorICAgICAgICByYWlzZSBWbUVycm9yKCdGYWlsZWQgdG8gcXVlcnkg dGFyZ2V0IG1lbW9yeSBhbGxvY2F0aW9uIG9mIGRvbTAuJykKKyAgICByZXR1cm4ga2IgLyAxMDI0 CiAKIGRlZiBmcmVlKHJlcXVpcmVkKToKICAgICAiIiJCYWxsb29uIG91dCBtZW1vcnkgZnJvbSB0 aGUgcHJpdmlsZWdlZCBkb21haW4gc28gdGhhdCB0aGVyZSBpcyB0aGUKQEAgLTg4LDcgKzEzMCw3 IEBAIGRlZiBmcmVlKHJlcXVpcmVkKToKICAgICAgICAgICAgICAgICBsb2cuZGVidWcoIkJhbGxv b246IGZyZWUgJWQ7IG5lZWQgJWQuIiwgZnJlZV9tZW0sIG5lZWRfbWVtKQogCiAgICAgICAgICAg ICBpZiBkb20wX21pbl9tZW0gPiAwOgotICAgICAgICAgICAgICAgIGRvbTBfYWxsb2MgPSBfZ2V0 X2RvbTBfYWxsb2MoKQorICAgICAgICAgICAgICAgIGRvbTBfYWxsb2MgPSBnZXRfZG9tMF9jdXJy ZW50X2FsbG9jKCkKICAgICAgICAgICAgICAgICBuZXdfYWxsb2MgPSBkb20wX2FsbG9jIC0gKG5l ZWRfbWVtIC0gZnJlZV9tZW0pCiAKICAgICAgICAgICAgICAgICBpZiAobmV3X2FsbG9jID49IGRv bTBfbWluX21lbSBhbmQKQEAgLTEyMSwyMCArMTYzLDMgQEAgZGVmIGZyZWUocmVxdWlyZWQpOgog CiAgICAgZmluYWxseToKICAgICAgICAgZGVsIHhjCi0KLQotZGVmIF9nZXRfZG9tMF9hbGxvYygp OgotICAgICIiIlJldHVybiBjdXJyZW50IGFsbG9jYXRpb24gbWVtb3J5IG9mIGRvbTAgKGluIE1p QikuIFJldHVybiAwIG9uIGVycm9yIiIiCi0KLSAgICBmID0gZmlsZShQUk9DX1hFTl9CQUxMT09O LCAncicpCi0gICAgdHJ5OgotICAgICAgICBsaW5lID0gZi5yZWFkbGluZSgpCi0gICAgICAgIGZv ciB4IGluIGxpbmUuc3BsaXQoKToKLSAgICAgICAgICAgIGZvciBuIGluIHg6Ci0gICAgICAgICAg ICAgICAgaWYgbm90IG4uaXNkaWdpdCgpOgotICAgICAgICAgICAgICAgICAgICBicmVhawotICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICByZXR1cm4gaW50KHgpIC8gMTAyNAotICAg ICAgICByZXR1cm4gMAotICAgIGZpbmFsbHk6Ci0gICAgICAgIGYuY2xvc2UoKQogCg== --=__PartC5E09C3F.0__= 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 --=__PartC5E09C3F.0__=--