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

Fix some SLIRP warnings

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6272 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2009-01-12 17:51:06 +00:00
parent 7fa9ae1aaa
commit 0580ac9160
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slirp/main.h
View File

@ -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

7
slirp/slirp.c
View File

@ -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;

2
slirp/tcp_subr.c
View File

@ -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;