diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-17 13:13:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-17 13:13:03 +0100 |
| commit | a9038e5e1992b7fac33e346ec10a01e4a4f33ab2 (patch) | |
| tree | c59e8ba82daac9ac27712a6f2c71fd925323e521 /io | |
| parent | dabc50e4c68c1be046d4a42908af0f9df69f910a (diff) | |
| parent | 6b4f250bfc529bdf73a10ca6873a460175e666cc (diff) | |
| download | qemu-a9038e5e1992b7fac33e346ec10a01e4a4f33ab2.zip qemu-a9038e5e1992b7fac33e346ec10a01e4a4f33ab2.tar.gz qemu-a9038e5e1992b7fac33e346ec10a01e4a4f33ab2.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-10-16
# gpg: Signature made Mon 16 Oct 2017 21:32:05 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch:
Add myself as maintainer for TPM code
filter-mirror: segfault when specifying non existent device
MAINTAINERS: Track default-configs/pci.mak
MAINTAINERS: Fix Sun4v file
MAINTAINERS: Clean up SCSI device section
include/hw/or-irq.h: Drop unused in_irqs field
io: Add missing GCC_FMT_ATTR (fix -Werror=suggest-attribute=format)
os-posix: Drop misleading comment
linux-user: Add some random ioctls
futex: add missing header guards
ui/gtk: Fix deprecation of vte_terminal_copy_clipboard
gitignore: ignore check-qlit test
linux-user: remove duplicate break in syscall
qemu-doc.texi: remove trailing whitespace
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io')
| -rw-r--r-- | io/channel-websock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/io/channel-websock.c b/io/channel-websock.c index df2c3a9..87ebdeb 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -152,9 +152,10 @@ enum { QIO_CHANNEL_WEBSOCK_OPCODE_PONG = 0xA }; -static void qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, - const char *resmsg, - ...) +static void GCC_FMT_ATTR(2, 3) +qio_channel_websock_handshake_send_res(QIOChannelWebsock *ioc, + const char *resmsg, + ...) { va_list vargs; char *response; |