[Pkg-libvirt-commits] [virt-manager] 01/08: osdict: Don't return virtio1.0-net as a valid device name

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%1.4.0-4
in repository virt-manager.

commit 73327a8bd80264c1925230ec728e94ad420abde9
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Dec 23 21:25:17 2016 +0100

    osdict: Don't return virtio1.0-net as a valid device name
---
 ...turn-virtio1.0-net-as-a-valid-device-name.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/osdict-Don-t-return-virtio1.0-net-as-a-valid-device-name.patch b/debian/patches/osdict-Don-t-return-virtio1.0-net-as-a-valid-device-name.patch
new file mode 100644
index 0000000..a74865f
--- /dev/null
+++ b/debian/patches/osdict-Don-t-return-virtio1.0-net-as-a-valid-device-name.patch
@@ -0,0 +1,27 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Tue, 13 Dec 2016 12:58:14 -0500
+Subject: osdict: Don't return virtio1.0-net as a valid device name
+
+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
+
+Closes: #846356
+---
+ virtinst/osdict.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virtinst/osdict.py b/virtinst/osdict.py
+index 37426fd..38d626d 100644
+--- a/virtinst/osdict.py
++++ b/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
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ebf812e..240fbd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 virtinst/fix-path-to-hvmloader.patch
 virtinst/Fix-patch-to-pygrub.patch
 Mark-Jessie-as-having-qemu-guest-agent.patch
+osdict-Don-t-return-virtio1.0-net-as-a-valid-device-name.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git