From patchwork Fri Jun 7 09:05:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 166127 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp447064ili; Fri, 7 Jun 2019 03:21:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwY+o3AxclYYBD7I+IELJpg/TZwt7qpACG9E29nk4o7vKAQCBjC0rwI5hCQBm25sGz8owf9 X-Received: by 2002:ac8:25d9:: with SMTP id f25mr44511363qtf.256.1559902861887; Fri, 07 Jun 2019 03:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559902861; cv=none; d=google.com; s=arc-20160816; b=FBUQbjEpL4FpJg7H0NTfTYzqw3I5oFpTiFgsiHmd4l7MWa+jvd4l5CAq8lHNvkySgQ 7QSFvDRArZEYLN8NUyu4vOFbhD2rNSQLvzogjKbi7IO9LnYjYDn8ZYYEpL0C7hYDsn0E ELS/Kk/mgYO9MSAQH5AHsjfAx1De8e7/OEFN3FGprT4Rf+6IRs2huIeW7NjIJ1Cn+yQu roEWIIqVMElnDeSm2skELJBxtKSoxz1gMSjLCcYTLYwf3dd9x1wyghL/ZiGIQNvUCXk+ Sb11G4Ao0o3TAplyQsosV5dS8fWWUpU522xjQ9ml3jNpa6Hk498Np7rCbiDplDqyG+MK 7diQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=l3qvsmebNFZ5O5OwW5sp1A169mo8OEERmO3Igp6r4L0=; b=tfmY/t5vgxp9b+0y4SQ4IxqKWGN8ABbo/1ZRSxXXx1a64teU+Id0e2uJ5wk8wIHki+ N1j3urAkG91Ud+DrJg9F57H1zcEgqlI4uLdH9J1f3/gBdbWjV8X77+uGJ0SNTREAFxb8 ++0cZpE+qJps29vB9C2YzrxUqbmEy+RyFIyZgtBbhqXKYn6FXDaxkg1ULbYLTio1hNgS hJsei0ZgyTPyG5PeaaJfGTXpU9FYHYNWEceU+OKogtSnNiTOhtU890EKGOisWvToYI1Z 4c69LaldIvL8bVlQ5XHC58Nih9qAkmliD7gIvxCbR8+sKfYHye4ccXP/VPiKZh4QRZbT g+Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lMUN8FsR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.47]) by mx.google.com with ESMTPS id u7si903546qkc.254.2019.06.07.03.21.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jun 2019 03:21:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 as permitted sender) client-ip=209.51.188.47; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lMUN8FsR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZBzY-0007Ee-VY for patch@linaro.org; Fri, 07 Jun 2019 06:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42216) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZAvT-0002Fo-CG for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZAvQ-0004zE-Rj for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:43 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:46952) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZAvQ-0004h3-Ez for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:40 -0400 Received: by mail-wr1-x42b.google.com with SMTP id n4so1339732wrw.13 for ; Fri, 07 Jun 2019 02:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l3qvsmebNFZ5O5OwW5sp1A169mo8OEERmO3Igp6r4L0=; b=lMUN8FsR0cqZW/CU4/NbtsCLcBR8lJnXtHyTldqgblkNKAnHQK2Qty+ilzAsmIvRii itp+rMKzSh8P3cq5hQUkj47H6JdSGbG8OCq4V8aBzqNm0TYQuRiHK0WZiE9vfNqLM9is Zx7E1hFB5isz0bO1hFi/8Fq6mlR14VurwnJe//aP9z/oWbHWzU5MocnriDBDeMwBZwFz W4X9Yi8WLO3In0d8gVQuoP8RjGtOxJJ2y4zuqYRUDi1oQ4+7+fwJNV7mT1w5SK3Eh0GJ dB5Gd6eu0khJ4r3zAjCaXmbc1RGRiGeaAwqtbhnGcU6vQUieAvcnawtzB6v4G883ucq4 Jx7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l3qvsmebNFZ5O5OwW5sp1A169mo8OEERmO3Igp6r4L0=; b=sn2hNQONdnZGEFK1AoPkKQnFOXZWeN6PDWd8Vxglu+bak0iyob82IRgOtGfIhSjAEn R0mo6aEGYZda86pN7DOmWKjCav8Mrgs/tnoFUYZSoYp269bIzcAKYGQREs/ZHMB2ohVU 3IKj5wn68LRk5cKL4/oCQttuAZZt/+DpnoBUK8eMe8cyGJDJlhQg21RLqGi0pUKUDO0O debEVEhhe6B+MXDzOWm7L00WHWxjPATGDVHuJCkHjvwE40ylhcszXa/Ol9sen66ZTmb1 mNBOohUKdQgMAJKpvZxWgO/gmlAjo2drP2gki9YS7NSUhWdgtEWqweYeRKu7gBwc2VU3 dKxA== X-Gm-Message-State: APjAAAWNYRm7F9ybf3DkqF4v/vMQZh1bfvUYiPv6jsX7XHrdmKrDgkBn 3flAPIwWFR0NqDZ4tsDdNM3F/g== X-Received: by 2002:adf:d847:: with SMTP id k7mr2611647wrl.144.1559898751374; Fri, 07 Jun 2019 02:12:31 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f2sm1244110wru.31.2019.06.07.02.12.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 07 Jun 2019 02:12:29 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F82F1FFA5; Fri, 7 Jun 2019 10:05:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 7 Jun 2019 10:05:17 +0100 Message-Id: <20190607090552.12434-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org> References: <20190607090552.12434-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 18/52] tests/vm: add vm-boot-{ssh, serial}- targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann For testing/troubleshooting convinience. make vm-boot-serial- Boot guest, with the serial console on stdio. make vm-boot-ssh- Boot guest, login via ssh. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190520124716.30472-8-kraxel@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 276b870216..e329129bd6 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- - Boot guest, serial console on stdio" + @echo " vm-boot-ssh- - 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 $*")