Patchwork [V3,2/3] qerror: Add error telling that streaming blocks migration

login
register
mail settings
Submitter Benoit Canet
Date July 23, 2012, 1:06 p.m.
Message ID <1343048766-20142-3-git-send-email-benoit@irqsave.net>
Download mbox | patch
Permalink /patch/172669/
State New
Headers show

Comments

Benoit Canet - July 23, 2012, 1:06 p.m.
From: Benoît Canet <benoit@irqsave.net>

Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 qerror.c |    4 ++++
 qerror.h |    3 +++
 2 files changed, 7 insertions(+)
Stefan Hajnoczi - July 23, 2012, 1:39 p.m.
On Mon, Jul 23, 2012 at 2:06 PM,  <benoit.canet@gmail.com> wrote:
> From: Benoît Canet <benoit@irqsave.net>
>
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  qerror.c |    4 ++++
>  qerror.h |    3 +++
>  2 files changed, 7 insertions(+)
>
> diff --git a/qerror.c b/qerror.c
> index 92c4eff..c7889fe 100644
> --- a/qerror.c
> +++ b/qerror.c
> @@ -283,6 +283,10 @@ static const QErrorStringTable qerror_table[] = {
>          .desc      = "Could not set password",
>      },
>      {
> +        .error_fmt = QERR_MIGRATION_BLOCKED_BY_STREAMING,
> +        .desc      = "Migration is blocked by streaming",

bdrv_in_use() is general and the error message should be too.  There
may be other operations besides streaming that prevent migration.

Stefan

Patch

diff --git a/qerror.c b/qerror.c
index 92c4eff..c7889fe 100644
--- a/qerror.c
+++ b/qerror.c
@@ -283,6 +283,10 @@  static const QErrorStringTable qerror_table[] = {
         .desc      = "Could not set password",
     },
     {
+        .error_fmt = QERR_MIGRATION_BLOCKED_BY_STREAMING,
+        .desc      = "Migration is blocked by streaming",
+    },
+    {
         .error_fmt = QERR_TOO_MANY_FILES,
         .desc      = "Too many open files",
     },
diff --git a/qerror.h b/qerror.h
index b4c8758..dca27f7 100644
--- a/qerror.h
+++ b/qerror.h
@@ -233,6 +233,9 @@  QError *qobject_to_qerror(const QObject *obj);
 #define QERR_SET_PASSWD_FAILED \
     "{ 'class': 'SetPasswdFailed', 'data': {} }"
 
+#define QERR_MIGRATION_BLOCKED_BY_STREAMING \
+    "{ 'class': 'MigrationBlockedByStreaming', 'data': {} }"
+
 #define QERR_TOO_MANY_FILES \
     "{ 'class': 'TooManyFiles', 'data': {} }"