be685f76dc
http://git.et.redhat.com/?p=qemu-fedora.git Update the current patches with ones produced using format-patch, no real changes here. Drop a couple of patches which aren't referenced in the spec file
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 16eed05e9fe61c502fc2f936a68c252693804541 Mon Sep 17 00:00:00 2001
|
|
From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
|
|
Date: Tue, 21 Apr 2009 19:56:11 +0000
|
|
Subject: [PATCH 15/18] net: Fix -net socket,listen (Jan Kiszka)
|
|
|
|
In case no symbolic name is provided when requesting VLAN connection via
|
|
listening TCP socket ('-net socket,listen=...'), qemu crashes. This
|
|
fixes the cause.
|
|
|
|
(cherry picked from commit ea053add700d8abe203cd79a9ffb082aee4eabc0)
|
|
|
|
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
|
---
|
|
net.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/net.c b/net.c
|
|
index ef3a965..fee02b8 100644
|
|
--- a/net.c
|
|
+++ b/net.c
|
|
@@ -1658,7 +1658,7 @@ static int net_socket_listen_init(VLANState *vlan,
|
|
}
|
|
s->vlan = vlan;
|
|
s->model = strdup(model);
|
|
- s->name = strdup(name);
|
|
+ s->name = name ? strdup(name) : NULL;
|
|
s->fd = fd;
|
|
qemu_set_fd_handler(fd, net_socket_accept, NULL, s);
|
|
return 0;
|
|
--
|
|
1.6.2.2
|
|
|