Message ID | 1448273262-13845-2-git-send-email-peterx@redhat.com |
---|---|
State | New |
Headers | show |
On Mon, Nov 23, 2015 at 06:07:41PM +0800, Peter Xu wrote: > This patch only add the interfaces, but not implementing them. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > dump.c | 3 ++- > hmp-commands.hx | 5 +++-- > hmp.c | 3 ++- > qapi-schema.json | 3 ++- > qmp-commands.hx | 4 ++-- > 5 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/dump.c b/dump.c > index 78b7d84..3ec3423 100644 > --- a/dump.c > +++ b/dump.c > @@ -1598,7 +1598,8 @@ cleanup: > void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, > int64_t begin, bool has_length, > int64_t length, bool has_format, > - DumpGuestMemoryFormat format, Error **errp) > + DumpGuestMemoryFormat format, bool detach, > + Error **errp) > { > const char *p; > int fd = -1; > diff --git a/hmp-commands.hx b/hmp-commands.hx > index bb52e4d..8e27671 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1056,10 +1056,11 @@ ETEXI > > { > .name = "dump-guest-memory", > - .args_type = "paging:-p,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?", > - .params = "[-p] [-z|-l|-s] filename [begin length]", > + .args_type = "paging:-p,detach:-d,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?", > + .params = "[-p] [-d] [-z|-l|-s] filename [begin length]", > .help = "dump guest memory into file 'filename'.\n\t\t\t" > "-p: do paging to get guest's memory mapping.\n\t\t\t" > + "-d: return immediately (not wait for completion).\n\t\t\t" (do not wait...) > "-z: dump in kdump-compressed format, with zlib compression.\n\t\t\t" > "-l: dump in kdump-compressed format, with lzo compression.\n\t\t\t" > "-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t" > diff --git a/hmp.c b/hmp.c > index 2140605..4c5480d 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1580,6 +1580,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) > { > Error *err = NULL; > bool paging = qdict_get_try_bool(qdict, "paging", false); > + bool detach = qdict_get_try_bool(qdict, "detach", false); > bool zlib = qdict_get_try_bool(qdict, "zlib", false); > bool lzo = qdict_get_try_bool(qdict, "lzo", false); > bool snappy = qdict_get_try_bool(qdict, "snappy", false); > @@ -1619,7 +1620,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) > prot = g_strconcat("file:", file, NULL); > > qmp_dump_guest_memory(paging, prot, has_begin, begin, has_length, length, > - true, dump_format, &err); > + true, dump_format, detach, &err); > hmp_handle_error(mon, &err); > g_free(prot); > } > diff --git a/qapi-schema.json b/qapi-schema.json > index 8b1a423..1211082 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -2132,7 +2132,8 @@ > ## > { 'command': 'dump-guest-memory', > 'data': { 'paging': 'bool', 'protocol': 'str', '*begin': 'int', > - '*length': 'int', '*format': 'DumpGuestMemoryFormat' } } > + '*length': 'int', '*format': 'DumpGuestMemoryFormat', > + 'detach': 'bool'} } For consistency I would put detach after paging. > > ## > # @DumpGuestMemoryCapability: > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 9d8b42f..86864f6 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -840,8 +840,8 @@ EQMP > > { > .name = "dump-guest-memory", > - .args_type = "paging:b,protocol:s,begin:i?,end:i?,format:s?", > - .params = "-p protocol [begin] [length] [format]", > + .args_type = "paging:b,detach:d,protocol:s,begin:i?,end:i?,format:s?", > + .params = "-p protocol [-d] [begin] [length] [format]", shouldn't this be -p -d protocol [begin] [length] [format] > .help = "dump guest memory to file", > .mhandler.cmd_new = qmp_marshal_dump_guest_memory, > }, > -- > 2.4.3 > >
On 11/23/2015 03:07 AM, Peter Xu wrote: > This patch only add the interfaces, but not implementing them. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > dump.c | 3 ++- > hmp-commands.hx | 5 +++-- > hmp.c | 3 ++- > qapi-schema.json | 3 ++- > qmp-commands.hx | 4 ++-- > 5 files changed, 11 insertions(+), 7 deletions(-) > > +++ b/qapi-schema.json > @@ -2132,7 +2132,8 @@ > ## > { 'command': 'dump-guest-memory', > 'data': { 'paging': 'bool', 'protocol': 'str', '*begin': 'int', > - '*length': 'int', '*format': 'DumpGuestMemoryFormat' } } > + '*length': 'int', '*format': 'DumpGuestMemoryFormat', > + 'detach': 'bool'} } Missing documentation of the new flag, of its default state, and with a mention that it is '(since 2.6)'.
On Mon, 11/23 09:10, Eric Blake wrote: > On 11/23/2015 03:07 AM, Peter Xu wrote: > > This patch only add the interfaces, but not implementing them. > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > --- > > dump.c | 3 ++- > > hmp-commands.hx | 5 +++-- > > hmp.c | 3 ++- > > qapi-schema.json | 3 ++- > > qmp-commands.hx | 4 ++-- > > 5 files changed, 11 insertions(+), 7 deletions(-) > > > > > +++ b/qapi-schema.json > > @@ -2132,7 +2132,8 @@ > > ## > > { 'command': 'dump-guest-memory', > > 'data': { 'paging': 'bool', 'protocol': 'str', '*begin': 'int', > > - '*length': 'int', '*format': 'DumpGuestMemoryFormat' } } > > + '*length': 'int', '*format': 'DumpGuestMemoryFormat', > > + 'detach': 'bool'} } > > Missing documentation of the new flag, of its default state, and with a > mention that it is '(since 2.6)'. > Yes, also new flags must be added as optional to keep backward-compatibility. Fam
diff --git a/dump.c b/dump.c index 78b7d84..3ec3423 100644 --- a/dump.c +++ b/dump.c @@ -1598,7 +1598,8 @@ cleanup: void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, int64_t begin, bool has_length, int64_t length, bool has_format, - DumpGuestMemoryFormat format, Error **errp) + DumpGuestMemoryFormat format, bool detach, + Error **errp) { const char *p; int fd = -1; diff --git a/hmp-commands.hx b/hmp-commands.hx index bb52e4d..8e27671 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1056,10 +1056,11 @@ ETEXI { .name = "dump-guest-memory", - .args_type = "paging:-p,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?", - .params = "[-p] [-z|-l|-s] filename [begin length]", + .args_type = "paging:-p,detach:-d,zlib:-z,lzo:-l,snappy:-s,filename:F,begin:i?,length:i?", + .params = "[-p] [-d] [-z|-l|-s] filename [begin length]", .help = "dump guest memory into file 'filename'.\n\t\t\t" "-p: do paging to get guest's memory mapping.\n\t\t\t" + "-d: return immediately (not wait for completion).\n\t\t\t" "-z: dump in kdump-compressed format, with zlib compression.\n\t\t\t" "-l: dump in kdump-compressed format, with lzo compression.\n\t\t\t" "-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t" diff --git a/hmp.c b/hmp.c index 2140605..4c5480d 100644 --- a/hmp.c +++ b/hmp.c @@ -1580,6 +1580,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) { Error *err = NULL; bool paging = qdict_get_try_bool(qdict, "paging", false); + bool detach = qdict_get_try_bool(qdict, "detach", false); bool zlib = qdict_get_try_bool(qdict, "zlib", false); bool lzo = qdict_get_try_bool(qdict, "lzo", false); bool snappy = qdict_get_try_bool(qdict, "snappy", false); @@ -1619,7 +1620,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) prot = g_strconcat("file:", file, NULL); qmp_dump_guest_memory(paging, prot, has_begin, begin, has_length, length, - true, dump_format, &err); + true, dump_format, detach, &err); hmp_handle_error(mon, &err); g_free(prot); } diff --git a/qapi-schema.json b/qapi-schema.json index 8b1a423..1211082 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2132,7 +2132,8 @@ ## { 'command': 'dump-guest-memory', 'data': { 'paging': 'bool', 'protocol': 'str', '*begin': 'int', - '*length': 'int', '*format': 'DumpGuestMemoryFormat' } } + '*length': 'int', '*format': 'DumpGuestMemoryFormat', + 'detach': 'bool'} } ## # @DumpGuestMemoryCapability: diff --git a/qmp-commands.hx b/qmp-commands.hx index 9d8b42f..86864f6 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -840,8 +840,8 @@ EQMP { .name = "dump-guest-memory", - .args_type = "paging:b,protocol:s,begin:i?,end:i?,format:s?", - .params = "-p protocol [begin] [length] [format]", + .args_type = "paging:b,detach:d,protocol:s,begin:i?,end:i?,format:s?", + .params = "-p protocol [-d] [begin] [length] [format]", .help = "dump guest memory to file", .mhandler.cmd_new = qmp_marshal_dump_guest_memory, },
This patch only add the interfaces, but not implementing them. Signed-off-by: Peter Xu <peterx@redhat.com> --- dump.c | 3 ++- hmp-commands.hx | 5 +++-- hmp.c | 3 ++- qapi-schema.json | 3 ++- qmp-commands.hx | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-)