5 files changed, 22 insertions, 5 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index 2c5bcd253..d9cb4ca62 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -10,11 +10,21 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
 QEMU_ARCH:=x86_64
 
 QEMU_ARGS:=-M pc -m 256
+QEMU_ARGS+=${ADK_QEMU_ARGS}
+
 ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y)
 QEMU_ARGS+=-L . -bios bios-x86_64.bin
 endif
-QEMU_ARGS+=${ADK_QEMU_ARGS}
+
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+QEMU_ARGS+=-net nic,model=virtio -net user
+ifeq ($(ADK_TARGET_FS),archive)
+QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio
+endif
+else
 QEMU_ARGS+=-net user -net nic,model=e1000
+endif
+
 ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y)
 QEMU_ARGS+=-device AC97
 endif
@@ -39,7 +49,11 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo "$(CREATE) qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS}'
+else
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img'
+endif
 else
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
 endif
diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64
index 9e9c1197f..073a4c7ca 100644
--- a/target/x86_64/kernel/qemu-x86_64
+++ b/target/x86_64/kernel/qemu-x86_64
@@ -11,3 +11,4 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_AMD_NB=y
 CONFIG_IA32_EMULATION=y
 CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE_OVERRIDE=y
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 ff3cb08d2..247511d57 100644
--- a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg
+++ b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg
@@ -22,14 +22,14 @@ image disk.img {
 
   partition root1 {
     partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
-    image = "rootfs.ext"
-    size = 128M
+    image = "rootfs1.ext"
+    size = 64M
   }
 
   partition root2 {
     partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
-    image = "rootfs.ext"
-    size = 128M
+    image = "rootfs2.ext"
+    size = 64M
   }
 
   partition cfgfs {
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 {