shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-11 05:17:59 +03:00
Code Issues Projects Releases Wiki Activity

guest: Remove fallback xen loader/emulator handling

Browse Source 
This has been provided by libvirt caps for a long time, and we
don't even test it
This commit is contained in:
Cole Robinson 2018-09-02 10:01:41 -04:00
parent 468f5e67fa
commit c1443f8a80
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
virtinst/guest.py
View File

@ -749,10 +749,12 @@ class Guest(XMLBuilder):
dev.path = None
def _set_defaults(self):
if self.os.is_xenpv() or self.type == "vz":
self.emulator = None
self._add_install_cdrom()
self._set_clock_defaults()
self._set_emulator_defaults()
self._set_cpu_defaults()
self.features.set_defaults(self)
for seclabel in self.seclabels:
@ -779,9 +781,6 @@ class Guest(XMLBuilder):
if self.is_full_os_container():
self.os.init = "/sbin/init"
self.os.init = self.os.init or "/bin/sh"
if not self.os.loader and self.os.is_hvm() and self.type == "xen":
self.os.loader = "/usr/lib/xen/boot/hvmloader"
if self.os.kernel or self.os.init:
self.os.bootorder = []
@ -832,20 +831,6 @@ class Guest(XMLBuilder):
hyperv.name = "hypervclock"
hyperv.present = True
def _set_emulator_defaults(self):
if self.os.is_xenpv() or self.type == "vz":
self.emulator = None
return
if self.emulator:
return
if self.os.is_hvm() and self.type == "xen":
if self.conn.caps.host.cpu.arch == "x86_64":
self.emulator = "/usr/lib64/xen/bin/qemu-dm"
else:
self.emulator = "/usr/lib/xen/bin/qemu-dm"
def _set_cpu_x86_kvm_default(self):
if self.os.arch != self.conn.caps.host.cpu.arch:
return