github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 15:07:46 +00:00
Code Issues Projects Releases Wiki Activity

qemu: fix devID value error

Browse Source 
reason: When excutes ExecuteNetCCWDeviceAdd, the DevID is always "virtio-".
If add-iface multy times, qemu may report "dumplicated id:virtio-".

Fixes: #1305

Signed-off-by: xueshaojia <xueshaojia@huawei.com>
This commit is contained in:
xueshaojia 00464843 2019-03-01 16:13:42 +08:00
parent 6f2597ed11
commit 03dd780ddd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/qemu.go
View File

@ -949,7 +949,6 @@ func (q *qemu) hotplugNetDevice(endpoint Endpoint, op operation) error {
return err return err
} }
var tap TapInterface var tap TapInterface
devID := "virtio-" + tap.ID
switch endpoint.Type() { switch endpoint.Type() {
case VethEndpointType: case VethEndpointType:
@ -962,6 +961,7 @@ func (q *qemu) hotplugNetDevice(endpoint Endpoint, op operation) error {
return fmt.Errorf("this endpoint is not supported") return fmt.Errorf("this endpoint is not supported")
} }
devID := "virtio-" + tap.ID
if op == addDevice { if op == addDevice {
if err = q.hotAddNetDevice(tap.Name, endpoint.HardwareAddr(), tap.VMFds, tap.VhostFds); err != nil { if err = q.hotAddNetDevice(tap.Name, endpoint.HardwareAddr(), tap.VMFds, tap.VhostFds); err != nil {