github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 03:15:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2501 from ijc/qemu-reinstate-persistent-mac

Browse Source 
qemu: restore persistent mac address support
This commit is contained in:
Rolf Neugebauer 2017-09-12 13:39:18 +01:00 committed by GitHub
commit 95a1c51d0d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/linuxkit/run_qemu.go
View File

@ -571,13 +571,12 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
if config.NetdevConfig == "" {
qemuArgs = append(qemuArgs, "-net", "none")
} else {
// provide a network device first for the QEMU VM if '-networking' is specified,
qemuArgs = append(qemuArgs, "-device", "virtio-net-pci,netdev=t0")
mac := retrieveMAC(config.StatePath)
qemuArgs = append(qemuArgs, "-device", "virtio-net-pci,netdev=t0,mac="+mac.String())
forwardings, err := buildQemuForwardings(config.PublishedPorts, config.Containerized)
if err != nil {
log.Error(err)
}
// we perfer "-netdev" to the "-net" which is an old way to initialize a host nic
qemuArgs = append(qemuArgs, "-netdev", config.NetdevConfig+forwardings)
}