From patchwork Mon Nov 14 21:09:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 125611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C11DB720C for ; Tue, 15 Nov 2011 08:10:50 +1100 (EST) Received: from localhost ([::1]:46584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ3ne-0003I8-RD for incoming@patchwork.ozlabs.org; Mon, 14 Nov 2011 16:10:42 -0500 Received: from eggs.gnu.org ([140.186.70.92]:49977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ3nX-0003Gy-Fr for qemu-devel@nongnu.org; Mon, 14 Nov 2011 16:10:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQ3nW-0002sT-4k for qemu-devel@nongnu.org; Mon, 14 Nov 2011 16:10:35 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:46116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ3nV-0002s0-TT for qemu-devel@nongnu.org; Mon, 14 Nov 2011 16:10:34 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 Nov 2011 14:10:32 -0700 Received: from d03relay04.boulder.ibm.com ([9.17.195.106]) by e39.co.us.ibm.com ([192.168.1.139]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 14 Nov 2011 14:10:15 -0700 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAEL9xid112134 for ; Mon, 14 Nov 2011 14:10:00 -0700 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAEL9wYK000700 for ; Mon, 14 Nov 2011 14:09:58 -0700 Received: from titi.austin.rr.com (sig-9-65-229-191.mts.ibm.com [9.65.229.191]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAEL9ncf032518; Mon, 14 Nov 2011 14:09:57 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 14 Nov 2011 15:09:47 -0600 Message-Id: <1321304987-23041-5-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1321304987-23041-1-git-send-email-aliguori@us.ibm.com> References: <1321304987-23041-1-git-send-email-aliguori@us.ibm.com> x-cbid: 11111421-4242-0000-0000-00000020930F X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.160 Cc: Kevin Wolf , Lucas Meneghel Rodrigues , Anthony Liguori , Stefan Hajnoczi , Juan Quintela , Avi Kivity Subject: [Qemu-devel] [PATCH 5/5] qed: add migration blocker (v2) 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 Now when you try to migrate with qed, you get: (qemu) migrate tcp:localhost:1025 Block format 'qed' used by device 'ide0-hd0' does not support feature 'live migration' (qemu) Signed-off-by: Anthony Liguori --- v1 -> v2 - Pull in QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED. I hope Stefan reviews this patch and Ack's a similar approach to qcow2 so we can avoid using a blocker for QED. --- block/qed.c | 10 ++++++++++ block/qed.h | 2 ++ qemu-tool.c | 9 +++++++++ qerror.c | 4 ++++ qerror.h | 3 +++ 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/block/qed.c b/block/qed.c index d032a45..7e22e77 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,6 +16,7 @@ #include "trace.h" #include "qed.h" #include "qerror.h" +#include "migration.h" static void qed_aio_cancel(BlockDriverAIOCB *blockacb) { @@ -504,6 +505,12 @@ 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); @@ -516,6 +523,9 @@ 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 388fdb3..62cbd3b 100644 --- a/block/qed.h +++ b/block/qed.h @@ -164,6 +164,8 @@ typedef struct { /* Periodic flush and clear need check flag */ QEMUTimer *need_check_timer; + + Error *migration_blocker; } BDRVQEDState; enum { diff --git a/qemu-tool.c b/qemu-tool.c index e9f7fe1..5df7279 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -15,6 +15,7 @@ #include "monitor.h" #include "qemu-timer.h" #include "qemu-log.h" +#include "migration.h" #include @@ -92,3 +93,11 @@ int64_t qemu_get_clock_ns(QEMUClock *clock) { return 0; } + +void migrate_add_blocker(Error *reason) +{ +} + +void migrate_del_blocker(Error *reason) +{ +} diff --git a/qerror.c b/qerror.c index 8e30e2d..fdf62b9 100644 --- a/qerror.c +++ b/qerror.c @@ -49,6 +49,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Device '%(device)' can't go on a %(bad_bus_type) bus", }, { + .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, + .desc = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'", + }, + { .error_fmt = QERR_BUS_NOT_FOUND, .desc = "Bus '%(bus)' not found", }, diff --git a/qerror.h b/qerror.h index 7e2eebf..2d3d43b 100644 --- a/qerror.h +++ b/qerror.h @@ -54,6 +54,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_BAD_BUS_FOR_DEVICE \ "{ 'class': 'BadBusForDevice', 'data': { 'device': %s, 'bad_bus_type': %s } }" +#define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \ + "{ 'class': 'BlockFormatFeatureNotSupported', 'data': { 'format': %s, 'name': %s, 'feature': %s } }" + #define QERR_BUS_NOT_FOUND \ "{ 'class': 'BusNotFound', 'data': { 'bus': %s } }"