diff options
| author | Peter Maydell | 2016-08-10 16:59:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-10 16:59:08 +0200 |
| commit | 4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc (patch) | |
| tree | 7b52e327678a89a0baf99ef2405deb67bf4a2df0 /include/ui | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160810' into... (diff) | |
| parent | checkpatch: default to success if only warnings (diff) | |
| download | qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.tar.gz qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.tar.xz qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* pc-bios/optionrom/Makefile fixes
* warning fixes for __atomic_load and -1 << x in clang
* missed interrupt fix from Gonglei
* checkpatch fix from Radim and myself
# gpg: Signature made Wed 10 Aug 2016 14:54:31 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:
checkpatch: default to success if only warnings
checkpatch: bump most warnings to errors
CODING_STYLE, checkpatch: update line length rules
checkpatch: check for CVS keywords on all sources
checkpatch: tweak the files in which TABs are checked
timer: set vm_clock disabled default
checkpatch: ignore automatically imported Linux headers
clang: Fix warning reg. expansion to 'defined'
Disable warn about left shifts of negative values
atomic: strip "const" from variables declared with typeof
optionrom: fix compilation with mingw docker target
optionrom: add -fno-stack-protector
build-sys: fix building with make CFLAGS=.. argument
linuxboot_dma: avoid guest ABI breakage on gcc vs. clang compilation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/qemu-spice.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index edad5e7bbf..75e12396bb 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -42,8 +42,11 @@ int qemu_spice_set_pw_expire(time_t expires); int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, const char *subject); -#define SPICE_NEEDS_SET_MM_TIME \ - (!defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06)) +#if !defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06) +#define SPICE_NEEDS_SET_MM_TIME 1 +#else +#define SPICE_NEEDS_SET_MM_TIME 0 +#endif #if SPICE_SERVER_VERSION >= 0x000c02 void qemu_spice_register_ports(void); |