OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

slirp: Drop redundant checks from slirp_output

Browse Source 
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>
This commit is contained in:
Jan Kiszka 2009-06-24 14:42:30 +02:00 committed by Anthony Liguori
parent d918f23efa
commit d6cf84e1de
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net.c
View File

@ -696,7 +696,7 @@ static void slirp_smb(const char *exported_dir, struct in_addr vserver_addr);
int slirp_can_output(void) 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) 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"); printf("slirp output:\n");
hex_dump(stdout, pkt, pkt_len); hex_dump(stdout, pkt, pkt_len);
#endif #endif
if (!slirp_vc)
return;
qemu_send_packet(slirp_vc, pkt, pkt_len); qemu_send_packet(slirp_vc, pkt, pkt_len);
} }