shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-08 04:58:29 +03:00
Code Issues Projects Releases Wiki Activity

devices: interface: Have x86 fallback model be e1000

Browse Source 
libvirt will use rtl8139, but the qemu default changed a while
ago to e1000, and libvirt has diverged. e1000 is more modern and
considered the better default here, so use it
This commit is contained in:
Cole Robinson 2018-09-29 14:31:55 -04:00
parent 627bfabc32
commit 97ea737386
22 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
View File

@ -49,6 +49,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
View File

@ -22,6 +22,7 @@
<controller type="usb" index="0" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>

2
tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
View File

@ -31,6 +31,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>
@ -67,6 +68,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>

2
tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
View File

@ -40,6 +40,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">
@ -98,6 +99,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

2
tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
View File

@ -52,6 +52,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">
@ -120,6 +121,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

2
tests/cli-test-xml/compare/virt-install-kvm-win10.xml
View File

@ -64,6 +64,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">
@ -145,6 +146,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

2
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -55,6 +55,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">
@ -127,6 +128,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

2
tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
View File

@ -37,6 +37,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<memory model="dimm" access="private">
@ -101,6 +102,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<memory model="dimm" access="private">

2
tests/cli-test-xml/compare/virt-install-simple-pxe.xml
View File

@ -31,6 +31,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>
@ -67,6 +68,7 @@
</controller>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>

1
tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml
View File

@ -51,6 +51,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

2
tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
View File

@ -45,6 +45,7 @@
<controller type="usb" index="0" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>
@ -94,6 +95,7 @@
<controller type="usb" index="0" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
</devices>

2
tests/cli-test-xml/compare/virt-install-win7-uefi.xml
View File

@ -60,6 +60,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">
@ -137,6 +138,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/cli-test-xml/compare/virt-install-xen-hvm.xml
View File

@ -32,6 +32,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>

1
tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
View File

@ -44,6 +44,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -50,6 +50,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
View File

@ -49,6 +49,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
View File

@ -49,6 +49,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
View File

@ -49,6 +49,7 @@
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<channel type="spicevmc">

1
tests/xmlconfig-xml/install-hyperv-clock.xml
View File

@ -70,6 +70,7 @@
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>

1
tests/xmlconfig-xml/install-hyperv-noclock.xml
View File

@ -69,6 +69,7 @@
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
<model type="e1000"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>

1
tests/xmlparse-xml/add-devices-out.xml
View File

@ -42,6 +42,7 @@
<interface type="network">
<source network="default"/>
<mac address="1A:2A:3A:4A:5A:6A"/>
<model type="e1000"/>
<address type="spapr-vio"/>
</interface>
<watchdog model="i6300esb" action="reset"/>

4
virtinst/devices/interface.py
View File

@ -297,13 +297,15 @@ class DeviceInterface(Device):
return "virtio"
if guest.os.is_q35():
return "e1000e"
if not guest.os.is_x86():
return None
prefs = ["e1000", "rtl8139", "ne2k_pci", "pcnet"]
supported_models = guest.osinfo.supported_netmodels()
for pref in prefs:
if pref in supported_models:
return pref
return None
return "e1000"
def set_defaults(self, guest):
if not self.type: