sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

Add a -net name=foo parameter (Mark McLoughlin) 

Allow the user to supply a vlan client name on the command line.

This is probably only useful for management tools so that they can
use their own names rather than parsing the output of 'info network'.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6220 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-07 17:48:51 +00:00
parent 96d5e20138
commit 7a9f6e4a8d
19 changed files with 100 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/e1000.c
View File

@ -1071,7 +1071,7 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
d->rxbuf_min_shift = 1; d->rxbuf_min_shift = 1;
memset(&d->tx, 0, sizeof d->tx); memset(&d->tx, 0, sizeof d->tx);
d->vc = qemu_new_vlan_client(nd->vlan, nd->model, d->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
e1000_receive, e1000_can_receive, d); e1000_receive, e1000_can_receive, d);
qemu_format_nic_info_str(d->vc, d->nd->macaddr); qemu_format_nic_info_str(d->vc, d->nd->macaddr);

2
hw/eepro100.c
View File

@ -1776,7 +1776,7 @@ static void nic_init(PCIBus * bus, NICInfo * nd,
nic_reset(s); nic_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
nic_receive, nic_can_receive, s); nic_receive, nic_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);

2
hw/etraxfs_eth.c
View File

@ -572,7 +572,7 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth); eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth);
cpu_register_physical_memory (base, 0x5c, eth->ethregs); cpu_register_physical_memory (base, 0x5c, eth->ethregs);
eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
eth_receive, eth_can_receive, eth); eth_receive, eth_can_receive, eth);
return dma; return dma;

2
hw/mcf_fec.c
View File

@ -452,7 +452,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq)
mcf_fec_writefn, s); mcf_fec_writefn, s);
cpu_register_physical_memory(base, 0x400, iomemtype); cpu_register_physical_memory(base, 0x400, iomemtype);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
mcf_fec_receive, mcf_fec_can_receive, s); mcf_fec_receive, mcf_fec_can_receive, s);
memcpy(s->macaddr, nd->macaddr, 6); memcpy(s->macaddr, nd->macaddr, 6);
qemu_format_nic_info_str(n->vc, s->macaddr); qemu_format_nic_info_str(n->vc, s->macaddr);

2
hw/mipsnet.c
View File

@ -250,7 +250,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
s->irq = irq; s->irq = irq;
s->nd = nd; s->nd = nd;
if (nd && nd->vlan) { if (nd && nd->vlan) {
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
mipsnet_receive, mipsnet_can_receive, s); mipsnet_receive, mipsnet_can_receive, s);
} else { } else {
s->vc = NULL; s->vc = NULL;

2
hw/musicpal.c
View File

@ -718,7 +718,7 @@ static void mv88w8618_eth_init(NICInfo *nd, uint32_t base, qemu_irq irq)
if (!s) if (!s)
return; return;
s->irq = irq; s->irq = irq;
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
eth_receive, eth_can_receive, s); eth_receive, eth_can_receive, s);
iomemtype = cpu_register_io_memory(0, mv88w8618_eth_readfn, iomemtype = cpu_register_io_memory(0, mv88w8618_eth_readfn,
mv88w8618_eth_writefn, s); mv88w8618_eth_writefn, s);

4
hw/ne2000.c
View File

@ -741,7 +741,7 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd)
ne2000_reset(s); ne2000_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
ne2000_receive, ne2000_can_receive, s); ne2000_receive, ne2000_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);
@ -804,7 +804,7 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn)
s->pci_dev = (PCIDevice *)d; s->pci_dev = (PCIDevice *)d;
memcpy(s->macaddr, nd->macaddr, 6); memcpy(s->macaddr, nd->macaddr, 6);
ne2000_reset(s); ne2000_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
ne2000_receive, ne2000_can_receive, s); ne2000_receive, ne2000_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);

2
hw/pcnet.c
View File

@ -1936,7 +1936,7 @@ static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str)
d->nd = nd; d->nd = nd;
if (nd && nd->vlan) { if (nd && nd->vlan) {
d->vc = qemu_new_vlan_client(nd->vlan, nd->model, d->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
pcnet_receive, pcnet_can_receive, d); pcnet_receive, pcnet_can_receive, d);
qemu_format_nic_info_str(d->vc, d->nd->macaddr); qemu_format_nic_info_str(d->vc, d->nd->macaddr);

2
hw/rtl8139.c
View File

@ -3438,7 +3438,7 @@ void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn)
s->pci_dev = (PCIDevice *)d; s->pci_dev = (PCIDevice *)d;
memcpy(s->macaddr, nd->macaddr, 6); memcpy(s->macaddr, nd->macaddr, 6);
rtl8139_reset(s); rtl8139_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
rtl8139_receive, rtl8139_can_receive, s); rtl8139_receive, rtl8139_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);

2
hw/smc91c111.c
View File

@ -704,7 +704,7 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
smc91c111_reset(s); smc91c111_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
smc91c111_receive, smc91c111_can_receive, s); smc91c111_receive, smc91c111_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);
/* ??? Save/restore. */ /* ??? Save/restore. */

2
hw/stellaris_enet.c
View File

@ -397,7 +397,7 @@ void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq)
memcpy(s->macaddr, nd->macaddr, 6); memcpy(s->macaddr, nd->macaddr, 6);
if (nd->vlan) { if (nd->vlan) {
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
stellaris_enet_receive, stellaris_enet_can_receive, s); stellaris_enet_receive, stellaris_enet_can_receive, s);
qemu_format_nic_info_str(s->vc, s->macaddr); qemu_format_nic_info_str(s->vc, s->macaddr);
} }

2
hw/usb-net.c
View File

@ -1453,7 +1453,7 @@ USBDevice *usb_net_init(NICInfo *nd)
pstrcpy(s->dev.devname, sizeof(s->dev.devname), pstrcpy(s->dev.devname, sizeof(s->dev.devname),
"QEMU USB Network Interface"); "QEMU USB Network Interface");
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
usbnet_receive, usbnet_can_receive, s); usbnet_receive, usbnet_can_receive, s);
qemu_format_nic_info_str(s->vc, s->mac); qemu_format_nic_info_str(s->vc, s->mac);

2
hw/virtio-net.c
View File

@ -315,7 +315,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx); n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx);
n->tx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_tx); n->tx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_tx);
memcpy(n->mac, nd->macaddr, 6); memcpy(n->mac, nd->macaddr, 6);
n->vc = qemu_new_vlan_client(nd->vlan, nd->model, n->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
virtio_net_receive, virtio_net_can_receive, n); virtio_net_receive, virtio_net_can_receive, n);
qemu_format_nic_info_str(n->vc, n->mac); qemu_format_nic_info_str(n->vc, n->mac);

97
net.c
View File

@ -325,6 +325,7 @@ static char *assign_name(VLANClientState *vc1, const char *model)
VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *qemu_new_vlan_client(VLANState *vlan,
const char *model, const char *model,
const char *name,
IOReadHandler *fd_read, IOReadHandler *fd_read,
IOCanRWHandler *fd_can_read, IOCanRWHandler *fd_can_read,
void *opaque) void *opaque)
@ -334,7 +335,10 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
if (!vc) if (!vc)
return NULL; return NULL;
vc->model = strdup(model); vc->model = strdup(model);
vc->name = assign_name(vc, model); if (name)
vc->name = strdup(name);
else
vc->name = assign_name(vc, model);
vc->fd_read = fd_read; vc->fd_read = fd_read;
vc->fd_can_read = fd_can_read; vc->fd_can_read = fd_can_read;
vc->opaque = opaque; vc->opaque = opaque;
@ -474,13 +478,13 @@ static void slirp_receive(void *opaque, const uint8_t *buf, int size)
slirp_input(buf, size); slirp_input(buf, size);
} }
static int net_slirp_init(VLANState *vlan, const char *model) static int net_slirp_init(VLANState *vlan, const char *model, const char *name)
{ {
if (!slirp_inited) { if (!slirp_inited) {
slirp_inited = 1; slirp_inited = 1;
slirp_init(); slirp_init();
} }
slirp_vc = qemu_new_vlan_client(vlan, model, slirp_vc = qemu_new_vlan_client(vlan, model, name,
slirp_receive, NULL, NULL); slirp_receive, NULL, NULL);
slirp_vc->info_str[0] = '\0'; slirp_vc->info_str[0] = '\0';
return 0; return 0;
@ -694,7 +698,10 @@ static void tap_send(void *opaque)
/* fd support */ /* fd support */
static TAPState *net_tap_fd_init(VLANState *vlan, const char *model, int fd) static TAPState *net_tap_fd_init(VLANState *vlan,
const char *model,
const char *name,
int fd)
{ {
TAPState *s; TAPState *s;
@ -702,7 +709,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, const char *model, int fd)
if (!s) if (!s)
return NULL; return NULL;
s->fd = fd; s->fd = fd;
s->vc = qemu_new_vlan_client(vlan, model, tap_receive, NULL, s); s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, s);
#ifdef HAVE_IOVEC #ifdef HAVE_IOVEC
s->vc->fd_readv = tap_receive_iov; s->vc->fd_readv = tap_receive_iov;
#endif #endif
@ -937,7 +944,8 @@ static int launch_script(const char *setup_script, const char *ifname, int fd)
return 0; return 0;
} }
static int net_tap_init(VLANState *vlan, const char *model, const char *ifname1, static int net_tap_init(VLANState *vlan, const char *model,
const char *name, const char *ifname1,
const char *setup_script, const char *down_script) const char *setup_script, const char *down_script)
{ {
TAPState *s; TAPState *s;
@ -958,7 +966,7 @@ static int net_tap_init(VLANState *vlan, const char *model, const char *ifname1,
if (launch_script(setup_script, ifname, fd)) if (launch_script(setup_script, ifname, fd))
return -1; return -1;
} }
s = net_tap_fd_init(vlan, model, fd); s = net_tap_fd_init(vlan, model, name, fd);
if (!s) if (!s)
return -1; return -1;
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
@ -1002,7 +1010,8 @@ static void vde_from_qemu(void *opaque, const uint8_t *buf, int size)
} }
} }
static int net_vde_init(VLANState *vlan, const char *model, const char *sock, static int net_vde_init(VLANState *vlan, const char *model,
const char *name, const char *sock,
int port, const char *group, int mode) int port, const char *group, int mode)
{ {
VDEState *s; VDEState *s;
@ -1023,7 +1032,7 @@ static int net_vde_init(VLANState *vlan, const char *model, const char *sock,
free(s); free(s);
return -1; return -1;
} }
s->vc = qemu_new_vlan_client(vlan, model, vde_from_qemu, NULL, s); s->vc = qemu_new_vlan_client(vlan, model, name, vde_from_qemu, NULL, s);
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s); qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d", snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d",
sock, vde_datafd(s->vde)); sock, vde_datafd(s->vde));
@ -1045,6 +1054,7 @@ typedef struct NetSocketState {
typedef struct NetSocketListenState { typedef struct NetSocketListenState {
VLANState *vlan; VLANState *vlan;
char *model; char *model;
char *name;
int fd; int fd;
} NetSocketListenState; } NetSocketListenState;
@ -1198,7 +1208,9 @@ fail:
return -1; return -1;
} }
static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan, const char *model, static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan,
const char *model,
const char *name,
int fd, int is_connected) int fd, int is_connected)
{ {
struct sockaddr_in saddr; struct sockaddr_in saddr;
@ -1242,7 +1254,7 @@ static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan, const char *mod
return NULL; return NULL;
s->fd = fd; s->fd = fd;
s->vc = qemu_new_vlan_client(vlan, model, net_socket_receive_dgram, NULL, s); s->vc = qemu_new_vlan_client(vlan, model, name, net_socket_receive_dgram, NULL, s);
qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s); qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s);
/* mcast: save bound address as dst */ /* mcast: save bound address as dst */
@ -1261,7 +1273,9 @@ static void net_socket_connect(void *opaque)
qemu_set_fd_handler(s->fd, net_socket_send, NULL, s); qemu_set_fd_handler(s->fd, net_socket_send, NULL, s);
} }
static NetSocketState *net_socket_fd_init_stream(VLANState *vlan, const char *model, static NetSocketState *net_socket_fd_init_stream(VLANState *vlan,
const char *model,
const char *name,
int fd, int is_connected) int fd, int is_connected)
{ {
NetSocketState *s; NetSocketState *s;
@ -1269,7 +1283,7 @@ static NetSocketState *net_socket_fd_init_stream(VLANState *vlan, const char *mo
if (!s) if (!s)
return NULL; return NULL;
s->fd = fd; s->fd = fd;
s->vc = qemu_new_vlan_client(vlan, model, s->vc = qemu_new_vlan_client(vlan, model, name,
net_socket_receive, NULL, s); net_socket_receive, NULL, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
"socket: fd=%d", fd); "socket: fd=%d", fd);
@ -1281,7 +1295,8 @@ static NetSocketState *net_socket_fd_init_stream(VLANState *vlan, const char *mo
return s; return s;
} }
static NetSocketState *net_socket_fd_init(VLANState *vlan, const char *model, static NetSocketState *net_socket_fd_init(VLANState *vlan,
const char *model, const char *name,
int fd, int is_connected) int fd, int is_connected)
{ {
int so_type=-1, optlen=sizeof(so_type); int so_type=-1, optlen=sizeof(so_type);
@ -1293,13 +1308,13 @@ static NetSocketState *net_socket_fd_init(VLANState *vlan, const char *model,
} }
switch(so_type) { switch(so_type) {
case SOCK_DGRAM: case SOCK_DGRAM:
return net_socket_fd_init_dgram(vlan, model, fd, is_connected); return net_socket_fd_init_dgram(vlan, model, name, fd, is_connected);
case SOCK_STREAM: case SOCK_STREAM:
return net_socket_fd_init_stream(vlan, model, fd, is_connected); return net_socket_fd_init_stream(vlan, model, name, fd, is_connected);
default: default:
/* who knows ... this could be a eg. a pty, do warn and continue as stream */ /* who knows ... this could be a eg. a pty, do warn and continue as stream */
fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd); fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd);
return net_socket_fd_init_stream(vlan, model, fd, is_connected); return net_socket_fd_init_stream(vlan, model, name, fd, is_connected);
} }
return NULL; return NULL;
} }
@ -1321,7 +1336,7 @@ static void net_socket_accept(void *opaque)
break; break;
} }
} }
s1 = net_socket_fd_init(s->vlan, s->model, fd, 1); s1 = net_socket_fd_init(s->vlan, s->model, s->name, fd, 1);
if (!s1) { if (!s1) {
closesocket(fd); closesocket(fd);
} else { } else {
@ -1331,7 +1346,9 @@ static void net_socket_accept(void *opaque)
} }
} }
static int net_socket_listen_init(VLANState *vlan, const char *model, static int net_socket_listen_init(VLANState *vlan,
const char *model,
const char *name,
const char *host_str) const char *host_str)
{ {
NetSocketListenState *s; NetSocketListenState *s;
@ -1368,12 +1385,15 @@ static int net_socket_listen_init(VLANState *vlan, const char *model,
} }
s->vlan = vlan; s->vlan = vlan;
s->model = strdup(model); s->model = strdup(model);
s->name = strdup(name);
s->fd = fd; s->fd = fd;
qemu_set_fd_handler(fd, net_socket_accept, NULL, s); qemu_set_fd_handler(fd, net_socket_accept, NULL, s);
return 0; return 0;
} }
static int net_socket_connect_init(VLANState *vlan, const char *model, static int net_socket_connect_init(VLANState *vlan,
const char *model,
const char *name,
const char *host_str) const char *host_str)
{ {
NetSocketState *s; NetSocketState *s;
@ -1412,7 +1432,7 @@ static int net_socket_connect_init(VLANState *vlan, const char *model,
break; break;
} }
} }
s = net_socket_fd_init(vlan, model, fd, connected); s = net_socket_fd_init(vlan, model, name, fd, connected);
if (!s) if (!s)
return -1; return -1;
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
@ -1421,7 +1441,9 @@ static int net_socket_connect_init(VLANState *vlan, const char *model,
return 0; return 0;
} }
static int net_socket_mcast_init(VLANState *vlan, const char *model, static int net_socket_mcast_init(VLANState *vlan,
const char *model,
const char *name,
const char *host_str) const char *host_str)
{ {
NetSocketState *s; NetSocketState *s;
@ -1436,7 +1458,7 @@ static int net_socket_mcast_init(VLANState *vlan, const char *model,
if (fd < 0) if (fd < 0)
return -1; return -1;
s = net_socket_fd_init(vlan, model, fd, 0); s = net_socket_fd_init(vlan, model, name, fd, 0);
if (!s) if (!s)
return -1; return -1;
@ -1474,6 +1496,7 @@ int net_client_init(const char *device, const char *p)
char buf[1024]; char buf[1024];
int vlan_id, ret; int vlan_id, ret;
VLANState *vlan; VLANState *vlan;
char *name = NULL;
vlan_id = 0; vlan_id = 0;
if (get_param_value(buf, sizeof(buf), "vlan", p)) { if (get_param_value(buf, sizeof(buf), "vlan", p)) {
@ -1484,6 +1507,9 @@ int net_client_init(const char *device, const char *p)
fprintf(stderr, "Could not create vlan %d\n", vlan_id); fprintf(stderr, "Could not create vlan %d\n", vlan_id);
return -1; return -1;
} }
if (get_param_value(buf, sizeof(buf), "name", p)) {
name = strdup(buf);
}
if (!strcmp(device, "nic")) { if (!strcmp(device, "nic")) {
NICInfo *nd; NICInfo *nd;
uint8_t *macaddr; uint8_t *macaddr;
@ -1511,6 +1537,8 @@ int net_client_init(const char *device, const char *p)
nd->model = strdup(buf); nd->model = strdup(buf);
} }
nd->vlan = vlan; nd->vlan = vlan;
nd->name = name;
name = NULL;
nb_nics++; nb_nics++;
vlan->nb_guest_devs++; vlan->nb_guest_devs++;
ret = 0; ret = 0;
@ -1526,7 +1554,7 @@ int net_client_init(const char *device, const char *p)
pstrcpy(slirp_hostname, sizeof(slirp_hostname), buf); pstrcpy(slirp_hostname, sizeof(slirp_hostname), buf);
} }
vlan->nb_host_devs++; vlan->nb_host_devs++;
ret = net_slirp_init(vlan, device); ret = net_slirp_init(vlan, device, name);
} else } else
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@ -1537,7 +1565,7 @@ int net_client_init(const char *device, const char *p)
return -1; return -1;
} }
vlan->nb_host_devs++; vlan->nb_host_devs++;
ret = tap_win32_init(vlan, device, ifname); ret = tap_win32_init(vlan, device, name, ifname);
} else } else
#elif defined (_AIX) #elif defined (_AIX)
#else #else
@ -1550,7 +1578,7 @@ int net_client_init(const char *device, const char *p)
fd = strtol(buf, NULL, 0); fd = strtol(buf, NULL, 0);
fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
ret = -1; ret = -1;
if (net_tap_fd_init(vlan, device, fd)) if (net_tap_fd_init(vlan, device, name, fd))
ret = 0; ret = 0;
} else { } else {
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) { if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@ -1562,7 +1590,7 @@ int net_client_init(const char *device, const char *p)
if (get_param_value(down_script, sizeof(down_script), "downscript", p) == 0) { if (get_param_value(down_script, sizeof(down_script), "downscript", p) == 0) {
pstrcpy(down_script, sizeof(down_script), DEFAULT_NETWORK_DOWN_SCRIPT); pstrcpy(down_script, sizeof(down_script), DEFAULT_NETWORK_DOWN_SCRIPT);
} }
ret = net_tap_init(vlan, device, ifname, setup_script, down_script); ret = net_tap_init(vlan, device, name, ifname, setup_script, down_script);
} }
} else } else
#endif #endif
@ -1571,14 +1599,14 @@ int net_client_init(const char *device, const char *p)
int fd; int fd;
fd = strtol(buf, NULL, 0); fd = strtol(buf, NULL, 0);
ret = -1; ret = -1;
if (net_socket_fd_init(vlan, device, fd, 1)) if (net_socket_fd_init(vlan, device, name, fd, 1))
ret = 0; ret = 0;
} else if (get_param_value(buf, sizeof(buf), "listen", p) > 0) { } else if (get_param_value(buf, sizeof(buf), "listen", p) > 0) {
ret = net_socket_listen_init(vlan, device, buf); ret = net_socket_listen_init(vlan, device, name, buf);
} else if (get_param_value(buf, sizeof(buf), "connect", p) > 0) { } else if (get_param_value(buf, sizeof(buf), "connect", p) > 0) {
ret = net_socket_connect_init(vlan, device, buf); ret = net_socket_connect_init(vlan, device, name, buf);
} else if (get_param_value(buf, sizeof(buf), "mcast", p) > 0) { } else if (get_param_value(buf, sizeof(buf), "mcast", p) > 0) {
ret = net_socket_mcast_init(vlan, device, buf); ret = net_socket_mcast_init(vlan, device, name, buf);
} else { } else {
fprintf(stderr, "Unknown socket options: %s\n", p); fprintf(stderr, "Unknown socket options: %s\n", p);
return -1; return -1;
@ -1606,17 +1634,20 @@ int net_client_init(const char *device, const char *p)
} else { } else {
vde_mode = 0700; vde_mode = 0700;
} }
ret = net_vde_init(vlan, device, vde_sock, vde_port, vde_group, vde_mode); ret = net_vde_init(vlan, device, name, vde_sock, vde_port, vde_group, vde_mode);
} else } else
#endif #endif
{ {
fprintf(stderr, "Unknown network device: %s\n", device); fprintf(stderr, "Unknown network device: %s\n", device);
if (name)
free(name);
return -1; return -1;
} }
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Could not initialize device '%s'\n", device); fprintf(stderr, "Could not initialize device '%s'\n", device);
} }
if (name)
free(name);
return ret; return ret;
} }

2
net.h
View File

@ -33,6 +33,7 @@ struct VLANState {
VLANState *qemu_find_vlan(int id); VLANState *qemu_find_vlan(int id);
VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *qemu_new_vlan_client(VLANState *vlan,
const char *model, const char *model,
const char *name,
IOReadHandler *fd_read, IOReadHandler *fd_read,
IOCanRWHandler *fd_can_read, IOCanRWHandler *fd_can_read,
void *opaque); void *opaque);
@ -53,6 +54,7 @@ void do_info_network(void);
struct NICInfo { struct NICInfo {
uint8_t macaddr[6]; uint8_t macaddr[6];
const char *model; const char *model;
const char *name;
VLANState *vlan; VLANState *vlan;
}; };

15
qemu-doc.texi
View File

@ -608,10 +608,11 @@ Network options:
@table @option @table @option
@item -net nic[,vlan=@var{n}][,macaddr=@var{addr}][,model=@var{type}] @item -net nic[,vlan=@var{n}][,macaddr=@var{addr}][,model=@var{type}][,name=@var{name}]
Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n} Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
= 0 is the default). The NIC is an ne2k_pci by default on the PC = 0 is the default). The NIC is an ne2k_pci by default on the PC
target. Optionally, the MAC address can be changed. If no target. Optionally, the MAC address can be changed to @var{addr}
and a @var{name} can be assigned for use in monitor commands. If no
@option{-net} option is specified, a single NIC is created. @option{-net} option is specified, a single NIC is created.
Qemu can emulate several different models of network card. Qemu can emulate several different models of network card.
Valid values for @var{type} are Valid values for @var{type} are
@ -621,12 +622,12 @@ Valid values for @var{type} are
Not all devices are supported on all targets. Use -net nic,model=? Not all devices are supported on all targets. Use -net nic,model=?
for a list of available devices for your target. for a list of available devices for your target.
@item -net user[,vlan=@var{n}][,hostname=@var{name}] @item -net user[,vlan=@var{n}][,hostname=@var{name}][,name=@var{name}]
Use the user mode network stack which requires no administrator Use the user mode network stack which requires no administrator
privilege to run. @option{hostname=name} can be used to specify the client privilege to run. @option{hostname=name} can be used to specify the client
hostname reported by the builtin DHCP server. hostname reported by the builtin DHCP server.
@item -net tap[,vlan=@var{n}][,fd=@var{h}][,ifname=@var{name}][,script=@var{file}][,downscript=@var{dfile}] @item -net tap[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,ifname=@var{name}][,script=@var{file}][,downscript=@var{dfile}]
Connect the host TAP network interface @var{name} to VLAN @var{n}, use Connect the host TAP network interface @var{name} to VLAN @var{n}, use
the network script @var{file} to configure it and the network script the network script @var{file} to configure it and the network script
@var{dfile} to deconfigure it. If @var{name} is not provided, the OS @var{dfile} to deconfigure it. If @var{name} is not provided, the OS
@ -647,7 +648,7 @@ qemu linux.img -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \
@end example @end example
@item -net socket[,vlan=@var{n}][,fd=@var{h}][,listen=[@var{host}]:@var{port}][,connect=@var{host}:@var{port}] @item -net socket[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,listen=[@var{host}]:@var{port}][,connect=@var{host}:@var{port}]
Connect the VLAN @var{n} to a remote VLAN in another QEMU virtual Connect the VLAN @var{n} to a remote VLAN in another QEMU virtual
machine using a TCP socket connection. If @option{listen} is machine using a TCP socket connection. If @option{listen} is
@ -667,7 +668,7 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:57 \
-net socket,connect=127.0.0.1:1234 -net socket,connect=127.0.0.1:1234
@end example @end example
@item -net socket[,vlan=@var{n}][,fd=@var{h}][,mcast=@var{maddr}:@var{port}] @item -net socket[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,mcast=@var{maddr}:@var{port}]
Create a VLAN @var{n} shared with another QEMU virtual Create a VLAN @var{n} shared with another QEMU virtual
machines using a UDP multicast socket, effectively making a bus for machines using a UDP multicast socket, effectively making a bus for
@ -707,7 +708,7 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \
/path/to/linux ubd0=/path/to/root_fs eth0=mcast /path/to/linux ubd0=/path/to/root_fs eth0=mcast
@end example @end example
@item -net vde[,vlan=@var{n}][,sock=@var{socketpath}][,port=@var{n}][,group=@var{groupname}][,mode=@var{octalmode}] @item -net vde[,vlan=@var{n}][,name=@var{name}][,sock=@var{socketpath}][,port=@var{n}][,group=@var{groupname}][,mode=@var{octalmode}]
Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and
listening for incoming connections on @var{socketpath}. Use GROUP @var{groupname} listening for incoming connections on @var{socketpath}. Use GROUP @var{groupname}
and MODE @var{octalmode} to change default ownership and permissions for and MODE @var{octalmode} to change default ownership and permissions for

3
sysemu.h
View File

@ -75,7 +75,8 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
#endif #endif
/* TAP win32 */ /* TAP win32 */
int tap_win32_init(VLANState *vlan, const char *model, const char *ifname); int tap_win32_init(VLANState *vlan, const char *model,
const char *name, const char *ifname);
/* SLIRP */ /* SLIRP */
void do_info_slirp(void); void do_info_slirp(void);

5
tap-win32.c
View File

@ -660,7 +660,8 @@ static void tap_win32_send(void *opaque)
} }
} }
int tap_win32_init(VLANState *vlan, const char *model, const char *ifname) int tap_win32_init(VLANState *vlan, const char *model,
const char *name, const char *ifname)
{ {
TAPState *s; TAPState *s;
@ -672,7 +673,7 @@ int tap_win32_init(VLANState *vlan, const char *model, const char *ifname)
return -1; return -1;
} }
s->vc = qemu_new_vlan_client(vlan, model, tap_receive, NULL, s); s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
"tap: ifname=%s", ifname); "tap: ifname=%s", ifname);

14
vl.c
View File

@ -3887,30 +3887,30 @@ static void help(int exitcode)
"-uuid %%08x-%%04x-%%04x-%%04x-%%012x specify machine UUID\n" "-uuid %%08x-%%04x-%%04x-%%04x-%%012x specify machine UUID\n"
"\n" "\n"
"Network options:\n" "Network options:\n"
"-net nic[,vlan=n][,macaddr=addr][,model=type]\n" "-net nic[,vlan=n][,macaddr=addr][,model=type][,name=str]\n"
" create a new Network Interface Card and connect it to VLAN 'n'\n" " create a new Network Interface Card and connect it to VLAN 'n'\n"
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
"-net user[,vlan=n][,hostname=host]\n" "-net user[,vlan=n][,name=str][,hostname=host]\n"
" connect the user mode network stack to VLAN 'n' and send\n" " connect the user mode network stack to VLAN 'n' and send\n"
" hostname 'host' to DHCP clients\n" " hostname 'host' to DHCP clients\n"
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
"-net tap[,vlan=n],ifname=name\n" "-net tap[,vlan=n][,name=str],ifname=name\n"
" connect the host TAP network interface to VLAN 'n'\n" " connect the host TAP network interface to VLAN 'n'\n"
#else #else
"-net tap[,vlan=n][,fd=h][,ifname=name][,script=file][,downscript=dfile]\n" "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile]\n"
" connect the host TAP network interface to VLAN 'n' and use the\n" " connect the host TAP network interface to VLAN 'n' and use the\n"
" network scripts 'file' (default=%s)\n" " network scripts 'file' (default=%s)\n"
" and 'dfile' (default=%s);\n" " and 'dfile' (default=%s);\n"
" use '[down]script=no' to disable script execution;\n" " use '[down]script=no' to disable script execution;\n"
" use 'fd=h' to connect to an already opened TAP interface\n" " use 'fd=h' to connect to an already opened TAP interface\n"
#endif #endif
"-net socket[,vlan=n][,fd=h][,listen=[host]:port][,connect=host:port]\n" "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n"
" connect the vlan 'n' to another VLAN using a socket connection\n" " connect the vlan 'n' to another VLAN using a socket connection\n"
"-net socket[,vlan=n][,fd=h][,mcast=maddr:port]\n" "-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port]\n"
" connect the vlan 'n' to multicast maddr and port\n" " connect the vlan 'n' to multicast maddr and port\n"
#ifdef CONFIG_VDE #ifdef CONFIG_VDE
"-net vde[,vlan=n][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n" "-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
" connect the vlan 'n' to port 'n' of a vde switch running\n" " connect the vlan 'n' to port 'n' of a vde switch running\n"
" on host and listening for incoming connections on 'socketpath'.\n" " on host and listening for incoming connections on 'socketpath'.\n"
" Use group 'groupname' and mode 'octalmode' to change default\n" " Use group 'groupname' and mode 'octalmode' to change default\n"