github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-22 21:49:41 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Update virtio-net-pci command line

Browse Source 
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 <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2017-08-16 10:07:00 -07:00
parent 25a2dc8f6e
commit 8d617ff5b9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qemu.go
View File

@ -390,6 +390,9 @@ func (netdev NetDevice) QemuParams(config *Config) []string {
var deviceParams []string var deviceParams []string
var qemuParams []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("%s", netdev.Driver))
deviceParams = append(deviceParams, fmt.Sprintf(",netdev=%s", netdev.ID)) deviceParams = append(deviceParams, fmt.Sprintf(",netdev=%s", netdev.ID))
deviceParams = append(deviceParams, fmt.Sprintf(",mac=%s", netdev.MACAddress)) deviceParams = append(deviceParams, fmt.Sprintf(",mac=%s", netdev.MACAddress))

2
qemu_test.go
View File

@ -143,7 +143,7 @@ func TestAppendDeviceNetwork(t *testing.T) {
testAppend(netdev, deviceNetworkString, 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) { func TestAppendDeviceNetworkPCI(t *testing.T) {
foo, _ := ioutil.TempFile(os.TempDir(), "qemu-ciao-test") foo, _ := ioutil.TempFile(os.TempDir(), "qemu-ciao-test")