[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT d6cf84e] slirp: Drop redundant checks from slirp_
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT d6cf84e] slirp: Drop redundant checks from slirp_output |
Date: |
Tue, 30 Jun 2009 00:57:32 -0000 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/net.c b/net.c
index 5f8edda..70cc995 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);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT d6cf84e] slirp: Drop redundant checks from slirp_output,
Anthony Liguori <=