958e1b
From 873247249112ac26ae02946d3f6a9484a85268a3 Mon Sep 17 00:00:00 2001
958e1b
From: Jeffrey Cody <jcody@redhat.com>
958e1b
Date: Tue, 16 Sep 2014 20:11:46 +0200
958e1b
Subject: [PATCH 08/20] vdi: remove double conversion
958e1b
958e1b
Message-id: <843ab27113b00881159ce51034472849d8178804.1410897407.git.jcody@redhat.com>
958e1b
Patchwork-id: 61212
958e1b
O-Subject: [PATCH qemu-kvm-rhel RHEL7.1 07/15] vdi: remove double conversion
958e1b
Bugzilla: 1098086
958e1b
RH-Acked-by: Fam Zheng <famz@redhat.com>
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
958e1b
958e1b
From: Paolo Bonzini <pbonzini@redhat.com>
958e1b
958e1b
This should be a problem when running on big-endian machines.
958e1b
958e1b
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
958e1b
Reviewed-by: Benoit Canet <benoit@irqsave.net>
958e1b
Reviewed-by: Stefan Weil <sw@weilnetz.de>
958e1b
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
958e1b
(cherry picked from commit 6998b6c11b4e8ca5e3c3e6bdbdf07a4f747d5d37)
958e1b
Signed-off-by: Jeff Cody <jcody@redhat.com>
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 block/vdi.c |    1 -
958e1b
 1 files changed, 0 insertions(+), 1 deletions(-)
958e1b
958e1b
diff --git a/block/vdi.c b/block/vdi.c
958e1b
index fecfa14..0211023 100644
958e1b
--- a/block/vdi.c
958e1b
+++ b/block/vdi.c
958e1b
@@ -239,7 +239,6 @@ static void vdi_header_to_le(VdiHeader *header)
958e1b
     cpu_to_le32s(&header->block_extra);
958e1b
     cpu_to_le32s(&header->blocks_in_image);
958e1b
     cpu_to_le32s(&header->blocks_allocated);
958e1b
-    cpu_to_le32s(&header->blocks_allocated);
958e1b
     uuid_convert(header->uuid_image);
958e1b
     uuid_convert(header->uuid_last_snap);
958e1b
     uuid_convert(header->uuid_link);
958e1b
-- 
958e1b
1.7.1
958e1b