diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-08 16:32:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-08 16:32:54 +0100 |
| commit | e42590c22a3b88f1cfcb7288f477b38200f5ae8c (patch) | |
| tree | 5c6a0aea5a298d207f0fb4d04859380bbc113704 /include/qemu-common.h | |
| parent | 53b080fa83c35d22cc94c730346fb2c53138d786 (diff) | |
| parent | f5048cb7517348a20ba202e435e1006a8f5001cf (diff) | |
| download | focaccia-qemu-e42590c22a3b88f1cfcb7288f477b38200f5ae8c.tar.gz focaccia-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 'include/qemu-common.h')
| -rw-r--r-- | include/qemu-common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index b5adbfa5e9..0456c79df4 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -22,6 +22,11 @@ #define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \ "Fabrice Bellard and the QEMU Project developers" +/* Bug reporting information for --help arguments, About dialogs, etc */ +#define QEMU_HELP_BOTTOM \ + "See <http://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \ + "More information on the QEMU project at <http://qemu.org>." + /* main function, renamed */ #if defined(CONFIG_COCOA) int qemu_main(int argc, char **argv, char **envp); |