From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NI198-0002Sh-HT for qemu-devel@nongnu.org; Tue, 08 Dec 2009 09:34:34 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NI192-0002Oq-TA for qemu-devel@nongnu.org; Tue, 08 Dec 2009 09:34:33 -0500 Received: from [199.232.76.173] (port=38974 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NI192-0002Of-30 for qemu-devel@nongnu.org; Tue, 08 Dec 2009 09:34:28 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:50590) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NI191-0006ki-Ev for qemu-devel@nongnu.org; Tue, 08 Dec 2009 09:34:28 -0500 Received: from smtp2-g21.free.fr (localhost [127.0.0.1]) by smtp2-g21.free.fr (Postfix) with ESMTP id DB05C4B01DB for ; Tue, 8 Dec 2009 15:34:22 +0100 (CET) Received: from laptop (vaf26-2-82-244-111-82.fbx.proxad.net [82.244.111.82]) by smtp2-g21.free.fr (Postfix) with ESMTP id E24B84B019B for ; Tue, 8 Dec 2009 15:34:19 +0100 (CET) From: "=?utf-8?q?Fran=C3=A7ois?= Revol" Date: Tue, 08 Dec 2009 15:34:18 +0100 CET Message-Id: <630568266-BeMail@laptop> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=----------Zoidberg-BeMail-temp-------- Subject: [Qemu-devel] [PATCH] block/vdi: allow disk sizes not multiple of block size List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multipart message in MIME format. ------------Zoidberg-BeMail-temp-------- Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit The disk image I created from my old laptop disk with VBoxManage internalcommand converthd obviously was not a multiple of 1MB as when created from scratch. This fixes QEMU refusing it. We still require the size to be a multiple of sector size though. It then boots correctly. Signed-off-by: ------------Zoidberg-BeMail-temp-------- Content-Transfer-Encoding: base64 Content-Disposition: BMailAttachment Content-Type: text/x-patch; name=qemu-vdi-unrounded-disk-size-fix.diff QWxsb3cgb3BlbmluZyBWREkgaW1hZ2VzIHdpdGggc2l6ZSBub3QgbXVsdGlwbGUgb2YgMU1CIChh cyB3aGVuIGNvbnZlcnRlZCBmcm9tIGEgcmF3IGRpc2spLgoKU2lnbmVkLW9mZi1ieTogRnJhbsOn b2lzIFJldm9sIDxyZXZvbEBmcmVlLmZyPgoKZGlmZiAtLWdpdCBhL2Jsb2NrL3ZkaS5jIGIvYmxv Y2svdmRpLmMKaW5kZXggNDVhYTgxYy4uYzkxOTYxYSAxMDA2NDQKLS0tIGEvYmxvY2svdmRpLmMK KysrIGIvYmxvY2svdmRpLmMKQEAgLTQxMSwxNCArNDExLDE3IEBAIHN0YXRpYyBpbnQgdmRpX29w ZW4oQmxvY2tEcml2ZXJTdGF0ZSAqYnMsIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBpbnQgZmxhZ3Mp CiAgICAgICAgIC8qIFdlIG9ubHkgc3VwcG9ydCBkYXRhIGJsb2NrcyB3aGljaCBzdGFydCBvbiBh IHNlY3RvciBib3VuZGFyeS4gKi8KICAgICAgICAgbG9nb3V0KCJ1bnN1cHBvcnRlZCBkYXRhIG9m ZnNldCAweCV4IEJcbiIsIGhlYWRlci5vZmZzZXRfZGF0YSk7CiAgICAgICAgIGdvdG8gZmFpbDsK KyAgICB9IGVsc2UgaWYgKGhlYWRlci5kaXNrX3NpemUgJSBTRUNUT1JfU0laRSAhPSAwKSB7Cisg ICAgICAgIGxvZ291dCgidW5zdXBwb3J0ZWQgZGlzayBzaXplICUiIFBSSXU2NCAiIEJcbiIsIGhl YWRlci5kaXNrX3NpemUpOworICAgICAgICBnb3RvIGZhaWw7CiAgICAgfSBlbHNlIGlmIChoZWFk ZXIuc2VjdG9yX3NpemUgIT0gU0VDVE9SX1NJWkUpIHsKICAgICAgICAgbG9nb3V0KCJ1bnN1cHBv cnRlZCBzZWN0b3Igc2l6ZSAldSBCXG4iLCBoZWFkZXIuc2VjdG9yX3NpemUpOwogICAgICAgICBn b3RvIGZhaWw7CiAgICAgfSBlbHNlIGlmIChoZWFkZXIuYmxvY2tfc2l6ZSAhPSAxICogTWlCKSB7 CiAgICAgICAgIGxvZ291dCgidW5zdXBwb3J0ZWQgYmxvY2sgc2l6ZSAldSBCXG4iLCBoZWFkZXIu YmxvY2tfc2l6ZSk7CiAgICAgICAgIGdvdG8gZmFpbDsKLSAgICB9IGVsc2UgaWYgKGhlYWRlci5k aXNrX3NpemUgIT0KLSAgICAgICAgICAgICAgICh1aW50NjRfdCloZWFkZXIuYmxvY2tzX2luX2lt YWdlICogaGVhZGVyLmJsb2NrX3NpemUpIHsKKyAgICB9IGVsc2UgaWYgKChoZWFkZXIuZGlza19z aXplICsgaGVhZGVyLmJsb2NrX3NpemUgLSAxKSAvIGhlYWRlci5ibG9ja19zaXplICE9CisgICAg ICAgICAgICAgICAodWludDY0X3QpaGVhZGVyLmJsb2Nrc19pbl9pbWFnZSkgewogICAgICAgICBs b2dvdXQoInVuZXhwZWN0ZWQgYmxvY2sgbnVtYmVyICV1IEJcbiIsIGhlYWRlci5ibG9ja3NfaW5f aW1hZ2UpOwogICAgICAgICBnb3RvIGZhaWw7CiAgICAgfSBlbHNlIGlmICghdXVpZF9pc19udWxs KGhlYWRlci51dWlkX2xpbmspKSB7Cg== ------------Zoidberg-BeMail-temp----------