* [Qemu-devel] [PATCH v3 1/8] fix format name for backing file
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
@ 2012-03-05 17:33 ` Paolo Bonzini
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions Paolo Bonzini
` (8 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d78aa51..96a893b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -800,7 +800,8 @@ void qmp_blockdev_group_snapshot_sync(SnapshotDevList *dev_list,
/* create new image w/backing file */
ret = bdrv_img_create(snapshot_file, format,
states->old_bs->filename,
- drv->format_name, NULL, -1, flags);
+ states->old_bs->drv->format_name,
+ NULL, -1, flags);
if (ret) {
error_set(errp, QERR_OPEN_FILE_FAILED, snapshot_file);
goto delete_and_fail;
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 1/8] fix format name for backing file Paolo Bonzini
@ 2012-03-05 17:33 ` Paolo Bonzini
2012-03-06 7:16 ` Mark Wu
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 3/8] rename blockdev-group-snapshot-sync Paolo Bonzini
` (7 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qapi-schema-test.json | 10 ++++++++++
scripts/qapi-types.py | 5 +++++
scripts/qapi-visit.py | 31 ++++++++++++++++++++++++++++++-
test-qmp-input-visitor.c | 18 ++++++++++++++++++
test-qmp-output-visitor.c | 34 ++++++++++++++++++++++++++++++++++
5 files changed, 97 insertions(+), 1 deletions(-)
diff --git a/qapi-schema-test.json b/qapi-schema-test.json
index 2b38919..8c7f9f7 100644
--- a/qapi-schema-test.json
+++ b/qapi-schema-test.json
@@ -22,6 +22,16 @@
'dict2': { 'userdef1': 'UserDefOne', 'string2': 'str' },
'*dict3': { 'userdef2': 'UserDefOne', 'string3': 'str' } } } }
+# for testing unions
+{ 'type': 'UserDefA',
+ 'data': { 'boolean': 'bool' } }
+
+{ 'type': 'UserDefB',
+ 'data': { 'integer': 'int' } }
+
+{ 'union': 'UserDefUnion',
+ 'data': { 'a' : 'UserDefA', 'b' : 'UserDefB' } }
+
# testing commands
{ 'command': 'user_def_cmd', 'data': {} }
{ 'command': 'user_def_cmd1', 'data': {'ud1a': 'UserDefOne'} }
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index b56225b..6968e7f 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -269,6 +269,7 @@ for expr in exprs:
elif expr.has_key('union'):
ret += generate_fwd_struct(expr['union'], expr['data']) + "\n"
ret += generate_enum('%sKind' % expr['union'], expr['data'].keys())
+ fdef.write(generate_enum_lookup('%sKind' % expr['union'], expr['data'].keys()))
else:
continue
fdecl.write(ret)
@@ -283,6 +284,10 @@ for expr in exprs:
fdef.write(generate_type_cleanup(expr['type']) + "\n")
elif expr.has_key('union'):
ret += generate_union(expr['union'], expr['data'])
+ ret += generate_type_cleanup_decl(expr['union'] + "List")
+ fdef.write(generate_type_cleanup(expr['union'] + "List") + "\n")
+ ret += generate_type_cleanup_decl(expr['union'])
+ fdef.write(generate_type_cleanup(expr['union']) + "\n")
else:
continue
fdecl.write(ret)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 5160d83..54117d4 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -110,10 +110,38 @@ def generate_visit_union(name, members):
void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp)
{
-}
+ Error *err = NULL;
+
+ visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err);
+ visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err);
+ if (err) {
+ error_propagate(errp, err);
+ goto end;
+ }
+ switch ((*obj)->kind) {
''',
name=name)
+ for key in members:
+ ret += mcgen('''
+ case %(abbrev)s_KIND_%(enum)s:
+ visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "data", errp);
+ break;
+''',
+ abbrev = de_camel_case(name).upper(),
+ enum = de_camel_case(key).upper(),
+ c_type=members[key],
+ c_name=c_var(key))
+
+ ret += mcgen('''
+ default:
+ abort();
+ }
+end:
+ visit_end_struct(m, errp);
+}
+''')
+
return ret
def generate_declaration(name, members, genlist=True):
@@ -242,6 +270,7 @@ for expr in exprs:
fdecl.write(ret)
elif expr.has_key('union'):
ret = generate_visit_union(expr['union'], expr['data'])
+ ret += generate_visit_list(expr['union'], expr['data'])
fdef.write(ret)
ret = generate_decl_enum('%sKind' % expr['union'], expr['data'].keys())
diff --git a/test-qmp-input-visitor.c b/test-qmp-input-visitor.c
index 926db5c..1996e49 100644
--- a/test-qmp-input-visitor.c
+++ b/test-qmp-input-visitor.c
@@ -234,6 +234,22 @@ static void test_visitor_in_list(TestInputVisitorData *data,
qapi_free_UserDefOneList(head);
}
+static void test_visitor_in_union(TestInputVisitorData *data,
+ const void *unused)
+{
+ Visitor *v;
+ Error *err = NULL;
+ UserDefUnion *tmp;
+
+ v = visitor_input_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");
+
+ visit_type_UserDefUnion(v, &tmp, NULL, &err);
+ g_assert(err == NULL);
+ g_assert_cmpint(tmp->kind, ==, USER_DEF_UNION_KIND_B);
+ g_assert_cmpint(tmp->b->integer, ==, 42);
+ qapi_free_UserDefUnion(tmp);
+}
+
static void input_visitor_test_add(const char *testpath,
TestInputVisitorData *data,
void (*test_func)(TestInputVisitorData *data, const void *user_data))
@@ -264,6 +280,8 @@ int main(int argc, char **argv)
&in_visitor_data, test_visitor_in_struct_nested);
input_visitor_test_add("/visitor/input/list",
&in_visitor_data, test_visitor_in_list);
+ input_visitor_test_add("/visitor/input/union",
+ &in_visitor_data, test_visitor_in_union);
g_test_run();
diff --git a/test-qmp-output-visitor.c b/test-qmp-output-visitor.c
index c94c208..78e5f2d 100644
--- a/test-qmp-output-visitor.c
+++ b/test-qmp-output-visitor.c
@@ -380,6 +380,38 @@ static void test_visitor_out_list_qapi_free(TestOutputVisitorData *data,
qapi_free_UserDefNestedList(head);
}
+static void test_visitor_out_union(TestOutputVisitorData *data,
+ const void *unused)
+{
+ QObject *arg, *qvalue;
+ QDict *qdict, *value;
+
+ Error *err = NULL;
+
+ UserDefUnion *tmp = g_malloc0(sizeof(UserDefUnion));
+ tmp->kind = USER_DEF_UNION_KIND_A;
+ tmp->a = g_malloc0(sizeof(UserDefA));
+ tmp->a->boolean = true;
+
+ visit_type_UserDefUnion(data->ov, &tmp, NULL, &err);
+ g_assert(err == NULL);
+ arg = qmp_output_get_qobject(data->qov);
+
+ g_assert(qobject_type(arg) == QTYPE_QDICT);
+ qdict = qobject_to_qdict(arg);
+
+ g_assert_cmpstr(qdict_get_str(qdict, "type"), ==, "a");
+
+ qvalue = qdict_get(qdict, "data");
+ g_assert(data != NULL);
+ g_assert(qobject_type(qvalue) == QTYPE_QDICT);
+ value = qobject_to_qdict(qvalue);
+ g_assert_cmpint(qdict_get_bool(value, "boolean"), ==, true);
+
+ qapi_free_UserDefUnion(tmp);
+ QDECREF(qdict);
+}
+
static void output_visitor_test_add(const char *testpath,
TestOutputVisitorData *data,
void (*test_func)(TestOutputVisitorData *data, const void *user_data))
@@ -416,6 +448,8 @@ int main(int argc, char **argv)
&out_visitor_data, test_visitor_out_list);
output_visitor_test_add("/visitor/output/list-qapi-free",
&out_visitor_data, test_visitor_out_list_qapi_free);
+ output_visitor_test_add("/visitor/output/union",
+ &out_visitor_data, test_visitor_out_union);
g_test_run();
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions Paolo Bonzini
@ 2012-03-06 7:16 ` Mark Wu
2012-03-06 8:14 ` Paolo Bonzini
2012-03-06 10:00 ` Paolo Bonzini
0 siblings, 2 replies; 23+ messages in thread
From: Mark Wu @ 2012-03-06 7:16 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
On 03/06/2012 01:33 AM, Paolo Bonzini wrote:
> Reviewed-by: Luiz Capitulino<lcapitulino@redhat.com>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> qapi-schema-test.json | 10 ++++++++++
> scripts/qapi-types.py | 5 +++++
> scripts/qapi-visit.py | 31 ++++++++++++++++++++++++++++++-
> test-qmp-input-visitor.c | 18 ++++++++++++++++++
> test-qmp-output-visitor.c | 34 ++++++++++++++++++++++++++++++++++
> 5 files changed, 97 insertions(+), 1 deletions(-)
>
> diff --git a/qapi-schema-test.json b/qapi-schema-test.json
> index 2b38919..8c7f9f7 100644
> --- a/qapi-schema-test.json
> +++ b/qapi-schema-test.json
> @@ -22,6 +22,16 @@
> 'dict2': { 'userdef1': 'UserDefOne', 'string2': 'str' },
> '*dict3': { 'userdef2': 'UserDefOne', 'string3': 'str' } } } }
>
> +# for testing unions
> +{ 'type': 'UserDefA',
> + 'data': { 'boolean': 'bool' } }
> +
> +{ 'type': 'UserDefB',
> + 'data': { 'integer': 'int' } }
> +
> +{ 'union': 'UserDefUnion',
> + 'data': { 'a' : 'UserDefA', 'b' : 'UserDefB' } }
> +
> # testing commands
> { 'command': 'user_def_cmd', 'data': {} }
> { 'command': 'user_def_cmd1', 'data': {'ud1a': 'UserDefOne'} }
> diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
> index b56225b..6968e7f 100644
> --- a/scripts/qapi-types.py
> +++ b/scripts/qapi-types.py
> @@ -269,6 +269,7 @@ for expr in exprs:
> elif expr.has_key('union'):
> ret += generate_fwd_struct(expr['union'], expr['data']) + "\n"
> ret += generate_enum('%sKind' % expr['union'], expr['data'].keys())
> + fdef.write(generate_enum_lookup('%sKind' % expr['union'], expr['data'].keys()))
> else:
> continue
> fdecl.write(ret)
> @@ -283,6 +284,10 @@ for expr in exprs:
> fdef.write(generate_type_cleanup(expr['type']) + "\n")
> elif expr.has_key('union'):
> ret += generate_union(expr['union'], expr['data'])
> + ret += generate_type_cleanup_decl(expr['union'] + "List")
> + fdef.write(generate_type_cleanup(expr['union'] + "List") + "\n")
> + ret += generate_type_cleanup_decl(expr['union'])
> + fdef.write(generate_type_cleanup(expr['union']) + "\n")
> else:
> continue
> fdecl.write(ret)
> diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
> index 5160d83..54117d4 100644
> --- a/scripts/qapi-visit.py
> +++ b/scripts/qapi-visit.py
> @@ -110,10 +110,38 @@ def generate_visit_union(name, members):
>
> void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp)
> {
> -}
> + Error *err = NULL;
> +
> + visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s),&err);
> + visit_type_%(name)sKind(m,&(*obj)->kind, "type",&err);
> + if (err) {
> + error_propagate(errp, err);
> + goto end;
> + }
> + switch ((*obj)->kind) {
> ''',
> name=name)
>
> + for key in members:
> + ret += mcgen('''
> + case %(abbrev)s_KIND_%(enum)s:
> + visit_type_%(c_type)s(m,&(*obj)->%(c_name)s, "data", errp);
> + break;
> +''',
> + abbrev = de_camel_case(name).upper(),
> + enum = de_camel_case(key).upper(),
> + c_type=members[key],
> + c_name=c_var(key))
> +
> + ret += mcgen('''
> + default:
> + abort();
> + }
> +end:
> + visit_end_struct(m, errp);
> +}
> +''')
> +
> return ret
>
> def generate_declaration(name, members, genlist=True):
> @@ -242,6 +270,7 @@ for expr in exprs:
> fdecl.write(ret)
> elif expr.has_key('union'):
> ret = generate_visit_union(expr['union'], expr['data'])
> + ret += generate_visit_list(expr['union'], expr['data'])
> fdef.write(ret)
>
> ret = generate_decl_enum('%sKind' % expr['union'], expr['data'].keys())
> diff --git a/test-qmp-input-visitor.c b/test-qmp-input-visitor.c
> index 926db5c..1996e49 100644
> --- a/test-qmp-input-visitor.c
> +++ b/test-qmp-input-visitor.c
> @@ -234,6 +234,22 @@ static void test_visitor_in_list(TestInputVisitorData *data,
> qapi_free_UserDefOneList(head);
> }
>
> +static void test_visitor_in_union(TestInputVisitorData *data,
> + const void *unused)
> +{
> + Visitor *v;
> + Error *err = NULL;
> + UserDefUnion *tmp;
> +
> + v = visitor_input_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");
> +
> + visit_type_UserDefUnion(v,&tmp, NULL,&err);
> + g_assert(err == NULL);
> + g_assert_cmpint(tmp->kind, ==, USER_DEF_UNION_KIND_B);
> + g_assert_cmpint(tmp->b->integer, ==, 42);
> + qapi_free_UserDefUnion(tmp);
> +}
> +
> static void input_visitor_test_add(const char *testpath,
> TestInputVisitorData *data,
> void (*test_func)(TestInputVisitorData *data, const void *user_data))
> @@ -264,6 +280,8 @@ int main(int argc, char **argv)
> &in_visitor_data, test_visitor_in_struct_nested);
> input_visitor_test_add("/visitor/input/list",
> &in_visitor_data, test_visitor_in_list);
> + input_visitor_test_add("/visitor/input/union",
> +&in_visitor_data, test_visitor_in_union);
>
> g_test_run();
>
> diff --git a/test-qmp-output-visitor.c b/test-qmp-output-visitor.c
> index c94c208..78e5f2d 100644
> --- a/test-qmp-output-visitor.c
> +++ b/test-qmp-output-visitor.c
> @@ -380,6 +380,38 @@ static void test_visitor_out_list_qapi_free(TestOutputVisitorData *data,
> qapi_free_UserDefNestedList(head);
> }
>
> +static void test_visitor_out_union(TestOutputVisitorData *data,
> + const void *unused)
> +{
> + QObject *arg, *qvalue;
> + QDict *qdict, *value;
> +
> + Error *err = NULL;
> +
> + UserDefUnion *tmp = g_malloc0(sizeof(UserDefUnion));
> + tmp->kind = USER_DEF_UNION_KIND_A;
> + tmp->a = g_malloc0(sizeof(UserDefA));
> + tmp->a->boolean = true;
> +
> + visit_type_UserDefUnion(data->ov,&tmp, NULL,&err);
> + g_assert(err == NULL);
> + arg = qmp_output_get_qobject(data->qov);
> +
> + g_assert(qobject_type(arg) == QTYPE_QDICT);
> + qdict = qobject_to_qdict(arg);
> +
> + g_assert_cmpstr(qdict_get_str(qdict, "type"), ==, "a");
> +
> + qvalue = qdict_get(qdict, "data");
> + g_assert(data != NULL);
> + g_assert(qobject_type(qvalue) == QTYPE_QDICT);
> + value = qobject_to_qdict(qvalue);
> + g_assert_cmpint(qdict_get_bool(value, "boolean"), ==, true);
> +
> + qapi_free_UserDefUnion(tmp);
> + QDECREF(qdict);
> +}
> +
> static void output_visitor_test_add(const char *testpath,
> TestOutputVisitorData *data,
> void (*test_func)(TestOutputVisitorData *data, const void *user_data))
> @@ -416,6 +448,8 @@ int main(int argc, char **argv)
> &out_visitor_data, test_visitor_out_list);
> output_visitor_test_add("/visitor/output/list-qapi-free",
> &out_visitor_data, test_visitor_out_list_qapi_free);
> + output_visitor_test_add("/visitor/output/union",
> +&out_visitor_data, test_visitor_out_union);
>
> g_test_run();
>
I got the following error when I tried to compile it:
blockdev.c: In function ‘qmp_blockdev_snapshot_sync’:
blockdev.c:664: error: unknown field ‘blockdev_snapshot_sync’ specified
in initializer
cc1: warnings being treated as errors
blockdev.c:664: error: missing braces around initializer
blockdev.c:664: error: (near initialization for ‘action.<anonymous>’)
blockdev.c: In function ‘qmp_drive_mirror’:
blockdev.c:688: error: unknown field ‘drive_mirror’ specified in initializer
blockdev.c:688: error: missing braces around initializer
blockdev.c:688: error: (near initialization for ‘action.<anonymous>’)
blockdev.c:688: error: initialization from incompatible pointer type
make: *** [blockdev.o] Error 1
make: *** Waiting for unfinished jobs....
It seems we need a name for the union to reference its member. So I
modified the scripts as the following patch. I also updated blockdev.c
accordingly. After that I can compile it without error. Actually, I
don't know why we need introduce a union for BlockdevAction. Can we just
use a void pointer like "void *action_param" to replace the union? Or
can we change the field ."snapshot_file to "target" too? Then they can
share the same action parameter structure. It could make the code in
qmp_transaction more compact because most of the code for cases mirror
and snapshot are the same.
Mark
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 6968e7f..de43790 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -128,7 +128,7 @@ struct %(name)s
c_name=c_var(key))
ret += mcgen('''
- };
+ } u;
};
''')
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 54117d4..4f8ac4d 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -125,7 +125,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **
obj, const char *name, Error **
for key in members:
ret += mcgen('''
case %(abbrev)s_KIND_%(enum)s:
- visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "data", errp);
+ visit_type_%(c_type)s(m, &(*obj)->u.%(c_name)s, "data", errp);
break;
''',
abbrev = de_camel_case(name).upper(),
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-06 7:16 ` Mark Wu
@ 2012-03-06 8:14 ` Paolo Bonzini
2012-03-06 8:19 ` Mark Wu
2012-03-06 10:00 ` Paolo Bonzini
1 sibling, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-06 8:14 UTC (permalink / raw)
To: Mark Wu; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
Il 06/03/2012 08:16, Mark Wu ha scritto:
> It seems we need a name for the union to reference its member.
What version is your compiler?
> So I
> modified the scripts as the following patch. I also updated blockdev.c
> accordingly. After that I can compile it without error. Actually, I
> don't know why we need introduce a union for BlockdevAction. Can we just
> use a void pointer like "void *action_param" to replace the union? Or
> can we change the field ."snapshot_file to "target" too? Then they can
> share the same action parameter structure.
No, the struct must match the existing blockdev-snapshot-sync command.
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-06 8:14 ` Paolo Bonzini
@ 2012-03-06 8:19 ` Mark Wu
2012-03-06 8:31 ` Paolo Bonzini
0 siblings, 1 reply; 23+ messages in thread
From: Mark Wu @ 2012-03-06 8:19 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
On 03/06/2012 04:14 PM, Paolo Bonzini wrote:
> Il 06/03/2012 08:16, Mark Wu ha scritto:
>> It seems we need a name for the union to reference its member.
> What version is your compiler?
>
>> So I
>> modified the scripts as the following patch. I also updated blockdev.c
>> accordingly. After that I can compile it without error. Actually, I
>> don't know why we need introduce a union for BlockdevAction. Can we just
>> use a void pointer like "void *action_param" to replace the union? Or
>> can we change the field ."snapshot_file to "target" too? Then they can
>> share the same action parameter structure.
> No, the struct must match the existing blockdev-snapshot-sync command.
>
> Paolo
>
gcc -v
Using built-in specs.
Target: x86_64-redhat-linux
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man
--infodir=/usr/share/info
--with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap
--enable-shared --enable-threads=posix --enable-checking=release
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions
--enable-gnu-unique-object
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada
--enable-java-awt=gtk --disable-dssi
--with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
--enable-libgcj-multifile --enable-java-maintainer-mode
--with-ecj-jar=/usr/share/java/eclipse-ecj.jar
--disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic
--with-arch_32=i686 --build=x86_64-redhat-linux
Thread model: posix
gcc version 4.4.5 20110214 (Red Hat 4.4.5-6) (GCC)
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-06 8:19 ` Mark Wu
@ 2012-03-06 8:31 ` Paolo Bonzini
2012-03-06 9:41 ` Mark Wu
0 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-06 8:31 UTC (permalink / raw)
To: Mark Wu; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
Il 06/03/2012 09:19, Mark Wu ha scritto:
> gcc -v
> Using built-in specs.
> Target: x86_64-redhat-linux
> Configured with: ../configure --prefix=/usr --mandir=/usr/share/man
> --infodir=/usr/share/info
> --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap
> --enable-shared --enable-threads=posix --enable-checking=release
> --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions
> --enable-gnu-unique-object
> --enable-languages=c,c++,objc,obj-c++,java,fortran,ada
> --enable-java-awt=gtk --disable-dssi
> --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
> --enable-libgcj-multifile --enable-java-maintainer-mode
> --with-ecj-jar=/usr/share/java/eclipse-ecj.jar
> --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic
> --with-arch_32=i686 --build=x86_64-redhat-linux
> Thread model: posix
> gcc version 4.4.5 20110214 (Red Hat 4.4.5-6) (GCC)
And you do not have any problems compiling, for example, usb-redir.c or
hw/usb-ehci.c?
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-06 8:31 ` Paolo Bonzini
@ 2012-03-06 9:41 ` Mark Wu
0 siblings, 0 replies; 23+ messages in thread
From: Mark Wu @ 2012-03-06 9:41 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
On 03/06/2012 04:31 PM, Paolo Bonzini wrote:
> Il 06/03/2012 09:19, Mark Wu ha scritto:
>> gcc -v
>> Using built-in specs.
>> Target: x86_64-redhat-linux
>> Configured with: ../configure --prefix=/usr --mandir=/usr/share/man
>> --infodir=/usr/share/info
>> --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap
>> --enable-shared --enable-threads=posix --enable-checking=release
>> --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions
>> --enable-gnu-unique-object
>> --enable-languages=c,c++,objc,obj-c++,java,fortran,ada
>> --enable-java-awt=gtk --disable-dssi
>> --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
>> --enable-libgcj-multifile --enable-java-maintainer-mode
>> --with-ecj-jar=/usr/share/java/eclipse-ecj.jar
>> --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic
>> --with-arch_32=i686 --build=x86_64-redhat-linux
>> Thread model: posix
>> gcc version 4.4.5 20110214 (Red Hat 4.4.5-6) (GCC)
> And you do not have any problems compiling, for example, usb-redir.c or
> hw/usb-ehci.c?
I can compile hw/usb-ehci.c, but for usb-redir.c, I am not sure. The
version of usbredir required by qemu is at least 0.3.4. I can't get the
rpm package for RHEL. I tried to build it from source code, but I got
another dependency issue:
Requested 'libusb-1.0 >= 1.0.9' but version of libusb-1.0 is 1.0.3.
Then I give up. Any other files I can try to compile to narrow down
the problem?
Thanks!!
> Paolo
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions
2012-03-06 7:16 ` Mark Wu
2012-03-06 8:14 ` Paolo Bonzini
@ 2012-03-06 10:00 ` Paolo Bonzini
1 sibling, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-06 10:00 UTC (permalink / raw)
To: Mark Wu; +Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, eblake
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
> I got the following error when I tried to compile it:
> blockdev.c: In function ‘qmp_blockdev_snapshot_sync’:
> blockdev.c:664: error: unknown field ‘blockdev_snapshot_sync’
> specified in initializer
> cc1: warnings being treated as errors
> blockdev.c:664: error: missing braces around initializer
> blockdev.c:664: error: (near initialization for ‘action.<anonymous>’)
> blockdev.c: In function ‘qmp_drive_mirror’:
> blockdev.c:688: error: unknown field ‘drive_mirror’ specified in
> initializer
> blockdev.c:688: error: missing braces around initializer
> blockdev.c:688: error: (near initialization for ‘action.<anonymous>’)
> blockdev.c:688: error: initialization from incompatible pointer type
> make: *** [blockdev.o] Error 1
> make: *** Waiting for unfinished jobs....
>
> It seems we need a name for the union to reference its member.
Ah, this is in the initializer. Please try the attached patch.
Paolo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix.patch --]
[-- Type: text/x-patch; name=fix.patch, Size: 2127 bytes --]
diff --git a/blockdev.c b/blockdev.c
index 9480dbb..df8ce14 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -709,6 +709,18 @@ void qmp_drive_reopen(const char *device, const char *new_image_file,
has_format ? format : "qcow2", errp);
}
+static void blockdev_do_action(int kind, void *data, Error **errp)
+{
+ BlockdevAction action;
+ BlockdevActionList list;
+
+ action.kind = kind;
+ action.data = data;
+ list.value = &action;
+ list.next = NULL;
+ qmp_transaction(&list, errp);
+}
+
void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
bool has_format, const char *format,
bool has_mode, enum NewImageMode mode,
@@ -722,16 +734,8 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
.has_mode = has_mode,
.mode = mode,
};
- BlockdevAction action = {
- .kind = BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,
- .blockdev_snapshot_sync = &snapshot,
- };
- BlockdevActionList list = {
- .value = &action,
- .next = NULL
- };
-
- qmp_transaction(&list, errp);
+ blockdev_do_action(BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC, &snapshot,
+ errp);
}
void qmp_drive_mirror(const char *device, const char *target,
@@ -746,16 +750,7 @@ void qmp_drive_mirror(const char *device, const char *target,
.has_mode = has_mode,
.mode = mode,
};
- BlockdevAction action = {
- .kind = BLOCKDEV_ACTION_KIND_DRIVE_MIRROR,
- .drive_mirror = &mirror,
- };
- BlockdevActionList list = {
- .value = &action,
- .next = NULL
- };
-
- qmp_transaction(&list, errp);
+ blockdev_do_action(BLOCKDEV_ACTION_KIND_DRIVE_MIRROR, &mirror, errp);
}
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 6968e7f..727fb77 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -117,6 +117,7 @@ struct %(name)s
{
%(name)sKind kind;
union {
+ void *data;
''',
name=name)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 3/8] rename blockdev-group-snapshot-sync
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 1/8] fix format name for backing file Paolo Bonzini
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 2/8] qapi: complete implementation of unions Paolo Bonzini
@ 2012-03-05 17:33 ` Paolo Bonzini
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 4/8] add mode field to blockdev-snapshot-sync transaction item Paolo Bonzini
` (6 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
We will add other kinds of operation. Prepare for this by adjusting
the schema.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 78 ++++++++++++++++++++++++++++-------------------------
qapi-schema.json | 42 ++++++++++++++++++----------
qmp-commands.hx | 52 +++++++++++++++++++----------------
3 files changed, 96 insertions(+), 76 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 96a893b..b434cd4 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -716,31 +716,24 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
/* New and old BlockDriverState structs for group snapshots */
-typedef struct BlkGroupSnapshotStates {
+typedef struct BlkTransactionStates {
BlockDriverState *old_bs;
BlockDriverState *new_bs;
- QSIMPLEQ_ENTRY(BlkGroupSnapshotStates) entry;
-} BlkGroupSnapshotStates;
+ QSIMPLEQ_ENTRY(BlkTransactionStates) entry;
+} BlkTransactionStates;
/*
* 'Atomic' group snapshots. The snapshots are taken as a set, and if any fail
* then we do not pivot any of the devices in the group, and abandon the
* snapshots
*/
-void qmp_blockdev_group_snapshot_sync(SnapshotDevList *dev_list,
- Error **errp)
+void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
{
int ret = 0;
- SnapshotDevList *dev_entry = dev_list;
- SnapshotDev *dev_info = NULL;
- BlkGroupSnapshotStates *states;
- BlockDriver *proto_drv;
- BlockDriver *drv;
- int flags;
- const char *format;
- const char *snapshot_file;
+ BlockdevActionList *dev_entry = dev_list;
+ BlkTransactionStates *states;
- QSIMPLEQ_HEAD(snap_bdrv_states, BlkGroupSnapshotStates) snap_bdrv_states;
+ QSIMPLEQ_HEAD(snap_bdrv_states, BlkTransactionStates) snap_bdrv_states;
QSIMPLEQ_INIT(&snap_bdrv_states);
/* drain all i/o before any snapshots */
@@ -748,21 +741,46 @@ void qmp_blockdev_group_snapshot_sync(SnapshotDevList *dev_list,
/* We don't do anything in this loop that commits us to the snapshot */
while (NULL != dev_entry) {
+ BlockdevAction *dev_info = NULL;
+ BlockDriver *proto_drv;
+ BlockDriver *drv;
+ int flags;
+ const char *device;
+ const char *format = "qcow2";
+ const char *new_image_file = NULL;
+
dev_info = dev_entry->value;
dev_entry = dev_entry->next;
- states = g_malloc0(sizeof(BlkGroupSnapshotStates));
+ states = g_malloc0(sizeof(BlkTransactionStates));
QSIMPLEQ_INSERT_TAIL(&snap_bdrv_states, states, entry);
- states->old_bs = bdrv_find(dev_info->device);
+ switch (dev_info->kind) {
+ case BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC:
+ device = dev_info->blockdev_snapshot_sync->device;
+ if (dev_info->blockdev_snapshot_sync->has_format) {
+ format = dev_info->blockdev_snapshot_sync->format;
+ }
+ new_image_file = dev_info->blockdev_snapshot_sync->snapshot_file;
+ break;
+ default:
+ abort();
+ }
+
+ drv = bdrv_find_format(format);
+ if (!drv) {
+ error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
+ goto delete_and_fail;
+ }
+ states->old_bs = bdrv_find(device);
if (!states->old_bs) {
- error_set(errp, QERR_DEVICE_NOT_FOUND, dev_info->device);
+ error_set(errp, QERR_DEVICE_NOT_FOUND, device);
goto delete_and_fail;
}
if (bdrv_in_use(states->old_bs)) {
- error_set(errp, QERR_DEVICE_IN_USE, dev_info->device);
+ error_set(errp, QERR_DEVICE_IN_USE, device);
goto delete_and_fail;
}
@@ -775,44 +793,30 @@ void qmp_blockdev_group_snapshot_sync(SnapshotDevList *dev_list,
}
}
- snapshot_file = dev_info->snapshot_file;
-
flags = states->old_bs->open_flags;
- if (!dev_info->has_format) {
- format = "qcow2";
- } else {
- format = dev_info->format;
- }
-
- drv = bdrv_find_format(format);
- if (!drv) {
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
- goto delete_and_fail;
- }
-
- proto_drv = bdrv_find_protocol(snapshot_file);
+ proto_drv = bdrv_find_protocol(new_image_file);
if (!proto_drv) {
error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
goto delete_and_fail;
}
/* create new image w/backing file */
- ret = bdrv_img_create(snapshot_file, format,
+ ret = bdrv_img_create(new_image_file, format,
states->old_bs->filename,
states->old_bs->drv->format_name,
NULL, -1, flags);
if (ret) {
- error_set(errp, QERR_OPEN_FILE_FAILED, snapshot_file);
+ error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
goto delete_and_fail;
}
/* We will manually add the backing_hd field to the bs later */
states->new_bs = bdrv_new("");
- ret = bdrv_open(states->new_bs, snapshot_file,
+ ret = bdrv_open(states->new_bs, new_image_file,
flags | BDRV_O_NO_BACKING, drv);
if (ret != 0) {
- error_set(errp, QERR_OPEN_FILE_FAILED, snapshot_file);
+ error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
goto delete_and_fail;
}
}
diff --git a/qapi-schema.json b/qapi-schema.json
index 5f293c4..1d1ffa6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1118,7 +1118,7 @@
{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' }}
##
-# @SnapshotDev
+# @BlockdevSnapshot
#
# @device: the name of the device to generate the snapshot from.
#
@@ -1126,19 +1126,30 @@
#
# @format: #optional the format of the snapshot image, default is 'qcow2'.
##
-{ 'type': 'SnapshotDev',
- 'data': {'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
+{ 'type': 'BlockdevSnapshot',
+ 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
+
+##
+# @BlockdevAction
+#
+# A discriminated record of operations that can be performed with
+# @transaction.
+##
+{ 'union': 'BlockdevAction',
+ 'data': {
+ 'blockdev-snapshot-sync': 'BlockdevSnapshot'
+ } }
##
-# @blockdev-group-snapshot-sync
+# @transaction
#
-# Generates a synchronous snapshot of a group of one or more block devices,
-# as atomically as possible. If the snapshot of any device in the group
-# fails, then the entire group snapshot will be abandoned and the
-# appropriate error returned.
+# Atomically operate on a group of one or more block devices. If
+# any operation fails, then the entire set of actions will be
+# abandoned and the appropriate error returned. The only operation
+# supported is currently blockdev-snapshot-sync.
#
# List of:
-# @SnapshotDev: information needed for the device snapshot
+# @BlockdevAction: information needed for the device snapshot
#
# Returns: nothing on success
# If @device is not a valid block device, DeviceNotFound
@@ -1147,13 +1158,14 @@
# If @snapshot-file can't be opened, OpenFileFailed
# If @format is invalid, InvalidBlockFormat
#
-# Note: The group snapshot attempt returns failure on the first snapshot
-# device failure. Therefore, there will be only one device or snapshot file
-# returned in an error condition, and subsequent devices will not have been
-# attempted.
+# Note: The transaction aborts on the first failure. Therefore, there will
+# be only one device or snapshot file returned in an error condition, and
+# subsequent actions will not have been attempted.
+#
+# Since 1.1
##
-{ 'command': 'blockdev-group-snapshot-sync',
- 'data': { 'devlist': [ 'SnapshotDev' ] } }
+{ 'command': 'transaction',
+ 'data': { 'actions': [ 'BlockdevAction' ] } }
##
# @blockdev-snapshot-sync
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 0c9bfac..fb4f1df 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -687,41 +687,45 @@ EQMP
.mhandler.cmd_new = qmp_marshal_input_block_job_cancel,
},
{
- .name = "blockdev-group-snapshot-sync",
- .args_type = "devlist:O",
- .params = "device:B,snapshot-file:s,format:s?",
- .mhandler.cmd_new = qmp_marshal_input_blockdev_group_snapshot_sync,
+ .name = "transaction",
+ .args_type = "actions:O",
+ .mhandler.cmd_new = qmp_marshal_input_transaction,
},
SQMP
-blockdev-group-snapshot-sync
-----------------------
-
-Synchronous snapshot of one or more block devices. A list array input
-is accepted, that contains the device and snapshot file information for
-each device in group. The default format, if not specified, is qcow2.
+transaction
+-----------
-If there is any failure creating or opening a new snapshot, all snapshots
-for the group are abandoned, and the original disks pre-snapshot attempt
-are used.
+Atomically operate on one or more block devices. The only supported
+operation for now is snapshotting. If there is any failure performing
+any of the operations, all snapshots for the group are abandoned, and
+the original disks pre-snapshot attempt are used.
+A list of dictionaries is accepted, that contains the actions to be performed.
+For snapshots this is the device, the file to use for the new snapshot,
+and the format. The default format, if not specified, is qcow2.
Arguments:
-devlist array:
- - "device": device name to snapshot (json-string)
- - "snapshot-file": name of new image file (json-string)
- - "format": format of new image (json-string, optional)
+actions array:
+ - "type": the operation to perform. The only supported
+ value is "blockdev-snapshot-sync". (json-string)
+ - "data": a dictionary. The contents depend on the value
+ of "type". When "type" is "blockdev-snapshot-sync":
+ - "device": device name to snapshot (json-string)
+ - "snapshot-file": name of new image file (json-string)
+ - "format": format of new image (json-string, optional)
Example:
--> { "execute": "blockdev-group-snapshot-sync", "arguments":
- { "devlist": [{ "device": "ide-hd0",
- "snapshot-file": "/some/place/my-image",
- "format": "qcow2" },
- { "device": "ide-hd1",
- "snapshot-file": "/some/place/my-image2",
- "format": "qcow2" }] } }
+-> { "execute": "transaction",
+ "arguments": { "actions": [
+ { 'type': 'blockdev-snapshot-sync', 'data' : { "device": "ide-hd0",
+ "snapshot-file": "/some/place/my-image",
+ "format": "qcow2" } },
+ { 'type': 'blockdev-snapshot-sync', 'data' : { "device": "ide-hd1",
+ "snapshot-file": "/some/place/my-image2",
+ "format": "qcow2" } } ] } }
<- { "return": {} }
EQMP
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 4/8] add mode field to blockdev-snapshot-sync transaction item
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (2 preceding siblings ...)
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 3/8] rename blockdev-group-snapshot-sync Paolo Bonzini
@ 2012-03-05 17:33 ` Paolo Bonzini
2012-03-05 18:45 ` Eric Blake
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions Paolo Bonzini
` (5 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
The mode field lets a management application create the snapshot
destination outside QEMU.
Right now, the only modes are "existing" and "absolute-paths". Mirroring
introduces "no-backing-file". In the future "relative-paths" could be
implemented too.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 25 ++++++++++++++++---------
qapi-schema.json | 21 ++++++++++++++++++++-
qmp-commands.hx | 10 ++++++++++
3 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index b434cd4..c9bd25b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -745,9 +745,10 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
BlockDriver *proto_drv;
BlockDriver *drv;
int flags;
+ enum NewImageMode mode;
+ const char *new_image_file;
const char *device;
const char *format = "qcow2";
- const char *new_image_file = NULL;
dev_info = dev_entry->value;
dev_entry = dev_entry->next;
@@ -758,10 +759,14 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
switch (dev_info->kind) {
case BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC:
device = dev_info->blockdev_snapshot_sync->device;
+ if (!dev_info->blockdev_snapshot_sync->has_mode) {
+ dev_info->blockdev_snapshot_sync->mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS;
+ }
+ new_image_file = dev_info->blockdev_snapshot_sync->snapshot_file;
if (dev_info->blockdev_snapshot_sync->has_format) {
format = dev_info->blockdev_snapshot_sync->format;
}
- new_image_file = dev_info->blockdev_snapshot_sync->snapshot_file;
+ mode = dev_info->blockdev_snapshot_sync->mode;
break;
default:
abort();
@@ -802,13 +807,15 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
}
/* create new image w/backing file */
- ret = bdrv_img_create(new_image_file, format,
- states->old_bs->filename,
- states->old_bs->drv->format_name,
- NULL, -1, flags);
- if (ret) {
- error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
- goto delete_and_fail;
+ if (mode != NEW_IMAGE_MODE_EXISTING) {
+ ret = bdrv_img_create(new_image_file, format,
+ states->old_bs->filename,
+ states->old_bs->drv->format_name,
+ NULL, -1, flags);
+ if (ret) {
+ error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
+ goto delete_and_fail;
+ }
}
/* We will manually add the backing_hd field to the bs later */
diff --git a/qapi-schema.json b/qapi-schema.json
index 1d1ffa6..b062d01 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1118,6 +1118,24 @@
{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' }}
##
+# @NewImageMode
+#
+# An enumeration that tells QEMU how to set the backing file path in
+# a new image file.
+#
+# @existing: QEMU should look for an existing image file.
+#
+# @absolute-paths: QEMU should create a new image with absolute paths
+# for the backing file.
+#
+# @no-backing-file: QEMU should create a new image with no backing file.
+#
+# Since: 1.1
+##
+{ 'enum': 'NewImageMode'
+ 'data': [ 'existing', 'absolute-paths' ] }
+
+##
# @BlockdevSnapshot
#
# @device: the name of the device to generate the snapshot from.
@@ -1127,7 +1145,8 @@
# @format: #optional the format of the snapshot image, default is 'qcow2'.
##
{ 'type': 'BlockdevSnapshot',
- 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
+ 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str',
+ '*mode': 'NewImageMode' } }
##
# @BlockdevAction
diff --git a/qmp-commands.hx b/qmp-commands.hx
index fb4f1df..7c03b62 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -705,6 +705,13 @@ A list of dictionaries is accepted, that contains the actions to be performed.
For snapshots this is the device, the file to use for the new snapshot,
and the format. The default format, if not specified, is qcow2.
+Each new snapshot defaults to being created by QEMU (wiping any
+contents if the file already exists), but it is also possible to reuse
+an externally-created file. In the latter case, you should ensure that
+the new image file has the same contents as the current one; QEMU cannot
+perform any meaningful check. Typically this is achieved by using the
+current image file as the backing file for the new image.
+
Arguments:
actions array:
@@ -715,6 +722,8 @@ actions array:
- "device": device name to snapshot (json-string)
- "snapshot-file": name of new image file (json-string)
- "format": format of new image (json-string, optional)
+ - "mode": whether and how QEMU should create the snapshot file
+ (NewImageMode, optional, default "absolute-paths")
Example:
@@ -725,6 +734,7 @@ Example:
"format": "qcow2" } },
{ 'type': 'blockdev-snapshot-sync', 'data' : { "device": "ide-hd1",
"snapshot-file": "/some/place/my-image2",
+ "mode": "existing",
"format": "qcow2" } } ] } }
<- { "return": {} }
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 4/8] add mode field to blockdev-snapshot-sync transaction item
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 4/8] add mode field to blockdev-snapshot-sync transaction item Paolo Bonzini
@ 2012-03-05 18:45 ` Eric Blake
0 siblings, 0 replies; 23+ messages in thread
From: Eric Blake @ 2012-03-05 18:45 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, fsimonce, qemu-devel, stefanha, lcapitulino
[-- Attachment #1: Type: text/plain, Size: 3302 bytes --]
On 03/05/2012 10:33 AM, Paolo Bonzini wrote:
> The mode field lets a management application create the snapshot
> destination outside QEMU.
>
> Right now, the only modes are "existing" and "absolute-paths". Mirroring
> introduces "no-backing-file". In the future "relative-paths" could be
> implemented too.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> blockdev.c | 25 ++++++++++++++++---------
> qapi-schema.json | 21 ++++++++++++++++++++-
> qmp-commands.hx | 10 ++++++++++
> 3 files changed, 46 insertions(+), 10 deletions(-)
>
>
> ##
> +# @NewImageMode
> +#
> +# An enumeration that tells QEMU how to set the backing file path in
> +# a new image file.
> +#
> +# @existing: QEMU should look for an existing image file.
> +#
> +# @absolute-paths: QEMU should create a new image with absolute paths
> +# for the backing file.
> +#
> +# @no-backing-file: QEMU should create a new image with no backing file.
Not present in this patch. Does it need to be rebased into the correct
part of the series?
> +#
> +# Since: 1.1
> +##
> +{ 'enum': 'NewImageMode'
> + 'data': [ 'existing', 'absolute-paths' ] }
> +
> +##
> # @BlockdevSnapshot
> #
> # @device: the name of the device to generate the snapshot from.
> @@ -1127,7 +1145,8 @@
> # @format: #optional the format of the snapshot image, default is 'qcow2'.
> ##
> { 'type': 'BlockdevSnapshot',
> - 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
> + 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str',
> + '*mode': 'NewImageMode' } }
>
> ##
> # @BlockdevAction
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index fb4f1df..7c03b62 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -705,6 +705,13 @@ A list of dictionaries is accepted, that contains the actions to be performed.
> For snapshots this is the device, the file to use for the new snapshot,
> and the format. The default format, if not specified, is qcow2.
>
> +Each new snapshot defaults to being created by QEMU (wiping any
> +contents if the file already exists),
so this is mode of 'absolute-paths', which is the default if mode is not
present,
> but it is also possible to reuse
> +an externally-created file. In the latter case, you should ensure that
> +the new image file has the same contents as the current one; QEMU cannot
> +perform any meaningful check. Typically this is achieved by using the
> +current image file as the backing file for the new image.
and this is mode 'existing'. Correct? If so, let's actually call that
out in the wording.
> +
> Arguments:
>
> actions array:
> @@ -715,6 +722,8 @@ actions array:
> - "device": device name to snapshot (json-string)
> - "snapshot-file": name of new image file (json-string)
> - "format": format of new image (json-string, optional)
> + - "mode": whether and how QEMU should create the snapshot file
> + (NewImageMode, optional, default "absolute-paths")
Well, this solves one of my two comments about the above wording, by
calling out the default.
--
Eric Blake eblake@redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 620 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (3 preceding siblings ...)
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 4/8] add mode field to blockdev-snapshot-sync transaction item Paolo Bonzini
@ 2012-03-05 17:33 ` Paolo Bonzini
2012-03-05 18:55 ` Eric Blake
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 6/8] Add blkmirror block driver Paolo Bonzini
` (4 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
Simplify the blockdev-snapshot-sync code and gain failsafe operation
by turning it into a wrapper around the new transaction command. A new
option is also added matching "mode".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 81 ++++++++++++-----------------------------------------
hmp-commands.hx | 9 ++++--
hmp.c | 6 +++-
qapi-schema.json | 15 +++++----
qmp-commands.hx | 2 +
5 files changed, 40 insertions(+), 73 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index c9bd25b..06c3017 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -648,70 +648,27 @@ void do_commit(Monitor *mon, const QDict *qdict)
void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
bool has_format, const char *format,
+ bool has_mode, enum NewImageMode mode,
Error **errp)
{
- BlockDriverState *bs;
- BlockDriver *drv, *old_drv, *proto_drv;
- int ret = 0;
- int flags;
- char old_filename[1024];
-
- bs = bdrv_find(device);
- if (!bs) {
- error_set(errp, QERR_DEVICE_NOT_FOUND, device);
- return;
- }
- if (bdrv_in_use(bs)) {
- error_set(errp, QERR_DEVICE_IN_USE, device);
- return;
- }
-
- pstrcpy(old_filename, sizeof(old_filename), bs->filename);
-
- old_drv = bs->drv;
- flags = bs->open_flags;
-
- if (!has_format) {
- format = "qcow2";
- }
-
- drv = bdrv_find_format(format);
- if (!drv) {
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
- return;
- }
-
- proto_drv = bdrv_find_protocol(snapshot_file);
- if (!proto_drv) {
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
- return;
- }
-
- ret = bdrv_img_create(snapshot_file, format, bs->filename,
- bs->drv->format_name, NULL, -1, flags);
- if (ret) {
- error_set(errp, QERR_UNDEFINED_ERROR);
- return;
- }
-
- bdrv_drain_all();
- bdrv_flush(bs);
-
- bdrv_close(bs);
- ret = bdrv_open(bs, snapshot_file, flags, drv);
- /*
- * If reopening the image file we just created fails, fall back
- * and try to re-open the original image. If that fails too, we
- * are in serious trouble.
- */
- if (ret != 0) {
- ret = bdrv_open(bs, old_filename, flags, old_drv);
- if (ret != 0) {
- error_set(errp, QERR_OPEN_FILE_FAILED, old_filename);
- } else {
- error_set(errp, QERR_OPEN_FILE_FAILED, snapshot_file);
- }
- }
+ BlockdevSnapshot snapshot = {
+ .device = (char *) device,
+ .snapshot_file = (char *) snapshot_file,
+ .has_format = has_format,
+ .format = (char *) format,
+ .has_mode = has_mode,
+ .mode = mode,
+ };
+ BlockdevAction action = {
+ .kind = BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,
+ .blockdev_snapshot_sync = &snapshot,
+ };
+ BlockdevActionList list = {
+ .value = &action,
+ .next = NULL
+ };
+
+ qmp_transaction(&list, errp);
}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index ed88877..6980214 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -882,14 +882,17 @@ ETEXI
{
.name = "snapshot_blkdev",
- .args_type = "device:B,snapshot-file:s?,format:s?",
- .params = "device [new-image-file] [format]",
+ .args_type = "reuse:-n,device:B,snapshot-file:s?,format:s?",
+ .params = "[-n] device [new-image-file] [format]",
.help = "initiates a live snapshot\n\t\t\t"
"of device. If a new image file is specified, the\n\t\t\t"
"new image file will become the new root image.\n\t\t\t"
"If format is specified, the snapshot file will\n\t\t\t"
"be created in that format. Otherwise the\n\t\t\t"
- "snapshot will be internal! (currently unsupported)",
+ "snapshot will be internal! (currently unsupported).\n\t\t\t"
+ "The default format is qcow2. The -n flag requests QEMU\n\t\t\t"
+ "to reuse the image found in new-image-file, instead of\n\t\t\t"
+ "recreating it from scratch.",
.mhandler.cmd = hmp_snapshot_blkdev,
},
diff --git a/hmp.c b/hmp.c
index 3a54455..290c43d 100644
--- a/hmp.c
+++ b/hmp.c
@@ -692,6 +692,8 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
const char *device = qdict_get_str(qdict, "device");
const char *filename = qdict_get_try_str(qdict, "snapshot-file");
const char *format = qdict_get_try_str(qdict, "format");
+ int reuse = qdict_get_try_bool(qdict, "reuse", 0);
+ enum NewImageMode mode;
Error *errp = NULL;
if (!filename) {
@@ -702,7 +704,9 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
return;
}
- qmp_blockdev_snapshot_sync(device, filename, !!format, format, &errp);
+ mode = reuse ? NEW_IMAGE_MODE_EXISTING : NEW_IMAGE_MODE_ABSOLUTE_PATHS;
+ qmp_blockdev_snapshot_sync(device, filename, !!format, format,
+ true, mode, &errp);
hmp_handle_error(mon, &errp);
}
diff --git a/qapi-schema.json b/qapi-schema.json
index b062d01..0d24240 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1143,6 +1143,9 @@
# @snapshot-file: the target of the new image. A new file will be created.
#
# @format: #optional the format of the snapshot image, default is 'qcow2'.
+#
+# @mode: #optional whether and how QEMU should create a new image, default is
+# 'absolute-paths'.
##
{ 'type': 'BlockdevSnapshot',
'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str',
@@ -1199,21 +1202,19 @@
#
# @format: #optional the format of the snapshot image, default is 'qcow2'.
#
+# @mode: #optional whether and how QEMU should create a new image, default is
+# 'absolute-paths'.
+#
# Returns: nothing on success
# If @device is not a valid block device, DeviceNotFound
# If @snapshot-file can't be opened, OpenFileFailed
# If @format is invalid, InvalidBlockFormat
#
-# Notes: One of the last steps taken by this command is to close the current
-# image being used by @device and open the @snapshot-file one. If that
-# fails, the command will try to reopen the original image file. If
-# that also fails OpenFileFailed will be returned and the guest may get
-# unexpected errors.
-#
# Since 0.14.0
##
{ 'command': 'blockdev-snapshot-sync',
- 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str' } }
+ 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str',
+ '*mode': 'NewImageMode'} }
##
# @human-monitor-command:
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 7c03b62..dfe8a5b 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -760,6 +760,8 @@ Arguments:
- "device": device name to snapshot (json-string)
- "snapshot-file": name of new image file (json-string)
+- "mode": whether and how QEMU should create the snapshot file
+ (NewImageMode, optional, default "absolute-paths")
- "format": format of new image (json-string, optional)
Example:
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions Paolo Bonzini
@ 2012-03-05 18:55 ` Eric Blake
2012-03-05 19:44 ` Paolo Bonzini
0 siblings, 1 reply; 23+ messages in thread
From: Eric Blake @ 2012-03-05 18:55 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, fsimonce, qemu-devel, stefanha, lcapitulino
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
On 03/05/2012 10:33 AM, Paolo Bonzini wrote:
> Simplify the blockdev-snapshot-sync code and gain failsafe operation
> by turning it into a wrapper around the new transaction command. A new
> option is also added matching "mode".
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> blockdev.c | 81 ++++++++++++-----------------------------------------
> hmp-commands.hx | 9 ++++--
> hmp.c | 6 +++-
> qapi-schema.json | 15 +++++----
> qmp-commands.hx | 2 +
> 5 files changed, 40 insertions(+), 73 deletions(-)
>
> +++ b/qapi-schema.json
> @@ -1143,6 +1143,9 @@
> # @snapshot-file: the target of the new image. A new file will be created.
> #
> # @format: #optional the format of the snapshot image, default is 'qcow2'.
> +#
> +# @mode: #optional whether and how QEMU should create a new image, default is
> +# 'absolute-paths'.
> ##
> { 'type': 'BlockdevSnapshot',
> 'data': { 'device': 'str', 'snapshot-file': 'str', '*format': 'str',
> @@ -1199,21 +1202,19 @@
> #
> # @format: #optional the format of the snapshot image, default is 'qcow2'.
> #
> +# @mode: #optional whether and how QEMU should create a new image, default is
> +# 'absolute-paths'.
Right now, libvirt has an API virDomainSnapshotCreateXML with a flag
VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, which should map to this new mode
operand. Am I guaranteed that if I pass a 'mode' argument of 'existing'
to an older qemu that lacked mode, I will get a sane error? If so, then
this rewrite looks fine from libvirt's point of view.
--
Eric Blake eblake@redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 620 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions
2012-03-05 18:55 ` Eric Blake
@ 2012-03-05 19:44 ` Paolo Bonzini
2012-03-05 21:16 ` Paolo Bonzini
2012-03-06 11:30 ` Luiz Capitulino
0 siblings, 2 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 19:44 UTC (permalink / raw)
To: Eric Blake; +Cc: kwolf, fsimonce, lcapitulino, qemu-devel, stefanha
Il 05/03/2012 19:55, Eric Blake ha scritto:
> Right now, libvirt has an API virDomainSnapshotCreateXML with a flag
> VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, which should map to this new mode
> operand. Am I guaranteed that if I pass a 'mode' argument of 'existing'
> to an older qemu that lacked mode, I will get a sane error? If so, then
> this rewrite looks fine from libvirt's point of view.
Not sure... Luiz?
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions
2012-03-05 19:44 ` Paolo Bonzini
@ 2012-03-05 21:16 ` Paolo Bonzini
2012-03-06 11:30 ` Luiz Capitulino
1 sibling, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 21:16 UTC (permalink / raw)
Cc: kwolf, stefanha, qemu-devel, lcapitulino, fsimonce, Eric Blake
Il 05/03/2012 20:44, Paolo Bonzini ha scritto:
> Il 05/03/2012 19:55, Eric Blake ha scritto:
>> Right now, libvirt has an API virDomainSnapshotCreateXML with a flag
>> VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, which should map to this new mode
>> operand. Am I guaranteed that if I pass a 'mode' argument of 'existing'
>> to an older qemu that lacked mode, I will get a sane error? If so, then
>> this rewrite looks fine from libvirt's point of view.
>
> Not sure... Luiz?
Well, you could always use the transaction command if the flag is there.
That command will have it always.
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions
2012-03-05 19:44 ` Paolo Bonzini
2012-03-05 21:16 ` Paolo Bonzini
@ 2012-03-06 11:30 ` Luiz Capitulino
1 sibling, 0 replies; 23+ messages in thread
From: Luiz Capitulino @ 2012-03-06 11:30 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, fsimonce, Eric Blake, qemu-devel, stefanha
On Mon, 05 Mar 2012 20:44:39 +0100
Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 05/03/2012 19:55, Eric Blake ha scritto:
> > Right now, libvirt has an API virDomainSnapshotCreateXML with a flag
> > VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, which should map to this new mode
> > operand. Am I guaranteed that if I pass a 'mode' argument of 'existing'
> > to an older qemu that lacked mode, I will get a sane error? If so, then
> > this rewrite looks fine from libvirt's point of view.
>
> Not sure... Luiz?
The question is: will I get an error if I pass an unknown argument to
a command? Yes, you will.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 6/8] Add blkmirror block driver
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (4 preceding siblings ...)
2012-03-05 17:33 ` [Qemu-devel] [PATCH v3 5/8] qmp: convert blockdev-snapshot-sync to a wrapper around transactions Paolo Bonzini
@ 2012-03-05 17:34 ` Paolo Bonzini
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 7/8] add mirroring to transaction Paolo Bonzini
` (3 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:34 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, stefanha, Marcelo Tosatti, lcapitulino, fsimonce, eblake
From: Marcelo Tosatti <mtosatti@redhat.com>
Mirrored writes are used by live block copy.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 +-
block/blkmirror.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 240 insertions(+), 1 deletions(-)
create mode 100644 block/blkmirror.c
diff --git a/Makefile.objs b/Makefile.objs
index 808de6a..982f44b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -74,7 +74,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
# suppress *all* target specific code in case of system emulation, i.e. a
# single QEMU executable should support all CPUs and machines.
-common-obj-y = $(block-obj-y) blockdev.o
+common-obj-y = $(block-obj-y) blockdev.o block/blkmirror.o
common-obj-y += $(net-obj-y)
common-obj-y += $(qobject-obj-y)
common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
diff --git a/block/blkmirror.c b/block/blkmirror.c
new file mode 100644
index 0000000..0ee2ca6
--- /dev/null
+++ b/block/blkmirror.c
@@ -0,0 +1,239 @@
+/*
+ * Block driver for mirrored writes.
+ *
+ * Copyright (C) 2011-2012 Red Hat, Inc.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include <stdarg.h>
+#include "block_int.h"
+
+typedef struct DupAIOCB DupAIOCB;
+
+typedef struct SingleAIOCB {
+ BlockDriverAIOCB *aiocb;
+ DupAIOCB *parent;
+} SingleAIOCB;
+
+struct DupAIOCB {
+ BlockDriverAIOCB common;
+ int count;
+ int canceled;
+
+ BlockDriverCompletionFunc *cb;
+ SingleAIOCB aios[2];
+ int ret;
+};
+
+/* Valid blkmirror filenames look like blkmirror:format:path/to/target.
+ *
+ * The driver is not intended for general usage. It expects bdrv_append
+ * to tack it onto an existing image, which is used as the primary
+ * source and hardcoded to be the backing file for the target.
+ */
+static int blkmirror_open(BlockDriverState *bs, const char *filename, int flags)
+{
+ int ret, n;
+ const char *filename2;
+ char *format;
+ BlockDriver *drv;
+
+ /* Parse the blkmirror: prefix */
+ if (strncmp(filename, "blkmirror:", strlen("blkmirror:"))) {
+ return -EINVAL;
+ }
+ filename += strlen("blkmirror:");
+
+ /* The source image filename is added by bdrv_append. We only need
+ * to parse and open the destination image and format. */
+ n = strcspn(filename, ":");
+ if (filename[n] == 0) {
+ format = NULL;
+ filename2 = filename;
+ } else {
+ format = g_strdup(filename);
+ format[n] = 0;
+ filename2 = format + n + 1;
+ }
+
+ drv = bdrv_find_whitelisted_format(format);
+ if (!drv) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ bs->file = bdrv_new("");
+ if (bs->file == NULL) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ /* If we crash, we cannot assume that the destination is a
+ * valid mirror and we have to start over. So speed up things
+ * by effectively operating on the destination in cache=unsafe
+ * mode.
+ */
+ ret = bdrv_open(bs->file, filename2,
+ flags | BDRV_O_NO_BACKING | BDRV_O_NO_FLUSH | BDRV_O_CACHE_WB,
+ drv);
+ if (ret < 0) {
+ goto out;
+ }
+
+out:
+ g_free(format);
+ return ret;
+}
+
+static void blkmirror_close(BlockDriverState *bs)
+{
+ bs->file->backing_hd = NULL;
+
+ /* backing_hd and file closed by the caller. */
+}
+
+static coroutine_fn int blkmirror_co_flush(BlockDriverState *bs)
+{
+ return bdrv_co_flush(bs->backing_hd);
+}
+
+static int64_t blkmirror_getlength(BlockDriverState *bs)
+{
+ return bdrv_getlength(bs->file);
+}
+
+static int coroutine_fn blkmirror_co_is_allocated(BlockDriverState *bs,
+ int64_t sector_num,
+ int nb_sectors, int *pnum)
+{
+ return bdrv_is_allocated(bs->file, sector_num, nb_sectors, pnum);
+}
+
+static BlockDriverAIOCB *blkmirror_aio_readv(BlockDriverState *bs,
+ int64_t sector_num,
+ QEMUIOVector *qiov, int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
+{
+ return bdrv_aio_readv(bs->backing_hd, sector_num, qiov, nb_sectors,
+ cb, opaque);
+}
+
+static void dup_aio_cancel(BlockDriverAIOCB *acb)
+{
+ DupAIOCB *dcb = container_of(acb, DupAIOCB, common);
+ int i;
+
+ dcb->canceled = true;
+ for (i = 0 ; i < 2; i++) {
+ if (dcb->aios[i].aiocb) {
+ bdrv_aio_cancel(dcb->aios[i].aiocb);
+ }
+ }
+ qemu_aio_release(dcb);
+}
+
+static AIOPool dup_aio_pool = {
+ .aiocb_size = sizeof(DupAIOCB),
+ .cancel = dup_aio_cancel,
+};
+
+static void blkmirror_aio_cb(void *opaque, int ret)
+{
+ SingleAIOCB *scb = opaque;
+ DupAIOCB *dcb = scb->parent;
+
+ scb->aiocb = NULL;
+
+ assert(dcb->count > 0);
+ if (ret < 0 && dcb->ret == 0) {
+ dcb->ret = ret;
+ }
+ if (--dcb->count == 0) {
+ dcb->common.cb(dcb->common.opaque, dcb->ret);
+ if (!dcb->canceled) {
+ qemu_aio_release(dcb);
+ }
+ }
+}
+
+static DupAIOCB *dup_aio_get(BlockDriverState *bs,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
+{
+ DupAIOCB *dcb = qemu_aio_get(&dup_aio_pool, bs, cb, opaque);
+
+ dcb->canceled = false;
+ dcb->aios[0].parent = dcb;
+ dcb->aios[1].parent = dcb;
+ dcb->count = 2;
+ dcb->ret = 0;
+ return dcb;
+}
+
+static BlockDriverAIOCB *blkmirror_aio_writev(BlockDriverState *bs,
+ int64_t sector_num,
+ QEMUIOVector *qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
+{
+ DupAIOCB *dcb = dup_aio_get(bs, cb, opaque);
+
+ /* bs->backing_hd is set after initialization. */
+ bs->file->backing_hd = bs->backing_hd;
+
+ dcb->aios[0].aiocb = bdrv_aio_writev(bs->backing_hd, sector_num, qiov,
+ nb_sectors, blkmirror_aio_cb,
+ &dcb->aios[0]);
+ dcb->aios[1].aiocb = bdrv_aio_writev(bs->file, sector_num, qiov,
+ nb_sectors, blkmirror_aio_cb,
+ &dcb->aios[1]);
+
+ return &dcb->common;
+}
+
+static BlockDriverAIOCB *blkmirror_aio_discard(BlockDriverState *bs,
+ int64_t sector_num,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
+{
+ DupAIOCB *dcb = dup_aio_get(bs, cb, opaque);
+
+ dcb->aios[0].aiocb = bdrv_aio_discard(bs->backing_hd, sector_num,
+ nb_sectors, blkmirror_aio_cb,
+ &dcb->aios[0]);
+ dcb->aios[1].aiocb = bdrv_aio_discard(bs->file, sector_num,
+ nb_sectors, blkmirror_aio_cb,
+ &dcb->aios[1]);
+
+ return &dcb->common;
+}
+
+
+static BlockDriver bdrv_blkmirror = {
+ .format_name = "blkmirror",
+ .protocol_name = "blkmirror",
+ .instance_size = 0,
+
+ .bdrv_getlength = blkmirror_getlength,
+
+ .bdrv_file_open = blkmirror_open,
+ .bdrv_close = blkmirror_close,
+ .bdrv_co_flush_to_disk = blkmirror_co_flush,
+ .bdrv_co_is_allocated = blkmirror_co_is_allocated,
+
+ .bdrv_aio_readv = blkmirror_aio_readv,
+ .bdrv_aio_writev = blkmirror_aio_writev,
+ .bdrv_aio_discard = blkmirror_aio_discard,
+};
+
+static void bdrv_blkmirror_init(void)
+{
+ bdrv_register(&bdrv_blkmirror);
+}
+
+block_init(bdrv_blkmirror_init);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 7/8] add mirroring to transaction
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (5 preceding siblings ...)
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 6/8] Add blkmirror block driver Paolo Bonzini
@ 2012-03-05 17:34 ` Paolo Bonzini
2012-03-05 19:04 ` Eric Blake
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 8/8] add drive-mirror command and HMP equivalent Paolo Bonzini
` (2 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:34 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
With it comes a new image creation mode, "no-backing-file", that can
be used to stream an image so that the destination does not need the
original image's backing file(s).
Both bdrv_append and blkmirror will set the backing_hd on the target,
even if the image is created without one, so that both streaming and
copy-on-write work properly (at least with qcow2 or qed, not raw).
Streaming mode works with the following gotchas:
- streaming will rewrite every bit of the source image;
- zero writes are not supported by the blkmirror driver, hence both
the source and the destination image will grow to full size.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
qapi-schema.json | 21 +++++++++++++++++++--
qmp-commands.hx | 12 +++++++++++-
3 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 06c3017..df086d1 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -689,6 +689,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
int ret = 0;
BlockdevActionList *dev_entry = dev_list;
BlkTransactionStates *states;
+ char *new_source = NULL;
QSIMPLEQ_HEAD(snap_bdrv_states, BlkTransactionStates) snap_bdrv_states;
QSIMPLEQ_INIT(&snap_bdrv_states);
@@ -700,7 +701,8 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
while (NULL != dev_entry) {
BlockdevAction *dev_info = NULL;
BlockDriver *proto_drv;
- BlockDriver *drv;
+ BlockDriver *target_drv;
+ BlockDriver *drv = NULL;
int flags;
enum NewImageMode mode;
const char *new_image_file;
@@ -724,16 +726,36 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
format = dev_info->blockdev_snapshot_sync->format;
}
mode = dev_info->blockdev_snapshot_sync->mode;
+ new_source = g_strdup(new_image_file);
break;
+
+ case BLOCKDEV_ACTION_KIND_DRIVE_MIRROR:
+ device = dev_info->drive_mirror->device;
+ drv = bdrv_find_format("blkmirror");
+ if (!dev_info->drive_mirror->has_mode) {
+ dev_info->drive_mirror->mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS;
+ }
+ new_image_file = dev_info->drive_mirror->target;
+ if (dev_info->drive_mirror->has_format) {
+ format = dev_info->drive_mirror->format;
+ }
+ mode = dev_info->drive_mirror->mode;
+ new_source = g_strdup_printf("blkmirror:%s:%s", format,
+ dev_info->drive_mirror->target);
+ break;
+
default:
abort();
}
- drv = bdrv_find_format(format);
- if (!drv) {
+ target_drv = bdrv_find_format(format);
+ if (!target_drv) {
error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
goto delete_and_fail;
}
+ if (!drv) {
+ drv = target_drv;
+ }
states->old_bs = bdrv_find(device);
if (!states->old_bs) {
@@ -757,7 +779,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
flags = states->old_bs->open_flags;
- proto_drv = bdrv_find_protocol(new_image_file);
+ proto_drv = bdrv_find_protocol(new_source);
if (!proto_drv) {
error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
goto delete_and_fail;
@@ -765,10 +787,18 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
/* create new image w/backing file */
if (mode != NEW_IMAGE_MODE_EXISTING) {
- ret = bdrv_img_create(new_image_file, format,
- states->old_bs->filename,
- states->old_bs->drv->format_name,
- NULL, -1, flags);
+ if (mode == NEW_IMAGE_MODE_ABSOLUTE_PATHS) {
+ ret = bdrv_img_create(new_image_file, format,
+ states->old_bs->filename,
+ states->old_bs->drv->format_name,
+ NULL, -1, flags);
+ } else {
+ uint64_t size;
+ bdrv_get_geometry(states->old_bs, &size);
+ size *= 512;
+ ret = bdrv_img_create(new_image_file, format,
+ NULL, NULL, NULL, size, flags);
+ }
if (ret) {
error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
goto delete_and_fail;
@@ -777,12 +807,14 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
/* We will manually add the backing_hd field to the bs later */
states->new_bs = bdrv_new("");
- ret = bdrv_open(states->new_bs, new_image_file,
+ ret = bdrv_open(states->new_bs, new_source,
flags | BDRV_O_NO_BACKING, drv);
if (ret != 0) {
- error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
+ error_set(errp, QERR_OPEN_FILE_FAILED, new_source);
goto delete_and_fail;
}
+ g_free(new_source);
+ new_source = NULL;
}
@@ -810,6 +842,7 @@ exit:
QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) {
g_free(states);
}
+ g_free(new_source);
return;
}
diff --git a/qapi-schema.json b/qapi-schema.json
index 0d24240..a61e90c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1133,7 +1133,7 @@
# Since: 1.1
##
{ 'enum': 'NewImageMode'
- 'data': [ 'existing', 'absolute-paths' ] }
+ 'data': [ 'existing', 'absolute-paths', 'no-backing-file' ] }
##
# @BlockdevSnapshot
@@ -1152,6 +1152,23 @@
'*mode': 'NewImageMode' } }
##
+# @BlockdevMirror
+#
+# @device: the name of the device to start mirroring.
+#
+# @target: the image that will start receiving writes for @device. A new
+# file will be created unless @mode is "existing".
+#
+# @format: #optional the format of the target image, default is 'qcow2'.
+#
+# @mode: #optional whether and how QEMU should create a new image, default is
+# 'absolute-paths'.
+##
+{ 'type': 'BlockdevMirror',
+ 'data': { 'device': 'str', 'target': 'str', '*format': 'str',
+ '*mode': 'NewImageMode' } }
+
+##
# @BlockdevAction
#
# A discriminated record of operations that can be performed with
@@ -1159,7 +1175,8 @@
##
{ 'union': 'BlockdevAction',
'data': {
- 'blockdev-snapshot-sync': 'BlockdevSnapshot'
+ 'blockdev-snapshot-sync': 'BlockdevSnapshot',
+ 'drive-mirror': 'BlockdevMirror',
} }
##
diff --git a/qmp-commands.hx b/qmp-commands.hx
index dfe8a5b..9dcafd4 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -701,12 +701,16 @@ operation for now is snapshotting. If there is any failure performing
transaction
-----------
-Atomically operate on one or more block devices. The only supported
-operation for now is snapshotting. If there is any failure performing
+Atomically operate on one or more block devices, snapshotting them
+or enabling mirrored writes. If there is any failure performing
any of the operations, all snapshots for the group are abandoned, and
the original disks pre-snapshot attempt are used.
+Mirrored writes keep the previous image file open, and start writing
+data also to the new file specified in the command.
+
A list of dictionaries is accepted, that contains the actions to be performed.
+
For snapshots this is the device, the file to use for the new snapshot,
and the format. The default format, if not specified, is qcow2.
@@ -716,7 +720,7 @@ Arguments:
actions array:
- "type": the operation to perform. The only supported
- value is "blockdev-snapshot-sync". (json-string)
+ values are "blockdev-snapshot-sync" and "mirror". (json-string)
- "data": a dictionary. The contents depend on the value
of "type". When "type" is "blockdev-snapshot-sync":
- "device": device name to snapshot (json-string)
@@ -724,6 +728,12 @@ actions array:
- "format": format of new image (json-string, optional)
- "mode": whether and how QEMU should create the snapshot file
(NewImageMode, optional, default "absolute-paths")
+ When "type" is "drive-mirror":
+ - "device": device name to snapshot (json-string)
+ - "target": name of destination image file (json-string)
+ - "format": format of new image (json-string, optional)
+ - "mode": how QEMU should look for an existing image file
+ (NewImageMode, optional, default "absolute-paths")
Example:
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [Qemu-devel] [PATCH v3 7/8] add mirroring to transaction
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 7/8] add mirroring to transaction Paolo Bonzini
@ 2012-03-05 19:04 ` Eric Blake
0 siblings, 0 replies; 23+ messages in thread
From: Eric Blake @ 2012-03-05 19:04 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kwolf, fsimonce, qemu-devel, stefanha, lcapitulino
[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]
On 03/05/2012 10:34 AM, Paolo Bonzini wrote:
> With it comes a new image creation mode, "no-backing-file", that can
> be used to stream an image so that the destination does not need the
> original image's backing file(s).
>
> Both bdrv_append and blkmirror will set the backing_hd on the target,
> even if the image is created without one, so that both streaming and
> copy-on-write work properly (at least with qcow2 or qed, not raw).
>
> Streaming mode works with the following gotchas:
>
> - streaming will rewrite every bit of the source image;
>
> - zero writes are not supported by the blkmirror driver, hence both
> the source and the destination image will grow to full size.
>
> @@ -1159,7 +1175,8 @@
> ##
> { 'union': 'BlockdevAction',
> 'data': {
> - 'blockdev-snapshot-sync': 'BlockdevSnapshot'
> + 'blockdev-snapshot-sync': 'BlockdevSnapshot',
Minor nit - should we rebase this trailing comma earlier in the series,
to make it obvious that BlockdevAction will grow and for less churn in
this patch?
--
Eric Blake eblake@redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 620 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH v3 8/8] add drive-mirror command and HMP equivalent
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (6 preceding siblings ...)
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 7/8] add mirroring to transaction Paolo Bonzini
@ 2012-03-05 17:34 ` Paolo Bonzini
2012-03-06 8:02 ` [Qemu-devel] [PATCH v3 9/8] Add the drive-reopen command Paolo Bonzini
2012-03-06 8:52 ` [Qemu-devel] [PATCH v3 10/8] use QSIMPLEQ_FOREACH_SAFE when freeing list elements Paolo Bonzini
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-05 17:34 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
Since QMP transactions are supposed to take (pseudo) QMP commands,
add a standalone drive-mirror command.
The corresponding HMP command does not provide atomic snapshot+mirror,
but it can still be used together with image streaming.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 24 ++++++++++++++++++++++++
hmp-commands.hx | 22 ++++++++++++++++++++++
hmp.c | 28 ++++++++++++++++++++++++++++
hmp.h | 1 +
qapi-schema.json | 26 ++++++++++++++++++++++++++
qmp-commands.hx | 33 +++++++++++++++++++++++++++++++++
6 files changed, 134 insertions(+), 0 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index df086d1..60fdc7b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -671,6 +671,30 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
qmp_transaction(&list, errp);
}
+void qmp_drive_mirror(const char *device, const char *target,
+ bool has_format, const char *format,
+ bool has_mode, enum NewImageMode mode, Error **errp)
+{
+ BlockdevMirror mirror = {
+ .device = (char *) device,
+ .target = (char *) target,
+ .has_format = has_format,
+ .format = (char *) format,
+ .has_mode = has_mode,
+ .mode = mode,
+ };
+ BlockdevAction action = {
+ .kind = BLOCKDEV_ACTION_KIND_DRIVE_MIRROR,
+ .drive_mirror = &mirror,
+ };
+ BlockdevActionList list = {
+ .value = &action,
+ .next = NULL
+ };
+
+ qmp_transaction(&list, errp);
+}
+
/* New and old BlockDriverState structs for group snapshots */
typedef struct BlkTransactionStates {
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 6980214..9c49c33 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -903,6 +903,28 @@ Snapshot device, using snapshot file as target if provided
ETEXI
{
+ .name = "drive_mirror",
+ .args_type = "reuse:-n,no-backing:-s,device:B,target:s,format:s?",
+ .params = "[-n] [-s] device [new-image-file] [format]",
+ .help = "initiates live storage\n\t\t\t"
+ "migration for a device. New writes are mirrored to the\n\t\t\t"
+ "specified new image file, and the block_stream\n\t\t\t"
+ "command can then be started.\n\t\t\t"
+ "The default format is qcow2. The -n flag requests QEMU\n\t\t\t"
+ "to reuse the image found in new-image-file, instead of\n\t\t\t"
+ "recreating it from scratch. The -s flag requests QEMU\n\t\t\t"
+ "to create a root image, that does not have the current\n\t\t\t"
+ "image as the backing file.",
+ .mhandler.cmd = hmp_drive_mirror,
+ },
+STEXI
+@item drive_mirror
+@findex drive_mirror
+Start mirroring a block device's writes to a new destination,
+using the specified target.
+ETEXI
+
+ {
.name = "drive_add",
.args_type = "pci_addr:s,opts:s",
.params = "[[<domain>:]<bus>:]<slot>\n"
diff --git a/hmp.c b/hmp.c
index 290c43d..e706db9 100644
--- a/hmp.c
+++ b/hmp.c
@@ -687,6 +687,34 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, &errp);
}
+void hmp_drive_mirror(Monitor *mon, const QDict *qdict)
+{
+ const char *device = qdict_get_str(qdict, "device");
+ const char *filename = qdict_get_try_str(qdict, "target");
+ const char *format = qdict_get_try_str(qdict, "format");
+ int reuse = qdict_get_try_bool(qdict, "reuse", 0);
+ int no_backing = qdict_get_try_bool(qdict, "no-backing", 0);
+ enum NewImageMode mode;
+ Error *errp = NULL;
+
+ if (!filename) {
+ error_set(&errp, QERR_MISSING_PARAMETER, "target");
+ hmp_handle_error(mon, &errp);
+ return;
+ }
+
+ if (reuse) {
+ mode = NEW_IMAGE_MODE_EXISTING;
+ } else if (no_backing) {
+ mode = NEW_IMAGE_MODE_NO_BACKING_FILE;
+ } else {
+ mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS;
+ }
+
+ qmp_drive_mirror(device, filename, !!format, format, true, mode, &errp);
+ hmp_handle_error(mon, &errp);
+}
+
void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_str(qdict, "device");
diff --git a/hmp.h b/hmp.h
index 5409464..5352f00 100644
--- a/hmp.h
+++ b/hmp.h
@@ -48,6 +48,7 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdict);
void hmp_balloon(Monitor *mon, const QDict *qdict);
void hmp_block_resize(Monitor *mon, const QDict *qdict);
void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict);
+void hmp_drive_mirror(Monitor *mon, const QDict *qdict);
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict);
diff --git a/qapi-schema.json b/qapi-schema.json
index a61e90c..16e8786 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1262,6 +1262,33 @@
'returns': 'str' }
##
+# @drive-mirror
+#
+# Start mirroring a block device's writes to a new destination.
+#
+# @device: the name of the device whose writes should be mirrored.
+#
+# @target: the target of the new image. If the file exists, or if it
+# is a device, the existing file/device will be used as the new
+# destination. If it does not exist, a new file will be created.
+#
+# @format: #optional the format of the new destination, default is 'qcow2'.
+#
+# @mode: #optional whether and how QEMU should create a new image, default is
+# 'absolute-paths'.
+#
+# Returns: nothing on success
+# If @device is not a valid block device, DeviceNotFound
+# If @target can't be opened, OpenFileFailed
+# If @format is invalid, InvalidBlockFormat
+#
+# Since 1.1
+##
+{ 'command': 'drive-mirror',
+ 'data': { 'device': 'str', 'target': 'str', '*format': 'str',
+ '*mode': 'NewImageMode'} }
+
+##
# @migrate_cancel
#
# Cancel the current executing migration process.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 9dcafd4..b8a93d1 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -785,6 +785,39 @@ Example:
EQMP
{
+ .name = "drive-mirror",
+ .args_type = "device:B,snapshot-file:s,mode:s?,format:s?",
+ .mhandler.cmd_new = qmp_marshal_input_drive_mirror,
+ },
+
+SQMP
+drive-mirror
+------------
+
+Start mirroring a block device's writes to a new destination. target
+specifies the target of the new image. If the file exists, or if it is
+a device, it will be used as the new destination for writes. If does not
+exist, a new file will be created. format specifies the format of the
+mirror image, default is qcow2.
+
+Arguments:
+
+- "device": device name to operate on (json-string)
+- "target": name of new image file (json-string)
+- "format": format of new image (json-string, optional)
+- "mode": how an image file should be created into the target
+ file/device (NewImageMode, optional, default 'absolute-paths')
+
+Example:
+
+-> { "execute": "drive-mirror", "arguments": { "device": "ide-hd0",
+ "target": "/some/place/my-image",
+ "format": "qcow2" } }
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "balloon",
.args_type = "value:M",
.mhandler.cmd_new = qmp_marshal_input_balloon,
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 9/8] Add the drive-reopen command
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (7 preceding siblings ...)
2012-03-05 17:34 ` [Qemu-devel] [PATCH v3 8/8] add drive-mirror command and HMP equivalent Paolo Bonzini
@ 2012-03-06 8:02 ` Paolo Bonzini
2012-03-06 8:52 ` [Qemu-devel] [PATCH v3 10/8] use QSIMPLEQ_FOREACH_SAFE when freeing list elements Paolo Bonzini
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-06 8:02 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, Federico Simoncelli, eblake, stefanha, lcapitulino
From: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
hmp-commands.hx | 16 +++++++++++++
hmp.c | 11 +++++++++
hmp.h | 1 +
qapi-schema.json | 22 ++++++++++++++++++
5 files changed, 113 insertions(+), 0 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 60fdc7b..1fb2a17 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -646,6 +646,69 @@ void do_commit(Monitor *mon, const QDict *qdict)
}
}
+static void change_blockdev_image(const char *device, const char *new_image_file,
+ const char *format, Error **errp)
+{
+ BlockDriverState *bs;
+ BlockDriver *drv, *old_drv, *proto_drv;
+ int ret = 0;
+ int flags;
+ char old_filename[1024];
+
+ bs = bdrv_find(device);
+ if (!bs) {
+ error_set(errp, QERR_DEVICE_NOT_FOUND, device);
+ return;
+ }
+ if (bdrv_in_use(bs)) {
+ error_set(errp, QERR_DEVICE_IN_USE, device);
+ return;
+ }
+
+ pstrcpy(old_filename, sizeof(old_filename), bs->filename);
+
+ old_drv = bs->drv;
+ flags = bs->open_flags;
+
+ drv = bdrv_find_format(format);
+ if (!drv) {
+ error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
+ return;
+ }
+
+ proto_drv = bdrv_find_protocol(new_image_file);
+ if (!proto_drv) {
+ error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
+ return;
+ }
+
+ bdrv_drain_all();
+ bdrv_flush(bs);
+
+ bdrv_close(bs);
+ ret = bdrv_open(bs, new_image_file, flags, drv);
+ /*
+ * If reopening the image file we just created fails, fall back
+ * and try to re-open the original image. If that fails too, we
+ * are in serious trouble.
+ */
+ if (ret != 0) {
+ ret = bdrv_open(bs, old_filename, flags, old_drv);
+ if (ret != 0) {
+ error_set(errp, QERR_OPEN_FILE_FAILED, old_filename);
+ } else {
+ error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
+ }
+ }
+}
+
+void qmp_drive_reopen(const char *device, const char *new_image_file,
+ bool has_format, const char *format, Error **errp)
+{
+ change_blockdev_image(device, new_image_file,
+ has_format ? format : "qcow2", errp);
+}
+
void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file,
bool has_format, const char *format,
bool has_mode, enum NewImageMode mode,
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 9c49c33..4afde71 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -925,6 +925,22 @@ using the specified target.
ETEXI
{
+ .name = "drive_reopen",
+ .args_type = "device:B,new-image-file:s,format:s?",
+ .params = "device new-image-file [format]",
+ .help = "Assigns a new image file to a device.\n\t\t\t"
+ "The image will be opened using the format\n\t\t\t"
+ "specified or 'qcow2' by default.\n\t\t\t",
+ .mhandler.cmd = hmp_drive_reopen,
+ },
+
+STEXI
+@item drive_reopen
+@findex drive_reopen
+Assigns a new image file to a device.
+ETEXI
+
+ {
.name = "drive_add",
.args_type = "pci_addr:s,opts:s",
.params = "[[<domain>:]<bus>:]<slot>\n"
diff --git a/hmp.c b/hmp.c
index e706db9..ec41d83 100644
--- a/hmp.c
+++ b/hmp.c
@@ -738,6 +738,17 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, &errp);
}
+void hmp_drive_reopen(Monitor *mon, const QDict *qdict)
+{
+ const char *device = qdict_get_str(qdict, "device");
+ const char *filename = qdict_get_str(qdict, "new-image-file");
+ const char *format = qdict_get_try_str(qdict, "format");
+ Error *errp = NULL;
+
+ qmp_drive_reopen(device, filename, !!format, format, &errp);
+ hmp_handle_error(mon, &errp);
+}
+
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
diff --git a/hmp.h b/hmp.h
index 5352f00..648a84f 100644
--- a/hmp.h
+++ b/hmp.h
@@ -49,6 +49,7 @@ void hmp_balloon(Monitor *mon, const QDict *qdict);
void hmp_block_resize(Monitor *mon, const QDict *qdict);
void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict);
void hmp_drive_mirror(Monitor *mon, const QDict *qdict);
+void hmp_drive_reopen(Monitor *mon, const QDict *qdict);
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict);
diff --git a/qapi-schema.json b/qapi-schema.json
index 4cebf78..21eb256 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1235,6 +1235,28 @@
'*mode': 'NewImageMode'} }
##
+# @drive-reopen
+#
+# Assigns a new image file to a device.
+#
+# @device: the name of the device for which we are changing the image file.
+#
+# @new-image-file: the target of the new image. If the file doesn't exists the
+# command will fail.
+#
+# @format: #optional the format of the new image, default is 'qcow2'.
+#
+# Returns: nothing on success
+# If @device is not a valid block device, DeviceNotFound
+# If @new-image-file can't be opened, OpenFileFailed
+# If @format is invalid, InvalidBlockFormat
+#
+# Since 1.1
+##
+{ 'command': 'drive-reopen',
+ 'data': { 'device': 'str', 'new-image-file': 'str', '*format': 'str' } }
+
+##
# @human-monitor-command:
#
# Execute a command on the human monitor and return the output.
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Qemu-devel] [PATCH v3 10/8] use QSIMPLEQ_FOREACH_SAFE when freeing list elements
2012-03-05 17:33 [Qemu-devel] [PATCH v3 0/8] Mirrored block writes Paolo Bonzini
` (8 preceding siblings ...)
2012-03-06 8:02 ` [Qemu-devel] [PATCH v3 9/8] Add the drive-reopen command Paolo Bonzini
@ 2012-03-06 8:52 ` Paolo Bonzini
9 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2012-03-06 8:52 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, fsimonce, eblake, stefanha, lcapitulino
QSIMPLEQ_FOREACH will use the states pointer after the loop has freed it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Found while (re)reviewing Jeff's patches.
blockdev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 1fb2a17..9480dbb 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -775,7 +775,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
{
int ret = 0;
BlockdevActionList *dev_entry = dev_list;
- BlkTransactionStates *states;
+ BlkTransactionStates *states, *next;
char *new_source = NULL;
QSIMPLEQ_HEAD(snap_bdrv_states, BlkTransactionStates) snap_bdrv_states;
@@ -926,7 +926,7 @@ delete_and_fail:
}
}
exit:
- QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) {
+ QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {
g_free(states);
}
g_free(new_source);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 23+ messages in thread