From patchwork Mon Jun 24 13:43:27 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: 167579 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4257917ilk; Mon, 24 Jun 2019 06:51:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzxNR48aHqcRho4Tr20HWl7frlZy99i19mfUBJF9Kq3zUDuJ4HVZWLjz0QD0hc/8T/VzalG X-Received: by 2002:a50:89a6:: with SMTP id g35mr112272547edg.145.1561384282721; Mon, 24 Jun 2019 06:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561384282; cv=none; d=google.com; s=arc-20160816; b=sKbR7ewwbM8k6DZLle74AKdRGXq2PAkBQ4hAynq0FRFXkFdR9ZPlP0UcagYJ2tEY90 iCT9D0h+7hI0rKSxzsbbNa04zgibOSY1n6gEhL54ZHViFNLP7EX3JcuMgtjpzZ2TANuR ZZjLvvlVqRTn1Abj8ytZ1vFjQ1esGLaqCZUig6qA2ljWufaY4wB4SDzndO7o6NoyRMRa AS9HnKgAEOOn3bSBG9Cm1fV1cB3xZbNdcLEOrFgp15TkrjMhBn7K88iXeRhNtp5ye4Dn V+M3xziwsGwFBmKLRA5w0MUhZAUqn2ha4QRBg7Fnw8hHXmmjfxsS6ZYFA/PmtMqOJbIP pDLg== 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=uYenwXAi2dqO9YgcCSxpMSuNa4TOsTlySRQpX2U2e0k=; b=gZ36fW8rgIWhfLjsaSJBNHx2HY+dwL2xYXJZbHg5YvBnwxckwQ5YBszXP7ce3L+VwT YSyN3fDqnPv2NTdLOu7A50nkY57LL/4R8fYF1mDvX0b/z8PN9PLidX1bPPlDmv2HBtcQ RdapZXB2GyxSEv9punX7DjZBbGIhoejUGUMQVCgmk9ABI1ryQdqrfhFwv05vU4smYrAp YUSxikencEg0ZJXyQ9QKaiAcZcuBfFJz3vwMt1uDQTPXFtkFt73k3jHV2MAifQjicHwh jNc+HROhFSyltzluAwdDobP96CslqjBy9oU75zQq1Vh7IX8fchNIK/gdZCzWQJo0GEpl MfCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qVD+5bjH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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.17]) by mx.google.com with ESMTPS id j9si6864390ejv.235.2019.06.24.06.51.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jun 2019 06:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qVD+5bjH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:51334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfPNR-0002dM-O1 for patch@linaro.org; Mon, 24 Jun 2019 09:51:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41560) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfPGI-0006ix-DF for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfPGG-0007fw-IV for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:43:58 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfPGG-0007SE-A7 for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:43:56 -0400 Received: by mail-wm1-x32b.google.com with SMTP id f17so13455886wme.2 for ; Mon, 24 Jun 2019 06:43:47 -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=uYenwXAi2dqO9YgcCSxpMSuNa4TOsTlySRQpX2U2e0k=; b=qVD+5bjHqYP++60WwQB0iVxga0/Cbar8oQmqdGFSasEK2fAJQaqZXYJ0wQLnA+qsU9 OGkK38ebu45b41wth+GZ19XuhPsHbDnPLOYewoK5+GRJiKVasutA1XFmuDePAep7Sj/Y qz/flomZJzwaskMS/NG/90YPWlMerFx6ExCLP8zy2guCany4BxOFzajJKsCj7lg5OG4+ vymE6PeH8TNT15FioIsElauc3Dry3SQaoHHQr/fhP/Whv5CTzMExt1KFJgOrsnRR3wxN XrITkw/MruWSMFVgMYS8tUAnr6VI0Abqsz4fsZziBBrQBaa9PU7OQ0ad/pJHA+i+zkvK Kexg== 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=uYenwXAi2dqO9YgcCSxpMSuNa4TOsTlySRQpX2U2e0k=; b=M0Vs7A8A8qWWT2arTI2d4dyXKrmilAHcSDhyMYVTcxHzNh2+X3ClK0Tg5I6j8Wer3t 6kzMMFxaK5vBqEOOcKvFJMLvXTEJH3s31e5U0mW5ymula8WmFM343WoveA++8crvLCG8 dHHJJXIPTRdUnJzCDkDAkLF/rPogxU0w3nUXhNYEHGNOX7zL/9JTLHn/cguUjM0vdUC9 juLrNjiKiOkIB5gi/+2Oxbi0d9oWLvJwP8AgYdLVmfRiFtdW/7/xsZZtWXauolkNs7s7 Cy52taKFVsgd+0+NIxr1+hcTIcVspyL9yT3GZI5Yr/FnYuPMk8s+n54fi9vJ+fSAc26l yOUQ== X-Gm-Message-State: APjAAAWq5AptxkUX96a8yYHtTAqyLuNJ/vlol2kJqbGLyvZbB+37FDrd LyDK6NoW2YPwWfaKYPr3hqPIcQ== X-Received: by 2002:a1c:720e:: with SMTP id n14mr16224973wmc.53.1561383826209; Mon, 24 Jun 2019 06:43:46 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y17sm18277427wrg.18.2019.06.24.06.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 06:43:42 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 460331FF99; Mon, 24 Jun 2019 14:43:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 24 Jun 2019 14:43:27 +0100 Message-Id: <20190624134337.10532-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624134337.10532-1-alex.bennee@linaro.org> References: <20190624134337.10532-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::32b Subject: [Qemu-devel] [PULL 09/19] 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 convenience. 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: <20190617043858.8290-6-kraxel@redhat.com> [AJB: added tags] Signed-off-by: Alex Bennée -- 2.20.1 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- - 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 $*") || true