From mboxrd@z Thu Jan 1 00:00:00 1970 From: aq Subject: [PATCH] xen bootloader Date: Wed, 27 Apr 2005 18:21:22 +0900 Message-ID: <9cde8bff0504270221eded71f@mail.gmail.com> Reply-To: aq Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_1357_8413726.1114593682161" 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: Jeremy Katz Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org ------=_Part_1357_8413726.1114593682161 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline hello Jeremy, Here is a patch to fix few problems in Xen bootloader you sent to the list yesterday. list of changes: - make a dummy tools/pygrub/src/__init__.py - extend filesystem abstraction by adding file_exist() method. this method is used to check for existent of a file given its name. now ext2fs implements this method. - pygrub opens and parses /boot/grub/menu.lst or /boot/grub/grub.conf, in that order. - add /usr/lib/python to system path (see pygrub). without this change, pygrub cannot find grub python package. - remove few blank lines $ diffstat xen-grub.patch __init__.py | 1 fsys/__init__.py | 5 +++- fsys/ext2/ext2module.c | 51 ++++++++++++++++++++++++++++++++++++++++----= ----- pygrub | 12 +++++++++-- 4 files changed, 57 insertions(+), 12 deletions(-) Signed-off-by: Nguyen Anh Quynh I wonder why the patch you sent to list is in CR/LF format? arent you programming on Windows, are you ;-). could you please remove them next time ? regards, aq ------=_Part_1357_8413726.1114593682161 Content-Type: application/octet-stream; name="xen-grub.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xen-grub.patch" ZGlmZiAtTnVycCB1bnN0YWJsZS4yNy4zLm9yZy90b29scy9weWdydWIvc3JjL2ZzeXMvZXh0Mi9l eHQybW9kdWxlLmMgdW5zdGFibGUuMjcuMy90b29scy9weWdydWIvc3JjL2ZzeXMvZXh0Mi9leHQy bW9kdWxlLmMKLS0tIHVuc3RhYmxlLjI3LjMub3JnL3Rvb2xzL3B5Z3J1Yi9zcmMvZnN5cy9leHQy L2V4dDJtb2R1bGUuYwkyMDA1LTA0LTI3IDE2OjI3OjMzLjAwMDAwMDAwMCArMDkwMAorKysgdW5z dGFibGUuMjcuMy90b29scy9weWdydWIvc3JjL2ZzeXMvZXh0Mi9leHQybW9kdWxlLmMJMjAwNS0w NC0yNyAxODowMToyNi4wNzcwMjgwMDAgKzA5MDAKQEAgLTE3NCw2ICsxNzQsMjUgQEAgZXh0Ml9m aWxlX29wZW4gKEV4dDJGcyAqZnMsIGNoYXIgKiBuYW1lLAogICAgIHJldHVybiAoUHlPYmplY3Qg KikgZmlsZTsNCiB9DQogDQorc3RhdGljIFB5T2JqZWN0ICoNCitleHQyX2ZpbGVfZXhpc3QgKEV4 dDJGcyAqZnMsIGNoYXIgKiBuYW1lKQ0KK3sNCisgICAgaW50IGVycjsNCisgICAgZXh0Ml9pbm9f dCBpbm87DQorICAgIEV4dDJGaWxlICogZmlsZTsNCisNCisgICAgZmlsZSA9IChFeHQyRmlsZSAq KSBQeU9iamVjdF9ORVcoRXh0MkZpbGUsICZFeHQyRmlsZVR5cGUpOw0KKyAgICBmaWxlLT5maWxl ID0gTlVMTDsNCisNCisgICAgZXJyID0gZXh0MmZzX25hbWVpX2ZvbGxvdyhmcy0+ZnMsIEVYVDJf Uk9PVF9JTk8sIEVYVDJfUk9PVF9JTk8sIG5hbWUsICZpbm8pOw0KKyAgICBpZiAoZXJyKSB7DQor ICAgICAgICBQeV9JTkNSRUYoUHlfRmFsc2UpOw0KKyAgICAgICAgcmV0dXJuIFB5X0ZhbHNlOw0K KyAgICB9DQorICAgIFB5X0lOQ1JFRihQeV9UcnVlKTsNCisgICAgcmV0dXJuIFB5X1RydWU7DQor fQ0KKw0KIC8qIGV4dDJmcyBvYmplY3QgKi8NCiANCiBzdGF0aWMgUHlPYmplY3QgKg0KQEAgLTIz MSw2ICsyNTAsMTggQEAgZXh0Ml9mc19vcGVuX2ZpbGUgKEV4dDJGcyAqZnMsIFB5T2JqZWN0IAog ICAgIHJldHVybiBleHQyX2ZpbGVfb3BlbihmcywgbmFtZSwgZmxhZ3MpOw0KIH0NCiANCitzdGF0 aWMgUHlPYmplY3QgKg0KK2V4dDJfZnNfZmlsZV9leGlzdCAoRXh0MkZzICpmcywgUHlPYmplY3Qg KmFyZ3MsIFB5T2JqZWN0ICprd2FyZ3MpDQorew0KKyAgICBzdGF0aWMgY2hhciAqa3dsaXN0W10g PSB7ICJuYW1lIiwgTlVMTCB9Ow0KKyAgICBjaGFyICogbmFtZTsNCisNCisgICAgaWYgKCFQeUFy Z19QYXJzZVR1cGxlQW5kS2V5d29yZHMoYXJncywga3dhcmdzLCAicyIsIGt3bGlzdCwgJm5hbWUp KQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsNCisN CisgICAgcmV0dXJuIGV4dDJfZmlsZV9leGlzdChmcywgbmFtZSk7DQorfQ0KKw0KIHN0YXRpYyB2 b2lkDQogZXh0Ml9mc19kZWFsbG9jIChFeHQyRnMgKiBmcykNCiB7DQpAQCAtMjQ5LDYgKzI4MCw5 IEBAIHN0YXRpYyBzdHJ1Y3QgUHlNZXRob2REZWYgRXh0MkZzTWV0aG9kc1sKICAgICAgICAgeyAi b3Blbl9maWxlIiwNCiAgICAgICAgICAgKFB5Q0Z1bmN0aW9uKSBleHQyX2ZzX29wZW5fZmlsZSwN CiAgICAgICAgICAgTUVUSF9WQVJBUkdTfE1FVEhfS0VZV09SRFMsIE5VTEwgfSwNCisgICAgICAg IHsgImZpbGVfZXhpc3QiLA0KKyAgICAgICAgICAoUHlDRnVuY3Rpb24pIGV4dDJfZnNfZmlsZV9l eGlzdCwNCisgICAgICAgICAgTUVUSF9WQVJBUkdTfE1FVEhfS0VZV09SRFMsIE5VTEwgfSwNCiAJ eyBOVUxMLCBOVUxMLCAwLCBOVUxMIH0JDQogfTsNCiANCkBAIC0zMTIsMjEgKzM0NiwyMCBAQCBl eHQyX2ZzX25ldyhQeU9iamVjdCAqbywgUHlPYmplY3QgKmFyZ3MsCiAgICAgcmV0dXJuIChQeU9i amVjdCAqKXBmczsNCiB9DQogDQotDQogc3RhdGljIHN0cnVjdCBQeU1ldGhvZERlZiBFeHQyTW9k dWxlTWV0aG9kc1tdID0gew0KICAgICB7ICJFeHQyRnMiLCAoUHlDRnVuY3Rpb24pIGV4dDJfZnNf bmV3LCBNRVRIX1ZBUkFSR1N8TUVUSF9LRVlXT1JEUywgTlVMTCB9LA0KICAgICB7IE5VTEwsIE5V TEwsIDAsIE5VTEwgfQ0KIH07DQogDQotDQogdm9pZCBpbml0X3B5ZXh0Mih2b2lkKSB7DQotICAg IFB5T2JqZWN0ICptLCAqZDsNCisgICAgUHlPYmplY3QgKm07DQogDQogICAgIG0gPSBQeV9Jbml0 TW9kdWxlKCJfcHlleHQyIiwgRXh0Mk1vZHVsZU1ldGhvZHMpOw0KLSAgICBkID0gUHlNb2R1bGVf R2V0RGljdChtKTsNCi0NCi0gICAgLyogICAgbyA9IFB5T2JqZWN0X05FVyhQeU9iamVjdCwgeUV4 dDJGc0NvbnN0cnVjdG9yVHlwZSk7DQotICAgIFB5RGljdF9TZXRJdGVtU3RyaW5nKGQsICJQeUV4 dDJGcyIsIG8pOw0KLSAgICBQeV9ERUNSRUYobyk7Ki8NCi0gICAgICAgICAgICAgICAgICAgICAg DQorICAgIC8qDQorICAgICAqIFB5T2JqZWN0ICpkOw0KKyAgICAgKiBkID0gUHlNb2R1bGVfR2V0 RGljdChtKTsNCisgICAgICogbyA9IFB5T2JqZWN0X05FVyhQeU9iamVjdCwgeUV4dDJGc0NvbnN0 cnVjdG9yVHlwZSk7DQorICAgICAqIFB5RGljdF9TZXRJdGVtU3RyaW5nKGQsICJQeUV4dDJGcyIs IG8pOw0KKyAgICAgKiBQeV9ERUNSRUYobyk7DQorICAgICAqLw0KIH0NCmRpZmYgLU51cnAgdW5z dGFibGUuMjcuMy5vcmcvdG9vbHMvcHlncnViL3NyYy9mc3lzL19faW5pdF9fLnB5IHVuc3RhYmxl LjI3LjMvdG9vbHMvcHlncnViL3NyYy9mc3lzL19faW5pdF9fLnB5Ci0tLSB1bnN0YWJsZS4yNy4z Lm9yZy90b29scy9weWdydWIvc3JjL2ZzeXMvX19pbml0X18ucHkJMjAwNS0wNC0yNyAxNjoyNzoz My4wMDAwMDAwMDAgKzA5MDAKKysrIHVuc3RhYmxlLjI3LjMvdG9vbHMvcHlncnViL3NyYy9mc3lz L19faW5pdF9fLnB5CTIwMDUtMDQtMjcgMTU6MjA6MzcuMDAwMDAwMDAwICswOTAwCkBAIC00OSw3 ICs0OSwxMCBAQCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6DQogICAgICAgICBzaG91bGQgbG9v ayBzaW1pbGFyIHRvIGEgbmF0aXZlIGZpbGUgb2JqZWN0LiIiIg0KICAgICAgICAgcmFpc2UgUnVu dGltZUVycm9yLCAib3Blbl9maWxlIG5vdCBpbXBsZW1lbnRlZCINCiAgICAgDQotDQorICAgIGRl ZiBmaWxlX2V4aXN0KHNlbGYsIGZpbGUpOg0KKyAgICAgICAgIiIiQ2hlY2sgdG8gc2VlIGlmIHRo ZSBnaXZlIGZpbGUgaXMgZXhpc3RlZC4NCisgICAgICAgIFJldHVybiB0cnVlIGlmIGZpbGUgZXhp c3RlZCwgcmV0dXJuIGZhbHNlIG90aGVyd2lzZS4iIiINCisgICAgICAgIHJhaXNlIFJ1bnRpbWVF cnJvciwgImZpbGVfZXhpc3Qgbm90IGltcGxlbWVudGVkIg0KIA0KIG15ZGlyID0gc3lzLm1vZHVs ZXNbJ2dydWIuZnN5cyddLl9fcGF0aF9fWzBdDQogZm9yIGYgaW4gb3MubGlzdGRpcihteWRpcik6 DQpkaWZmIC1OdXJwIHVuc3RhYmxlLjI3LjMub3JnL3Rvb2xzL3B5Z3J1Yi9zcmMvX19pbml0X18u cHkgdW5zdGFibGUuMjcuMy90b29scy9weWdydWIvc3JjL19faW5pdF9fLnB5Ci0tLSB1bnN0YWJs ZS4yNy4zLm9yZy90b29scy9weWdydWIvc3JjL19faW5pdF9fLnB5CTE5NzAtMDEtMDEgMDk6MDA6 MDAuMDAwMDAwMDAwICswOTAwCisrKyB1bnN0YWJsZS4yNy4zL3Rvb2xzL3B5Z3J1Yi9zcmMvX19p bml0X18ucHkJMjAwNS0wNC0yNyAxNDo0Njo1MC4wMDAwMDAwMDAgKzA5MDAKQEAgLTAsMCArMSBA QAorIApkaWZmIC1OdXJwIHVuc3RhYmxlLjI3LjMub3JnL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnVi IHVuc3RhYmxlLjI3LjMvdG9vbHMvcHlncnViL3NyYy9weWdydWIKLS0tIHVuc3RhYmxlLjI3LjMu b3JnL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCTIwMDUtMDQtMjcgMTc6NTM6MDUuMDAwMDAwMDAw ICswOTAwCisrKyB1bnN0YWJsZS4yNy4zL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCTIwMDUtMDQt MjcgMTc6NTc6NDQuMDAwMDAwMDAwICswOTAwCkBAIC0xOSw2ICsxOSw4IEBAIGltcG9ydCBsb2dn aW5nCiBpbXBvcnQgY3Vyc2VzLCBfY3Vyc2VzLCBjdXJzZXMud3JhcHBlcgogaW1wb3J0IGdldG9w dAogCitzeXMucGF0aCA9IFsgJy91c3IvbGliL3B5dGhvbicgXSArIHN5cy5wYXRoCisKIGltcG9y dCBncnViLkdydWJDb25mCiBpbXBvcnQgZ3J1Yi5mc3lzCiAKQEAgLTc4LDcgKzgwLDYgQEAgZGVm IGlzX2Rpc2tfaW1hZ2UoZmlsZSk6CiAgICAgaWYgbGVuKGJ1ZikgPj0gNTEyIGFuZCBzdHJ1Y3Qu dW5wYWNrKCJIIiwgYnVmWzB4MWZlOiAweDIwMF0pID09ICgweGFhZmYpOgogICAgICAgICByZXR1 cm4gVHJ1ZQogICAgIHJldHVybiBGYWxzZQotICAgIAogCiBkZWYgZ2V0X2NvbmZpZyhmbik6CiAg ICAgaWYgbm90IG9zLmFjY2Vzcyhmbiwgb3MuUl9PSyk6CkBAIC05Nyw3ICs5OCwxNCBAQCBkZWYg Z2V0X2NvbmZpZyhmbik6CiAgICAgICAgICAgICBicmVhawogCiAgICAgaWYgZnMgaXMgbm90IE5v bmU6Ci0gICAgICAgIGYgPSBmcy5vcGVuX2ZpbGUoIi9ib290L2dydWIvZ3J1Yi5jb25mIikKKyAg ICAgICAgaWYgZnMuZmlsZV9leGlzdCgiL2Jvb3QvZ3J1Yi9tZW51LmxzdCIpOgorICAgICAgICAg ICAgZ3J1YmZpbGUgPSAiL2Jvb3QvZ3J1Yi9tZW51LmxzdCIKKyAgICAgICAgZWxpZiBmcy5maWxl X2V4aXN0KCIvYm9vdC9ncnViL2dydWIuY29uZiIpOgorICAgICAgICAgICAgZ3J1YmZpbGUgPSAi L2Jvb3QvZ3J1Yi9ncnViLmNvbmYiCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByYWlzZSBS dW50aW1lRXJyb3IsICJ3ZSBjb3VsZG4ndCBmaW5kIC9ib290L2dydWJ7bWVudS5sc3QsZ3J1Yi5j b25mfSAiICsgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW4gdGhlIGltYWdl IHByb3ZpZGVkLiBoYWx0ISIKKyAgICAgICAgZiA9IGZzLm9wZW5fZmlsZShncnViZmlsZSkKICAg ICAgICAgYnVmID0gZi5yZWFkKCkKICAgICAgICAgZi5jbG9zZSgpCiAgICAgICAgIGZzLmNsb3Nl KCkK ------=_Part_1357_8413726.1114593682161 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_1357_8413726.1114593682161--