github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 21:18:28 +00:00
Code Issues Projects Releases Wiki Activity

qemu: restore persistent mac address support

Browse Source 
If the state dir is preserved then the VM should come up with the same mac
address on subsequent reboots.

Fixes regression in #2498.

Rather than fixing the typo in the associated comments just remove them since
they don't really convey any useful information.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-09-12 12:12:03 +01:00
parent ca4ee13fca
commit 16147a7591
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 == "" { if config.NetdevConfig == "" {
qemuArgs = append(qemuArgs, "-net", "none") qemuArgs = append(qemuArgs, "-net", "none")
} else { } else {
// provide a network device first for the QEMU VM if '-networking' is specified, mac := retrieveMAC(config.StatePath)
qemuArgs = append(qemuArgs, "-device", "virtio-net-pci,netdev=t0") qemuArgs = append(qemuArgs, "-device", "virtio-net-pci,netdev=t0,mac="+mac.String())
forwardings, err := buildQemuForwardings(config.PublishedPorts, config.Containerized) forwardings, err := buildQemuForwardings(config.PublishedPorts, config.Containerized)
if err != nil { if err != nil {
log.Error(err) 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) qemuArgs = append(qemuArgs, "-netdev", config.NetdevConfig+forwardings)
} }