Commit deb0f500 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/block' into staging 



# By Jeff Cody (26) and others
# Via Stefan Hajnoczi
* stefanha/block: (37 commits)
  block: Round up total_sectors
  block: vhdx qemu-iotest - log replay of data sector
  block: qemu-iotests for vhdx, add write test support
  block: vhdx - update _make_test_img() to filter out vhdx options
  block: vhdx - add .bdrv_create() support
  block: vhdx - fix comment typos in header, fix incorrect struct fields
  block: vhdx - break out code operations to functions
  block: vhdx - move more endian translations to vhdx-endian.c
  block: vhdx - remove BAT file offset bit shifting
  block: vhdx write support
  block: vhdx - add log write support
  block: vhdx - add region overlap detection for image files
  block: vhdx - log parsing, replay, and flush support
  block: vhdx code movement - move vhdx_close() above vhdx_open()
  block: vhdx - update log guid in header, and first write tracker
  block: vhdx - break endian translation functions out
  block: vhdx - log support struct and defines
  block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header.
  block: vhdx - add header update capability.
  block: vhdx - minor comments and typo correction.
  ...

Message-id: 1383905551-16411-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 70c4c5b5 7e382003

block.c

+2 −2
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int refresh_total_sectors(BlockDriverState *bs, int64_t hint) 
        if (length < 0) {

            return length;

        }

        hint = length >> BDRV_SECTOR_BITS;

        hint = DIV_ROUND_UP(length, BDRV_SECTOR_SIZE);

    }



    bs->total_sectors = hint;
@@ -1084,8 +1084,8 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, 
            snprintf(backing_filename, sizeof(backing_filename),

                     "%s", filename);

        } else if (!realpath(filename, backing_filename)) {

            error_setg_errno(errp, errno, "Could not resolve path '%s'", filename);

            ret = -errno;

            error_setg_errno(errp, errno, "Could not resolve path '%s'", filename);

            goto fail;

        }

block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o v 
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-y += vhdx.o

block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.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

block/raw-posix.c

+2 −1
Original line number Diff line number Diff line
@@ -1842,7 +1842,8 @@ static BlockDriver bdrv_host_cdrom = { 
#endif /* __linux__ */



#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)

static int cdrom_open(BlockDriverState *bs, QDict *options, int flags)

static int cdrom_open(BlockDriverState *bs, QDict *options, int flags,

                      Error **errp)

{

    BDRVRawState *s = bs->opaque;

    Error *local_err = NULL;

block/vhdx-endian.c

0 → 100644
+216 −0
Original line number Diff line number Diff line 
/*

 * Block driver for Hyper-V VHDX Images

 *

 * Copyright (c) 2013 Red Hat, Inc.,

 *

 * Authors:

 *  Jeff Cody <jcody@redhat.com>

 *

 *  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);

}





/* Region table entries */

void vhdx_region_header_le_import(VHDXRegionTableHeader *hdr)

{

    assert(hdr != NULL);



    le32_to_cpus(&hdr->signature);

    le32_to_cpus(&hdr->checksum);

    le32_to_cpus(&hdr->entry_count);

}



void vhdx_region_header_le_export(VHDXRegionTableHeader *hdr)

{

    assert(hdr != NULL);



    cpu_to_le32s(&hdr->signature);

    cpu_to_le32s(&hdr->checksum);

    cpu_to_le32s(&hdr->entry_count);

}



void vhdx_region_entry_le_import(VHDXRegionTableEntry *e)

{

    assert(e != NULL);



    leguid_to_cpus(&e->guid);

    le64_to_cpus(&e->file_offset);

    le32_to_cpus(&e->length);

    le32_to_cpus(&e->data_bits);

}



void vhdx_region_entry_le_export(VHDXRegionTableEntry *e)

{

    assert(e != NULL);



    cpu_to_leguids(&e->guid);

    cpu_to_le64s(&e->file_offset);

    cpu_to_le32s(&e->length);

    cpu_to_le32s(&e->data_bits);

}





/* Metadata headers & table */

void vhdx_metadata_header_le_import(VHDXMetadataTableHeader *hdr)

{

    assert(hdr != NULL);



    le64_to_cpus(&hdr->signature);

    le16_to_cpus(&hdr->entry_count);

}



void vhdx_metadata_header_le_export(VHDXMetadataTableHeader *hdr)

{

    assert(hdr != NULL);



    cpu_to_le64s(&hdr->signature);

    cpu_to_le16s(&hdr->entry_count);

}



void vhdx_metadata_entry_le_import(VHDXMetadataTableEntry *e)

{

    assert(e != NULL);



    leguid_to_cpus(&e->item_id);

    le32_to_cpus(&e->offset);

    le32_to_cpus(&e->length);

    le32_to_cpus(&e->data_bits);

}

void vhdx_metadata_entry_le_export(VHDXMetadataTableEntry *e)

{

    assert(e != NULL);



    cpu_to_leguids(&e->item_id);

    cpu_to_le32s(&e->offset);

    cpu_to_le32s(&e->length);

    cpu_to_le32s(&e->data_bits);

}

block/vhdx-log.c

0 → 100644
+1010 −0

File added.

Preview size limit exceeded, changes collapsed.