github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

src: De-lint run_qemu.go

Browse Source 
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2019-03-03 15:07:05 +00:00
parent 27f8e8c850
commit 9f9252c3f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ func retrieveMAC(statePath string) net.HardwareAddr {
if macString, err := ioutil.ReadFile(fileName); err == nil { if macString, err := ioutil.ReadFile(fileName); err == nil {
if mac, err = net.ParseMAC(string(macString)); err != nil { if mac, err = net.ParseMAC(string(macString)); err != nil {
log.Fatal("failed to parse mac-addr file: %s\n", macString) log.Fatalf("failed to parse mac-addr file: %s\n", macString)
} }
} else { } else {
// we did not generate a mac yet. generate one // we did not generate a mac yet. generate one
@ -114,7 +114,7 @@ func generateMAC() net.HardwareAddr {
log.WithError(err).Fatal("failed to generate random mac address") log.WithError(err).Fatal("failed to generate random mac address")
} }
if n != 6 { if n != 6 {
log.WithError(err).Fatal("generated %d bytes for random mac address", n) log.WithError(err).Fatalf("generated %d bytes for random mac address", n)
} }
mac[0] &^= 0x01 // Clear multicast bit mac[0] &^= 0x01 // Clear multicast bit
mac[0] |= 0x2 // Set locally administered bit mac[0] |= 0x2 // Set locally administered bit
@ -546,7 +546,7 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
case "x86_64": case "x86_64":
goArch = "amd64" goArch = "amd64"
default: default:
log.Fatalf("%s is an unsupported architecture.") log.Fatalf("%s is an unsupported architecture.", config.Arch)
} }
if goArch != runtime.GOARCH { if goArch != runtime.GOARCH {