| From 7ac8b98c5873a6c69a73a2a1c03518137024efb8 Mon Sep 17 00:00:00 2001 |
| From: Jeffrey Cody <jcody@redhat.com> |
| Date: Wed, 6 Nov 2013 19:01:09 +0100 |
| Subject: [PATCH 79/81] block: vhdx - add migration blocker |
| |
| RH-Author: Jeffrey Cody <jcody@redhat.com> |
| Message-id: <92e2ff0b02d3cfe596589be909331fd83e66667b.1383763969.git.jcody@redhat.com> |
| Patchwork-id: 55578 |
| O-Subject: [RHEL7 qemu-kvm PATCH 1/3] block: vhdx - add migration blocker |
| Bugzilla: 1007176 |
| RH-Acked-by: Kevin Wolf <kwolf@redhat.com> |
| RH-Acked-by: Max Reitz <mreitz@redhat.com> |
| RH-Acked-by: Alex Williamson <alex.williamson@redhat.com> |
| RH-Acked-by: Fam Zheng <famz@redhat.com> |
| |
| This blocks migration for VHDX image files, until the |
| functionality can be supported. |
| |
| Signed-off-by: Jeff Cody <jcody@redhat.com> |
| Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| (cherry picked from commit 5641bf405608cc89578fafed8ec689a19046285a) |
| |
| block/vhdx.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| block/vhdx.c | 10 ++++++++++ |
| 1 files changed, 10 insertions(+), 0 deletions(-) |
| |
| diff --git a/block/vhdx.c b/block/vhdx.c |
| index e9704b1..11d923f 100644 |
| |
| |
| @@ -20,6 +20,7 @@ |
| #include "qemu/module.h" |
| #include "qemu/crc32c.h" |
| #include "block/vhdx.h" |
| +#include "migration/migration.h" |
| |
| |
| /* Several metadata and region table data entries are identified by |
| @@ -159,6 +160,7 @@ typedef struct BDRVVHDXState { |
| VHDXParentLocatorHeader parent_header; |
| VHDXParentLocatorEntry *parent_entries; |
| |
| + Error *migration_blocker; |
| } BDRVVHDXState; |
| |
| uint32_t vhdx_checksum_calc(uint32_t crc, uint8_t *buf, size_t size, |
| @@ -805,6 +807,12 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags) |
| |
| /* TODO: differencing files, write */ |
| |
| + /* Disable migration when VHDX images are used */ |
| + error_set(&s->migration_blocker, |
| + QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, |
| + "vhdx", bs->device_name, "live migration"); |
| + migrate_add_blocker(s->migration_blocker); |
| + |
| return 0; |
| fail: |
| qemu_vfree(s->headers[0]); |
| @@ -951,6 +959,8 @@ static void vhdx_close(BlockDriverState *bs) |
| qemu_vfree(s->headers[1]); |
| qemu_vfree(s->bat); |
| qemu_vfree(s->parent_entries); |
| + migrate_del_blocker(s->migration_blocker); |
| + error_free(s->migration_blocker); |
| } |
| |
| static BlockDriver bdrv_vhdx = { |
| -- |
| 1.7.1 |
| |