From 8d617ff5b9f66c9b0fae48f40998ba9d44e45202 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 16 Aug 2017 10:07:00 -0700 Subject: [PATCH] qemu: Update virtio-net-pci command line In case of a network device, and specifically virtio-net-pci, we have to update to what is expected by qemu. In this case, the driver name should be prefixed with "driver=". Signed-off-by: Sebastien Boeuf --- qemu.go | 3 +++ qemu_test.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu.go b/qemu.go index 827c054608..6a08f26c11 100644 --- a/qemu.go +++ b/qemu.go @@ -390,6 +390,9 @@ func (netdev NetDevice) QemuParams(config *Config) []string { var deviceParams []string var qemuParams []string + if netdev.Driver == VirtioNetPCI { + deviceParams = append(deviceParams, "driver=") + } deviceParams = append(deviceParams, fmt.Sprintf("%s", netdev.Driver)) deviceParams = append(deviceParams, fmt.Sprintf(",netdev=%s", netdev.ID)) deviceParams = append(deviceParams, fmt.Sprintf(",mac=%s", netdev.MACAddress)) diff --git a/qemu_test.go b/qemu_test.go index 7f3ba0c015..fd144936d6 100644 --- a/qemu_test.go +++ b/qemu_test.go @@ -143,7 +143,7 @@ func TestAppendDeviceNetwork(t *testing.T) { testAppend(netdev, deviceNetworkString, t) } -var deviceNetworkPCIString = "-device virtio-net-pci,netdev=tap0,mac=01:02:de:ad:be:ef,bus=/pci-bus/pcie.0,addr=ff -netdev tap,id=tap0,ifname=ceth0,downscript=no,script=no,fds=3:4,vhost=on" +var deviceNetworkPCIString = "-device driver=virtio-net-pci,netdev=tap0,mac=01:02:de:ad:be:ef,bus=/pci-bus/pcie.0,addr=ff -netdev tap,id=tap0,ifname=ceth0,downscript=no,script=no,fds=3:4,vhost=on" func TestAppendDeviceNetworkPCI(t *testing.T) { foo, _ := ioutil.TempFile(os.TempDir(), "qemu-ciao-test")