From patchwork Sat Nov 12 15:56:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 125347 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 1B5EF1007D8 for ; Sun, 13 Nov 2011 02:57:25 +1100 (EST) Received: from localhost ([::1]:52050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPFxE-0007o8-8z for incoming@patchwork.ozlabs.org; Sat, 12 Nov 2011 10:57:16 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPFx8-0007nl-QL for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:57:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPFx7-00077i-MQ for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:57:10 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:42168 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPFx7-00077c-Ex for qemu-devel@nongnu.org; Sat, 12 Nov 2011 10:57:09 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pACFv3F4003292; Sat, 12 Nov 2011 09:57:03 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pACFv2It003290; Sat, 12 Nov 2011 09:57:02 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Sat, 12 Nov 2011 09:56:54 -0600 Message-Id: <1321113420-3252-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Lucas Meneghel Rodrigues , Anthony Liguori , Stefan Hajnoczi , Juan Quintela , Avi Kivity Subject: [Qemu-devel] [PATCH 1/7] migrate: add migration blockers 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 This lets different subsystems register an Error that is thrown whenever migration is attempted. This works nicely because it gracefully supports things like hotplug. Right now, if multiple errors are registered, only one of them is reported. I expect that for 1.1, we'll extend query-migrate to return all of the reasons why migration is disabled at any given point in time. Signed-off-by: Anthony Liguori Signed-off-by: Anthony Liguori --- migration.c | 18 ++++++++++++++++++ migration.h | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/migration.c b/migration.c index 41c3c24..6764d3a 100644 --- a/migration.c +++ b/migration.c @@ -398,6 +398,18 @@ static MigrationState *migrate_init(Monitor *mon, int detach, int blk, int inc) return s; } +static GSList *migration_blockers; + +void migrate_add_blocker(Error *reason) +{ + migration_blockers = g_slist_prepend(migration_blockers, reason); +} + +void migrate_del_blocker(Error *reason) +{ + migration_blockers = g_slist_remove(migration_blockers, reason); +} + int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = migrate_get_current(); @@ -417,6 +429,12 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } + if (migration_blockers) { + Error *err = migration_blockers->data; + qerror_report_err(err); + return -1; + } + s = migrate_init(mon, detach, blk, inc); if (strstart(uri, "tcp:", &p)) { diff --git a/migration.h b/migration.h index 1b8ee58..0682179 100644 --- a/migration.h +++ b/migration.h @@ -17,6 +17,7 @@ #include "qdict.h" #include "qemu-common.h" #include "notify.h" +#include "error.h" typedef struct MigrationState MigrationState; @@ -89,4 +90,18 @@ int ram_load(QEMUFile *f, void *opaque, int version_id); extern int incoming_expected; +/** + * @migrate_add_blocker - prevent migration from proceeding + * + * @reason - an error to be returned whenever migration is attempted + */ +void migrate_add_blocker(Error *reason); + +/** + * @migrate_del_blocker - remove a blocking error from migration + * + * @reason - the error blocking migration + */ +void migrate_del_blocker(Error *reason); + #endif