From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PULL 09/19] tests/vm: add vm-boot-{ssh, serial}-<guest> targets
Date: Mon, 24 Jun 2019 14:43:27 +0100 [thread overview]
Message-ID: <20190624134337.10532-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190624134337.10532-1-alex.bennee@linaro.org>
From: Gerd Hoffmann <kraxel@redhat.com>
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 276b870216..a61c236b8e 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"
@@ -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
--
2.20.1
next prev parent reply other threads:[~2019-06-24 13:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 13:43 [Qemu-devel] [PULL 00/19] testing/next (tests/vm, Travis and hyperv build fix) Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 01/19] tests/vm: avoid extra compressed image copy Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 02/19] tests/vm: avoid image presence check and removal Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 03/19] tests/vm: pin ubuntu.i386 image Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 04/19] tests/vm: add source repos on ubuntu.i386 Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 05/19] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 06/19] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 07/19] tests/vm: run test builds on snapshot Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 08/19] tests/vm: proper guest shutdown Alex Bennée
2019-06-24 13:43 ` Alex Bennée [this message]
2019-06-24 13:43 ` [Qemu-devel] [PULL 10/19] tests/vm: serial console support helpers Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 11/19] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 12/19] tests/vm: freebsd " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 13/19] tests/vm: netbsd " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 14/19] tests/vm: fedora " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 15/19] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 16/19] .travis.yml: default the --disable-system build to --static Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 17/19] .travis.yml: force a brew update for MacOS builds Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 18/19] Makefile: Rename the 'vm-test' target as 'vm-help' Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 19/19] target/i386: fix feature check in hyperv-stub.c Alex Bennée
2019-07-01 9:52 ` [Qemu-devel] [PULL 00/19] testing/next (tests/vm, Travis and hyperv build fix) Peter Maydell
2019-07-01 15:07 ` Alex Bennée
2019-07-01 15:58 ` Alex Bennée
2019-07-02 10:10 ` Philippe Mathieu-Daudé
2019-07-02 10:28 ` Alex Bennée
2019-07-02 10:29 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624134337.10532-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).