diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 14:55:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-31 14:55:10 +0000 |
| commit | 5e6464f9c6756c95d036c4acf7ce557a7eb3a7be (patch) | |
| tree | 4fbab44b5460985f34af92e149451bf08d569ac1 /io | |
| parent | 69d7eab0b8bb14f8d52539618ae33918032eaaf7 (diff) | |
| parent | dfc00eb7dea43bfb6d4a2ba38c4f6bc9745f3729 (diff) | |
Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-next-pull-request' into staging
Misc fixes
* Improve socket cnnection failure error reporting
* Fix LGPL version number
# gpg: Signature made Thu 29 Oct 2020 10:00:47 GMT
# gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange-gitlab/tags/misc-next-pull-request:
util: include the target address in socket connect failures
io: Don't use '#' flag of printf format
authz: Fix Lesser GPL version number
crypt: Fix Lesser GPL version number
io: Fix Lesser GPL version number
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io')
| -rw-r--r-- | io/channel-websock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io/channel-websock.c b/io/channel-websock.c index bb545fa327..03c1f7cb62 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -746,7 +746,7 @@ static int qio_channel_websock_decode_header(QIOChannelWebsock *ioc, opcode != QIO_CHANNEL_WEBSOCK_OPCODE_CLOSE && opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PING && opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PONG) { - error_setg(errp, "unsupported opcode: %#04x; only binary, close, " + error_setg(errp, "unsupported opcode: 0x%04x; only binary, close, " "ping, and pong websocket frames are supported", opcode); qio_channel_websock_write_close( ioc, QIO_CHANNEL_WEBSOCK_STATUS_INVALID_DATA , |