[Qemu-devel] [PATCH 06/13] tests/vm: add vm-boot-{ssh, serial}-<guest> targets

[Gerd Hoffmann]

For testing/troubleshooting convinience.

make vm-boot-serial-<guest>
  Boot guest, with the serial console on stdio.

make vm-boot-ssh-<guest>
  Boot guest, login via ssh.

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 tests/vm/Makefile.include | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index d628e0a986f6..47084d5717c6 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -20,6 +20,10 @@ vm-test:
        @echo "  vm-build-all                    - Build QEMU in all VMs"
        @echo "  vm-clean-all                    - Clean up VM images"
        @echo
+       @echo "For trouble-shooting:"
+       @echo "  vm-boot-serial-<guest>          - Boot guest, serial console 
on stdio"
+       @echo "  vm-boot-ssh-<guest>             - Boot guest and login via ssh"
+       @echo
        @echo "Special variables:"
        @echo "    BUILD_TARGET=foo              - override the build target"
        @echo "    TARGET_LIST=a,b,c             - Override target list in 
builds."
@@ -59,3 +63,18 @@ vm-build-%: $(IMAGES_DIR)/%.img
                $(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
                "  VM-BUILD $*")
 
+vm-boot-serial-%: $(IMAGES_DIR)/%.img
+       qemu-system-x86_64 -enable-kvm -m 4G -smp 2 -nographic \
+               -drive if=none,id=vblk,cache=writeback,file="$<" \
+               -netdev user,id=vnet \
+               -device virtio-blk-pci,drive=vblk \
+               -device virtio-net-pci,netdev=vnet \
+       || true
+
+vm-boot-ssh-%: $(IMAGES_DIR)/%.img
+       $(call quiet-command, \
+               $(SRC_PATH)/tests/vm/$* \
+               --image "$<" \
+               --interactive \
+               false, \
+               "  VM-BOOT-SSH $*")
-- 
2.18.1