diff options
| author | Peter Maydell | 2015-11-06 13:50:24 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-06 13:50:24 +0100 |
| commit | 4b59f39bc9a03afcc74b2fa28da7c3189fca507c (patch) | |
| tree | 8c5c06154146e8cda32837ae6d3ad7a3e74009a1 /contrib/ivshmem-server/ivshmem-server.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-replay' into ... (diff) | |
| parent | tap-bsd: use user-specified tap device if it already exists (diff) | |
| download | qemu-4b59f39bc9a03afcc74b2fa28da7c3189fca507c.tar.gz qemu-4b59f39bc9a03afcc74b2fa28da7c3189fca507c.tar.xz qemu-4b59f39bc9a03afcc74b2fa28da7c3189fca507c.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-11-06' into staging
trivial patches for 2015-11-06
# gpg: Signature made Fri 06 Nov 2015 12:42:43 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-11-06: (24 commits)
tap-bsd: use user-specified tap device if it already exists
qemu-sockets: do not test path with access() before unlinking
taget-ppc: Fix read access to IBAT registers higher than IBAT3
exec: avoid unnecessary cacheline bounce on ram_list.mru_block
target-alpha: fix uninitialized variable
ivshmem-server: fix possible OVERRUN
pci-assign: do not test path with access() before opening
qom/object: fix 2 comment typos
configure: remove help string for 'vnc-tls' option
usb: Use g_new() & friends where that makes obvious sense
qxl: Use g_new() & friends where that makes obvious sense
ui: Use g_new() & friends where that makes obvious sense
bt: fix use of uninitialized variable seqlen
hw/dma/pxa2xx: Remove superfluous memset
linux-user/syscall: Replace g_malloc0 + memcpy with g_memdup
tests/i44fx-test: No need for zeroing memory before memset
hw/input/tsc210x: Remove superfluous memset
xen: fix invalid assertion
tests: ignore test-qga
fix bad indentation in pcie_cap_slot_write_config()
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib/ivshmem-server/ivshmem-server.c')
| -rw-r--r-- | contrib/ivshmem-server/ivshmem-server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c index 5e5239ce45..d9e26b0574 100644 --- a/contrib/ivshmem-server/ivshmem-server.c +++ b/contrib/ivshmem-server/ivshmem-server.c @@ -168,7 +168,9 @@ ivshmem_server_handle_new_conn(IvshmemServer *server) } if (i == G_MAXUINT16) { IVSHMEM_SERVER_DEBUG(server, "cannot allocate new client id\n"); - goto fail; + close(newfd); + g_free(peer); + return -1; } peer->id = server->cur_id++; |