| Message ID | 20190617043858.8290-6-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/vm: serial console autoinstall, misc fixes. | expand |
On 6/17/19 6:38 AM, Gerd Hoffmann wrote: > For testing/troubleshooting convinience. "convenience" (v3) > 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> > --- > tests/vm/Makefile.include | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include > index 276b870216c4..e329129bd658 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 $*") From v3: We might want the '|| true' here too: $ exit Shutdown NOW! poweroff: [pid 769] make: *** [tests/vm/Makefile.include:78: vm-boot-ssh-freebsd] Error 3 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 276b870216c4..e329129bd658 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 $*")