From patchwork Tue Mar 6 17:32:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 144991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCECCB6EF3 for ; Wed, 7 Mar 2012 06:22:25 +1100 (EST) Received: from localhost ([::1]:56762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yGl-0002jv-HA for incoming@patchwork.ozlabs.org; Tue, 06 Mar 2012 12:33:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yGD-0001US-7l for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4yFl-000569-HR for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:16 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yFl-00053f-9D for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:32:49 -0500 Received: by mail-ww0-f53.google.com with SMTP id fm10so3536275wgb.10 for ; Tue, 06 Mar 2012 09:32:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=4jLQld+lFbuqCicJ4nhOqVEsGmttolSGmMpyEVLlxjs=; b=oxsLD9YgWv8AuXv5wjxcSirATyTpUsLV1mNJ5LdErFy8S+fBuyBerRr/ieFg1ksYrI lamEYSjKSZRkq6raHDpxi5G9gqKsXptMLkWEyOqoJZ7pBiMHuGjx0awbV5njeeVBu2KU r5pQOxPhBqZKk6VMgTPLdeMsEz6SVeHbs/Rhoq5GG0OdGr/xE+WhOHR1++qHpNUuWLgn z3q2P5EGkdaXJgTz9Ms3XavjtqZvqGZCv0j6uG8mHnTbhgh4smRwFBjQ2WHYpLz9zjbs Uh24M8YjSl8mbW3xWczREMbL9PoMxVlItxp9qujLoUIrvFKMSyrUoNAbXW50VaWtQHRD cdoA== Received: by 10.180.87.8 with SMTP id t8mr20417255wiz.15.1331055168399; Tue, 06 Mar 2012 09:32:48 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id hn8sm81593717wib.11.2012.03.06.09.32.47 (version=SSLv3 cipher=OTHER); Tue, 06 Mar 2012 09:32:47 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 6 Mar 2012 18:32:29 +0100 Message-Id: <1331055149-10982-11-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> References: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.53 Cc: pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, wolf@redhat.com Subject: [Qemu-devel] [RFC PATCH 10/10] qed: remove incoming live migration blocker X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- 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 {