projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
net.h
diff --git
a/net.h
b/net.h
index
cdf63a4
..
feee021
100644
(file)
--- a/
net.h
+++ b/
net.h
@@
-112,7
+112,7
@@
int net_client_init(const char *device, const char *p);
void net_client_uninit(NICInfo *nd);
int net_client_parse(const char *str);
void net_slirp_smb(const char *exported_dir);
void net_client_uninit(NICInfo *nd);
int net_client_parse(const char *str);
void net_slirp_smb(const char *exported_dir);
-void net_slirp_redir(Monitor *mon, const char *redir_str);
+void net_slirp_redir(Monitor *mon, const char *redir_str, const char *redir_opt2);
void net_cleanup(void);
int slirp_is_inited(void);
void net_client_check(void);
void net_cleanup(void);
int slirp_is_inited(void);
void net_client_check(void);
@@
-127,4
+127,11
@@
void net_host_device_remove(Monitor *mon, int vlan_id, const char *device);
#define SMBD_COMMAND "/usr/sbin/smbd"
#endif
#define SMBD_COMMAND "/usr/sbin/smbd"
#endif
+void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr);
+VLANClientState *qdev_get_vlan_client(DeviceState *dev,
+ IOReadHandler *fd_read,
+ IOCanRWHandler *fd_can_read,
+ NetCleanup *cleanup,
+ void *opaque);
+
#endif
#endif