qemu-x86_64: use gpt for efi boot, cfgfs needs to be fixed

1 files changed, 8 insertions, 7 deletions

diff --git a/target/x86_64/qemu-x86_64/genimage-efi.cfg b/target/x86_64/qemu-x86_64/genimage-efi.cfg
index a59d75e47..a2bfd0b7a 100644
--- a/target/x86_64/qemu-x86_64/genimage-efi.cfg
+++ b/target/x86_64/qemu-x86_64/genimage-efi.cfg
@@ -3,6 +3,9 @@ image efi-part.vfat {
     file EFI {
       image = "efi-part/EFI"
     }
+    file kernel {
+      image = "kernel"
+    }
   }
   size = 32M
 }
@@ -10,21 +13,19 @@ image efi-part.vfat {
 image disk.img {
 
   hdimage {
+    partition-table-type = "gpt"
   }
 
   partition boot {
-    partition-type = 0xEF
     image = "efi-part.vfat"
+    partition-type-uuid = U
+    offset = 32K
+    bootable = true
   }
 
   partition root {
-    partition-type = 0x83
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
     image = "rootfs.ext"
   }
 
-  partition cfgfs {
-    partition-type = 0x88
-    image = "cfgfs.img"
-  }
-
 }