bootloader: Remove tboot support

tboot is no longer supported so remove the code that handles it.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

Author: rosslagerwall

tests/data/grub-linux.cfg

@@ -3,10 +3,3 @@ menuentry 'Linux - Safe Mode' {
 	linux /boot/vmlinuz-1 ro
 	initrd /boot/initrd.img-1
 }
-menuentry 'XCP-ng (Trusted Boot)' {
-	search --label --set root root-vgdorj
-	multiboot2 /boot/tboot.gz logging=serial,memory
-	module2 /boot/xen.gz dom0_mem=7584M,max:7584M watchdog crashkernel=256M,below=4G
-    module2 /boot/vmlinuz-6.1-xen root=LABEL=root-vgdorj ro  console=hvc0 console=tty0
-	module2 /boot/initrd-6.1-xen.img
-}

tests/test_bootloader.py

@@ -58,7 +58,6 @@ def test_grub2_newdefault(self):
                 "",
             ],
             [],
-            [],
         ]
         assert str(bl.default).startswith("safe")
         assert bl.location == "mbr"
@@ -68,10 +67,6 @@ def test_grub2_newdefault(self):
         assert bl.menu["safe"].kernel == "/boot/vmlinuz-2"
         assert bl.menu["safe"].kernel_args == "ro"
         assert bl.menu["safe"].initrd == "/boot/initrd.img-2"
-        assert bl.menu["xe-tboot"].title == "XCP-ng (Trusted Boot)"
-        assert bl.menu["xe-tboot"].hypervisor == "/boot/xen.gz"
-        assert bl.menu["xe-tboot"].tboot == "/boot/tboot.gz"
-        assert bl.menu["xe-tboot"].getTbootArgs() == ["logging=serial,memory"]
 
 class TestBootloaderAdHoc(unittest.TestCase):
     def setUp(self):

xcp/bootloader.py

@@ -43,13 +43,11 @@
 COUNTER = 0
 
 class MenuEntry(object):
+    # pylint: disable=too-many-positional-arguments
     def __init__(self, hypervisor, hypervisor_args, kernel, kernel_args,
-                 initrd, title = None, tboot = None, tboot_args = None,
-                 root = None):
+                 initrd, title = None, root = None):
         self.extra = None
         self.contents = []
-        self.tboot = tboot
-        self.tboot_args = tboot_args
         self.hypervisor = hypervisor
         self.hypervisor_args = hypervisor_args
         self.kernel = kernel
@@ -58,12 +56,6 @@ def __init__(self, hypervisor, hypervisor_args, kernel, kernel_args,
         self.title = title
         self.root = root
 
-    def getTbootArgs(self):
-        return re.findall(r'\S[^ "]*(?:"[^"]*")?\S*', cast(str, self.tboot_args))
-
-    def setTbootArgs(self, args):
-        self.tboot_args = ' '.join(args)
-
     def getHypervisorArgs(self):
         return re.findall(r'\S[^ "]*(?:"[^"]*")?\S*', self.hypervisor_args)
 
@@ -115,8 +107,6 @@ def readGrub2(cls, src_file):
         timeout = None
         serial = None
         title = None
-        tboot = None
-        tboot_args = None
         hypervisor = None
         hypervisor_args = None
         kernel = None
@@ -133,10 +123,6 @@ def create_label(title):
 
             if title == branding.PRODUCT_BRAND:
                 return 'xe'
-            if title.endswith('(Serial) (Trusted Boot)'):
-                return 'xe-serial-tboot'
-            if title.endswith('(Trusted Boot)'):
-                return 'xe-tboot'
             if title.endswith('(Serial)'):
                 return 'xe-serial'
             if title.endswith('Safe Mode'):
@@ -206,10 +192,7 @@ def parse_boot_entry(line):
                     boilerplate = []
                 elif title:
                     if l.startswith("multiboot2"):
-                        if "tboot" in l:
-                            tboot, tboot_args = parse_boot_entry(l)
-                        else:
-                            hypervisor, hypervisor_args = parse_boot_entry(l)
+                        hypervisor, hypervisor_args = parse_boot_entry(l)
                     elif l.startswith("module2"):
                         if not hypervisor:
                             hypervisor, hypervisor_args = parse_boot_entry(l)
@@ -226,9 +209,7 @@ def parse_boot_entry(line):
                     elif l == "}":
                         label = create_label(title)
                         menu_order.append(label)
-                        menu[label] = MenuEntry(tboot = tboot,
-                                                tboot_args = tboot_args,
-                                                hypervisor = hypervisor,
+                        menu[label] = MenuEntry(hypervisor = hypervisor,
                                                 hypervisor_args = hypervisor_args,
                                                 kernel = kernel,
                                                 kernel_args = kernel_args,
@@ -238,8 +219,6 @@ def parse_boot_entry(line):
                         menu[label].contents = menu_entry_contents
 
                         title = None
-                        tboot = None
-                        tboot_args = None
                         hypervisor = None
                         hypervisor_args = None
                         kernel = None
@@ -327,11 +306,7 @@ def writeGrub2(self, dst_file = None):
                 print("\tsearch --label --set root %s" % m.root, file=fh)
 
             if m.hypervisor:
-                if m.tboot:
-                    print("\tmultiboot2 %s %s" % (m.tboot, m.tboot_args), file=fh)
-                    print("\tmodule2 %s %s" % (m.hypervisor, m.hypervisor_args), file=fh)
-                else:
-                    print("\tmultiboot2 %s %s" % (m.hypervisor, m.hypervisor_args), file=fh)
+                print("\tmultiboot2 %s %s" % (m.hypervisor, m.hypervisor_args), file=fh)
                 if m.kernel:
                     print("\tmodule2 %s %s" % (m.kernel, m.kernel_args), file=fh)
                 if m.initrd: