| Message ID | 20180211093607.27351-29-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/11/2018 03:36 AM, Markus Armbruster wrote: > Fix up the reference to qmp-commands.hx in qmp.c. Missed in commit > 5032a16d1d. > > Fix up the reference to qmp-commands.txt in > docs/xen-save-devices-state.txt. Missed in commit 4d8bb958fa. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > docs/xen-save-devices-state.txt | 3 +-- > qmp.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/docs/xen-save-devices-state.txt b/docs/xen-save-devices-state.txt > index a72ecc8081..1912ecad25 100644 > --- a/docs/xen-save-devices-state.txt > +++ b/docs/xen-save-devices-state.txt > @@ -8,8 +8,7 @@ These operations are normally used with migration (see migration.txt), > however it is also possible to save the state of all devices to file, > without saving the RAM or the block devices of the VM. > > -This operation is called "xen-save-devices-state" (see > -qmp-commands.txt) > +The save operation is available as QMP command xen-save-devices-state. I like the fact that you made the reword more generic (in case we rename things again, one less place to edit). Reviewed-by: Eric Blake <eblake@redhat.com>
On Sun, Feb 11, 2018 at 10:36 AM, Markus Armbruster <armbru@redhat.com> wrote: > Fix up the reference to qmp-commands.hx in qmp.c. Missed in commit > 5032a16d1d. > > Fix up the reference to qmp-commands.txt in > docs/xen-save-devices-state.txt. Missed in commit 4d8bb958fa. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > docs/xen-save-devices-state.txt | 3 +-- > qmp.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/docs/xen-save-devices-state.txt b/docs/xen-save-devices-state.txt > index a72ecc8081..1912ecad25 100644 > --- a/docs/xen-save-devices-state.txt > +++ b/docs/xen-save-devices-state.txt > @@ -8,8 +8,7 @@ These operations are normally used with migration (see migration.txt), > however it is also possible to save the state of all devices to file, > without saving the RAM or the block devices of the VM. > > -This operation is called "xen-save-devices-state" (see > -qmp-commands.txt) > +The save operation is available as QMP command xen-save-devices-state. > > > The binary format used in the file is the following: > diff --git a/qmp.c b/qmp.c > index a8d4eba973..ba82e1df9f 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -147,13 +147,13 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) > > #ifndef CONFIG_SPICE > /* > - * qmp-commands.hx ensures that QMP command query-spice exists only > - * #ifdef CONFIG_SPICE. Necessary for an accurate query-commands > - * result. However, the QAPI schema is blissfully unaware of that, > - * and the QAPI code generator happily generates a dead > - * qmp_marshal_query_spice() that calls qmp_query_spice(). Provide it > - * one, or else linking fails. FIXME Educate the QAPI schema on > - * CONFIG_SPICE. > + * qmp_unregister_commands_hack() ensures that QMP command query-spice > + * exists only #ifdef CONFIG_SPICE. Necessary for an accurate > + * query-commands result. However, the QAPI schema is blissfully > + * unaware of that, and the QAPI code generator happily generates a > + * dead qmp_marshal_query_spice() that calls qmp_query_spice(). > + * Provide it one, or else linking fails. FIXME Educate the QAPI > + * schema on CONFIG_SPICE. > */ I hope this comment will go away soon, Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > SpiceInfo *qmp_query_spice(Error **errp) > { > -- > 2.13.6 >
Quoting Markus Armbruster (2018-02-11 03:36:06) > Fix up the reference to qmp-commands.hx in qmp.c. Missed in commit > 5032a16d1d. > > Fix up the reference to qmp-commands.txt in > docs/xen-save-devices-state.txt. Missed in commit 4d8bb958fa. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > docs/xen-save-devices-state.txt | 3 +-- > qmp.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/docs/xen-save-devices-state.txt b/docs/xen-save-devices-state.txt > index a72ecc8081..1912ecad25 100644 > --- a/docs/xen-save-devices-state.txt > +++ b/docs/xen-save-devices-state.txt > @@ -8,8 +8,7 @@ These operations are normally used with migration (see migration.txt), > however it is also possible to save the state of all devices to file, > without saving the RAM or the block devices of the VM. > > -This operation is called "xen-save-devices-state" (see > -qmp-commands.txt) > +The save operation is available as QMP command xen-save-devices-state. > > > The binary format used in the file is the following: > diff --git a/qmp.c b/qmp.c > index a8d4eba973..ba82e1df9f 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -147,13 +147,13 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) > > #ifndef CONFIG_SPICE > /* > - * qmp-commands.hx ensures that QMP command query-spice exists only > - * #ifdef CONFIG_SPICE. Necessary for an accurate query-commands > - * result. However, the QAPI schema is blissfully unaware of that, > - * and the QAPI code generator happily generates a dead > - * qmp_marshal_query_spice() that calls qmp_query_spice(). Provide it > - * one, or else linking fails. FIXME Educate the QAPI schema on > - * CONFIG_SPICE. > + * qmp_unregister_commands_hack() ensures that QMP command query-spice > + * exists only #ifdef CONFIG_SPICE. Necessary for an accurate > + * query-commands result. However, the QAPI schema is blissfully > + * unaware of that, and the QAPI code generator happily generates a > + * dead qmp_marshal_query_spice() that calls qmp_query_spice(). > + * Provide it one, or else linking fails. FIXME Educate the QAPI > + * schema on CONFIG_SPICE. > */ > SpiceInfo *qmp_query_spice(Error **errp) > { > -- > 2.13.6 >
diff --git a/docs/xen-save-devices-state.txt b/docs/xen-save-devices-state.txt index a72ecc8081..1912ecad25 100644 --- a/docs/xen-save-devices-state.txt +++ b/docs/xen-save-devices-state.txt @@ -8,8 +8,7 @@ These operations are normally used with migration (see migration.txt), however it is also possible to save the state of all devices to file, without saving the RAM or the block devices of the VM. -This operation is called "xen-save-devices-state" (see -qmp-commands.txt) +The save operation is available as QMP command xen-save-devices-state. The binary format used in the file is the following: diff --git a/qmp.c b/qmp.c index a8d4eba973..ba82e1df9f 100644 --- a/qmp.c +++ b/qmp.c @@ -147,13 +147,13 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) #ifndef CONFIG_SPICE /* - * qmp-commands.hx ensures that QMP command query-spice exists only - * #ifdef CONFIG_SPICE. Necessary for an accurate query-commands - * result. However, the QAPI schema is blissfully unaware of that, - * and the QAPI code generator happily generates a dead - * qmp_marshal_query_spice() that calls qmp_query_spice(). Provide it - * one, or else linking fails. FIXME Educate the QAPI schema on - * CONFIG_SPICE. + * qmp_unregister_commands_hack() ensures that QMP command query-spice + * exists only #ifdef CONFIG_SPICE. Necessary for an accurate + * query-commands result. However, the QAPI schema is blissfully + * unaware of that, and the QAPI code generator happily generates a + * dead qmp_marshal_query_spice() that calls qmp_query_spice(). + * Provide it one, or else linking fails. FIXME Educate the QAPI + * schema on CONFIG_SPICE. */ SpiceInfo *qmp_query_spice(Error **errp) {
Fix up the reference to qmp-commands.hx in qmp.c. Missed in commit 5032a16d1d. Fix up the reference to qmp-commands.txt in docs/xen-save-devices-state.txt. Missed in commit 4d8bb958fa. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- docs/xen-save-devices-state.txt | 3 +-- qmp.c | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-)