github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2498 from arm64b/arm64-qemu-networking-tap

Browse Source 
qemu: Fix the networking issue in 'tap' mode on arm64
This commit is contained in:
Rolf Neugebauer 2017-09-11 09:47:12 +01:00 committed by GitHub
commit 7c78352a74
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ func runQemu(args []string) {
var netdevConfig string var netdevConfig string
switch netMode[0] { switch netMode[0] {
case qemuNetworkingUser: case qemuNetworkingUser:
netdevConfig = "user" netdevConfig = "user,id=t0"
case qemuNetworkingTap: case qemuNetworkingTap:
if len(netMode) != 2 { if len(netMode) != 2 {
log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingTap) log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingTap)
@ -284,7 +284,7 @@ func runQemu(args []string) {
if len(publishFlags) != 0 { if len(publishFlags) != 0 {
log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser) log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser)
} }
netdevConfig = fmt.Sprintf("tap,ifname=%s,script=no,downscript=no", netMode[1]) netdevConfig = fmt.Sprintf("tap,id=t0,ifname=%s,script=no,downscript=no", netMode[1])
case qemuNetworkingBridge: case qemuNetworkingBridge:
if len(netMode) != 2 { if len(netMode) != 2 {
log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingBridge) log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingBridge)
@ -292,7 +292,7 @@ func runQemu(args []string) {
if len(publishFlags) != 0 { if len(publishFlags) != 0 {
log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser) log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser)
} }
netdevConfig = fmt.Sprintf("bridge,br=%s", netMode[1]) netdevConfig = fmt.Sprintf("bridge,id=t0,br=%s", netMode[1])
case qemuNetworkingNone: case qemuNetworkingNone:
if len(publishFlags) != 0 { if len(publishFlags) != 0 {
log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser) log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser)
@ -571,13 +571,14 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
if config.NetdevConfig == "" { if config.NetdevConfig == "" {
qemuArgs = append(qemuArgs, "-net", "none") qemuArgs = append(qemuArgs, "-net", "none")
} else { } else {
mac := retrieveMAC(config.StatePath) // provide a network device first for the QEMU VM if '-networking' is specified,
qemuArgs = append(qemuArgs, "-net", "nic,model=virtio,macaddr="+mac.String()) qemuArgs = append(qemuArgs, "-device", "virtio-net-pci,netdev=t0")
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)
} }
qemuArgs = append(qemuArgs, "-net", config.NetdevConfig+forwardings) // we perfer "-netdev" to the "-net" which is an old way to initialize a host nic
qemuArgs = append(qemuArgs, "-netdev", config.NetdevConfig+forwardings)
} }
if config.GUI != true { if config.GUI != true {