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

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

[Peter Krempa]

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. This causes abort of qemu after
commit:

commit f43e47dbf6de24db20ec9b588bb6cc762093dd69
Author: Markus Armbruster <armbru@redhat.com>
Date:   Thu Feb 12 17:52:20 2015 +0100

    QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use

Add the two fields so that the options can again be parsed correctly.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1220252

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
Cc: Eric Blake <eblake@redhat.com>
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

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

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]

On 05/13/2015 08:44 AM, Peter Krempa wrote:
> 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. This causes abort of qemu after
> commit:
> 
> commit f43e47dbf6de24db20ec9b588bb6cc762093dd69
> Author: Markus Armbruster <armbru@redhat.com>
> Date:   Thu Feb 12 17:52:20 2015 +0100
> 
>     QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use
> 
> Add the two fields so that the options can again be parsed correctly.
> 
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1220252
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
> Cc: Eric Blake <eblake@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> 
>  util/qemu-sockets.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

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

[Markus Armbruster]

Peter Krempa <pkrempa@redhat.com> writes:

> 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. This causes abort of qemu after
> commit:
>
> commit f43e47dbf6de24db20ec9b588bb6cc762093dd69
> Author: Markus Armbruster <armbru@redhat.com>
> Date:   Thu Feb 12 17:52:20 2015 +0100
>
>     QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use
>
> Add the two fields so that the options can again be parsed correctly.
>
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1220252
>
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>

I fished the reproducer out of Bugzilla:

    $ 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)

Please include it in the commit message next time.

Before commit f43e47d, errors are reported and ignored instead:

    qemu-system-x86_64: -chardev udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234: Invalid parameter 'localaddr'
    qemu-system-x86_64: -chardev udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234: Invalid parameter 'localport'

When inet_dgram_opts() tries to retrieve them, it gets NULL, and duly
assumes default values: wildcard address, port 0.  bind() then binds a
port chosen by the kernel on all interfaces.

Specifying a localaddr other than "" or a localport other than 0 does
not work.

The commit you quoted didn't break it, it only made existing breakage
more obvious.

Do you have an idea when this was broken?  Assuming it ever worked...