[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/30] slirp: fix CharDriver breakage
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 25/30] slirp: fix CharDriver breakage |
Date: |
Tue, 1 Nov 2016 17:29:38 +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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
net/slirp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index 64dd325..bcd1c5f 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -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);
--
2.7.4
- [Qemu-devel] [PULL 17/30] nbd: Let client skip portions of server reply, (continued)
- [Qemu-devel] [PULL 17/30] nbd: Let client skip portions of server reply, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 16/30] nbd: Let server know when client gives up negotiation, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 12/30] nbd: Rename struct nbd_request and nbd_reply, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 19/30] nbd: Support shorter handshake, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 20/30] nbd: Refactor conversion to errno to silence checkpatch, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 21/30] nbd: Improve server handling of shutdown requests, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 22/30] nbd: Implement NBD_CMD_WRITE_ZEROES on server, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 23/30] nbd: Implement NBD_CMD_WRITE_ZEROES on client, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 24/30] qemu-char: do not forward events through the mux until QEMU has started, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 26/30] x86: add AVX512_4VNNIW and AVX512_4FMAPS features, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 25/30] slirp: fix CharDriver breakage,
Paolo Bonzini <=
- [Qemu-devel] [PULL 28/30] vl: exit qemu on guest panic if -no-shutdown is not set, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 27/30] checkpatch: allow spaces before parenthesis for 'coroutine_fn', Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 30/30] main-loop: Suppress I/O thread warning under qtest, Paolo Bonzini, 2016/11/01
- [Qemu-devel] [PULL 29/30] docs/rcu.txt: Fix minor typo, Paolo Bonzini, 2016/11/01
- Re: [Qemu-devel] [PULL v2 00/30] Misc patches for 2016-10-31, no-reply, 2016/11/01
- Re: [Qemu-devel] [PULL v2 00/30] Misc patches for 2016-10-31, Peter Maydell, 2016/11/01