* [Qemu-trivial] [PATCH 2/2] qemu-ga: fix help output
2012-04-17 17:07 [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze Michael Roth
@ 2012-04-17 17:07 ` Michael Roth
2012-04-17 17:38 ` Luiz Capitulino
2012-04-17 17:35 ` [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze Luiz Capitulino
2012-04-19 15:49 ` Michael Roth
2 siblings, 1 reply; 6+ messages in thread
From: Michael Roth @ 2012-04-17 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, afaerber, lcapitulino
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
qemu-ga.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/qemu-ga.c b/qemu-ga.c
index d6f786e..74a1b02 100644
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -117,12 +117,13 @@ static gboolean register_signal_handlers(void)
static void usage(const char *cmd)
{
printf(
-"Usage: %s -c <channel_opts>\n"
+"Usage: %s [-m <method> -p <path>] [<options>]\n"
"QEMU Guest Agent %s\n"
"\n"
" -m, --method transport method: one of unix-listen, virtio-serial, or\n"
" isa-serial (virtio-serial is the default)\n"
-" -p, --path device/socket path (%s is the default for virtio-serial)\n"
+" -p, --path device/socket path (the default for virtio-serial is:\n"
+" %s)\n"
" -l, --logfile set logfile path, logs to stderr by default\n"
" -f, --pidfile specify pidfile (default is %s)\n"
" -v, --verbose log extra debugging information\n"
@@ -131,7 +132,7 @@ static void usage(const char *cmd)
#ifdef _WIN32
" -s, --service service commands: install, uninstall\n"
#endif
-" -b, --blacklist comma-separated list of RPCs to disable (no spaces, \"?\""
+" -b, --blacklist comma-separated list of RPCs to disable (no spaces, \"?\"\n"
" to list available RPCs)\n"
" -h, --help display this help and exit\n"
"\n"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-trivial] [PATCH 2/2] qemu-ga: fix help output
2012-04-17 17:07 ` [Qemu-trivial] [PATCH 2/2] qemu-ga: fix help output Michael Roth
@ 2012-04-17 17:38 ` Luiz Capitulino
0 siblings, 0 replies; 6+ messages in thread
From: Luiz Capitulino @ 2012-04-17 17:38 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, qemu-devel, afaerber
On Tue, 17 Apr 2012 12:07:39 -0500
Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
> qemu-ga.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/qemu-ga.c b/qemu-ga.c
> index d6f786e..74a1b02 100644
> --- a/qemu-ga.c
> +++ b/qemu-ga.c
> @@ -117,12 +117,13 @@ static gboolean register_signal_handlers(void)
> static void usage(const char *cmd)
> {
> printf(
> -"Usage: %s -c <channel_opts>\n"
> +"Usage: %s [-m <method> -p <path>] [<options>]\n"
> "QEMU Guest Agent %s\n"
> "\n"
> " -m, --method transport method: one of unix-listen, virtio-serial, or\n"
> " isa-serial (virtio-serial is the default)\n"
> -" -p, --path device/socket path (%s is the default for virtio-serial)\n"
> +" -p, --path device/socket path (the default for virtio-serial is:\n"
> +" %s)\n"
> " -l, --logfile set logfile path, logs to stderr by default\n"
> " -f, --pidfile specify pidfile (default is %s)\n"
> " -v, --verbose log extra debugging information\n"
> @@ -131,7 +132,7 @@ static void usage(const char *cmd)
> #ifdef _WIN32
> " -s, --service service commands: install, uninstall\n"
> #endif
> -" -b, --blacklist comma-separated list of RPCs to disable (no spaces, \"?\""
> +" -b, --blacklist comma-separated list of RPCs to disable (no spaces, \"?\"\n"
> " to list available RPCs)\n"
> " -h, --help display this help and exit\n"
> "\n"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze
2012-04-17 17:07 [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze Michael Roth
2012-04-17 17:07 ` [Qemu-trivial] [PATCH 2/2] qemu-ga: fix help output Michael Roth
@ 2012-04-17 17:35 ` Luiz Capitulino
2012-04-19 15:49 ` Michael Roth
2 siblings, 0 replies; 6+ messages in thread
From: Luiz Capitulino @ 2012-04-17 17:35 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, qemu-devel, afaerber
On Tue, 17 Apr 2012 12:07:38 -0500
Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> When linux-specific commands (including guest-fsfreeze-*) were consolidated
> under defined(__linux__), we forgot to account for the case where
> defined(__linux__) && !defined(FIFREEZE). As a result stubs are no longer
> being generated on linux hosts that don't have FIFREEZE support. Fix
> this.
>
> Tested-by: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
> qga/commands-posix.c | 36 ++++++++++++++++++++----------------
> 1 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index faf970d..087c3af 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -881,46 +881,50 @@ error:
>
> #else /* defined(__linux__) */
>
> -GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> +void qmp_guest_suspend_disk(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_freeze(Error **err)
> +void qmp_guest_suspend_ram(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_thaw(Error **err)
> +void qmp_guest_suspend_hybrid(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -void qmp_guest_suspend_disk(Error **err)
> +GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> {
> - error_set(err, QERR_UNSUPPORTED);
> + error_set(errp, QERR_UNSUPPORTED);
> + return NULL;
> }
>
> -void qmp_guest_suspend_ram(Error **err)
> +#endif
> +
> +#if !defined(CONFIG_FSFREEZE)
> +
> +GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -void qmp_guest_suspend_hybrid(Error **err)
> +int64_t qmp_guest_fsfreeze_freeze(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> +int64_t qmp_guest_fsfreeze_thaw(Error **err)
> {
> - error_set(errp, QERR_UNSUPPORTED);
> - return NULL;
> + error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> #endif
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze
2012-04-17 17:07 [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze Michael Roth
2012-04-17 17:07 ` [Qemu-trivial] [PATCH 2/2] qemu-ga: fix help output Michael Roth
2012-04-17 17:35 ` [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze Luiz Capitulino
@ 2012-04-19 15:49 ` Michael Roth
2012-04-20 12:02 ` Stefan Hajnoczi
2 siblings, 1 reply; 6+ messages in thread
From: Michael Roth @ 2012-04-19 15:49 UTC (permalink / raw)
To: stefanha; +Cc: qemu-trivial, qemu-devel, afaerber, lcapitulino
On Tue, Apr 17, 2012 at 12:07:38PM -0500, Michael Roth wrote:
> When linux-specific commands (including guest-fsfreeze-*) were consolidated
> under defined(__linux__), we forgot to account for the case where
> defined(__linux__) && !defined(FIFREEZE). As a result stubs are no longer
> being generated on linux hosts that don't have FIFREEZE support. Fix
> this.
>
> Tested-by: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Hi Stefan,
Please ignore these for trivial, gonna submit a qemu-ga pull for these since
a build fix is involved.
> ---
> qga/commands-posix.c | 36 ++++++++++++++++++++----------------
> 1 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index faf970d..087c3af 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -881,46 +881,50 @@ error:
>
> #else /* defined(__linux__) */
>
> -GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> +void qmp_guest_suspend_disk(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_freeze(Error **err)
> +void qmp_guest_suspend_ram(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_thaw(Error **err)
> +void qmp_guest_suspend_hybrid(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -void qmp_guest_suspend_disk(Error **err)
> +GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> {
> - error_set(err, QERR_UNSUPPORTED);
> + error_set(errp, QERR_UNSUPPORTED);
> + return NULL;
> }
>
> -void qmp_guest_suspend_ram(Error **err)
> +#endif
> +
> +#if !defined(CONFIG_FSFREEZE)
> +
> +GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -void qmp_guest_suspend_hybrid(Error **err)
> +int64_t qmp_guest_fsfreeze_freeze(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> +int64_t qmp_guest_fsfreeze_thaw(Error **err)
> {
> - error_set(errp, QERR_UNSUPPORTED);
> - return NULL;
> + error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> #endif
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-trivial] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze
2012-04-19 15:49 ` Michael Roth
@ 2012-04-20 12:02 ` Stefan Hajnoczi
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2012-04-20 12:02 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, qemu-devel, afaerber, lcapitulino
On Thu, Apr 19, 2012 at 10:49:16AM -0500, Michael Roth wrote:
> On Tue, Apr 17, 2012 at 12:07:38PM -0500, Michael Roth wrote:
> > When linux-specific commands (including guest-fsfreeze-*) were consolidated
> > under defined(__linux__), we forgot to account for the case where
> > defined(__linux__) && !defined(FIFREEZE). As a result stubs are no longer
> > being generated on linux hosts that don't have FIFREEZE support. Fix
> > this.
> >
> > Tested-by: Andreas Färber <afaerber@suse.de>
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
>
> Hi Stefan,
>
> Please ignore these for trivial, gonna submit a qemu-ga pull for these since
> a build fix is involved.
Sure.
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread