clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-06 21:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Initialize MAC and IP address for uip properly

Browse Source 
- Drop static initialization

- Use {host,guet}_{ip,mac} to initialize

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2015-06-01 16:39:46 +01:00
committed by Will Deacon
parent f715177d99
commit 0c54698e85
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio/net.c
+8 -5
View File
@@ -93,9 +93,6 @@ static struct net_dev ndev = {
| 1UL << VIRTIO_NET_F_GUEST_TSO4
| 1UL << VIRTIO_NET_F_GUEST_TSO6,
.info = {
.host_mac.addr = {0x00, 0x01, 0x01, 0x01, 0x01, 0x01},
.guest_mac.addr = {0x00, 0x15, 0x15, 0x15, 0x15, 0x15},
.host_ip = 0xc0a82101,
.buf_nr = 20,
}
};
@@ -455,14 +452,20 @@ void virtio_net__init(const struct virtio_net_parameters *params)
ndev.base_addr = net_base_addr;
pci__register(&pci_header, dev);
for (i = 0 ; i < 6 ; i++)
ndev.config.mac[i] = params->guest_mac[i];
for (i = 0 ; i < 6 ; i++) {
ndev.config.mac[i] = params->guest_mac[i];
ndev.info.guest_mac.addr[i] = params->guest_mac[i];
ndev.info.host_mac.addr[i] = params->host_mac[i];
}
ndev.mode = params->mode;
if (ndev.mode == NET_MODE_TAP) {
virtio_net__tap_init(params);
ndev.ops = &tap_ops;
} else {
ndev.info.host_ip = ntohl(inet_addr(params->host_ip));
ndev.info.guest_ip = ntohl(inet_addr(params->guest_ip));
ndev.info.guest_netmask = ntohl(inet_addr("255.255.255.0"));
uip_init(&ndev.info);
ndev.ops = &uip_ops;
}