tests/vm: add vm-boot-{ssh,serial}-<guest> targets

For testing/troubleshooting convenience.

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 <kraxel@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190617043858.8290-6-kraxel@redhat.com>
[AJB: added tags]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index 276b870216c481824bbcf178415e912ed9c5bf40..a61c236b8e9c852d5edfa3a1c7dadc02a5e9369e 100644 (file)
--- 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"
@@ -63,3 +67,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 $*") || true