From mboxrd@z Thu Jan 1 00:00:00 1970 From: "B.G. Bruce" Subject: VNET - full update Date: Wed, 09 Feb 2005 17:49:58 -0400 Message-ID: <1107985798.9884.367.camel@master.vms.security> Reply-To: bgb@nt-nv.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-Omt7Hb1E6e8tV431oUyQ" Sender: xen-devel-admin@lists.sourceforge.net Errors-To: xen-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: xen-devel List-Id: xen-devel@lists.xenproject.org --=-Omt7Hb1E6e8tV431oUyQ Content-Type: text/plain Content-Transfer-Encoding: 7bit I would like to revoke my patch from earlier today for vnets and instead submit the attached patch in it's place as a full update that allows vnets to compile and run under 2.6.10/xen-testing. PATCH: vnet-cleanup.patch Signed off by: bgb@nt-nv.com --=-Omt7Hb1E6e8tV431oUyQ Content-Disposition: attachment; filename=vnet-cleanup.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=vnet-cleanup.patch; charset=ISO-8859-1 ZGlmZiAtcnVOIHhlbi0yLjAtdGVzdGluZy5iay90b29scy92bmV0L0lOU1RBTEwgeGVuL3Rvb2xz L3ZuZXQvSU5TVEFMTA0KLS0tIHhlbi0yLjAtdGVzdGluZy5iay90b29scy92bmV0L0lOU1RBTEwJ MTk2OS0xMi0zMSAyMDowMDowMC4wMDAwMDAwMDAgLTA0MDANCisrKyB4ZW4vdG9vbHMvdm5ldC9J TlNUQUxMCTIwMDUtMDItMDkgMTc6NDM6MzMuMDUwMjU1MDAwIC0wNDAwDQpAQCAtMCwwICsxLDMx IEBADQorVG8gY29tcGlsZSBhbmQgaW5zdGFsbCBydW4gIm1ha2UgaW5zdGFsbCI7IGlmIGl0IGZh aWxzIG9yIHlvdSBuZWVkIHRvIHJlaW5zdGFsbCANCitydW4gIm1ha2UgY2xlYW4iIGZpcnN0IG9y IHRoZSBidWlsZCB3aWxsIGZhaWwsIGF0IGxlYXN0IHRoYXQgaXMgd2hhdCBJIGhhdmUgDQorZm91 bmQgdW5kZXIgMi42LjEwLg0KKw0KK090aGVyIGltcG9ydGFudCBpdGVtczoNCisxKQlZb3Ugd2ls bCBuZWVkIHRvIGhhdmUgeW91ciB4ZW4wIGtlcm5lbCBjb21waWxlZCB3aXRoIEhNQUNfU1VQUE9S VCANCisJMi42LnggPSAoTUFJTiBNRU5VOiBDcnlwdG9ncmFwaGljIE9wdGlvbnMgLT4gSE1BQyBT dXBwb3J0KQ0KKwlCRUZPUkUgcnVubmluZyAibWFrZSBpbnN0YWxsIi4NCisNCisyKQlZb3Ugd2ls bCB3YW50IGF0IGxlYXN0IHNvbWUgb2YgdGhlIG90aGVyIGFsb2dvcml0aG1zIGxpc3RlZCB1bmRl cg0KKwkiQ3J5cHRvZ3JhcGhpYyBPcHRpb25zIiBmb3IgdGhlIGtlcm5lbCBjb21waWxlZCBhcyBt b2R1bGVzLg0KKw0KKzMpCVlvdSB3aWxsIHdhbnQgdGhlIG5ldHdvcmtpbmcgSVBzZWMvVkxBTiBv cHRpb25zIGNvbXBpbGVkIGluIGFzIG1vZHVsZXMNCisJMi42LnggPSAoTUFJTiBNRU5VOiBEZXZp Y2UgRHJpdmVycyAtPiBOZXR3b3JraW5nIFN1cHBvcnQgLT4gDQorCQkJCU5ldHdvcmtpbmcgT3B0 aW9ucyAtPg0KKwkJCQkJSVA6IEFIIHRyYW5zZm9ybWF0aW9uDQorCQkJCQlJUDogRVNQIHRyYW5z Zm9ybWF0aW9uDQorCQkJCQlJUDogSVBDb21wIHRyYW5zZm9ybWF0aW9uIA0KKwkJCQkJSVA6IHR1 bm5lbCB0cmFuc2Zvcm1hdGlvbg0KKw0KKwkJCQkJSVBzZWMgdXNlciBjb25maWd1cmF0aW9uIGlu dGVyZmFjZQ0KKwkNCisJCQkJCTgwMi4xUSBWTEFOIFN1cHBvcnQNCisNCis0KQlUaGUgbW9kdWxl ICh2bmV0X21vZHVsZSkgd2lsbCBub3QgcHJvcGVybHkgbG9hZCBmcm9tIHRoZSBjb21tYW5kIGxp bmUNCisJd2l0aCBhICJtb2Rwcm9iZSB2bmV0X21vZHVsZSIuICBVc2UgbmV0d29yay12bmV0IHRv IHByb3Blcmx5IGNvbmZpZ3VyZQ0KKwl5b3VyIHN5c3RlbSBhbmQgbG9hZCB0aGUgbW9kdWxlIGZv ciB5b3UuDQorDQorUGxlYXNlIHJlZmVyIHRvIHRoZSBhZGRpdGlvbmFsIGRvY3VtZW50YXRpb24g Zm91bmQgaW4gdG9vbHMvdm5ldC9kb2MgZm9yDQorcHJvcGVyIHN5bnRheCBhbmQgY29uZmlnIGZp bGUgcGFyYW1ldGVycy4NCisNCmRpZmYgLXJ1TiB4ZW4tMi4wLXRlc3RpbmcuYmsvdG9vbHMvdm5l dC9NYWtlZmlsZSB4ZW4vdG9vbHMvdm5ldC9NYWtlZmlsZQ0KLS0tIHhlbi0yLjAtdGVzdGluZy5i ay90b29scy92bmV0L01ha2VmaWxlCTIwMDUtMDEtMzEgMjA6Mzg6MzMuMDAwMDAwMDAwIC0wNDAw DQorKysgeGVuL3Rvb2xzL3ZuZXQvTWFrZWZpbGUJMjAwNS0wMi0wOSAxMzozOTozNC4wMDAwMDAw MDAgLTA0MDANCkBAIC0xMiw2ICsxMiw3IEBADQogYWxsOiBjb21waWxlDQogDQogY29tcGlsZTog dm5ldGQgdm5ldC1tb2R1bGUNCisjY29tcGlsZTogdm5ldC1tb2R1bGUNCiANCiBnYy50YXIuZ3o6 DQogCXdnZXQgaHR0cDovL3d3dy5ocGwuaHAuY29tL3BlcnNvbmFsL0hhbnNfQm9laG0vZ2MvZ2Nf c291cmNlLyRADQpAQCAtMjAsMTAgKzIxLDggQEANCiAJdGFyIHhmeiBnYy50YXIuZ3oNCiAJbG4g LXNmIGdjPy4/IGdjDQogDQotZ2MvTWFrZWZpbGU6DQotCShjZCBnYyAmJiAuL2NvbmZpZ3VyZSAt LXByZWZpeD1gcHdkYC9pbnN0YWxsKQ0KLQ0KLWdjLWluc3RhbGw6IGdjIGdjL01ha2VmaWxlDQor Z2MtaW5zdGFsbDogZ2MgDQorCShjZCBnYyAmJiBtYWtlIHRlc3QgJiYgLi9jb25maWd1cmUgLS1w cmVmaXg9YHB3ZGAvaW5zdGFsbCkNCiAJbWFrZSAtQyBnYw0KIAltYWtlIC1DIGdjIGluc3RhbGwN CiANCkBAIC00Nyw1ICs0Niw2IEBADQogY2xlYW46DQogCS0kKE1BS0UpIC1DIHZuZXRkIGNsZWFu DQogCS0kKE1BS0UpIC1DIHZuZXQtbW9kdWxlIGNsZWFuDQotDQorCS1ybSAtcmYgZ2M/Lj8gZ2MN CisJDQogcHJpc3RpbmU6IGNsZWFuIGdjLXByaXN0aW5lDQpkaWZmIC1ydU4geGVuLTIuMC10ZXN0 aW5nLmJrL3Rvb2xzL3ZuZXQvdm5ldC1tb2R1bGUvTWFrZWZpbGUtMi42IHhlbi90b29scy92bmV0 L3ZuZXQtbW9kdWxlL01ha2VmaWxlLTIuNg0KLS0tIHhlbi0yLjAtdGVzdGluZy5iay90b29scy92 bmV0L3ZuZXQtbW9kdWxlL01ha2VmaWxlLTIuNgkyMDA1LTAxLTMxIDIwOjM4OjMzLjAwMDAwMDAw MCAtMDQwMA0KKysrIHhlbi90b29scy92bmV0L3ZuZXQtbW9kdWxlL01ha2VmaWxlLTIuNgkyMDA1 LTAyLTA5IDE0OjU2OjU1LjAwMDAwMDAwMCAtMDQwMA0KQEAgLTM4LDggKzM4LDggQEANCiANCiAu UEhPTlk6IGluc3RhbGwgaW5zdGFsbC1tb2R1bGUgbW9kdWxlc19pbnN0YWxsDQogaW5zdGFsbCBp bnN0YWxsLW1vZHVsZSBtb2R1bGVzX2luc3RhbGw6IG1vZHVsZQ0KLQlpbnN0YWxsIC1tIDA3NTUg LWQgJChERVNURElSKSQoS0VSTkVMX01PRFVMRV9ESVIpDQotCWluc3RhbGwgLW0gMDU1NCAkKEtF Uk5FTF9NT0RVTEUpICQoREVTVERJUikkKEtFUk5FTF9NT0RVTEVfRElSKQ0KKwlpbnN0YWxsIC1t IDA3NTUgLWQgJChERVNURElSKSQoS0VSTkVMX01PRFVMRV9ESVIpL3hlbg0KKwlpbnN0YWxsIC1t IDA1NTQgJChLRVJORUxfTU9EVUxFKSAkKERFU1RESVIpJChLRVJORUxfTU9EVUxFX0RJUikveGVu DQogDQogLlBIT05ZOiBjbGVhbg0KIGNsZWFuOg0KZGlmZiAtcnVOIHhlbi0yLjAtdGVzdGluZy5i ay90b29scy92bmV0L3ZuZXQtbW9kdWxlL2lmX3ZhcnAuaCB4ZW4vdG9vbHMvdm5ldC92bmV0LW1v ZHVsZS9pZl92YXJwLmgNCi0tLSB4ZW4tMi4wLXRlc3RpbmcuYmsvdG9vbHMvdm5ldC92bmV0LW1v ZHVsZS9pZl92YXJwLmgJMjAwNS0wMS0zMSAyMDozODozMy4wMDAwMDAwMDAgLTA0MDANCisrKyB4 ZW4vdG9vbHMvdm5ldC92bmV0LW1vZHVsZS9pZl92YXJwLmgJMjAwNS0wMi0wOSAxNDowMzo0Ni4w MDAwMDAwMDAgLTA0MDANCkBAIC0zNiw3ICszNiw3IEBADQogfSBfX2F0dHJpYnV0ZV9fKChwYWNr ZWQpKSBWbmV0TXNnSGRyOw0KIA0KIHR5cGVkZWYgc3RydWN0IFZhcnBIZHIgew0KLSAgICBWbmV0 TXNnSGRyOw0KKyAgICBWbmV0TXNnSGRyIHZuZXRtc2doZHI7DQogICAgIHVpbnQzMl90IHZuZXQ7 DQogICAgIFZtYWMgdm1hYzsNCiAgICAgdWludDMyX3QgYWRkcjsNCkBAIC01MCw0ICs1MCw0IEBA DQogDQogDQogDQotI2VuZGlmIC8qICEgX1ZORVRfSUZfVkFSUF9IICovDQorI2VuZGlmICAvKiAh IF9WTkVUX0lGX1ZBUlBfSCAqLw0KZGlmZiAtcnVOIHhlbi0yLjAtdGVzdGluZy5iay90b29scy92 bmV0L3ZuZXQtbW9kdWxlL3ZhcnAuYyB4ZW4vdG9vbHMvdm5ldC92bmV0LW1vZHVsZS92YXJwLmMN Ci0tLSB4ZW4tMi4wLXRlc3RpbmcuYmsvdG9vbHMvdm5ldC92bmV0LW1vZHVsZS92YXJwLmMJMjAw NS0wMS0zMSAyMDozODozMy4wMDAwMDAwMDAgLTA0MDANCisrKyB4ZW4vdG9vbHMvdm5ldC92bmV0 LW1vZHVsZS92YXJwLmMJMjAwNS0wMi0wOSAxNDoyMjo0Ny4wMDAwMDAwMDAgLTA0MDANCkBAIC0z NjgsOCArMzY4LDggQEANCiAgICAgLy8gVmFycCBoZWFkZXIuDQogICAgIHZhcnBoID0gKHZvaWQq KXNrYl9wdXQoc2tib3V0LCB2YXJwX24pOw0KICAgICAqdmFycGggPSAoVmFycEhkcil7fTsNCi0g ICAgdmFycGgtPmlkICAgICAgICAgICAgICAgID0gaHRvbnMoVkFSUF9JRCk7DQotICAgIHZhcnBo LT5vcGNvZGUgICAgICAgICAgICA9IGh0b25zKG9wY29kZSk7DQorICAgIHZhcnBoLT52bmV0bXNn aGRyLmlkICAgICA9IGh0b25zKFZBUlBfSUQpOw0KKyAgICB2YXJwaC0+dm5ldG1zZ2hkci5vcGNv ZGUgPSBodG9ucyhvcGNvZGUpOw0KICAgICB2YXJwaC0+dm5ldCAgICAgICAgICAgICAgPSBodG9u bCh2bmV0KTsNCiAgICAgdmFycGgtPnZtYWMgICAgICAgICAgICAgID0gKnZtYWM7DQogICAgIHZh cnBoLT5hZGRyICAgICAgICAgICAgICA9IHNhZGRyOw0KQEAgLTEwNzYsOSArMTA3Niw5IEBADQog ICAgICAgICBnb3RvIGV4aXQ7DQogICAgIH0NCiAgICAgbWluZSA9IDE7DQotICAgIGlmKHZhcnBo LT5pZCAhPSBodG9ucyhWQVJQX0lEKSl7DQorICAgIGlmKHZhcnBoLT52bmV0bXNnaGRyLmlkICE9 IGh0b25zKFZBUlBfSUQpKXsNCiAgICAgICAgIC8vIEl0J3Mgbm90IHZhcnAgYXQgYWxsIC0gaWdu b3JlIGl0Lg0KLSAgICAgICAgd3ByaW50ZigiPiBVbmtub3duIGlkOiAlZCBcbiIsIG50b2hzKHZh cnBoLT5pZCkpOw0KKyAgICAgICAgd3ByaW50ZigiPiBVbmtub3duIGlkOiAlZCBcbiIsIG50b2hz KHZhcnBoLT52bmV0bXNnaGRyLmlkKSk7DQogICAgICAgICBnb3RvIGV4aXQ7DQogICAgIH0NCiAg ICAgaWYoMSl7DQpAQCAtMTA4NiwxMyArMTA4NiwxMyBAQA0KICAgICAgICAgICAgICAgICBOSVBR VUFEKHNrYi0+bmguaXBoLT5zYWRkciksIE5JUFFVQUQoc2tiLT5uaC5pcGgtPmRhZGRyKSk7DQog ICAgICAgICBkcHJpbnRmKCI+IHNwb3J0PSV1IGRwb3J0PSV1XG4iLCBudG9ocyhza2ItPmgudWgt PnNvdXJjZSksIG50b2hzKHNrYi0+aC51aC0+ZGVzdCkpOw0KICAgICAgICAgZHByaW50ZigiPiBv cGNvZGU9JWQgdm5ldD0ldSB2bWFjPSIgTUFDRk1UICIgYWRkcj0iIElQRk1UICJcbiIsDQotICAg ICAgICAgICAgICAgIG50b2hzKHZhcnBoLT5vcGNvZGUpLA0KKyAgICAgICAgICAgICAgICBudG9o cyh2YXJwaC0+dm5ldG1zZ2hkci5vcGNvZGUpLA0KICAgICAgICAgICAgICAgICBudG9obCh2YXJw aC0+dm5ldCksDQogICAgICAgICAgICAgICAgIE1BQzZUVVBMRSh2YXJwaC0+dm1hYy5tYWMpLA0K ICAgICAgICAgICAgICAgICBOSVBRVUFEKHZhcnBoLT5hZGRyKSk7DQogICAgICAgICB2YXJwX2Rw cmludCgpOw0KICAgICB9DQotICAgIHN3aXRjaChudG9ocyh2YXJwaC0+b3Bjb2RlKSl7DQorICAg IHN3aXRjaChudG9ocyh2YXJwaC0+dm5ldG1zZ2hkci5vcGNvZGUpKXsNCiAgICAgY2FzZSBWQVJQ X09QX1JFUVVFU1Q6DQogICAgICAgICBlcnIgPSB2YXJwX2hhbmRsZV9yZXF1ZXN0KHNrYiwgdmFy cGgpOw0KICAgICAgICAgYnJlYWs7DQpAQCAtMTEwMCw3ICsxMTAwLDcgQEANCiAgICAgICAgIGVy ciA9IHZhcnBfaGFuZGxlX2Fubm91bmNlKHNrYiwgdmFycGgpOw0KICAgICAgICAgYnJlYWs7DQog ICAgIGRlZmF1bHQ6DQotICAgICAgICB3cHJpbnRmKCI+IFVua25vd24gb3Bjb2RlOiAlZCBcbiIs IG50b2hzKHZhcnBoLT5vcGNvZGUpKTsNCisgICAgICAgIHdwcmludGYoIj4gVW5rbm93biBvcGNv ZGU6ICVkIFxuIiwgbnRvaHModmFycGgtPnZuZXRtc2doZHIub3Bjb2RlKSk7DQogICAgICAgIGJy ZWFrOw0KICAgICB9DQogICBleGl0Og0KZGlmZiAtcnVOIHhlbi0yLjAtdGVzdGluZy5iay90b29s cy92bmV0L3ZuZXRkL3ZjYWNoZS5jIHhlbi90b29scy92bmV0L3ZuZXRkL3ZjYWNoZS5jDQotLS0g eGVuLTIuMC10ZXN0aW5nLmJrL3Rvb2xzL3ZuZXQvdm5ldGQvdmNhY2hlLmMJMjAwNS0wMS0zMSAy MDozODozMy4wMDAwMDAwMDAgLTA0MDANCisrKyB4ZW4vdG9vbHMvdm5ldC92bmV0ZC92Y2FjaGUu YwkyMDA1LTAyLTA5IDE0OjEzOjU5LjAwMDAwMDAwMCAtMDQwMA0KQEAgLTEwMiwxMSArMTAyLDEx IEBADQogICAgIGludCB2YXJwX24gPSBzaXplb2YoVmFycEhkcik7DQogICAgIFZhcnBIZHIgdmFy cGggPSB7fTsNCiANCi0gICAgdmFycGguaWQgICAgID0gaHRvbnMoVkFSUF9JRCk7DQotICAgIHZh cnBoLm9wY29kZSA9IGh0b25zKG9wY29kZSk7DQotICAgIHZhcnBoLnZuZXQgICA9IHZuZXQ7DQot ICAgIHZhcnBoLnZtYWMgICA9ICp2bWFjOw0KLSAgICB2YXJwaC5hZGRyICAgPSBhZGRyOw0KKyAg ICB2YXJwaC52bmV0bXNnaGRyLmlkICAgICA9IGh0b25zKFZBUlBfSUQpOw0KKyAgICB2YXJwaC52 bmV0bXNnaGRyLm9wY29kZSA9IGh0b25zKG9wY29kZSk7DQorICAgIHZhcnBoLnZuZXQgICAgICAg ICAgICAgID0gdm5ldDsNCisgICAgdmFycGgudm1hYyAgICAgICAgICAgICAgPSAqdm1hYzsNCisg ICAgdmFycGguYWRkciAgICAgICAgICAgICAgPSBhZGRyOw0KIA0KICAgICBpZigwKXsNCiAgICAg ICAgIHN0cnVjdCBzb2NrYWRkcl9pbiBzZWxmOw0KQEAgLTUwMyw3ICs1MDMsNyBAQA0KICAqIEBw YXJhbSBsb2NhbCB3aGV0aGVyIGl0J3MgbG9jYWwgb3Igbm90DQogICovDQogdm9pZCB2Y2FjaGVf Zm9yd2FyZF92YXJwKFZhcnBIZHIgKnZhcnBoLCBpbnQgbG9jYWwpew0KLSAgICB1aW50MTZfdCBv cGNvZGUgPSBudG9ocyh2YXJwaC0+b3Bjb2RlKTsNCisgICAgdWludDE2X3Qgb3Bjb2RlID0gbnRv aHModmFycGgtPnZuZXRtc2doZHIub3Bjb2RlKTsNCiAgICAgaWYobG9jYWwpew0KICAgICAgICAg Q29ubkxpc3QgKmw7DQogICAgICAgICBmb3IobCA9IHZuZXRkLT5jb25uZWN0aW9uczsgbDsgbCA9 IGwtPm5leHQpew0KQEAgLTYxMSw3ICs2MTEsNyBAQA0KICAgICAgICAgZHByaW50ZigiPiBvcGNv ZGU9JWQgdm5ldD0ldSB2bWFjPSIgTUFDRk1UICJcbiIsDQogICAgICAgICAgICAgICAgIG50b2hz KHZhcnBoLT5vcGNvZGUpLCBudG9obCh2YXJwaC0+dm5ldCksIE1BQzZUVVBMRSh2YXJwaC0+dm1h Yy5tYWMpKTsNCiAgICAgfQ0KLSAgICBzd2l0Y2gobnRvaHModmFycGgtPm9wY29kZSkpew0KKyAg ICBzd2l0Y2gobnRvaHModmFycGgtPnZuZXRtc2doZHIub3Bjb2RlKSl7DQogICAgIGNhc2UgVkFS UF9PUF9SRVFVRVNUOg0KICAgICAgICAgZXJyID0gdmNhY2hlX2hhbmRsZV9yZXF1ZXN0KG1zZywg dmFycGgsIGxvY2FsKTsNCiAgICAgICAgIGJyZWFrOw0K --=-Omt7Hb1E6e8tV431oUyQ-- ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click