From e1bcd42aa04b8df3f4d97cf33192a6316e0e9806 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 29 Jan 2020 04:58:30 -0500
Subject: [PATCH] guest: Move bootorder helpers out of the osinfo code area

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 virtinst/guest.py | 85 +++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/virtinst/guest.py b/virtinst/guest.py
index a59c3b14e..936db3f54 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -309,6 +309,51 @@ class Guest(XMLBuilder):
         return self.__osinfo
     osinfo = property(_get_osinfo)
 
+    def _set_os_obj(self, obj):
+        self.__osinfo = obj
+        self._metadata.libosinfo.os_id = obj.full_id
+
+    def set_os_name(self, name):
+        obj = OSDB.lookup_os(name, raise_error=True)
+        log.debug("Setting Guest osinfo name %s", obj)
+        self._set_os_obj(obj)
+
+    def set_default_os_name(self):
+        self.set_os_name("generic")
+
+    def _supports_virtio(self, os_support):
+        if not self.conn.is_qemu():
+            return False
+
+        # These _only_ support virtio so don't check the OS
+        if (self.os.is_arm_machvirt() or
+            self.os.is_riscv_virt() or
+            self.os.is_s390x() or
+            self.os.is_pseries()):
+            return True
+
+        if not os_support:
+            return False
+
+        if self.os.is_x86():
+            return True
+
+        return False  # pragma: no cover
+
+    def supports_virtionet(self):
+        return self._supports_virtio(self.osinfo.supports_virtionet(self._extra_drivers))
+    def supports_virtiodisk(self):
+        return self._supports_virtio(self.osinfo.supports_virtiodisk(self._extra_drivers))
+    def supports_virtioscsi(self):
+        return self._supports_virtio(self.osinfo.supports_virtioscsi(self._extra_drivers))
+    def _supports_virtioserial(self):
+        return self._supports_virtio(self.osinfo.supports_virtioserial(self._extra_drivers))
+
+
+    #####################
+    # Bootorder helpers #
+    #####################
+
     def _get_old_boot_order(self):
         return self.os.bootorder
 
@@ -424,46 +469,6 @@ class Guest(XMLBuilder):
                 # we found a hole so we can stop here
                 break
 
-    def _set_os_obj(self, obj):
-        self.__osinfo = obj
-        self._metadata.libosinfo.os_id = obj.full_id
-
-    def set_os_name(self, name):
-        obj = OSDB.lookup_os(name, raise_error=True)
-        log.debug("Setting Guest osinfo name %s", obj)
-        self._set_os_obj(obj)
-
-    def set_default_os_name(self):
-        self.set_os_name("generic")
-
-    def _supports_virtio(self, os_support):
-        if not self.conn.is_qemu():
-            return False
-
-        # These _only_ support virtio so don't check the OS
-        if (self.os.is_arm_machvirt() or
-            self.os.is_riscv_virt() or
-            self.os.is_s390x() or
-            self.os.is_pseries()):
-            return True
-
-        if not os_support:
-            return False
-
-        if self.os.is_x86():
-            return True
-
-        return False  # pragma: no cover
-
-    def supports_virtionet(self):
-        return self._supports_virtio(self.osinfo.supports_virtionet(self._extra_drivers))
-    def supports_virtiodisk(self):
-        return self._supports_virtio(self.osinfo.supports_virtiodisk(self._extra_drivers))
-    def supports_virtioscsi(self):
-        return self._supports_virtio(self.osinfo.supports_virtioscsi(self._extra_drivers))
-    def _supports_virtioserial(self):
-        return self._supports_virtio(self.osinfo.supports_virtioserial(self._extra_drivers))
-
 
     ###############################
     # Public XML APIs and helpers #