diff options
| author | Peter Maydell | 2017-08-08 17:32:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-08 17:32:54 +0200 |
| commit | e42590c22a3b88f1cfcb7288f477b38200f5ae8c (patch) | |
| tree | 5c6a0aea5a298d207f0fb4d04859380bbc113704 /qga/main.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | maint: Include bug-reporting info in --help output (diff) | |
| download | qemu-e42590c22a3b88f1cfcb7288f477b38200f5ae8c.tar.gz qemu-e42590c22a3b88f1cfcb7288f477b38200f5ae8c.tar.xz qemu-e42590c22a3b88f1cfcb7288f477b38200f5ae8c.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* --help/--version improvements (Eric)
* GCC 7 workaround (Greg)
* Small SCSI fix (Hannes)
* SSE 4.1 fix (Joseph)
* RCU deadlock fix (myself)
# gpg: Signature made Tue 08 Aug 2017 16:28:56 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
maint: Include bug-reporting info in --help output
qga: Give more --version information
qemu-io: Give more --version information
qemu-img: Sort sub-command names in --help
target/i386: set rip_offset for some SSE4.1 instructions
scsi: clarify sense codes for LUN0 emulation
kvm: workaround build break on gcc-7.1.1 / fedora26
Revert "rcu: do not create thread in pthread_atfork callback"
rcu: completely disable pthread_atfork callbacks as soon as possible
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/main.c')
| -rw-r--r-- | qga/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qga/main.c b/qga/main.c index 1b381d0bf3..62a62755bd 100644 --- a/qga/main.c +++ b/qga/main.c @@ -29,6 +29,7 @@ #include "qemu/help_option.h" #include "qemu/sockets.h" #include "qemu/systemd.h" +#include "qemu-version.h" #ifdef _WIN32 #include "qga/service-win32.h" #include "qga/vss-win32.h" @@ -213,7 +214,8 @@ static void usage(const char *cmd) { printf( "Usage: %s [-m <method> -p <path>] [<options>]\n" -"QEMU Guest Agent %s\n" +"QEMU Guest Agent " QEMU_VERSION QEMU_PKGVERSION "\n" +QEMU_COPYRIGHT "\n" "\n" " -m, --method transport method: one of unix-listen, virtio-serial,\n" " isa-serial, or vsock-listen (virtio-serial is the default)\n" @@ -247,8 +249,8 @@ static void usage(const char *cmd) " options / command-line parameters to stdout\n" " -h, --help display this help and exit\n" "\n" -"Report bugs to <mdroth@linux.vnet.ibm.com>\n" - , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_SERIAL_PATH_DEFAULT, +QEMU_HELP_BOTTOM "\n" + , cmd, QGA_VIRTIO_PATH_DEFAULT, QGA_SERIAL_PATH_DEFAULT, dfl_pathnames.pidfile, #ifdef CONFIG_FSFREEZE QGA_FSFREEZE_HOOK_DEFAULT, |