From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ0nE-00035y-Jk for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQ0nD-0005Ub-9D for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:58:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQ0nD-0005UW-1r for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:58:03 -0500 Message-ID: <4EC156A8.7030808@redhat.com> Date: Mon, 14 Nov 2011 15:58:00 -0200 From: Lucas Meneghel Rodrigues MIME-Version: 1.0 References: <1321113459-3331-1-git-send-email-aliguori@us.ibm.com> <1321113459-3331-3-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1321113459-3331-3-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/7] qcow2: add a migration blocker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Kevin Wolf , Stefan Hajnoczi , Juan Quintela , qemu-devel@nongnu.org, Avi Kivity On 11/12/2011 01:57 PM, Anthony Liguori wrote: > Now when you try to migrate with qcow2, you get: > > (qemu) migrate tcp:localhost:1025 > Block format 'qcow2' used by device 'ide0-hd0' does not support feature 'live migration' > (qemu) LGTM. From a testing perspective, it's clear and understandable, a lot better than throwing a generic error. > Signed-off-by: Anthony Liguori > --- > block/qcow2.c | 9 +++++++++ > block/qcow2.h | 2 ++ > qemu-tool.c | 9 +++++++++ > qerror.c | 4 ++++ > qerror.h | 3 +++ > 5 files changed, 27 insertions(+), 0 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index 5c784ee..e4126b7 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -29,6 +29,7 @@ > #include "block/qcow2.h" > #include "qemu-error.h" > #include "qerror.h" > +#include "migration.h" > > /* > Differences with QCOW: > @@ -277,6 +278,11 @@ static int qcow2_open(BlockDriverState *bs, int flags) > goto fail; > } > > + error_set(&s->migration_blocker, > + QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, > + "qcow2", bs->device_name, "live migration"); > + migrate_add_blocker(s->migration_blocker); > + > /* Initialise locks */ > qemu_co_mutex_init(&s->lock); > > @@ -621,6 +627,9 @@ static void qcow2_close(BlockDriverState *bs) > BDRVQcowState *s = bs->opaque; > g_free(s->l1_table); > > + migrate_del_blocker(s->migration_blocker); > + error_free(s->migration_blocker); > + > qcow2_cache_flush(bs, s->l2_table_cache); > qcow2_cache_flush(bs, s->refcount_block_cache); > > diff --git a/block/qcow2.h b/block/qcow2.h > index 531af39..0734b23 100644 > --- a/block/qcow2.h > +++ b/block/qcow2.h > @@ -125,6 +125,8 @@ typedef struct BDRVQcowState { > int snapshots_size; > int nb_snapshots; > QCowSnapshot *snapshots; > + > + Error *migration_blocker; > } BDRVQcowState; > > /* XXX: use std qcow open function ? */ > 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 } }" >