提交 d6cf84e1 编写于 作者: J Jan Kiszka 提交者: Anthony Liguori

slirp: Drop redundant checks from slirp_output

Slirp doesn't invoke slirp[_can]_output before it is initialized. The
motivation for these checks (3b7f5d47) 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: NJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 d918f23e
...@@ -696,7 +696,7 @@ static void slirp_smb(const char *exported_dir, struct in_addr vserver_addr); ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册