diff options
| author | Peter Krempa | 2015-05-15 11:31:43 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2015-06-03 13:21:23 +0200 |
| commit | b8981dc9aae25fa79e5f35609e63f50f078a572d (patch) | |
| tree | 8412a941034cd881222d68b3ef531d88592151d1 /util | |
| parent | microblaze: cpu: Delete MMAP_SHIFT definition (diff) | |
| download | qemu-b8981dc9aae25fa79e5f35609e63f50f078a572d.tar.gz qemu-b8981dc9aae25fa79e5f35609e63f50f078a572d.tar.xz qemu-b8981dc9aae25fa79e5f35609e63f50f078a572d.zip | |
util: socket: Add missing localaddr and localport option for DGRAM socket
The 'socket_optslist' structure does not contain the 'localaddr' and
'localport' options that are parsed in case you are creating a
'connect' type UDP character device.
I've noticed it happening after commit f43e47dbf6de24db20ec9b588bb6cc762
made qemu abort() after seeing the invalid option.
A minimal reproducer for the case is:
$ qemu-system-x86_64 -chardev udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234
qemu-system-x86_64: -chardev udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234: Invalid parameter 'localaddr'
Aborted (core dumped)
Prior to the commit mentioned above the error would be printed but the
value for localaddr and localport was simply ignored. I did not go
through the code to find out when it was broken.
Add the two fields so that the options can again be parsed correctly and
qemu doesn't abort().
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1220252
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-sockets.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 22c8c4c5d5..f9ad34e40c 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -45,6 +45,12 @@ QemuOptsList socket_optslist = { .name = "port", .type = QEMU_OPT_STRING, },{ + .name = "localaddr", + .type = QEMU_OPT_STRING, + },{ + .name = "localport", + .type = QEMU_OPT_STRING, + },{ .name = "to", .type = QEMU_OPT_NUMBER, },{ |