24 lines
952 B
Diff
24 lines
952 B
Diff
|
Subject: osdict: Don't return virtio1.0-net as a valid device name (bug 1399083)
|
||
|
|
From: Cole Robinson crobinso@redhat.com Tue Dec 13 12:58:14 2016 -0500
|
||
|
|
Date: Tue Dec 13 12:58:14 2016 -0500:
|
||
|
|
Git: 617b92710f50015c5df5f9db15d25de18867957d
|
||
|
|
|
||
|
|
We can't depend on libosinfo device names being valid libvirt network
|
||
|
|
model names, so use a whitelist
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1399083
|
||
|
|
|
||
|
|
Index: virt-manager-1.4.0/virtinst/osdict.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-1.4.0.orig/virtinst/osdict.py
|
||
|
|
+++ virt-manager-1.4.0/virtinst/osdict.py
|
||
|
|
@@ -453,7 +453,7 @@ class _OsVariant(object):
|
||
|
|
devs = self._os.get_all_devices(fltr)
|
||
|
|
for idx in range(devs.get_length()):
|
||
|
|
devname = devs.get_nth(idx).get_name()
|
||
|
|
- if devname != "virtio-net":
|
||
|
|
+ if devname in ["pcnet", "ne2k_pci", "rtl8139", "e1000"]:
|
||
|
|
return devname
|
||
|
|
return None
|
||
|
|
|