diff options
| author | Cole Robinson <crobinso@redhat.com> | 2022-01-25 10:19:40 -0500 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2022-01-25 12:05:45 -0500 |
| commit | f13c8d87fbb2a298b4ec41f6532d087011d9937b (patch) | |
| tree | fe8e5076c178bc132311000ce31e05d3d882a724 /virtinst | |
| parent | 8896944d5944637d2e6beb0d69ec21077d3700e7 (diff) | |
| download | virt-manager-f13c8d87fbb2a298b4ec41f6532d087011d9937b.tar.gz | |
guest: Remove the hyperv + uefi workaround for win7 + win2k8r2
Both these windows versions are now longer supported, and UEFI isn't
the default, so I don't think this hack is much needed anymore
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'virtinst')
| -rw-r--r-- | virtinst/cli.py | 1 | ||||
| -rw-r--r-- | virtinst/guest.py | 17 | ||||
| -rw-r--r-- | virtinst/osdict.py | 6 |
3 files changed, 0 insertions, 24 deletions
diff --git a/virtinst/cli.py b/virtinst/cli.py index 681d5b87..df60a3cc 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -2734,7 +2734,6 @@ class ParserBoot(VirtCLIParser): self.guest.uefi_requested = True else: self.guest.set_uefi_path(self.guest.get_uefi_path()) - self.guest.disable_hyperv_for_uefi() def set_initargs_cb(self, inst, val, virtarg): inst.set_initargs_string(val) diff --git a/virtinst/guest.py b/virtinst/guest.py index 4e767dd0..e8286ab8 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -570,20 +570,6 @@ class Guest(XMLBuilder): self.os.machine) self.os.machine = "q35" - def disable_hyperv_for_uefi(self): - # UEFI doesn't work with hyperv bits for some OS - if not self.is_uefi(): - return # pragma: no cover - if not self.osinfo.broken_uefi_with_hyperv(): - return # pragma: no cover - self.features.hyperv_relaxed = None - self.features.hyperv_vapic = None - self.features.hyperv_spinlocks = None - self.features.hyperv_spinlocks_retries = None - for i in self.clock.timers: - if i.name == "hypervclock": - self.clock.timers.remove(i) - def has_spice(self): for gfx in self.devices.graphics: if gfx.type == gfx.TYPE_SPICE: @@ -620,9 +606,6 @@ class Guest(XMLBuilder): def hyperv_supported(self): if not self.osinfo.is_windows(): return False - if (self.is_uefi() and - self.osinfo.broken_uefi_with_hyperv()): - return False return True def lookup_domcaps(self): diff --git a/virtinst/osdict.py b/virtinst/osdict.py index e6296c53..8f75e58d 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -429,12 +429,6 @@ class _OsVariant(object): def is_windows(self): return self._family in ['win9x', 'winnt', 'win16'] - def broken_uefi_with_hyperv(self): - # Some windows versions are broken with hyperv enlightenments + UEFI - # https://bugzilla.redhat.com/show_bug.cgi?id=1185253 - # https://bugs.launchpad.net/qemu/+bug/1593605 - return self.name in ("win2k8r2", "win7") - def get_clock(self): if self.is_windows() or self._family in ['solaris']: return "localtime" |