qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 06/12] qcow: Add migration blocker
Date: Fri, 25 Nov 2011 19:12:09 +0100	[thread overview]
Message-ID: <1322244735-12516-7-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com>

qcow caches L2 tables. For migration to work, they would have to be
invalidated. Block migration for now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index adecee0..4814ed0 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -26,6 +26,7 @@
 #include "module.h"
 #include <zlib.h>
 #include "aes.h"
+#include "migration.h"
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */
@@ -74,6 +75,7 @@ typedef struct BDRVQcowState {
     AES_KEY aes_encrypt_key;
     AES_KEY aes_decrypt_key;
     CoMutex lock;
+    Error *migration_blocker;
 } BDRVQcowState;
 
 static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
@@ -160,6 +162,12 @@ static int qcow_open(BlockDriverState *bs, int flags)
         bs->backing_file[len] = '\0';
     }
 
+    /* Disable migration when qcow images are used */
+    error_set(&s->migration_blocker,
+              QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
+              "qcow", bs->device_name, "live migration");
+    migrate_add_blocker(s->migration_blocker);
+
     qemu_co_mutex_init(&s->lock);
     return 0;
 
@@ -604,10 +612,14 @@ static int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
 static void qcow_close(BlockDriverState *bs)
 {
     BDRVQcowState *s = bs->opaque;
+
     g_free(s->l1_table);
     g_free(s->l2_cache);
     g_free(s->cluster_cache);
     g_free(s->cluster_data);
+
+    migrate_del_blocker(s->migration_blocker);
+    error_free(s->migration_blocker);
 }
 
 static int qcow_create(const char *filename, QEMUOptionParameter *options)
-- 
1.7.6.4

  parent reply	other threads:[~2011-11-25 18:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-25 18:12 [Qemu-devel] [PULL 00/12] Block patches for 1.0 Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 01/12] virtio-blk: fix cross-endian config space Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 02/12] usb-msd: do not register twice in the boot order Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 03/12] scsi: fix fw path Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 04/12] scsi-generic: add as boot device Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path Kevin Wolf
2011-11-25 18:12 ` Kevin Wolf [this message]
2011-11-25 18:12 ` [Qemu-devel] [PATCH 07/12] vdi: Add migration blocker Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 08/12] vmdk: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 09/12] vpc: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 10/12] vvfat: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 11/12] vdi: Fix memory leak Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 12/12] vpc: Add missing error handling in alloc_block Kevin Wolf
2011-11-28 22:33 ` [Qemu-devel] [PULL 00/12] Block patches for 1.0 Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322244735-12516-7-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).