From patchwork Tue Aug 14 13:32:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 177273 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 ECCCC2C007B for ; Tue, 14 Aug 2012 23:33:19 +1000 (EST) Received: from localhost ([::1]:56890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1HFF-0007Z3-Ax for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 09:33:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1HF4-0007V9-0c for qemu-devel@nongnu.org; Tue, 14 Aug 2012 09:33:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1HEx-0000Oo-Tf for qemu-devel@nongnu.org; Tue, 14 Aug 2012 09:33:05 -0400 Received: from cpe-70-123-145-39.austin.res.rr.com ([70.123.145.39]:60412 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1HEx-0000OX-Md for qemu-devel@nongnu.org; Tue, 14 Aug 2012 09:32:59 -0400 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id q7EDWqoE026989; Tue, 14 Aug 2012 08:32:53 -0500 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id q7EDWVSR026421; Tue, 14 Aug 2012 08:32:31 -0500 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 08:32:31 -0500 Message-Id: <1344951151-26387-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.5.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.145.39 Cc: Kevin Wolf , Paolo Bonzini , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] block-migration: deprecate block migration for the 1.2 release 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 To be replaced with live block copy. Signed-off-by: Anthony Liguori --- migration.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/migration.c b/migration.c index 653a3c1..babccf4 100644 --- a/migration.c +++ b/migration.c @@ -482,10 +482,19 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, MigrationParams params; const char *p; int ret; + static bool suppress_deprecation_message; params.blk = blk; params.shared = inc; + if (blk && !suppress_deprecation_message) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, + "Block migration is deprecated. " + "See http://wiki.qemu.org/Features/LiveBlockCopy " + "for an alternative syntax."); + suppress_deprecation_message = true; + } + if (s->state == MIG_STATE_ACTIVE) { error_set(errp, QERR_MIGRATION_ACTIVE); return;