From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KRTpA-000325-2G for qemu-devel@nongnu.org; Fri, 08 Aug 2008 11:24:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KRTp8-0002zR-Ht for qemu-devel@nongnu.org; Fri, 08 Aug 2008 11:24:15 -0400 Received: from [199.232.76.173] (port=36459 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KRTp8-0002zI-EQ for qemu-devel@nongnu.org; Fri, 08 Aug 2008 11:24:14 -0400 Received: from wf-out-1314.google.com ([209.85.200.170]:57948) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KRTp7-0000b9-Un for qemu-devel@nongnu.org; Fri, 08 Aug 2008 11:24:14 -0400 Received: by wf-out-1314.google.com with SMTP id 27so1736975wfd.4 for ; Fri, 08 Aug 2008 08:24:09 -0700 (PDT) Message-ID: Date: Fri, 8 Aug 2008 18:24:08 +0300 From: "Blue Swirl" Subject: Re: [Xen-devel] Re: [Qemu-devel] [PATCH 0/7] merge some xen bits into qemu In-Reply-To: <489B1316.1030109@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_48779_126599.1218209048945" References: <20080805150328.GT4478@implementation.uk.xensource.com> <20080806125055.GG4448@implementation.uk.xensource.com> <4899AD19.8060606@redhat.com> <20080806140132.GL4448@implementation.uk.xensource.com> <4899B06F.2090101@redhat.com> <20080806142526.GN4448@implementation.uk.xensource.com> <20080806221047.GE4486@implementation> <489AA532.7040006@redhat.com> <489B1316.1030109@redhat.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: xen-devel@lists.xensource.com, Ian Jackson , Markus Armbruster , qemu-devel@nongnu.org, Samuel Thibault ------=_Part_48779_126599.1218209048945 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline On 8/7/08, Gerd Hoffmann wrote: > Blue Swirl wrote: > >> http://kraxel.fedorapeople.org/patches/qemu-xen/ > > > > 0004-xenpv-groundwork.patch > > > > You dropped nodisk_ok support from vl.c. > > > Oh, there are *two* patchsets: > http://kraxel.fedorapeople.org/patches/qemu-upstream/ > > http://kraxel.fedorapeople.org/patches/qemu-xen/ > > > The first also includes some not-yet submitted work-in-progress bits. > It is against upstream qemu svn. The second is against xen's qemu fork, > so the xen-related changes can get a test-drive there. > > Especially the vl.c changes are very different in the two patch sets > because xen's vl.c looks very different (lot of CONFIG_DM conditional > code) and because I don't want to break the command line interface for > now to not break xend's expectations. > > That doesn't mean that the nodisk_ok got lost. It is only in the first > patchset though. I extracted a small patch that only introduces the nodisk_ok part. Anybody unhappy if I commit it? ------=_Part_48779_126599.1218209048945 Content-Type: plain/text; name=nodisk.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fjmy55gl Content-Disposition: attachment; filename=nodisk.diff SW5kZXg6IHFlbXUvaHcvYm9hcmRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL2h3L2JvYXJk cy5oCTIwMDgtMDgtMDggMTU6MDg6NDMuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L2h3L2JvYXJk cy5oCTIwMDgtMDgtMDggMTU6MDk6MzMuMDAwMDAwMDAwICswMDAwCkBAIC0xNiw2ICsxNiw3IEBA CiAgICAgUUVNVU1hY2hpbmVJbml0RnVuYyAqaW5pdDsKICNkZWZpbmUgUkFNU0laRV9GSVhFRAko MSA8PCAwKQogICAgIHJhbV9hZGRyX3QgcmFtX3JlcXVpcmU7CisgICAgaW50IG5vZGlza19vazsK ICAgICBzdHJ1Y3QgUUVNVU1hY2hpbmUgKm5leHQ7CiB9IFFFTVVNYWNoaW5lOwogCkluZGV4OiBx ZW11L3ZsLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL3ZsLmMJMjAwOC0wOC0wOCAxNTowODox MS4wMDAwMDAwMDAgKzAwMDAKKysrIHFlbXUvdmwuYwkyMDA4LTA4LTA4IDE1OjEwOjUwLjAwMDAw MDAwMCArMDAwMApAQCAtODg0OCw5ICs4ODQ4LDggQEAKICAgICBsaW51eF9ib290ID0gKGtlcm5l bF9maWxlbmFtZSAhPSBOVUxMKTsKICAgICBuZXRfYm9vdCA9IChib290X2RldmljZXNfYml0bWFw ID4+ICgnbicgLSAnYScpKSAmIDB4RjsKIAotICAgIC8qIFhYWDogdGhpcyBzaG91bGQgbm90IGJl OiBzb21lIGVtYmVkZGVkIHRhcmdldHMganVzdCBoYXZlIGZsYXNoICovCiAgICAgaWYgKCFsaW51 eF9ib290ICYmIG5ldF9ib290ID09IDAgJiYKLSAgICAgICAgbmJfZHJpdmVzX29wdCA9PSAwKQor ICAgICAgICAhbWFjaGluZS0+bm9kaXNrX29rICYmIG5iX2RyaXZlc19vcHQgPT0gMCkKICAgICAg ICAgaGVscCgxKTsKIAogICAgIGlmICghbGludXhfYm9vdCAmJiAqa2VybmVsX2NtZGxpbmUgIT0g J1wwJykgewpJbmRleDogcWVtdS9ody9zdW40bS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHFlbXUub3JpZy9o dy9zdW40bS5jCTIwMDgtMDgtMDggMTU6MTE6MDkuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L2h3 L3N1bjRtLmMJMjAwOC0wOC0wOCAxNToxMjozMS4wMDAwMDAwMDAgKzAwMDAKQEAgLTEyNDIsNiAr MTI0Miw3IEBACiAgICAgIlN1bjRtIHBsYXRmb3JtLCBTUEFSQ3N0YXRpb24gNSIsCiAgICAgc3M1 X2luaXQsCiAgICAgUFJPTV9TSVpFX01BWCArIFRDWF9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAx LAogfTsKIAogUUVNVU1hY2hpbmUgc3MxMF9tYWNoaW5lID0gewpAQCAtMTI0OSw2ICsxMjUwLDcg QEAKICAgICAiU3VuNG0gcGxhdGZvcm0sIFNQQVJDc3RhdGlvbiAxMCIsCiAgICAgc3MxMF9pbml0 LAogICAgIFBST01fU0laRV9NQVggKyBUQ1hfU0laRSwKKyAgICAubm9kaXNrX29rID0gMSwKIH07 CiAKIFFFTVVNYWNoaW5lIHNzNjAwbXBfbWFjaGluZSA9IHsKQEAgLTEyNTYsNiArMTI1OCw3IEBA CiAgICAgIlN1bjRtIHBsYXRmb3JtLCBTUEFSQ3NlcnZlciA2MDBNUCIsCiAgICAgc3M2MDBtcF9p bml0LAogICAgIFBST01fU0laRV9NQVggKyBUQ1hfU0laRSwKKyAgICAubm9kaXNrX29rID0gMSwK IH07CiAKIFFFTVVNYWNoaW5lIHNzMjBfbWFjaGluZSA9IHsKQEAgLTEyNjMsNiArMTI2Niw3IEBA CiAgICAgIlN1bjRtIHBsYXRmb3JtLCBTUEFSQ3N0YXRpb24gMjAiLAogICAgIHNzMjBfaW5pdCwK ICAgICBQUk9NX1NJWkVfTUFYICsgVENYX1NJWkUsCisgICAgLm5vZGlza19vayA9IDEsCiB9Owog CiBRRU1VTWFjaGluZSBzczJfbWFjaGluZSA9IHsKQEAgLTEyNzAsNiArMTI3NCw3IEBACiAgICAg IlN1bjRjIHBsYXRmb3JtLCBTUEFSQ3N0YXRpb24gMiIsCiAgICAgc3MyX2luaXQsCiAgICAgUFJP TV9TSVpFX01BWCArIFRDWF9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAxLAogfTsKIAogUUVNVU1h Y2hpbmUgdm95YWdlcl9tYWNoaW5lID0gewpAQCAtMTI3Nyw2ICsxMjgyLDcgQEAKICAgICAiU3Vu NG0gcGxhdGZvcm0sIFNQQVJDc3RhdGlvbiBWb3lhZ2VyIiwKICAgICB2Z2VyX2luaXQsCiAgICAg UFJPTV9TSVpFX01BWCArIFRDWF9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAxLAogfTsKIAogUUVN VU1hY2hpbmUgc3NfbHhfbWFjaGluZSA9IHsKQEAgLTEyODQsNiArMTI5MCw3IEBACiAgICAgIlN1 bjRtIHBsYXRmb3JtLCBTUEFSQ3N0YXRpb24gTFgiLAogICAgIHNzX2x4X2luaXQsCiAgICAgUFJP TV9TSVpFX01BWCArIFRDWF9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAxLAogfTsKIAogUUVNVU1h Y2hpbmUgc3M0X21hY2hpbmUgPSB7CkBAIC0xMjkxLDYgKzEyOTgsNyBAQAogICAgICJTdW40bSBw bGF0Zm9ybSwgU1BBUkNzdGF0aW9uIDQiLAogICAgIHNzNF9pbml0LAogICAgIFBST01fU0laRV9N QVggKyBUQ1hfU0laRSwKKyAgICAubm9kaXNrX29rID0gMSwKIH07CiAKIFFFTVVNYWNoaW5lIHNj bHNfbWFjaGluZSA9IHsKQEAgLTEyOTgsNiArMTMwNiw3IEBACiAgICAgIlN1bjRtIHBsYXRmb3Jt LCBTUEFSQ0NsYXNzaWMiLAogICAgIHNjbHNfaW5pdCwKICAgICBQUk9NX1NJWkVfTUFYICsgVENY X1NJWkUsCisgICAgLm5vZGlza19vayA9IDEsCiB9OwogCiBRRU1VTWFjaGluZSBzYm9va19tYWNo aW5lID0gewpAQCAtMTMwNSw2ICsxMzE0LDcgQEAKICAgICAiU3VuNG0gcGxhdGZvcm0sIFNQQVJD Ym9vayIsCiAgICAgc2Jvb2tfaW5pdCwKICAgICBQUk9NX1NJWkVfTUFYICsgVENYX1NJWkUsCisg ICAgLm5vZGlza19vayA9IDEsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IHN1bjRkX2h3ZGVm IHN1bjRkX2h3ZGVmc1tdID0gewpJbmRleDogcWVtdS9ody9zdW40dS5jCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHFlbXUub3JpZy9ody9zdW40dS5jCTIwMDgtMDgtMDggMTU6MTE6MTEuMDAwMDAwMDAwICswMDAw CisrKyBxZW11L2h3L3N1bjR1LmMJMjAwOC0wOC0wOCAxNToxMjo1NC4wMDAwMDAwMDAgKzAwMDAK QEAgLTQ1MCw2ICs0NTAsNyBAQAogICAgICJTdW40dSBwbGF0Zm9ybSIsCiAgICAgc3VuNHVfaW5p dCwKICAgICBQUk9NX1NJWkVfTUFYICsgVkdBX1JBTV9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAx LAogfTsKIAogUUVNVU1hY2hpbmUgc3VuNHZfbWFjaGluZSA9IHsKQEAgLTQ1Nyw0ICs0NTgsNSBA QAogICAgICJTdW40diBwbGF0Zm9ybSIsCiAgICAgc3VuNHZfaW5pdCwKICAgICBQUk9NX1NJWkVf TUFYICsgVkdBX1JBTV9TSVpFLAorICAgIC5ub2Rpc2tfb2sgPSAxLAogfTsK ------=_Part_48779_126599.1218209048945--