OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'mdroth/qga-pull-4-19-12' into staging

Browse Source 
* mdroth/qga-pull-4-19-12:
  qemu-ga: fix help output
  qemu-ga: generate missing stubs for fsfreeze
This commit is contained in:
Anthony Liguori 2012-04-23 09:58:19 -05:00
commit 25896d8063
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qemu-ga.c
View File

@ -117,12 +117,13 @@ static gboolean register_signal_handlers(void)
static void usage(const char *cmd) static void usage(const char *cmd)
{ {
printf( printf(
"Usage: %s -c <channel_opts>\n" "Usage: %s [-m <method> -p <path>] [<options>]\n"
"QEMU Guest Agent %s\n" "QEMU Guest Agent %s\n"
"\n" "\n"
" -m, --method transport method: one of unix-listen, virtio-serial, or\n" " -m, --method transport method: one of unix-listen, virtio-serial, or\n"
" isa-serial (virtio-serial is the default)\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" " -l, --logfile set logfile path, logs to stderr by default\n"
" -f, --pidfile specify pidfile (default is %s)\n" " -f, --pidfile specify pidfile (default is %s)\n"
" -v, --verbose log extra debugging information\n" " -v, --verbose log extra debugging information\n"
@ -131,7 +132,7 @@ static void usage(const char *cmd)
#ifdef _WIN32 #ifdef _WIN32
" -s, --service service commands: install, uninstall\n" " -s, --service service commands: install, uninstall\n"
#endif #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" " to list available RPCs)\n"
" -h, --help display this help and exit\n" " -h, --help display this help and exit\n"
"\n" "\n"

46
qga/commands-posix.c
View File

@ -881,27 +881,6 @@ error:
#else /* defined(__linux__) */ #else /* defined(__linux__) */
GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
int64_t qmp_guest_fsfreeze_freeze(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
int64_t qmp_guest_fsfreeze_thaw(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
void qmp_guest_suspend_disk(Error **err) void qmp_guest_suspend_disk(Error **err)
{ {
error_set(err, QERR_UNSUPPORTED); error_set(err, QERR_UNSUPPORTED);
@ -925,6 +904,31 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
#endif #endif
#if !defined(CONFIG_FSFREEZE)
GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
int64_t qmp_guest_fsfreeze_freeze(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
int64_t qmp_guest_fsfreeze_thaw(Error **err)
{
error_set(err, QERR_UNSUPPORTED);
return 0;
}
#endif
/* register init/cleanup routines for stateful command groups */ /* register init/cleanup routines for stateful command groups */
void ga_command_state_init(GAState *s, GACommandState *cs) void ga_command_state_init(GAState *s, GACommandState *cs)
{ {