[libvirt] [PATCH] Fix size probing for VDI images

Commit 027bf2ea used the wrong offset: the text field at the start of the header has 64 bytes, not 68. [1] Bug: https://bugzilla.redhat.com/show_bug.cgi?id=921452 [1] https://forums.virtualbox.org/viewtopic.php?p=29267#p29267 --- Relevant for v1.0.3-maint. src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index cbcab5c..aabb5c8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -199,7 +199,7 @@ static struct FileTypeInfo const fileTypeInfo[] = { [VIR_STORAGE_FILE_VDI] = { 64, "\x7f\x10\xda\xbe", ".vdi", LV_LITTLE_ENDIAN, 68, 0x00010001, - 68 + 5 * 4 + 256 + 7 * 4, 8, 1, -1, NULL}, + 64 + 5 * 4 + 256 + 7 * 4, 8, 1, -1, NULL}, /* Not direct file formats, but used for various drivers */ [VIR_STORAGE_FILE_FAT] = { 0, NULL, NULL, LV_LITTLE_ENDIAN, -- 1.8.1.5

On 03/14/2013 01:45 PM, Ján Tomko wrote:
Commit 027bf2ea used the wrong offset: the text field at the start of the header has 64 bytes, not 68. [1]
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=921452
[1] https://forums.virtualbox.org/viewtopic.php?p=29267#p29267 --- Relevant for v1.0.3-maint.
src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index cbcab5c..aabb5c8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -199,7 +199,7 @@ static struct FileTypeInfo const fileTypeInfo[] = { [VIR_STORAGE_FILE_VDI] = { 64, "\x7f\x10\xda\xbe", ".vdi", LV_LITTLE_ENDIAN, 68, 0x00010001, - 68 + 5 * 4 + 256 + 7 * 4, 8, 1, -1, NULL}, + 64 + 5 * 4 + 256 + 7 * 4, 8, 1, -1, NULL},
/* Not direct file formats, but used for various drivers */ [VIR_STORAGE_FILE_FAT] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
ACK, that was my fault in 027bf2ea, looking back at 'block/vdi.c' in qemu.git, this is the right number. Martin

On 03/14/2013 02:57 PM, Martin Kletzander wrote:
On 03/14/2013 01:45 PM, Ján Tomko wrote:
Commit 027bf2ea used the wrong offset: the text field at the start of the header has 64 bytes, not 68. [1]
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=921452
[1] https://forums.virtualbox.org/viewtopic.php?p=29267#p29267 --- Relevant for v1.0.3-maint.
src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
...
ACK, that was my fault in 027bf2ea, looking back at 'block/vdi.c' in qemu.git, this is the right number.
Martin
Thanks, pushed now. Jan
participants (2)
-
Ján Tomko
-
Martin Kletzander