4 files changed, 19 insertions, 11 deletions
diff --git a/target/x86_64/qemu-x86_64/genimage-dual.cfg b/target/x86_64/qemu-x86_64/genimage-dual.cfg
index 647a2bcb5..c9b73170d 100644
--- a/target/x86_64/qemu-x86_64/genimage-dual.cfg
+++ b/target/x86_64/qemu-x86_64/genimage-dual.cfg
@@ -8,6 +8,7 @@ image disk.img {
     image = "boot.img"
     offset = 0
     size = 512
+    holes = {"(440; 512)"}
   }
 
   partition grub {
diff --git a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg
index 7c82a0bcb..247511d57 100644
--- a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg
+++ b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg
@@ -10,27 +10,30 @@ 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 root1 {
-    partition-type = 0x83
-    image = "rootfs.ext"
-    size = 128M
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
+    image = "rootfs1.ext"
+    size = 64M
   }
 
   partition root2 {
-    partition-type = 0x83
-    image = "rootfs.ext"
-    size = 128M
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
+    image = "rootfs2.ext"
+    size = 64M
   }
 
   partition cfgfs {
-    partition-type = 0x88
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
     image = "cfgfs.img"
   }
 
diff --git a/target/x86_64/qemu-x86_64/genimage-efi.cfg b/target/x86_64/qemu-x86_64/genimage-efi.cfg
index a59d75e47..c7fa9a2c3 100644
--- a/target/x86_64/qemu-x86_64/genimage-efi.cfg
+++ b/target/x86_64/qemu-x86_64/genimage-efi.cfg
@@ -10,20 +10,23 @@ 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
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
     image = "cfgfs.img"
   }
 
diff --git a/target/x86_64/qemu-x86_64/genimage.cfg b/target/x86_64/qemu-x86_64/genimage.cfg
index d86f7ffd7..c1bc286f3 100644
--- a/target/x86_64/qemu-x86_64/genimage.cfg
+++ b/target/x86_64/qemu-x86_64/genimage.cfg
@@ -8,6 +8,7 @@ image disk.img {
     image = "boot.img"
     offset = 0
     size = 512
+    holes = {"(440; 512)"}
   }
 
   partition grub {