[Qemu-devel] [PATCH v2] util: socket: Add missing localaddr and localport option for DGRAM socket

* [Qemu-devel] [PATCH v2] util: socket: Add missing localaddr and localport option for DGRAM socket
@ 2015-05-15  9:31 Peter Krempa
  2015-05-15 12:24 ` Markus Armbruster
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Krempa @ 2015-05-15  9:31 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Krempa, Markus Armbruster

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
trhough 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>
---

Notes:
    Version 2:
    - improved commit message as suggested by Markus
    
Cc: Markus Armbruster <armbru@redhat.com>

 util/qemu-sockets.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 87c9bc6..72066be 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,
         },{
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread