aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-06-24 14:42:30 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 08:52:49 -0500
commitd6cf84e1de0a167963f0803d6e39f6ca03e27eaa (patch)
tree0b01f3c19c87ec5d3e9c931707a29895f17f7799
parentd918f23efaf486293b96418fe5deaff8a5583304 (diff)
slirp: Drop redundant checks from slirp_output
Slirp doesn't invoke slirp[_can]_output before it is initialized. The motivation for these checks (3b7f5d479c) no longer applies. So drop them. Note: slirp_vc will become invalid if the slirp stack is removed during runtime. But this is no new bug and will be fixed later. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--net.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net.c b/net.c
index 5f8edda005..70cc9953e3 100644
--- a/net.c
+++ b/net.c
@@ -696,7 +696,7 @@ static void slirp_smb(const char *exported_dir, struct in_addr vserver_addr);
int slirp_can_output(void)
{
- return !slirp_vc || qemu_can_send_packet(slirp_vc);
+ return qemu_can_send_packet(slirp_vc);
}
void slirp_output(const uint8_t *pkt, int pkt_len)
@@ -705,8 +705,6 @@ void slirp_output(const uint8_t *pkt, int pkt_len)
printf("slirp output:\n");
hex_dump(stdout, pkt, pkt_len);
#endif
- if (!slirp_vc)
- return;
qemu_send_packet(slirp_vc, pkt, pkt_len);
}