]> git.proxmox.com Git - mirror_qemu.git/commitdiff
slirp: fix CharDriver breakage
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 27 Oct 2016 20:04:58 +0000 (22:04 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 2 Nov 2016 08:28:56 +0000 (09:28 +0100)
SLIRP expects a CharBackend as the third argument to slirp_add_exec,
but net/slirp.c was passing a CharDriverState.  Fix this to restore
guestfwd functionality.

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
net/slirp.c

index 64dd3255aefbd3466ff9e6c0a9be495929c0f9dd..bcd1c5f57d19473d9822e32ae7a2fbba2f63ae74 100644 (file)
@@ -763,8 +763,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str,
             return -1;
         }
 
-        if (slirp_add_exec(s->slirp, 3, qemu_chr_fe_get_driver(&fwd->hd),
-                           &server, port) < 0) {
+        if (slirp_add_exec(s->slirp, 3, &fwd->hd, &server, port) < 0) {
             error_report("conflicting/invalid host:port in guest forwarding "
                          "rule '%s'", config_str);
             g_free(fwd);