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: pbonzini@redhat.com, "Benoît Canet" <benoit.canet@gmail.com>,
	stefanha@linux.vnet.ibm.com, wolf@redhat.com
Subject: [Qemu-devel] [RFC PATCH 10/10] qed: remove incoming live migration blocker
Date: Tue,  6 Mar 2012 18:32:29 +0100	[thread overview]
Message-ID: <1331055149-10982-11-git-send-email-benoit.canet@gmail.com> (raw)
In-Reply-To: <1331055149-10982-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 4bfda24..a7964f0 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -511,12 +511,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);
@@ -529,9 +523,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 62624a1..c716772 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -169,8 +169,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-06 17:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-06 17:32 [Qemu-devel] [RFC PATCH 00/10] make qed and live migration usage safe Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 01/10] block: Add new BDRV_O_INCOMING flag to notice incoming live migration Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 02/10] block: add a function to set " Benoît Canet
2012-03-20 15:57   ` Stefan Hajnoczi
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 03/10] block: add a function to clear " Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 04/10] block: rename *_invalidate_cache_* to *_post_incoming_migration_* Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 05/10] migration: inform the block layer of incoming live status Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 06/10] block: open images with BDRV_O_INCOMING on incoming live migration Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 07/10] qed: extract image checking into check_image_if_needed Benoît Canet
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 08/10] qed: add bdrv_post_incoming_migration operation checking the image Benoît Canet
2012-03-20 15:42   ` Stefan Hajnoczi
2012-03-20 15:52     ` Benoît Canet
2012-03-20 16:05       ` Stefan Hajnoczi
2012-03-06 17:32 ` [Qemu-devel] [RFC PATCH 09/10] qed: honor BDRV_O_INCOMING for incoming live migration Benoît Canet
2012-03-06 17:32 ` Benoît Canet [this message]
2012-03-06 20:10 ` [Qemu-devel] [RFC PATCH 00/10] make qed and live migration usage safe Benoît Canet
2012-03-16 12:40 ` Benoît Canet
2012-03-20 15:47 ` Stefan Hajnoczi

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=1331055149-10982-11-git-send-email-benoit.canet@gmail.com \
    --to=benoit.canet@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@linux.vnet.ibm.com \
    --cc=wolf@redhat.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).