summaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-12 17:51:06 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-12 17:51:06 +0000
commit0580ac9160eec864579c03932869f72148296779 (patch)
tree67640315578e8f4fd2ab3ffce59367f9f30dd021 /slirp
parent7fa9ae1aaab87bd197a34623a1c264dca51d6217 (diff)
Fix some SLIRP warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6272 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'slirp')
-rw-r--r--slirp/main.h2
-rw-r--r--slirp/slirp.c7
-rw-r--r--slirp/tcp_subr.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/slirp/main.h b/slirp/main.h
index b4926147d8..ed51385599 100644
--- a/slirp/main.h
+++ b/slirp/main.h
@@ -44,7 +44,7 @@ extern int towrite_max;
extern int ppp_exit;
extern int tcp_keepintvl;
extern uint8_t client_ethaddr[6];
-extern char *slirp_special_ip;
+extern const char *slirp_special_ip;
extern int slirp_restrict;
#define PROTO_SLIP 0x1
diff --git a/slirp/slirp.c b/slirp/slirp.c
index c1361ab108..b4a04c4250 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
+#include "qemu-char.h"
#include "slirp.h"
#include "hw/hw.h"
@@ -47,7 +48,7 @@ static struct in_addr client_ipaddr;
static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 };
-char *slirp_special_ip = CTL_SPECIAL;
+const char *slirp_special_ip = CTL_SPECIAL;
int slirp_restrict;
int do_slowtimo;
int link_up;
@@ -809,7 +810,7 @@ void slirp_socket_recv(int addr_low_byte, int guest_port, const uint8_t *buf,
if (!so)
return;
- ret = soreadbuf(so, buf, size);
+ ret = soreadbuf(so, (const char *)buf, size);
if (ret > 0)
tcp_output(sototcpcb(so));
@@ -1031,7 +1032,7 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id)
if (!ex_ptr)
return -EINVAL;
- so->extra = ex_ptr->ex_exec;
+ so->extra = (void *)ex_ptr->ex_exec;
}
return 0;
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 12abebeb96..00f61c1614 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -1283,7 +1283,7 @@ tcp_ctl(so)
command == ex_ptr->ex_addr) {
if (ex_ptr->ex_pty == 3) {
so->s = -1;
- so->extra = ex_ptr->ex_exec;
+ so->extra = (void *)ex_ptr->ex_exec;
return 1;
}
do_pty = ex_ptr->ex_pty;