qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Benoît Canet" <benoit.canet@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com,
	"Benoît Canet" <benoit.canet@gmail.com>,
	stefanha@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH V2 7/7] qed: remove incoming live migration blocker
Date: Wed, 21 Mar 2012 16:52:04 +0100	[thread overview]
Message-ID: <1332345124-381-8-git-send-email-benoit.canet@gmail.com> (raw)
In-Reply-To: <1332345124-381-1-git-send-email-benoit.canet@gmail.com>

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
---
 block/qed.c |    9 ---------
 block/qed.h |    2 --
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/block/qed.c b/block/qed.c
index 4c04bc9..803a6c2 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -502,12 +502,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags)
     s->need_check_timer = qemu_new_timer_ns(vm_clock,
                                             qed_need_check_timer_cb, s);
 
-    error_set(&s->migration_blocker,
-              QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
-              "qed", bs->device_name, "live migration");
-    migrate_add_blocker(s->migration_blocker);
-
-
 out:
     if (ret) {
         qed_free_l2_cache(&s->l2_cache);
@@ -520,9 +514,6 @@ static void bdrv_qed_close(BlockDriverState *bs)
 {
     BDRVQEDState *s = bs->opaque;
 
-    migrate_del_blocker(s->migration_blocker);
-    error_free(s->migration_blocker);
-
     qed_cancel_need_check_timer(s);
     qemu_free_timer(s->need_check_timer);
 
diff --git a/block/qed.h b/block/qed.h
index cb1ebd8..9fac300 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -170,8 +170,6 @@ typedef struct {
 
     /* Periodic flush and clear need check flag */
     QEMUTimer *need_check_timer;
-
-    Error *migration_blocker;
 } BDRVQEDState;
 
 enum {
-- 
1.7.7.6

      parent reply	other threads:[~2012-03-21 15:52 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-21 15:51 [Qemu-devel] [PATCH V2 0/7] Make QED with live migration safe Benoît Canet
2012-03-21 15:51 ` [Qemu-devel] [PATCH V2 1/7] block: Add new BDRV_O_INCOMING flag to notice incoming live migration Benoît Canet
2012-03-21 15:51 ` [Qemu-devel] [PATCH V2 2/7] block: add a function to clear incoming live migration flags Benoît Canet
2012-03-21 15:52 ` [Qemu-devel] [PATCH V2 3/7] blockdev: open images with BDRV_O_INCOMING on incoming live migration Benoît Canet
2012-03-21 15:52 ` [Qemu-devel] [PATCH V2 4/7] qed: add bdrv_invalidate_cache to be called after " Benoît Canet
2012-03-22 13:21   ` Stefan Hajnoczi
2012-03-22 14:15     ` Benoît Canet
2012-03-22 14:17       ` Paolo Bonzini
2012-03-22 15:30         ` Stefan Hajnoczi
2012-03-21 15:52 ` [Qemu-devel] [PATCH V2 5/7] migration: clear BDRV_O_INCOMING flags on end of " Benoît Canet
2012-03-21 15:52 ` [Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for " Benoît Canet
2012-03-21 15:52 ` Benoît Canet [this message]

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=1332345124-381-8-git-send-email-benoit.canet@gmail.com \
    --to=benoit.canet@gmail.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@linux.vnet.ibm.com \
    /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).