[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/13] block: vhdx - break endian translation fun
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PATCH v4 05/13] block: vhdx - break endian translation functions out |
Date: |
Tue, 20 Aug 2013 02:01:16 -0400 |
This moves the endian translation functions out from the vhdx.c source,
into a separate source file. In addition to the previously defined
endian functions, new endian translation functions for log support are
added as well.
Signed-off-by: Jeff Cody <address@hidden>
---
block/Makefile.objs | 2 +-
block/vhdx-endian.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++
block/vhdx.c | 43 ----------------
block/vhdx.h | 8 +++
4 files changed, 150 insertions(+), 44 deletions(-)
create mode 100644 block/vhdx-endian.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index e5e54e6..e6f5d33 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -2,7 +2,7 @@ block-obj-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o
bochs.o vpc.o vvfat
block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
qcow2-cache.o
block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
block-obj-y += qed-check.o
-block-obj-$(CONFIG_VHDX) += vhdx.o
+block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o
block-obj-y += parallels.o blkdebug.o blkverify.o
block-obj-y += snapshot.o qapi.o
block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o
diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
new file mode 100644
index 0000000..3e93e63
--- /dev/null
+++ b/block/vhdx-endian.c
@@ -0,0 +1,141 @@
+/*
+ * Block driver for Hyper-V VHDX Images
+ *
+ * Copyright (c) 2013 Red Hat, Inc.,
+ *
+ * Authors:
+ * Jeff Cody <address@hidden>
+ *
+ * This is based on the "VHDX Format Specification v1.00", published 8/25/2012
+ * by Microsoft:
+ * https://www.microsoft.com/en-us/download/details.aspx?id=34750
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#include "qemu-common.h"
+#include "block/block_int.h"
+#include "block/vhdx.h"
+
+#include <uuid/uuid.h>
+
+
+/*
+ * All the VHDX formats on disk are little endian - the following
+ * are helper import/export functions to correctly convert
+ * endianness from disk read to native cpu format, and back again.
+ */
+
+
+/* VHDX File Header */
+
+
+void vhdx_header_le_import(VHDXHeader *h)
+{
+ assert(h != NULL);
+
+ le32_to_cpus(&h->signature);
+ le32_to_cpus(&h->checksum);
+ le64_to_cpus(&h->sequence_number);
+
+ leguid_to_cpus(&h->file_write_guid);
+ leguid_to_cpus(&h->data_write_guid);
+ leguid_to_cpus(&h->log_guid);
+
+ le16_to_cpus(&h->log_version);
+ le16_to_cpus(&h->version);
+ le32_to_cpus(&h->log_length);
+ le64_to_cpus(&h->log_offset);
+}
+
+void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h)
+{
+ assert(orig_h != NULL);
+ assert(new_h != NULL);
+
+ new_h->signature = cpu_to_le32(orig_h->signature);
+ new_h->checksum = cpu_to_le32(orig_h->checksum);
+ new_h->sequence_number = cpu_to_le64(orig_h->sequence_number);
+
+ new_h->file_write_guid = orig_h->file_write_guid;
+ new_h->data_write_guid = orig_h->data_write_guid;
+ new_h->log_guid = orig_h->log_guid;
+
+ cpu_to_leguids(&new_h->file_write_guid);
+ cpu_to_leguids(&new_h->data_write_guid);
+ cpu_to_leguids(&new_h->log_guid);
+
+ new_h->log_version = cpu_to_le16(orig_h->log_version);
+ new_h->version = cpu_to_le16(orig_h->version);
+ new_h->log_length = cpu_to_le32(orig_h->log_length);
+ new_h->log_offset = cpu_to_le64(orig_h->log_offset);
+}
+
+
+/* VHDX Log Headers */
+
+
+void vhdx_log_desc_le_import(VHDXLogDescriptor *d)
+{
+ assert(d != NULL);
+
+ le32_to_cpus(&d->signature);
+ le32_to_cpus(&d->trailing_bytes);
+ le64_to_cpus(&d->leading_bytes);
+ le64_to_cpus(&d->file_offset);
+ le64_to_cpus(&d->sequence_number);
+}
+
+void vhdx_log_desc_le_export(VHDXLogDescriptor *d)
+{
+ assert(d != NULL);
+
+ cpu_to_le32s(&d->signature);
+ cpu_to_le32s(&d->trailing_bytes);
+ cpu_to_le64s(&d->leading_bytes);
+ cpu_to_le64s(&d->file_offset);
+ cpu_to_le64s(&d->sequence_number);
+}
+
+void vhdx_log_data_le_export(VHDXLogDataSector *d)
+{
+ assert(d != NULL);
+
+ cpu_to_le32s(&d->data_signature);
+ cpu_to_le32s(&d->sequence_high);
+ cpu_to_le32s(&d->sequence_low);
+}
+
+void vhdx_log_entry_hdr_le_import(VHDXLogEntryHeader *hdr)
+{
+ assert(hdr != NULL);
+
+ le32_to_cpus(&hdr->signature);
+ le32_to_cpus(&hdr->checksum);
+ le32_to_cpus(&hdr->entry_length);
+ le32_to_cpus(&hdr->tail);
+ le64_to_cpus(&hdr->sequence_number);
+ le32_to_cpus(&hdr->descriptor_count);
+ leguid_to_cpus(&hdr->log_guid);
+ le64_to_cpus(&hdr->flushed_file_offset);
+ le64_to_cpus(&hdr->last_file_offset);
+}
+
+void vhdx_log_entry_hdr_le_export(VHDXLogEntryHeader *hdr)
+{
+ assert(hdr != NULL);
+
+ cpu_to_le32s(&hdr->signature);
+ cpu_to_le32s(&hdr->checksum);
+ cpu_to_le32s(&hdr->entry_length);
+ cpu_to_le32s(&hdr->tail);
+ cpu_to_le64s(&hdr->sequence_number);
+ cpu_to_le32s(&hdr->descriptor_count);
+ cpu_to_leguids(&hdr->log_guid);
+ cpu_to_le64s(&hdr->flushed_file_offset);
+ cpu_to_le64s(&hdr->last_file_offset);
+}
+
+
diff --git a/block/vhdx.c b/block/vhdx.c
index 68648e1..15a4d1d 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -222,49 +222,6 @@ static int vhdx_probe(const uint8_t *buf, int buf_size,
const char *filename)
return 0;
}
-/* All VHDX structures on disk are little endian */
-static void vhdx_header_le_import(VHDXHeader *h)
-{
- assert(h != NULL);
-
- le32_to_cpus(&h->signature);
- le32_to_cpus(&h->checksum);
- le64_to_cpus(&h->sequence_number);
-
- leguid_to_cpus(&h->file_write_guid);
- leguid_to_cpus(&h->data_write_guid);
- leguid_to_cpus(&h->log_guid);
-
- le16_to_cpus(&h->log_version);
- le16_to_cpus(&h->version);
- le32_to_cpus(&h->log_length);
- le64_to_cpus(&h->log_offset);
-}
-
-/* All VHDX structures on disk are little endian */
-static void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h)
-{
- assert(orig_h != NULL);
- assert(new_h != NULL);
-
- new_h->signature = cpu_to_le32(orig_h->signature);
- new_h->checksum = cpu_to_le32(orig_h->checksum);
- new_h->sequence_number = cpu_to_le64(orig_h->sequence_number);
-
- new_h->file_write_guid = orig_h->file_write_guid;
- new_h->data_write_guid = orig_h->data_write_guid;
- new_h->log_guid = orig_h->log_guid;
-
- cpu_to_leguids(&new_h->file_write_guid);
- cpu_to_leguids(&new_h->data_write_guid);
- cpu_to_leguids(&new_h->log_guid);
-
- new_h->log_version = cpu_to_le16(orig_h->log_version);
- new_h->version = cpu_to_le16(orig_h->version);
- new_h->log_length = cpu_to_le32(orig_h->log_length);
- new_h->log_offset = cpu_to_le64(orig_h->log_offset);
-}
-
/* Update the VHDX headers
*
* This follows the VHDX spec procedures for header updates.
diff --git a/block/vhdx.h b/block/vhdx.h
index 0ab8bf3..89d9a78 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -393,4 +393,12 @@ static inline void cpu_to_leguids(MSGUID *guid)
cpu_to_le16s(&guid->data3);
}
+void vhdx_header_le_import(VHDXHeader *h);
+void vhdx_header_le_export(VHDXHeader *orig_h, VHDXHeader *new_h);
+void vhdx_log_desc_le_import(VHDXLogDescriptor *d);
+void vhdx_log_desc_le_export(VHDXLogDescriptor *d);
+void vhdx_log_data_le_export(VHDXLogDataSector *d);
+void vhdx_log_entry_hdr_le_import(VHDXLogEntryHeader *hdr);
+void vhdx_log_entry_hdr_le_export(VHDXLogEntryHeader *hdr);
+
#endif
--
1.8.1.4
- [Qemu-devel] [PATCH v4 00/13] VHDX log replay and write support, .bdrv_create(), Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 01/13] block: vhdx - minor comments and typo correction., Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 02/13] block: vhdx - add header update capability., Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 03/13] block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header., Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 04/13] block: vhdx - log support struct and defines, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 05/13] block: vhdx - break endian translation functions out,
Jeff Cody <=
- [Qemu-devel] [PATCH v4 06/13] block: vhdx - update log guid in header, and first write tracker, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 07/13] block: vhdx - log parsing, replay, and flush support, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 09/13] block: vhdx write support, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 08/13] block: vhdx - add log write support, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 10/13] block: vhdx - move more endian translations to vhdx-endian.c, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 11/13] block: vhdx - break out code operations to functions, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 13/13] block: vhdx - add .bdrv_create() support, Jeff Cody, 2013/08/20
- [Qemu-devel] [PATCH v4 12/13] block: vhdx - fix comment typos in header, fix incorrect struct fields, Jeff Cody, 2013/08/20