From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211532; cv=none; d=zoho.com; s=zohoarc; b=kqnBZ4cQDbHMzgRpAfLdSSr9RhlEAqxhH0iGAlDpUmFlWLNDh/1THstnnCMrmin96C2EZtF5fqi3FbUxX4HhZ+Belq+0dyvbXX+tn6KyAn1PNnY8d/Oy2VBHXWH0dwSvV53d67CTibTjC2o77zbQlHM7N1+9rlwSGji59hbw/bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211532; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jLczjKqy5I61WYJJtUxpOpS4jWdp7XC8w4aaEJBgg5s=; b=JDF9VcB9ut0ZChwUvuMjX4c5TqEeRBG8DtHB/QkoaD0oHXr0iEM6v44zJJtc37nBZ9JMLpfvAljK8jdSI3PgC9LE8Kl+EGiM0jFmRx4nuhJFGcF3ZRyUK84Nfu5C/5phedIVZ06Rf/7SpKErqPHKg4K4z1h7DmP0uOSSYIaTKrQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211532084142.2578898337057; Thu, 30 May 2019 03:18:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:50551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI8w-0003r3-VJ for importer@patchew.org; Thu, 30 May 2019 06:18:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6S-0002W0-Jn for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6R-0006RC-SQ for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:08 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6R-0006QH-M8 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:07 -0400 Received: by mail-wr1-x436.google.com with SMTP id b18so3779619wrq.12 for ; Thu, 30 May 2019 03:16:07 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o1sm74569wre.76.2019.05.30.03.16.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:04 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1CE381FF8C; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=jLczjKqy5I61WYJJtUxpOpS4jWdp7XC8w4aaEJBgg5s=; b=LoiCikYZy/xPUoBQXG0IZN1Ku+TWb6jvMovUQCSE8D3TqFc4PRUbExeruxaBRPyXbF OeHb5reDz8sqEDEe6dBzgDy6p/TG+2yi9JgXPM18khAwG4OY3VLHXSnlfwI8gT+QDK83 lriewhXh9638Lqxz51P6r+XJH2KRDcLUzZ60XNLCUwlh+TER0j25IKp8tAq/174Rd4GC yi0dmq+HqoH7WrpH/ZIYDF5hhl1PlhxJn6Qb5+3I8M5Wm3GT15SpblgR9dGtBzn7wmHE vFJibnyH1G1l78ZprB7MqQyS4ZQ1/ljTsM1zxGlXZhoMqp0IPxFY0s5+AizWPLq8WakG CrVA== 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=jLczjKqy5I61WYJJtUxpOpS4jWdp7XC8w4aaEJBgg5s=; b=KJ9sY7hs04WbL39+3eVLV4HzXR4c8Ej2kOfNhj5BHtS2BVZr1f4RJaC+7vYRB3+xvQ aDGbPb+N9kb4Hdcvqq6RWC9VFnjglTzjO7BwdlbOMjFABBixKWhu+Ez31CfmZ/dSqNIs S8pEWnatYced2iAEX9jAIdual1jlBdexQ4SpznLmDSH+Zr+HpdiWQlxyCPAeNG+o+64R MJJeTKyDjmmwiiSXuwSK6KG4OjVrOpYdTcamt8Hf6tiUToXkBby1goy8dnZ3dFMRgHLk osduN8UChnlYkpMkZOOPlN8XXAouPqJIZBJkcIWVV83BlKWtStQQjYjx1AHS/RKttvBB YmPw== X-Gm-Message-State: APjAAAXI9wVAG/ynF+dPWMyFUWnV1Rex570k8gC8X0wG2mc/RiAIxL38 S2xe4KICie/mJqDulONROEOLgA== X-Google-Smtp-Source: APXvYqzSvlnjOIuOy7/A6WaQaZJXpHHQ8jHZkGuH+CsOmlG2MWa2wq8SUdvpYnMq9HU53Xhbz6wWuQ== X-Received: by 2002:adf:ea4c:: with SMTP id j12mr2116981wrn.230.1559211366399; Thu, 30 May 2019 03:16:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:38 +0100 Message-Id: <20190530101603.22254-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PATCH v1 01/26] editorconfig: add setting for shell scripts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index df6db65531d..a001f340bd8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,6 +26,10 @@ file_type_emacs =3D makefile indent_style =3D space indent_size =3D 4 =20 +[*.sh] +indent_style =3D space +indent_size =3D 4 + [*.{s,S}] indent_style =3D tab indent_size =3D 8 --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211537; cv=none; d=zoho.com; s=zohoarc; b=kJFj3U9a1ZhiKai0Zb2WeVSsWOwxC0Fx+bVBrc6H44y+B5hsMlKhzruoGHDizN0UfAKAk4BlUwZLfj8QbIX3goVEn8+sFkHB2BOWYUvP77MCvn9BBUOg4DUme1OOAl1HBoSAQ/aum+jkUjFWenNO6Lh5Xg3w1adxthtZPrf849I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BFjisebq0hiOO8nTLU3fa+Dkmd/UUHwPkWgZnwgthE0=; b=fXyVuN/Z1NZdwFGfJmCKcHZUFZ2kTwGmzATp7bbX5a41M5CctOJJrPA2cw9VXK+IYrkrWZ8OsLokmw3LErzLB3wS+XJR3P+0ZDVx9mX2kpdMB6xmP8xkGCTYPS7SGGSrnsKrSi8AoPt1v+YVx88Nqy9I3QThkvMgay3HSjea/9Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211537806855.7615656104955; Thu, 30 May 2019 03:18:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:50555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI8z-0003sk-Nz for importer@patchew.org; Thu, 30 May 2019 06:18:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6U-0002ZH-7F for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6S-0006Rx-Ml for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:10 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54260) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6S-0006R7-FR for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:08 -0400 Received: by mail-wm1-x342.google.com with SMTP id d17so3593610wmb.3 for ; Thu, 30 May 2019 03:16:08 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h12sm1917464wre.14.2019.05.30.03.16.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:04 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31D7F1FF8F; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=BFjisebq0hiOO8nTLU3fa+Dkmd/UUHwPkWgZnwgthE0=; b=oWYG3OsZHSvMDtOSOcqGd358S7FY6Qy7aFfdfAXFGpkWzeTJyPHN5EcqeLWu/2995E eYL9nAaDcAfdl3Zp50yUa4ArvHxS8zek5XoB6fS7RyeXmByX8HBwBGbWhVyttf5+ks99 jueFlGH8XasYjgJN3WSMP5oWG0IxHzBGZWgHFXTjbjGzOnjiWkTqfGKDPZMj8A5kBNz0 k/RwgaL8UiU77pkiM7lW3TDHYVq9s50x22sn+DGwV2GUEZgBFOlDm93nIWrp8Sj919Ou N+gTklJvg7OTyiqni61wauYxGklPccK1AU9Q2xYbgGa8FY8ourmuZv9l4NnUQU7W/GPt Bbrw== 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=BFjisebq0hiOO8nTLU3fa+Dkmd/UUHwPkWgZnwgthE0=; b=BT1KFrD5qkHPhInFCF+Y6bsJBpTN0/gTlhByyRIE3h2Cd80IBNNE+GQ5C6TPnD5Ckp Kgt3sqY5swSr/8sPXOqACZkn5J0l2rtWTR2IBGzIc8BDvnOXUFWFzQvO4S8KONwHofiz WzqW/BT67zgE5Y2b2dfaiq8+tWM2FNgxNZ1nFskSe4PVFaa+VYe0xl9zBPu9ogoWXMpl yNv6tD8tUdCzbvn++v4XP/gLIWN7XZQgyw3qm1/PJb9IS+SsuT/5BrhQ1AxeYlVtzp87 yJY0Gjvt4ePXMgV3mvRhQy7cCau1BxxfLGdLNV776urOsgYm5tasQQF4dnmZSEt0Virp 0ZXg== X-Gm-Message-State: APjAAAUAV869yoWjBa6LCc5V0TMliL+pVhgXNrP3R0EQSeQafuzaOC5r wVy464BRpKuMdJn6zQM0akw0rQ== X-Google-Smtp-Source: APXvYqyZBlYGdwJiueywb0PiVnPzW7eEvT6GTvBWQ1WqZcrEV3v2U2ebgxIjc4FUyROC89NTiKQLrw== X-Received: by 2002:a1c:407:: with SMTP id 7mr1852691wme.113.1559211367301; Thu, 30 May 2019 03:16:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:39 +0100 Message-Id: <20190530101603.22254-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 02/26] qemu-io-cmds: use clock_gettime for benchmarking X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The previous use of gettimeofday() ran into undefined behaviour when we ended up doing a div 0 for a very short operation. This is because gettimeofday only works at the microsecond level as well as being prone to discontinuous jumps in system time. Using clock_gettime with CLOCK_MONOTONIC gives greater precision and alleviates some of the potential problems with time jumping around. We could use CLOCK_MONOTONIC_RAW to avoid being tripped up by NTP and adjtime but that is Linux specific so I decided it would do for now. Signed-off-by: Alex Benn=C3=A9e --- qemu-io-cmds.c | 69 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 30a7d9a13bf..f6701e3b8a8 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -248,20 +248,21 @@ static void cvtstr(double value, char *str, size_t si= ze) =20 =20 =20 -static struct timeval tsub(struct timeval t1, struct timeval t2) +static struct timespec tsub(struct timespec t1, struct timespec t2) { - t1.tv_usec -=3D t2.tv_usec; - if (t1.tv_usec < 0) { - t1.tv_usec +=3D 1000000; + t1.tv_nsec -=3D t2.tv_nsec; + if (t1.tv_nsec < 0) { + t1.tv_nsec +=3D 1000000000; t1.tv_sec--; } t1.tv_sec -=3D t2.tv_sec; return t1; } =20 -static double tdiv(double value, struct timeval tv) +static double tdiv(double value, struct timespec tv) { - return value / ((double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0)); + double time =3D (double)tv.tv_sec + ((double)tv.tv_nsec / 1000000000.0= ); + return value / time; } =20 #define HOURS(sec) ((sec) / (60 * 60)) @@ -274,16 +275,16 @@ enum { VERBOSE_FIXED_TIME =3D 0x2, }; =20 -static void timestr(struct timeval *tv, char *ts, size_t size, int format) +static void timestr(struct timespec *tv, char *ts, size_t size, int format) { - double usec =3D (double)tv->tv_usec / 1000000.0; + double nsec =3D (double)tv->tv_nsec / 1000000000.0; =20 if (format & TERSE_FIXED_TIME) { if (!HOURS(tv->tv_sec)) { snprintf(ts, size, "%u:%02u.%02u", (unsigned int) MINUTES(tv->tv_sec), (unsigned int) SECONDS(tv->tv_sec), - (unsigned int) (usec * 100)); + (unsigned int) (nsec * 100000)); return; } format |=3D VERBOSE_FIXED_TIME; /* fallback if hours needed */ @@ -294,9 +295,9 @@ static void timestr(struct timeval *tv, char *ts, size_= t size, int format) (unsigned int) HOURS(tv->tv_sec), (unsigned int) MINUTES(tv->tv_sec), (unsigned int) SECONDS(tv->tv_sec), - (unsigned int) (usec * 100)); + (unsigned int) (nsec * 100000)); } else { - snprintf(ts, size, "0.%04u sec", (unsigned int) (usec * 10000)); + snprintf(ts, size, "0.%04u sec", (unsigned int) (nsec * 10000000)); } } =20 @@ -376,7 +377,7 @@ static void dump_buffer(const void *buffer, int64_t off= set, int64_t len) } } =20 -static void print_report(const char *op, struct timeval *t, int64_t offset, +static void print_report(const char *op, struct timespec *t, int64_t offse= t, int64_t count, int64_t total, int cnt, bool Cflag) { char s1[64], s2[64], ts[64]; @@ -649,7 +650,7 @@ static const cmdinfo_t read_cmd =3D { =20 static int read_f(BlockBackend *blk, int argc, char **argv) { - struct timeval t1, t2; + struct timespec t1, t2; bool Cflag =3D false, qflag =3D false, vflag =3D false; bool Pflag =3D false, sflag =3D false, lflag =3D false, bflag =3D fals= e; int c, cnt, ret; @@ -758,13 +759,13 @@ static int read_f(BlockBackend *blk, int argc, char *= *argv) =20 buf =3D qemu_io_alloc(blk, count, 0xab); =20 - gettimeofday(&t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &t1); if (bflag) { ret =3D do_load_vmstate(blk, buf, offset, count, &total); } else { ret =3D do_pread(blk, buf, offset, count, &total); } - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("read failed: %s\n", strerror(-ret)); @@ -836,7 +837,7 @@ static const cmdinfo_t readv_cmd =3D { =20 static int readv_f(BlockBackend *blk, int argc, char **argv) { - struct timeval t1, t2; + struct timespec t1, t2; bool Cflag =3D false, qflag =3D false, vflag =3D false; int c, cnt, ret; char *buf; @@ -891,9 +892,9 @@ static int readv_f(BlockBackend *blk, int argc, char **= argv) return -EINVAL; } =20 - gettimeofday(&t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &t1); ret =3D do_aio_readv(blk, &qiov, offset, &total); - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("readv failed: %s\n", strerror(-ret)); @@ -972,7 +973,7 @@ static const cmdinfo_t write_cmd =3D { =20 static int write_f(BlockBackend *blk, int argc, char **argv) { - struct timeval t1, t2; + struct timespec t1, t2; bool Cflag =3D false, qflag =3D false, bflag =3D false; bool Pflag =3D false, zflag =3D false, cflag =3D false; int flags =3D 0; @@ -1091,7 +1092,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) buf =3D qemu_io_alloc(blk, count, pattern); } =20 - gettimeofday(&t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &t1); if (bflag) { ret =3D do_save_vmstate(blk, buf, offset, count, &total); } else if (zflag) { @@ -1101,7 +1102,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) } else { ret =3D do_pwrite(blk, buf, offset, count, flags, &total); } - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("write failed: %s\n", strerror(-ret)); @@ -1160,7 +1161,7 @@ static const cmdinfo_t writev_cmd =3D { =20 static int writev_f(BlockBackend *blk, int argc, char **argv) { - struct timeval t1, t2; + struct timespec t1, t2; bool Cflag =3D false, qflag =3D false; int flags =3D 0; int c, cnt, ret; @@ -1213,9 +1214,9 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) return -EINVAL; } =20 - gettimeofday(&t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &t1); ret =3D do_aio_writev(blk, &qiov, offset, flags, &total); - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("writev failed: %s\n", strerror(-ret)); @@ -1250,15 +1251,15 @@ struct aio_ctx { bool zflag; BlockAcctCookie acct; int pattern; - struct timeval t1; + struct timespec t1; }; =20 static void aio_write_done(void *opaque, int ret) { struct aio_ctx *ctx =3D opaque; - struct timeval t2; + struct timespec t2; =20 - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 =20 if (ret < 0) { @@ -1288,9 +1289,9 @@ out: static void aio_read_done(void *opaque, int ret) { struct aio_ctx *ctx =3D opaque; - struct timeval t2; + struct timespec t2; =20 - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("readv failed: %s\n", strerror(-ret)); @@ -1425,7 +1426,7 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv) return -EINVAL; } =20 - gettimeofday(&ctx->t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &ctx->t1); block_acct_start(blk_get_stats(blk), &ctx->acct, ctx->qiov.size, BLOCK_ACCT_READ); blk_aio_preadv(blk, ctx->offset, &ctx->qiov, 0, aio_read_done, ctx); @@ -1570,7 +1571,7 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv) return -EINVAL; } =20 - gettimeofday(&ctx->t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &ctx->t1); block_acct_start(blk_get_stats(blk), &ctx->acct, ctx->qiov.size, BLOCK_ACCT_WRITE); =20 @@ -1746,7 +1747,7 @@ static const cmdinfo_t discard_cmd =3D { =20 static int discard_f(BlockBackend *blk, int argc, char **argv) { - struct timeval t1, t2; + struct timespec t1, t2; bool Cflag =3D false, qflag =3D false; int c, ret; int64_t offset, bytes; @@ -1787,9 +1788,9 @@ static int discard_f(BlockBackend *blk, int argc, cha= r **argv) return -EINVAL; } =20 - gettimeofday(&t1, NULL); + clock_gettime(CLOCK_MONOTONIC, &t1); ret =3D blk_pdiscard(blk, offset, bytes); - gettimeofday(&t2, NULL); + clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { printf("discard failed: %s\n", strerror(-ret)); --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211543; cv=none; d=zoho.com; s=zohoarc; b=UqeYlzRcUEhoauHhFJk4Okzo8e8e+TFCNRJrjYnSng3SRaXikjFhVu+riNxIMtmR2P8Cdh89rNykPMpkSbPpOALEuaagHav4p4c+uxc492DL/hGMKBcRw5/WzaEKKdjmEfBfq8uxNVDN1BsXJREoC9+cFzLkcAZnAVAYfH2J+To= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PPLFa9NHnZbGHQDGEn1CiaHDLKyObQdBVLbTqFMD65I=; b=iYpMrMeYZDBuoJTYqyHBEGM5yAnP2gSZotH3VNa2TxlcNA2vhlkQQQAGbqeLsp2cyBNgvp//HSc34xa4/YZaBqGahJEj/QJSjIcR5lQE0qSJ8YhpbP/zRcVqulEypLEzHJYzrXpLOTWzvVIxbqe9znesM9ACbRZqr+gtpTk7Pfg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211543318614.4633373672344; Thu, 30 May 2019 03:19:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:50557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI9D-00043M-56 for importer@patchew.org; Thu, 30 May 2019 06:18:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6U-0002ZK-Np for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6T-0006Sm-BU for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:10 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6T-0006RX-2u for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:09 -0400 Received: by mail-wr1-x442.google.com with SMTP id l17so3799857wrm.10 for ; Thu, 30 May 2019 03:16:09 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y17sm4609255wrg.18.2019.05.30.03.16.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:04 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 49ADE1FF90; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=PPLFa9NHnZbGHQDGEn1CiaHDLKyObQdBVLbTqFMD65I=; b=XZupICCADA9sZPbFCDZJlSNr9kqu2xsEr+tj1nHOnTeTYPzkB480cWgVdleix5zmas JvIk5yWG41IWcMH/K5H+Z5c45S6byrH4FHF+8CSnq1b8AzO0VQ9e2W31i7qOwNxc2NnS wCPDuXtIU1X33cUaXT5ZTkUZrrHBptHCx3fmSeCLhpP6GTgaVctqMczHqSxiE/U3zEqD j/Y//Qb2mpJAO1zaOh1odCA3T8c+4GR9tWv5OOYdLt4qeEpZOiT8d2L9gdmOnZlTnSFK MiwnQWNOP97g9OTG8idvD3rAs1A7sthtVktWQZjPBU0OYX2FRI1hOnkL8Hvn1wv3SG0K AfjQ== 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=PPLFa9NHnZbGHQDGEn1CiaHDLKyObQdBVLbTqFMD65I=; b=oDpgCtsQ0jeiMswVddCeIWdAlBD0tXQmy9a8eSzNSu4pFp/9eiifqvBUi/8AM0PJ84 wb/Oz3KL7wtq72Wte4KC7ctxn/rdP/vZ59Ksc/kp/39eKBrjhOIQSn0NsE3eL62+Mt9e A5u7YRDPDjEOfE47I/58xw0Px9bktICP4E27gwy396/5qZ7OQqd8mRpQ4Xj1SKXnZT6+ /K9/XfsFrFIbdG0KhbFZ/yCS9KviIgj6+Qdtw+zIt0YtTRlFnQSMSkTFzd53t6twkR53 zMjs3z/uugbj/e9ZVl+cGOrGBww3xQHMLBH7Cpp/fRMHBLT5iVZu8m0nZ9DRkrHTjw1w g1Ig== X-Gm-Message-State: APjAAAXVdy7SNx48mEhE5jOg4jzKG1W0s/NtQ5I23h+ypJxbnHw3YL3f jL8LKJn3UrOvfBQW2YmAzU6SMA== X-Google-Smtp-Source: APXvYqxHRtR09B5lWkb0xxaM07QHWeATVvSEuoLJ9UEw0Dx6P+9cwcsksNAYMYad7/C7IpGdsuooiw== X-Received: by 2002:adf:e7c5:: with SMTP id e5mr2018623wrn.107.1559211367918; Thu, 30 May 2019 03:16:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:40 +0100 Message-Id: <20190530101603.22254-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 03/26] tests: Run the iotests during "make check" again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth People often forget to run the iotests before submitting patches or pull requests - this is likely due to the fact that we do not run the tests during our mandatory "make check" tests yet. Now that we've got a proper "auto" group of iotests that should be fine to run in every environment, we can enable the iotests during "make check" again by running the "auto" tests by default from the check-block.sh script. Some cases still need to be checked first, though: iotests need bash and GNU sed (otherwise they fail), and if gprof is enabled, it spoils the output of some test cases causing them to fail. So if we detect that one of the required programs is missing or that gprof is enabled, we still have to skip the iotests to avoid failures. And finally, since we are using check-block.sh now again, this patch also removes the qemu-iotests-quick.sh script since we do not need that anymore (and having two shell wrapper scripts around the block tests seem rather confusing than helpful). Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-8-thuth@redhat.com> [AJB: -makecheck to check-block.sh, move check-block to start&gate it] Signed-off-by: Alex Benn=C3=A9e --- tests/Makefile.include | 8 +++---- tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- tests/qemu-iotests-quick.sh | 8 ------- 3 files changed, 38 insertions(+), 22 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh diff --git a/tests/Makefile.include b/tests/Makefile.include index 1865f6b3222..0c6d8c75941 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -140,7 +140,7 @@ check-unit-y +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 -check-block-$(CONFIG_POSIX) +=3D tests/qemu-iotests-quick.sh +check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh =20 # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. @@ -1077,8 +1077,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D te= sts/qemu-iotests/socket_scm_helper$(EXESUF) =20 -.PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(E= XESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +.PHONY: check-tests/check-block.sh +check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) qemu-io= $(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< =20 .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y)) @@ -1152,7 +1152,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tes= ts/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-qapi-schema check-unit check-softfloat check-qtest check-deco= detree +check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y)) $(check-qtest-generic-y)) diff --git a/tests/check-block.sh b/tests/check-block.sh index f3d12fd602d..c8b6cec3f68 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -1,24 +1,48 @@ #!/bin/sh =20 -FORMAT_LIST=3D"raw qcow2 qed vmdk vpc" +# Honor the SPEED environment variable, just like we do it for the qtests. +if [ "$SPEED" =3D "slow" ]; then + format_list=3D"raw qcow2" + group=3D +elif [ "$SPEED" =3D "thorough" ]; then + format_list=3D"raw qcow2 qed vmdk vpc" + group=3D +else + format_list=3Dqcow2 + group=3D"-g auto" +fi + if [ "$#" -ne 0 ]; then - FORMAT_LIST=3D"$@" + format_list=3D"$@" +fi + +if grep -q "TARGET_GPROF=3Dy" *-softmmu/config-target.mak 2>/dev/null ; th= en + echo "GPROF is enabled =3D=3D> Not running the qemu-iotests." + exit 0 fi =20 -export QEMU_PROG=3D"$PWD/x86_64-softmmu/qemu-system-x86_64" -export QEMU_IMG_PROG=3D"$PWD/qemu-img" -export QEMU_IO_PROG=3D"$PWD/qemu-io" +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then + echo "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." + exit 0 +fi + +if ! command -v bash >/dev/null 2>&1 ; then + echo "bash not available =3D=3D> Not running the qemu-iotests." + exit 0 +fi =20 -if [ ! -x $QEMU_PROG ]; then - echo "'make check-block' requires qemu-system-x86_64" - exit 1 +if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then + if ! command -v gsed >/dev/null 2>&1; then + echo "GNU sed not available =3D=3D> Not running the qemu-iotests." + exit 0 + fi fi =20 cd tests/qemu-iotests =20 ret=3D0 -for FMT in $FORMAT_LIST ; do - ./check -T -nocache -$FMT || ret=3D1 +for fmt in $format_list ; do + ./check -makecheck -$fmt $group || ret=3D1 done =20 exit $ret diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh deleted file mode 100755 index 0e554bb9724..00000000000 --- a/tests/qemu-iotests-quick.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -cd tests/qemu-iotests - -ret=3D0 -TEST_DIR=3D${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g qu= ick || ret=3D1 - -exit $ret --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211728; cv=none; d=zoho.com; s=zohoarc; b=WmTcSkcOTpf7MdKcXHAJR3ANJgu65N3C/VL2s3hCF3ZqRANb6/+ZoPF/2yZ5wWJe+XgLZKwzdChCqkvjHkOeQK1S6qByKTLR/BUrtUS6oS1+Hmc4A/DTag4QQeyvuf4OQRaCDd7drLEeS7IjfxJO+/wrW31S3XTE4WHdAxGt+X4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211728; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yQmtSC53V1a0JKg4AWzdnb+vwP+cvIVWjcrHwPCZ1/w=; b=ECkwFxovApdGT8Zp4DWraaOZvYi9GEYICfrwPiCToKljfqVPiEvGWBXmvkwH8TAc27pmw3vfcqvk6Qiv8EjhSYCj5nSBSIXXnworhDkR3CE7NonegNqfbdpE0BT8bAOwhNpgY+o4eVOJjioDfLByIORjKWgWqb0LV3Ow985Yw88= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211728147578.0361853696161; Thu, 30 May 2019 03:22:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:50615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWICA-0006Qr-4B for importer@patchew.org; Thu, 30 May 2019 06:22:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6V-0002ZM-Lz for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6U-0006Th-IP for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:11 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6U-0006T3-CA for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:10 -0400 Received: by mail-wr1-x441.google.com with SMTP id r7so3788701wrr.13 for ; Thu, 30 May 2019 03:16:10 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u14sm2690100wrt.75.2019.05.30.03.16.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:06 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5E5A31FF91; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=yQmtSC53V1a0JKg4AWzdnb+vwP+cvIVWjcrHwPCZ1/w=; b=b0zDxZwI8DCcavqQEsrfZ42GgsfYbuubHXpdanDl8UCYoA+7sIUhLeDQilG0bearmk PNxHJDFlY/O+fcH0t0C0J0j7C2+c7PTgGE4Q1tOYT+bS5lZeyeaEEuBOzKj6e47Xfbmk Qod2uN30J/GQW3oui14+m+9LFLNZQdfcbyjU58yrg83bjeOYj95CFGh3UxG3epDBUNDx j0MMH0tlWL8RNIb+ksbZsdzPOQ+fL+yGsuT+O5XVK0YB82zzTGBKJx8GAb2RvAVtgnd5 HnqOj8hjR+ptYul3NbeptQYDR+IZuKOj1lfuqk5GHg48fTS06ah15LH0+tEpg5eq8zsE ZNnA== 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=yQmtSC53V1a0JKg4AWzdnb+vwP+cvIVWjcrHwPCZ1/w=; b=Q+AcSyxQOSSloAKMAmeyF7Tf2nmjbJbWloeiKlJIBf2xRBEWr/7Jkc7bcWTIn9d3Cr qBeBtpTqe4ZLvMZ0sTw6NjbxFDBZQdNn5gn/9fB1Ey45MLw7IzrSrbFBZ2I4m15VkA5x 2D7i0exzLk+unW7Gam0IV5QNNm//xDTCLgipJtGg4so3liUu/9KqNMljvv/1KR3FyiZE 4ClwOJQUApyQb0t3sD/5qKwKnhAKVmfMjfJj7Cr5gdlSr9iqSWaYq7nhlFOmzsIPw1F7 sSaLsvLOfEEND3BlZLELrN83AkpFaVCsrCoHjtvLrZsJ6QD9sxV34EzA40SRUdTH4U6J 7qIA== X-Gm-Message-State: APjAAAWZUGW6/ElALClPow/tTFrnb0ybYl4MXyzzVtpSkse5KyiKPe6r yXyWAM7N4KBpmrem6f6hznHafg== X-Google-Smtp-Source: APXvYqwmFHRoNHh7v6ItWKRgKwUuYTrm4LFft7EcwdlAa9JZuTprh3t/0wMkCrKRVZXpV4XExmXCoQ== X-Received: by 2002:a5d:534b:: with SMTP id t11mr1864752wrv.61.1559211369320; Thu, 30 May 2019 03:16:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:41 +0100 Message-Id: <20190530101603.22254-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v1 04/26] tests/docker: Update the Fedora image to Fedora 30 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Fedora 30 got released: https://fedoramagazine.org/announcing-fedora-30/ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Stefano Garzarella Reviewed-by: Stefano Garzarella Message-Id: <20190528153304.27157-1-philmd@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index afbba29adaa..12c460597ed 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 ENV PACKAGES \ bc \ bison \ --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211904; cv=none; d=zoho.com; s=zohoarc; b=K7FmsazpgMz5Bi2NwrxsNbwIPE1Sk22NvFQkkiQ1Nwe0lpkY65ciOPRb/G0zuJ7Q6Y9i1dEm1VuGHiMMIHjMlgiWXesh17uTU9Bk0R2zNNl11cTWXq4x9QmNs0cltHsgex2n63g7z6kMF5VOf9EqBUSQ8sXD+3vK3w7OLG72YZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211904; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XEDDkoJKFf+IpBra7HDHG0A6Y/FKSBEEsukwDPufo7k=; b=dFur30W1ofvxgW2UkUQBH5swK81QQgpD1Tj2DkZ6QBXBpcdLUcZRMXRFjaOPFqSrG7iFChVM2HGQlEdU/bb9DYs6sLQXJoL8PNiItVrCUAQN4NKmncu5hBlKhWBhsjJUbUkxda+1Cz3BeXy7ao/Wm8brzIFjDLIxWmn4UMz8ICk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211903991362.0595653436503; Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:50642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIF0-0000Wl-0p for importer@patchew.org; Thu, 30 May 2019 06:24:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6W-0002Zl-8g for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6V-0006UZ-5g for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:12 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6U-0006Tc-V2 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:11 -0400 Received: by mail-wm1-x343.google.com with SMTP id 15so3457028wmg.5 for ; Thu, 30 May 2019 03:16:10 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w185sm1689633wma.39.2019.05.30.03.16.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:08 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7422B1FF92; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=XEDDkoJKFf+IpBra7HDHG0A6Y/FKSBEEsukwDPufo7k=; b=lR9r11t9rA8f0H5+5wxcChwS0IOKmncWsaLejMOBY+nUB0urOlE7EKrxfhvESLScSG pXan9EJoYz0xV7N5AybHN82/O3BVi9mfgKntuTbOxiJRu7nry7vDSHeuRa8yVo9Um9db BENdaI2y6SBKLtHYSZg+x0PEN9KE4SgFhR0qXwtua6PdfUrWrtObqmlLWLIL/HNl8dcp Ay7leC+khmFPgngHrFoo4Z5b0z5CRDASpydVgtdvNYloHluIkqXDauyJQ1q11L5E57X4 A941B+lyxVXNFUSLu0GNNSJ8QhMNjzB4ncSWcVmeK1z+YnPQAT6y6sMjqUcFoU2rSSpI oiaw== 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=XEDDkoJKFf+IpBra7HDHG0A6Y/FKSBEEsukwDPufo7k=; b=Jk6v7E4sltyu+24qfXhhyljGnWJADX6qtU7Qus1pxsZgUOvoyxefXzRE824mAY6gjY xavd23PM+gvVDvCaJEDP7U4b7rnIGqG0Pcq1GkxU2uxnpShQB5Z2cBMYxN0kMsWoSe1x O1WOiH/lfTNcXuSOS691JEsPeT5lhHR0ZvBOIFNhxsnMKl3Zz5IAGYIz53LPlg/f2yWm wBvRde1f/MRH1lpzDgP/6kKxxdBzbI4BzZnoVOUQj9tLi+xnISuHbDzIppNMG4djROa5 F1pmohSg53dcLA540pSH/IeSuVbVsxwTNj3a0xnONUyyd8UuLmzBOJR9vW8twgzObSLP xuEw== X-Gm-Message-State: APjAAAVc0HmxPe+nbXBAhZtVYe2zUDYj026SfyXg/7akWwPA0oI8k/u+ gvI7W9b2h3VgAj50YbUY4MClUQ== X-Google-Smtp-Source: APXvYqw7BIb3mLB2wgPSPaxW4Px2y4VKwvbgE6I93S9SyVxjEJcj+yQyhVOfhqI6sGbuThU19F5wqg== X-Received: by 2002:a1c:385:: with SMTP id 127mr1694799wmd.109.1559211369935; Thu, 30 May 2019 03:16:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:42 +0100 Message-Id: <20190530101603.22254-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 05/26] tests/docker: Update the Fedora cross compile images to 30 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) While at it remove the bogus :latest tag for cris cross compiler. It tends to break caching and cause confusion. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/fedora-cris-cross.docker | 2 +- tests/docker/dockerfiles/fedora-i386-cross.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/dock= er/dockerfiles/fedora-cris-cross.docker index b168ada615a..09e7e449f9b 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -2,7 +2,7 @@ # Cross compiler for cris system tests # =20 -FROM fedora:latest +FROM fedora:30 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/dock= er/dockerfiles/fedora-i386-cross.docker index eb8108d1185..9106cf9ebed 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 ENV PACKAGES \ gcc \ glib2-devel.i686 \ --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211717; cv=none; d=zoho.com; s=zohoarc; b=R6Us8LBAtHZRsls8Ihl+NLu41iRQKaU5IaH/Ks9XYN6DJ/uQzaEl4sJuQudnVgS2DoPUQrbwTCL3POLuO3uL2Hi+Gsst7L4CalbbavlHF/mNTFTuQp4h5jeQKWCs83iCC7+BzIM3Hfidd22KZtrqwlG7d3I6G9uXz1wJQXzVFXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211717; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tdfRNkcy3tXrd40GFlSuojfYwNRpqR4LehskXAKdxiE=; b=Rl9f3wIsNd4JsOdoi8oQuQGmFgBzH88/8jy9UIP7nR5GYrXD9iobWEnMMerBFg1wMf/Lj747sBFL1LbHj573aDOnLQKt0nvPRXzUI7uDD4GA2RE5dRgMouzDdtwvDPRNN/RLOpBgePdcK/Gu+Hgui/VqWGr1sZr3ghPTD3LmPIY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211717065910.5926634702207; Thu, 30 May 2019 03:21:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:50611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIBu-0006FE-Ky for importer@patchew.org; Thu, 30 May 2019 06:21:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6W-0002a4-TO for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6V-0006Uy-Mz for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:12 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6V-0006UF-EU for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:11 -0400 Received: by mail-wr1-x441.google.com with SMTP id c2so3807178wrm.8 for ; Thu, 30 May 2019 03:16:11 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u10sm1736567wml.42.2019.05.30.03.16.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:08 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 884C31FF93; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=tdfRNkcy3tXrd40GFlSuojfYwNRpqR4LehskXAKdxiE=; b=bU4MhMOMtOQF9SzIY9sKIx1ml5gCo6WA0CTGCSf//xBaBJx9aWmvonLe6FA3rgO0vM r1mqz9QtEKR0dJuKzlIvz9o0Ce6vfW3bVHKXYcShjgmMb7EQ3qBX+6k8VOcdfzTxwORo XObCcf/AWo1cTO/z/x0pw3nTH/8fIO5WyY/PM+GfGNEwjzF8jHamLew9U73WNDbW1RYz IhsdO5Uij9oSHSn1bEAeogEzX0auB+meUQnxhhlB0YKXxuAhSICyW9nBN0DqndfRmA64 wpkZQPGyjyRfrGtpV9nsRPomf/QDlBQQ/uDzlZ75tRSDOTHYXpgxbl0K0cJpi4hpQrjR eCcw== 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=tdfRNkcy3tXrd40GFlSuojfYwNRpqR4LehskXAKdxiE=; b=EgfTCFqii4MzZYjyOKfGm3mzrmIlmO3/8IqXkAjZjA0qB1LTf2ipRVspxPR8oSsh12 TUb+KSMlpTfJSQ8Tg/qAVI3qYyR7l4x4y/Amu4VinUTchCW3e+A8nbyUNbTsap1TXiST VItqlbKo2dHpk4G/WHgLEbWPTMGEj/p6qS4WSOt+Iosu4TMK2mEA6Hpn2toQ/CNphpI/ kdMSMdg/XW5BRmjTb4KUON9n6koiJiYEJ306n9/GWx+GLODbbHZ/6BBTwDFcOJYXcS1c 3K47/yOwj4UGgL+a6QwXaJPe5ZJhDmw6FNoohNPBWmp2r2Ozu8Ec24zRuQXMCRNlRdeg 4nyQ== X-Gm-Message-State: APjAAAVKwTd1mnZBUPB1hXA+58n+3wkbLhv+zB4Ec2iRd+QsdBuWVmyW fxjM2GF+fqNLY3BK51P8sS7B+Q== X-Google-Smtp-Source: APXvYqxWYHGYkBKlrK1Uu8vk/WJl+lcvUPnDXl+s1V+Pb9eXsuWSAnk6hotSNrANAlHm97daVv6edg== X-Received: by 2002:a5d:568c:: with SMTP id f12mr2040279wrv.77.1559211370441; Thu, 30 May 2019 03:16:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:43 +0100 Message-Id: <20190530101603.22254-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v1 06/26] tests/docker: Update the Ubuntu image to 19.04 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This has aged a little and we have a separate LTS image for testing on the older distros. Update it to a more recent release like its Fedora cousin. Besides it is useful to have something with gcc-9 on it for squashing those stringop truncation errors. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- tests/docker/dockerfiles/ubuntu.docker | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index 36e2b17de59..8d256961f06 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -1,6 +1,15 @@ -FROM ubuntu:16.04 -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse= " >> \ - /etc/apt/sources.list +# +# Latest Ubuntu Release +# +# Useful for testing against relatively bleeding edge libraries and +# compilers. We also have seperate recipe for the most recent LTS +# release. +# +# When updating use the full tag not :latest otherwise the build +# system won't pick up that it has changed. +# + +FROM ubuntu:19.04 ENV PACKAGES flex bison \ ccache \ clang \ @@ -21,7 +30,7 @@ ENV PACKAGES flex bison \ libepoxy-dev \ libfdt-dev \ libgbm-dev \ - libgnutls-dev \ + libgnutls28-dev \ libgtk-3-dev \ libibverbs-dev \ libiscsi-dev \ @@ -34,7 +43,7 @@ ENV PACKAGES flex bison \ libnss3-dev \ libnuma-dev \ libpixman-1-dev \ - libpng12-dev \ + libpng-dev \ librados-dev \ librbd-dev \ librdmacm-dev \ --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211717; cv=none; d=zoho.com; s=zohoarc; b=d0Y3Uq7wynlfDurguiB6Js796lPSSDGL1Mss0xc3BGWl1+KgQEUieUpNtwHW4IEivB1Xgysjj7LtgswzfoXs37CnSJ9A4VGJvABRA5kVPrCztPD3Vpeoq8ll1c4gt/AwkjA1gmBsrMU0CF94hVLZc3Snp3ecDIEmt5iyJpPXo5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211717; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=W0YwnQ7RyXinYmA/R3gRUT7SUlaDY+T48f3CddOaKS4=; b=Wqea9+9urFe4vSKzwFbiHkd5Pd1pXcfK/vWMFjmT83RMbiGE571WEP8T6R6o9dru8qfRlbtD9Nw61XtS7rKQWHthuwbauDC3R2NzZG6oYEbnGKXjf24+x2rUL8y16CUjmFvcrQafJHRRuyPZ7Qqvql+0QoXck10DKdf8wZLiVJg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155921171706460.553087489455265; Thu, 30 May 2019 03:21:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:50609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIBv-0006En-C7 for importer@patchew.org; Thu, 30 May 2019 06:21:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6Y-0002cF-R4 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6Y-0006XT-2T for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:14 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6X-0006Wx-SR for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:14 -0400 Received: by mail-wr1-x443.google.com with SMTP id t4so3810371wrx.7 for ; Thu, 30 May 2019 03:16:13 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h12sm1917633wre.14.2019.05.30.03.16.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B72E1FF96; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=W0YwnQ7RyXinYmA/R3gRUT7SUlaDY+T48f3CddOaKS4=; b=is+/WRibWmlDXeyKsRs5GmyS7UPJbnfWF923ZV7AYXKcxqn5PpLdrzy26ni0gIi6te obLr59UrIPwgbrj1WUYrmqmDYgT9z2RJRifLE1LVC+5KFZaaAV8qVB3m48p2XLihW5vF GTv5JBkZTqLkUFLmT0ufgMNnvMrHKIxytuujuoK5ULCsCihdY11xsTf4Cwp1UJObfIAL lj9dfaHBOFZZYPhziXvbA8DYDG7ljIn/9bBPfWqpZfEE4YXNBGjRrG4k2/d6a8OJyf5l lxcnnkh7ePCN4XJrPkR4xjnnapE+5JxKJFcuWQcCOmOqGw7KADNhcxGptghbeWnrqzsA a6vQ== 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=W0YwnQ7RyXinYmA/R3gRUT7SUlaDY+T48f3CddOaKS4=; b=K6vdjrwlLxle/vb/utQ4b9TX3/SdosrsetBtUCJMN99/oZCjE1Bc5HKzie1jdKWfW1 ZcpOGP0JpyOhzYIQdNEObsomDdy4D667Wf8+pEGyKDyRCGznxKN9JCU0avPb9E4fKnCk RPBBHJWEkh0hXjcCIK3FI9Il/jQWFGWv9zLZjIkVIKk+vPTxZDRE8htEmZXfRzqZ5p6m lr2VTqf5n77W0TvT3PegbT9OgDQFEb+Cgr/Q/cz2dmZnu241yYfDbmCahEhiLcfsLAFJ TFVVC4TJDUr/WvWj9qUGK4+l9+qxv5Lr74XJUef4Ab3aqGUSF6GnGx8cEMpOGFHhNF3U KM1Q== X-Gm-Message-State: APjAAAXN2PwNAGjdMbPHdhOc4fyKov8sar5ijODcVZ4DXDI+pINQzx9s 5HFxpXMhao0QM6aPaHcxYAdW3g== X-Google-Smtp-Source: APXvYqzX+8tBQ8C9W8CsItE4gtgPKPdb+9LiJIwHNszJUh3weKMVkbKy4WFGd1IHEy4z78c+dmmH8A== X-Received: by 2002:adf:dc8e:: with SMTP id r14mr2067766wrj.121.1559211372802; Thu, 30 May 2019 03:16:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:44 +0100 Message-Id: <20190530101603.22254-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v1 07/26] .travis.yml: bump gcc sanitiser job to gcc-9 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The toolchain PPA has it so we might as well use it. Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b053a836a32..f0aa37f2d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -240,8 +240,8 @@ matrix: - ubuntu-toolchain-r-test packages: # Extra toolchains - - gcc-7 - - g++-7 + - gcc-9 + - g++-9 # Build dependencies - libaio-dev - libattr1-dev @@ -270,11 +270,11 @@ matrix: language: generic compiler: none env: - - COMPILER_NAME=3Dgcc CXX=3Dg++-7 CC=3Dgcc-7 - - CONFIG=3D"--cc=3Dgcc-7 --cxx=3Dg++-7 --disable-pie --disable-lin= ux-user" + - COMPILER_NAME=3Dgcc CXX=3Dg++-9 CC=3Dgcc-9 + - CONFIG=3D"--cc=3Dgcc-9 --cxx=3Dg++-9 --disable-pie --disable-lin= ux-user" - TEST_CMD=3D"" before_script: - - ./configure ${CONFIG} --extra-cflags=3D"-g3 -O0 -fsanitize=3Dthr= ead -fuse-ld=3Dgold" || { cat config.log && exit 1; } + - ./configure ${CONFIG} --extra-cflags=3D"-g3 -O0 -Wno-error=3Dstr= ingop-truncation -fsanitize=3Dthread -fuse-ld=3Dgold" || { cat config.log &= & exit 1; } =20 =20 # Run check-tcg against linux-user --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211891; cv=none; d=zoho.com; s=zohoarc; b=hdc9k/F0Klui4L8GkSI67AkpZ6Hxghcgj/1sQkYqgfRVhoaUzalM8V2+qOh7U7Q+iRTxsRJ36XF6lLkr3QlT4G2fucwQH03R3WJ7yS7QVDx382yI+a1X54zFImN9XlXopB0YiVAMUlUx5PwqvR7aEc7Oj4yfCqjylH60p7XpGZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211891; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aEPT2KH0ylKDQMa3RRq5y0ml/pOWW4HSQXWafsxR9f0=; b=QW/6Qsd80MXk8eALUBswyfwmZ7QqwJhCQnP+kAenInhmKPJlXgs3qQOnEL9hhtklttL2domFVoTKFJUUWU58khehCx/HsRNOU7Zxgv/A2UUm9k68gwhFKC65SyQIGAGLRYR9mpknHw7+QatcT1phiFCHwVvwkVR7QB8eaYHDa20= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211891343326.22732281749336; Thu, 30 May 2019 03:24:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:50636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIEk-0000K9-8e for importer@patchew.org; Thu, 30 May 2019 06:24:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6Z-0002dD-Pc for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6Y-0006Xu-In for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:15 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6Y-0006XB-Ca for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:14 -0400 Received: by mail-wr1-x442.google.com with SMTP id n4so765077wrs.3 for ; Thu, 30 May 2019 03:16:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f3sm1906097wre.93.2019.05.30.03.16.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AF4561FF98; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=aEPT2KH0ylKDQMa3RRq5y0ml/pOWW4HSQXWafsxR9f0=; b=ISqxTQ+sW2feLTqo940rJnIFrMshLMilzv1nngoXgcL3rLG8EW93HVKRxBcSWtlRC0 cWV/WrfvsX6KIv3AeD8hV9u1bFw0cCmQA+mdT3JjsFx7JL/IrLaaQItB/rMPa9Q2NVjJ kQErzSH5GDGoiDCLGF2Y1xQ99JsQJnd5XmOWnHLlD+eQlfLFCl7ah8eR7H+9Fam28ZBP ShEKJpOvtuifJ48E4c5NxYjL+iAnS3C9ffRGnzpPEfWsfQVoyUbeilMZZPra/xNqC2oA GC9JiqeEkR4fWqDwpUvBprx6oLFmHM5t4oWeqQg8bKvn1iCMd2PTouJUmzMN07X7uL0Q 2wuQ== 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=aEPT2KH0ylKDQMa3RRq5y0ml/pOWW4HSQXWafsxR9f0=; b=Fq/0F4frv2NJFWHb5+4gGMD4TVu9l/ZJtxASQJGntnqUO5mKR6DNATUWW1+JSpT0yp cCDPz64M16WNxl0qBNTLpEngEKvhJfplJeXejB0ySaMWHjgGD3Zw8T+9TU996aoIMR2M sFuzVbCClLZNGXlu2S8L2HUWtlV1B3TyqcJknP267hyW1QoHMG4gW8MR6ADjTr1C6U2h Gz6tbvyxPD7jpQkrGTfjc6JNvDNVvHabcyi53ssI9hpGTA+NDRM7U/0krjquo6JM4xOX uJwX7Q2W7Eq4U+9rqFtHN9n3oamPkaEJgu6+VBgBL04kgeibWf6KIkTQ2MHPJJTFDf06 05Pg== X-Gm-Message-State: APjAAAVAD9f863l3rfs+sCW6C2Xx6BbjmtPlm9VNE0hUYCZ30U0bzMgv ydT42HhE1uiT9NQPgVOwL5upSQ== X-Google-Smtp-Source: APXvYqytXWu9kdd/CUBR4p0OTJno6iz9UKk6jl3wSSjP0H4u0r/9I7c5M0YodQuav55WYFkpmZZJWw== X-Received: by 2002:a05:6000:148:: with SMTP id r8mr2070870wrx.210.1559211373322; Thu, 30 May 2019 03:16:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:45 +0100 Message-Id: <20190530101603.22254-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 08/26] .travis.yml: add clang ubsan job X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We document this on our wiki and we might as well catch it in our CI rather than waiting for it to be picked up on merge: https://wiki.qemu.org/Testing#clang_UBSan Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index f0aa37f2d12..2f1658602ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,6 +152,13 @@ matrix: compiler: clang =20 =20 + - env: + - CONFIG=3D"--target-list=3D${MAIN_SOFTMMU_TARGETS} " + compiler: clang + before_script: + - ./configure ${CONFIG} --extra-cflags=3D"-fsanitize=3Dundefined -= Werror" || { cat config.log && exit 1; } + + - env: - CONFIG=3D"--disable-user --target-list-exclude=3D${MAIN_SOFTMMU_= TARGETS}" compiler: clang --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212064; cv=none; d=zoho.com; s=zohoarc; b=mjjHYFSmscXXNFDtajnmMnSTOjrGlfJqjSUVrDzZG6yo6SSKxg0Kemd7A/9vBndWmG0BiyPKWnmLJnswt4bZpiNtWqrLVk8PSmagFsZqkqt8JjzOcmDw6XEM4ged3gvET1/5Lt/ON24RVfJb8frfeNddxUZXQcGTCBp9Y0nEY+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xFNo43YFBlGXQTu9u+IzwiFY7MRIcliAhPyrexXbSw4=; b=UbTHSf17j6MgmvbEffYlJHXYHkh9i/QBNLIGa6gVuZCiDxYRqEMWse0Izdo/UY12AAJXfaXOaRxVT9pLCIj/6yQzPCZKUSDRrHUGqPoR7/k7SzYBvlYxRhwpuGi+j6KoQYY/+ZDVBQDTpViWrLTvjL+zJ9/5r3RHgA3NIdaD+aw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212064470505.79193448967055; Thu, 30 May 2019 03:27:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:50697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIHT-000301-Pg for importer@patchew.org; Thu, 30 May 2019 06:27:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6c-0002f6-EX for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6b-0006aX-Ju for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:18 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6b-0006Zh-Al for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:17 -0400 Received: by mail-wr1-x442.google.com with SMTP id x4so3823154wrt.6 for ; Thu, 30 May 2019 03:16:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j2sm2338652wrx.65.2019.05.30.03.16.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C32581FF99; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=xFNo43YFBlGXQTu9u+IzwiFY7MRIcliAhPyrexXbSw4=; b=aGjwsyhpJaISYkAKaegqef18bmnET9MGNJhLPvwin5OYecXdS5j8OilhPw2iOzIN5Z l6z3sNIxNC4428P1VhbmVEnBu70f5bB/ciSX8L4Y6wz+ICKS0L7wlKJfc5OrQJQteQ2R pezeixNxxn4Ddorw2qlh/wm5Ua+MWZeb56xtNq4Omj+7PQC7NDzPuUpQjRxRfGLOKYPH qoV4JeKcqok3eQp6JUbOMGVJdvlkW3RzUPF6IUS3CBReFtstDKmbTHYN8d6DCVutoV4e FriSvQmJFWux1UiDDtBjrM3ZMB4r+Zw32f8cHmruK2UT53LhMnZIiBMZ1q21N6bYbzhm I2oA== 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=xFNo43YFBlGXQTu9u+IzwiFY7MRIcliAhPyrexXbSw4=; b=h7u91pY74T8omO6V4HSt7ZPr+dIPlxJqZ3qffRA3ew61FvlEnSGBur/mk2earbyDzM QawGoqwZX57MAvAa8spmvADzCyQb51kSrP58ZA4hYyPMT495GIgmw7+SUCVCPCH3QBSj KM5bbQ4g5TrFqcaGQBfb56E1qpVpuyHoayHiWCOKfA6IbOHE3xuw25dZD7j4JSsu4McX /WIVEcJyd6CiZMQskN4ffO9Lm+XkQpMRVBwHJtjuoYzTmJ+PAIdPaiquq1BqXTbiVuNQ rQfKp63H/rt/P6y6qbTuQPK55+4mJn+YQcAdr0ctB5Mh+XxQRU8jhNQl77WmH2KmBNO7 2UJw== X-Gm-Message-State: APjAAAUlhq9QBW7d4cHRVqfsU6sxNhhAheDQ+aCiZ4/w7brKYDjRYf5p 1hGiV1EGStaD9eEJ2gkx9ZhMD/eDK/U= X-Google-Smtp-Source: APXvYqxWfR5ka4YxVTg7uJO60eRpfrpaBivarGhzWUZ0TJGb5+N4KuC+QC3y+EXmq3pTqSIFAltonQ== X-Received: by 2002:a5d:504f:: with SMTP id h15mr2043355wrt.208.1559211376335; Thu, 30 May 2019 03:16:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:46 +0100 Message-Id: <20190530101603.22254-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 09/26] tests/vm: Use python configured on build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Wainer dos Santos Moschetta Changed the vm-test makefile to execute python scripts with the interpreter configured on build. This allows to run vm-test targets properly in Linux distros with Python 3 only support. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190329210804.22121-2-wainersm@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 992d823f6bd..6f82676306d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -35,7 +35,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(SRC_PATH)/tests/vm/Makefile.include @mkdir -p $(IMAGES_DIR) $(call quiet-command, \ - $< \ + $(PYTHON) $< \ $(if $(V)$(DEBUG), --debug) \ --image "$@" \ --force \ @@ -46,7 +46,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ # Build in VM $(IMAGE) vm-build-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \ $(if $(DEBUG), --interactive) \ $(if $(J),--jobs $(J)) \ --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212076; cv=none; d=zoho.com; s=zohoarc; b=mEBKwHit/HR7u1/g5geXOgYBqnNF/CuaAB2MumjDeSG0Pwo38ZV8UnHU2H4MyuKhtLgjzwWFwcQvTQxvsHYAIlFA/UFhKeqKe4ZL1NRtmFmzDELzdTF1bwfYwgPm7jsIa/RV8mfISj+DM1mjfpfaxe2jP58Icwwf3wnxwrrXsVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=VBYJNdKck0NWEjbEOdu/UU5WU/f6QnZI7h23fVKWf28=; b=nTRdiK6eJ+CvgBEXsTTytTGHk92ssPN/+TRMyvIscdDOeeVFFO1BkP650lcocUy9799dqU157G+sUcyPJaa7vbeHHXGLjEgnUEf8+cdljq3aF8c55D6L1BL3QhTe5k/Q8nmXC34ibKFZkNeDRAaUWrjzKb2WJ421qCPbVZzm8CE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212076839648.7836364563279; Thu, 30 May 2019 03:27:56 -0700 (PDT) Received: from localhost ([127.0.0.1]:50699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIHj-0003Dq-Iw for importer@patchew.org; Thu, 30 May 2019 06:27:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6b-0002dd-3r for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6Z-0006Yz-Ng for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:16 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6Z-0006YD-HC for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:15 -0400 Received: by mail-wm1-x341.google.com with SMTP id t5so3468383wmh.3 for ; Thu, 30 May 2019 03:16:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t4sm2364980wmi.41.2019.05.30.03.16.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D623D1FF9A; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=VBYJNdKck0NWEjbEOdu/UU5WU/f6QnZI7h23fVKWf28=; b=L+hNclivWdfxNoKP9Bg5hf2z80o79jIPVIg4SR5HEfYzUFc0vWnf2F0ue9qFLldiEr 4yetA3dJhZqKAfepklZYFmo3CBXUB7GQMX779pmL7qUCq2OcCUO96v41Oj9fYvhfh75d Ir5YciGcITLKee7uQfSBYGC7EIQwgO8+gPNoiH9ppdsNdqLHwm2cP4eUeWREWkMAJWux U34GYK2BWqxf3aWSTlkA5QK/wrGRnVncjLDlbe68dv7XghiQVQyUIatFosPGgYWWpspx aDL9dcVlYmOxUJOHm8ASEM1sR6cZHLV8plAYkZ3hksyqP1csrWrUo8SIg8gRDsIWEW/9 ur7w== 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=VBYJNdKck0NWEjbEOdu/UU5WU/f6QnZI7h23fVKWf28=; b=tZ0jFSZj1rZ/8qDXBfFpoC8VSqKi+amoTlpTRY9Ii58J1dp+iiAdrKRiF9rtMeByLi dmfXZYXYEobVO3dzc23trAVKEWlpnsiljkd+0Nl3zwN8zRFoZK1HgZjUbzCK72Ven7kO 0Z0N9GvZEKwqkRYM1Nvd3bOnzoLLOUR3Ivl66UaTGN6kFdXKVdVs77IHpMwP1tTZKcBF gvBOAjxczYiNlmRcz3sbA5fa2TFmNIaBPpfgMNad2nqAnGpTzpK8+uV3Yxc9J78U0Gac nnhD6EoHocXFbyRnfNCZAxsshmX1r4rEkgYAK+Xoji9gQbkuj2f+/aYPgie2voQrvwi1 1YbQ== X-Gm-Message-State: APjAAAUymBS4Reb/jtuk0Nba8+u+cuXGyo9X9moVRbkWFV4mz9EC8ns0 LSH5LUFgQbZ1YxkwYl9BCyBf8A== X-Google-Smtp-Source: APXvYqwh5uWhkwqzfkXG5uWnOwaQfz//Eyss57ef36H+vxIXMZtK7lvQI5WSB+zFlqczjj0Um/xt0g== X-Received: by 2002:a1c:e3d7:: with SMTP id a206mr1840893wmh.7.1559211374442; Thu, 30 May 2019 03:16:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:47 +0100 Message-Id: <20190530101603.22254-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 10/26] tests/vm: Port basevm to Python 3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Wainer dos Santos Moschetta Fixed tests/vm/basevm.py to run with Python 3: - hashlib.sha1() requires an binary encoded object. - uses floor division ("//") (PEP 238). - decode bytes to unicode when needed. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190329210804.22121-3-wainersm@redhat.com> Signed-off-by: Alex Benn=C3=A9e Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e9..083befce9f5 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -85,12 +85,12 @@ class BaseVM(object): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] - return sha256sum =3D=3D checksum + return sha256sum =3D=3D checksum.decode() =20 cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) - fname =3D os.path.join(cache_dir, hashlib.sha1(url).hexdigest()) + fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdi= gest()) if os.path.exists(fname) and check_sha256sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) @@ -134,7 +134,7 @@ class BaseVM(object): raise NotImplementedError =20 def add_source_dir(self, src_dir): - name =3D "data-" + hashlib.sha1(src_dir).hexdigest()[:5] + name =3D "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5] tarfile =3D os.path.join(self._tmpdir, name + ".tar") logging.debug("Creating archive %s for src_dir dir: %s", tarfile, = src_dir) subprocess.check_call(["./scripts/archive-source.sh", tarfile], @@ -204,7 +204,7 @@ def parse_args(vmcls): =20 def get_default_jobs(): if kvm_available(vmcls.arch): - return multiprocessing.cpu_count() / 2 + return multiprocessing.cpu_count() // 2 else: return 1 =20 --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212241; cv=none; d=zoho.com; s=zohoarc; b=MrvypvMXbbYcTCOvEM13rOUAZhdFAk+OSbfO6O7aG5fa+zFN953lj4/l1CvtaMzkwF+qW0ukaQEgUO2LrrQzps5mol2Z3uAzhF3mHlITP5hAVDIhbBYV7C1jdaRPLsoIAJMbDDhyLENYTfBdRgtoSklaiAJeIQjRj+hqb7xlFRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=DzRVR0ExhRGQxByUv2nr/r2y2wqFk/czcVmFguGzwdY=; b=CLE8WzqsIKrljITQT6oiCsjLPJrumSq9AnlXsfhcy5shte0P/JNR+X3AKVltfsbunSVnVrkxuQGyzcRKpvWp79rCz7xGCo+Uxs0Ta6NS8zJRk8wbGu2aeWzwx2kxBmsgvmiFCFm0JxKX6iSvaqvE+htkgztTgwXNNtWXArww2Xs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212241874839.8516464633639; Thu, 30 May 2019 03:30:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:50731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIKP-0005Wz-Lt for importer@patchew.org; Thu, 30 May 2019 06:30:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6e-0002gc-0B for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6d-0006bi-4V for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:19 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35741) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6c-0006b5-SU for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:19 -0400 Received: by mail-wr1-x442.google.com with SMTP id m3so3829115wrv.2 for ; Thu, 30 May 2019 03:16:18 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f2sm2888915wme.12.2019.05.30.03.16.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:10 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E9E961FF9B; Thu, 30 May 2019 11:16:04 +0100 (BST) 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=DzRVR0ExhRGQxByUv2nr/r2y2wqFk/czcVmFguGzwdY=; b=RdP14LNOerzbqEp1tTroRRiVS7bA7UBC9UFnl1qdwxUFoUTbHJiokmedvonwoFAK9h svvAk61R/y5JcfxyI9ZyDTK/MRqY24Sqgu0JXNeJ0OxcU5DSl/KNWQZ0e6ds3xMNt4u+ RHk2qlNNmDCURKd8lpOeqrtex3kemf54jHZpw6c/Iol5wzzDaj6BT4Iv6ZuwSqL1A1/Z ct4r6deydGD0uezL2mgsr8wD2Uoi9Ez03bU+3kHy52G3uT/uEUYoc3WLlb7Z9ROdhLRb k4q1XFF1wdIXd3szo7nAfz6YVJX+8fwgd0nXDTdOPCL1KEkKzkejhzx7Zz0tT7rq5M8m 9reA== 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=DzRVR0ExhRGQxByUv2nr/r2y2wqFk/czcVmFguGzwdY=; b=agjecLv99QkjPUzYchKT4Tk5k0s8YQ2vqa7sambCtZTLNyjOD/AHvjlscL02r5Zjku LFehZc/Y4vhFFHf/6bEMZeTvp16+tDbOWoNVwSgAt55FuSWOx2DXsWlZSI304ZEISqY1 6WWlzv4droPKhjNE91rePDN5aPVazPQ/L0tUg3SQDJ863bxnTs956J3cflASUA3wKgoX ZqfXpQqyWTACAb8LlZ4mx/JN68vesmiFk2S8DUQWDZNwuF/hKZlNRJw4VTI0sXVkp+dE ZBVsiWB/ug4+xsba7E+Sxnd85PM3tv3vKjix8j1p8wCPYq5tLAOwk6hhPGrOPLJlg7XJ CfBQ== X-Gm-Message-State: APjAAAVbgfViFIVAJFmXQk3W0NbWP/qaojUP7ngrNyyOe+TpqJcpchuO uoMp/MTGb8YZ62CmikDwUpuDBQ== X-Google-Smtp-Source: APXvYqxiVDZNyIeMpJQHDPyfutDG8NqOHk19OMPgk26WtEZBtYdEGT6YG1wFsuPIoeKU0C70u0LpFA== X-Received: by 2002:a5d:694c:: with SMTP id r12mr2152352wrw.214.1559211377929; Thu, 30 May 2019 03:16:17 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:48 +0100 Message-Id: <20190530101603.22254-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 11/26] tests/vm: Fix build-centos docker-based tests run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Wainer dos Santos Moschetta `make vm-build-centos` run docker-based tests on CentOS. The created containers should have network otherwise some tests fail. Also fixed the BUILD_SCRIPT template to correctly evaluate "V=3D1" for verbose output. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190329210804.22121-5-wainersm@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/centos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index ba133ea429a..7417b50af4a 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -26,9 +26,9 @@ class CentosVM(basevm.BaseVM): export SRC_ARCHIVE=3D/dev/vdb; sudo chmod a+r $SRC_ARCHIVE; tar -xf $SRC_ARCHIVE; - make docker-test-block@centos7 V=3D{verbose} J=3D{jobs}; - make docker-test-quick@centos7 V=3D{verbose} J=3D{jobs}; - make docker-test-mingw@fedora V=3D{verbose} J=3D{jobs}; + make docker-test-block@centos7 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-quick@centos7 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def _gen_cloud_init_iso(self): --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211745; cv=none; d=zoho.com; s=zohoarc; b=aheuC0QO+tgti/g8j1FCNObjAxLDXu+BIB1XKr72VY9yhM0NBTPgcyYT9cyYp1VVuY9fsmEopoEWxY+4npTSPXZecKqz/xrZaG6UIN0tJ6e7xBxiCHmA2CTl7cBjdHdFJ73BsiLaj61DpoFBTZiRjgIZyJhEpQkUHhxUE75EG+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211745; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=zHc+QewZiPLzAKrh7Ap5biSxTst0S3+b8dtoVpxzoyo=; b=Hry4VMbsDmUTjGSTn8zDorzuvEa4pPHm/0q26Nlo/zOe8+Q4NSJFhng5Bu0fKDD81oV4ygWMYT82lTsmdtf+YG9cscMuHkqqw/ViJZNAklXboSr0mpZlufD2I4UjfX3MWHpoof7BET5PC0iUvQfONMO6YvCu2FkJdMaLNvHFZJ8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559211745301849.9053971046029; Thu, 30 May 2019 03:22:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:50613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIBw-0006Gg-Iv for importer@patchew.org; Thu, 30 May 2019 06:21:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6d-0002ff-3j for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6c-0006ao-2t for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:19 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:39175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6b-0006aH-Se for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:18 -0400 Received: by mail-wm1-x32a.google.com with SMTP id z23so3459874wma.4 for ; Thu, 30 May 2019 03:16:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h8sm5024657wmf.5.2019.05.30.03.16.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:10 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B85E1FF9C; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=zHc+QewZiPLzAKrh7Ap5biSxTst0S3+b8dtoVpxzoyo=; b=aCUSwaMJHXE+rRG3Ku2QceQq/98HeRQvRONO/R1BIQnVG1jeFIsenqNU2jnpL0T2ZR dJgxHo72vXx71eNWJL6906Jhbtz7kCkBlK5hAr/8OGWlMA8fNT70v3V5LBMjUujpICOt J4Slyk4z+Nss4WmEAqhnOs2e/vGKirgumAUVWCi0rcjG9UUrzD3AKZtGFm3b6qExo9eD T+qWDkaR+ygFV7IjU0Dm0cF0gNRFkPlAXIg43+UfGpGFp5yFBlDf0xtfXKEW+1O8z043 YT06593rCtvOeKfwp9wS1LfhB1wA0oX6wlct4ZPcIN+0uHll2F8LpG+bnbkRmaBtnAZ8 flTw== 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=zHc+QewZiPLzAKrh7Ap5biSxTst0S3+b8dtoVpxzoyo=; b=iU+wpEwofmiGF6KZMcju4eTgyhrPnL1OKKSVkH7lMUrtm20yWE0JWgWTfj75hopztT KCLE1h3eVaacUbl2rXyJjreaiZZnsfnySJ/9ORnDQv2XISWvQXRvURVrcZr+tWIfMGm8 ubjG9RmET8uA+xri7rqgRKgheyGItKPQbj+xyWRQkP44D+43ShH5+9bO/fR/IEo83hFN nlnSsCyWsYxiNRh1+caGKnlf0LfoSCUU9QRtDzGimhs0ADf6xC0Pn6DITctUPAhoD9Sz d0WMMp0kaqxbC48+7SwPtbASHsv3bQgG+Rv4gU2ZTY/zqzeZDTNxO4BEYEBjhICv4cqL YM9Q== X-Gm-Message-State: APjAAAWfI49mGGixaRG7Ut7PSC9TVE/Uaa3ZJdspkH/tzZZMFoHKzkVL CgopxEt8QyffvzgJxE0qH1J98Q== X-Google-Smtp-Source: APXvYqxXVomBiQw3TuXtOTLMLtFFcwzUhA1wgp8lcEVVqIUI4bAYpGBzQjTgJ6/fW0Hb8TOLmkSO/g== X-Received: by 2002:a1c:e109:: with SMTP id y9mr1689806wmg.35.1559211376798; Thu, 30 May 2019 03:16:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:49 +0100 Message-Id: <20190530101603.22254-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PATCH v1 12/26] tests/vm: Add missing variables on help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Wainer dos Santos Moschetta Added description of variables missing on vm-test help. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190329210804.22121-6-wainersm@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/Makefile.include | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 6f82676306d..c59411bee01 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -21,9 +21,13 @@ vm-test: @echo " vm-clean-all - Clean up VM images" @echo @echo "Special variables:" - @echo " BUILD_TARGET=3Dfoo - override the build target" - @echo " TARGET_LIST=3Da,b,c - Override target list in builds." + @echo " BUILD_TARGET=3Dfoo - Override the build target" + @echo " TARGET_LIST=3Da,b,c - Override target list in builds" @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' + @echo " J=3D[0..9]* - Override the -jN parameter for make= commands" + @echo " DEBUG=3D1 - Enable verbose output on host and i= nteractive debugging" + @echo " V=3D1 - Enable verbose ouput on host and guest commands" + @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" =20 vm-build-all: $(addprefix vm-build-, $(IMAGES)) =20 --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212414; cv=none; d=zoho.com; s=zohoarc; b=CC1EPRUklorsDzXRudTromm4PV8erkT9uq9ghUkBFVb5ZVz2ErR37HQFJ8s7llySH9mj181soUvj1tHn/nQOStcda/a2T1Os2FkaifLIbjI2AqREHohJEUNi/74vvjcWNU8JnR5IBYeTuPmIsSr+1IUv80ard4j8Zmlc9KgUsXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212414; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=y2B2y1XQyJxhlxlLqIvvLBXxQCmx4xrmH/BIjlRjWcs=; b=fvUgG+m6wp1wCoz6Mr2qAMrn8+OFoUYGC0wUu2EhML/6EWY13q12mB0elhTaolntun5J+43hf7t2lLuETk6hyaX3TdsN5G5aYqN7Qq79iTBR9yVC633Wc+/3UP/2fpmkamzVMNENgJQXwia1SbTJEycEk/J+CKOo60fJVtX5tLc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212414196711.4295003187704; Thu, 30 May 2019 03:33:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:50859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWINB-00081m-1p for importer@patchew.org; Thu, 30 May 2019 06:33:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6f-0002iD-7u for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6e-0006cZ-2r for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:21 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6d-0006bp-Qi for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:20 -0400 Received: by mail-wr1-x444.google.com with SMTP id x4so3823233wrt.6 for ; Thu, 30 May 2019 03:16:19 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4sm2355995wmo.20.2019.05.30.03.16.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 20DA71FF9D; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=y2B2y1XQyJxhlxlLqIvvLBXxQCmx4xrmH/BIjlRjWcs=; b=f0wR+s4PFVjNDk4AMOB+0UFj5XJN5P3DQ+suNvlR1vlOZFnL/ZdlFwTdxwMLARF6Tr gpbCJkbLz95o0AgRFTltIfiu1vdPzisBn+wo6PNUqvmmm2IDVlZ6u4plFy3sxSzDDcRz Us7bfyFayZm58+kC7y40nKaa9aZ+wvtZe9cn53GsyUpLVMmcq0Dwa4kwI0SViCPy8fNy PwDRUw/YygeIiMlUo4GX13xiafwhWPlS6LljgFWIZNgVGArq5naOngOSj/5qyyRabV2X HGn3Y/+4XzA91bHjENRe9euUc9hHhVvM44ddQX9Jo8ZWJMkMkJz+CA+Q4UPo2cIB4vhm mA7g== 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=y2B2y1XQyJxhlxlLqIvvLBXxQCmx4xrmH/BIjlRjWcs=; b=sVtUe1WaUcxvxrXyujWC57rj/tfdpyM2J4iR0EJUn8c3gM6WYs3YfJ7pfLfhg6AxXo Gg2zU96/j2HBGTbeVdwmXmhz84PHXE8DizuvrjrtRFEmBor4L9JJ4LU5s6fNTYGvhW+a uVjeDKNWGecYDsRiCvQk/xY1UQ7cWwnnE86aDxybE8wQgaCcsrdaffiyyNjybT40KBjW LFNeTR2W5rL3qXVm+WLIXoZlDwtpFyfyI1PqCBRGSkcS73gKtfADMtAZLk6KuTgPNK+I zH5NkGlXaV9SorGQU+l6xAopXAKD3rIzgg95dhvyoG1yADwX3Ofoqn2B6W6kCwr0QF5r bIDw== X-Gm-Message-State: APjAAAXtMJRgb+A51GJUB6R7YLimQdUY3W1qej7nUN5ag+eDA3gXJcZ+ NYtll63b243Wf7+wlVn+4Cz7y49DxHA= X-Google-Smtp-Source: APXvYqz1kHYFpJlkWKPIPHy8MV5oBerdGUwyhZy8vFS5nefHZMDqwx7gUHGry4D8qbXDHwbJ7ioe/w== X-Received: by 2002:a5d:51cf:: with SMTP id n15mr958810wrv.216.1559211378693; Thu, 30 May 2019 03:16:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:50 +0100 Message-Id: <20190530101603.22254-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 13/26] scripts: use git archive in archive-source X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Use git archive to create tarballs of qemu and submodules instead of cloning the repository and the submodules. This is a order of magnitude faster because it doesn't fetch the submodules from the internet each time the script runs. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-2-kraxel@redhat.com> [AJB: fixed up tabs] Signed-off-by: Alex Benn=C3=A9e --- scripts/archive-source.sh | 72 +++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 8b899482600..ca94e49978f 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -19,16 +19,25 @@ if test $# -lt 1; then fi =20 tar_file=3D$(realpath "$1") -list_file=3D"${tar_file}.list" -vroot_dir=3D"${tar_file}.vroot" +sub_tdir=3D$(mktemp -d "${tar_file%.tar}.sub.XXXXXXXX") +sub_file=3D"${sub_tdir}/submodule.tar" =20 # We want a predictable list of submodules for builds, that is # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. submodules=3D"dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 test= s/fp/berkeley-testfloat-3" +sub_deinit=3D"" =20 -trap "status=3D$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 = 1 2 3 15 +function cleanup() { + local status=3D$? + rm -rf "$sub_tdir" + if test "$sub_deinit" !=3D ""; then + git submodule deinit $sub_deinit + fi + exit $status +} +trap "cleanup" 0 1 2 3 15 =20 if git diff-index --quiet HEAD -- &>/dev/null then @@ -36,45 +45,26 @@ then else HEAD=3D$(git stash create) fi -git clone --shared . "$vroot_dir" -test $? -ne 0 && error "failed to clone into '$vroot_dir'" -for sm in $submodules; do - if test -d "$sm/.git" - then - git clone --shared "$sm" "$vroot_dir/$sm" - test $? -ne 0 && error "failed to clone submodule $sm" - fi -done - -cd "$vroot_dir" -test $? -ne 0 && error "failed to change into '$vroot_dir'" - -git checkout $HEAD -test $? -ne 0 && error "failed to checkout $HEAD revision" =20 +git archive --format tar $HEAD > "$tar_file" +test $? -ne 0 && error "failed to archive qemu" for sm in $submodules; do - git submodule update --init $sm - test $? -ne 0 && error "failed to init submodule $sm" + status=3D"$(git submodule status "$sm")" + smhash=3D"${status#[ +-]}" + smhash=3D"${smhash%% *}" + case "$status" in + -*) + sub_deinit=3D"$sub_deinit $sm" + git submodule update --init "$sm" + test $? -ne 0 && error "failed to update submodule $sm" + ;; + +*) + echo "WARNING: submodule $sm is out of sync" + ;; + esac + (cd $sm; git archive --format tar --prefix "$sm/" $smhash) > "$sub_fil= e" + test $? -ne 0 && error "failed to archive submodule $sm ($smhash)" + tar --concatenate --file "$tar_file" "$sub_file" + test $? -ne 0 && error "failed append submodule $sm to $tar_file" done - -if test -n "$submodules"; then - { - git ls-files || error "git ls-files failed" - for sm in $submodules; do - (cd $sm; git ls-files) | sed "s:^:$sm/:" - if test "${PIPESTATUS[*]}" !=3D "0 0"; then - error "git ls-files in submodule $sm failed" - fi - done - } | grep -x -v $(for sm in $submodules; do echo "-e $sm"; done) > "$li= st_file" -else - git ls-files > "$list_file" -fi - -if test $? -ne 0; then - error "failed to generate list file" -fi - -tar -cf "$tar_file" -T "$list_file" || error "failed to create tar file" - exit 0 --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212093; cv=none; d=zoho.com; s=zohoarc; b=Z/MuqhD5obu/B1AwGj7HhT48iGz1N/HkCJ/ObpEqkW+Rd1Pzuw3dVykgbNdRy5lG/sjAhkltxAcUXGe0smDoX4diUdv5Km7BUunY/SXVdBu0+HdzVJAxj33bHJxHdqkIuGadH2zEdyHq0CTyVQBb3H/j/Iw7bXpBpPMzDZNEm4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212093; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cCiZUh4L2IhfBkOcPLSzMZiMaGor1Q+neTC7jHeJYrM=; b=aUZMx4QDNI4yrFSCRU0bS6Ad2y3u2g5NmxywOXxsvlG0bje1qg0STE4Es5vdW/+F3AfAmfLvYxmyTNWTXkBIxBqwrcRpML7R7gydGaXN8eQr7aojNd9EI75TCz30oPMOeyNoLbgdbOn0sCfq82AkEKCYEgueO9yOpjBJvAqs7Sw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212093102787.9936677812569; Thu, 30 May 2019 03:28:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:50695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIHT-0002zt-B9 for importer@patchew.org; Thu, 30 May 2019 06:27:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFE-0001EL-Ez for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFC-0000Gq-VK for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:12 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:35939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFC-00004y-NL for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:10 -0400 Received: by mail-wm1-x344.google.com with SMTP id v22so3489000wml.1 for ; Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h90sm7115328wrh.15.2019.05.30.03.25.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:00 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 351D61FF9E; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=cCiZUh4L2IhfBkOcPLSzMZiMaGor1Q+neTC7jHeJYrM=; b=O56u2QoNY9oNO8vrbzs8wgl/wHsOmo9d5QufBecCQecm5KrjpChZR3S2U7kgXObvfR rMGKqnjBJDmXRpIpAAHwYH2npDiBOs+ww7v6n/xpA/w+k/2zHoNaVlAxe4r+vkPCpbZT egN9fcGcBhC6WYjYAho8ZG25WTGl+0tDYvpAPuKlLy1WoRSKbKVWLTMgneANYbWeJaZ+ yEyocS1D8ySUvO9vg3e3Mr7yYZTA56aIbP++3TJxDfxW5HzAhfITUHt9PF03YUxRCh49 6Yum5wjefv8ofdDmhH8eU91vKlO/NpuAJ6OtN16fB3nS036HoI5C2APU4XBgsbSbF4J0 eyPw== 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=cCiZUh4L2IhfBkOcPLSzMZiMaGor1Q+neTC7jHeJYrM=; b=eOtnPpI4G2qVVXcF1pkmq8V2jrXskSeDDm6E/vvwSpc1Umhh2oQXqQ3BPJt07CuDKf 6+ih07BEiHtGz4dS9HW0vLxHkvlqMyVK6t1alU6UMiv0Ta9S+sAfvdlJ42D3zeqcp73y EmEcwBuss4d+RxaYJ8O07ZXOlJ4yNVviiKjUhkKwkrff/KZu6ggW2S2qUnZ9tdK4H0YM If1/dLSdmgeBDVOKXGxUzBwRp/KDblvn8JO7hus0ji99PaqM1k+6hdA3lme4hiC4vIM1 fzcYrQe5Bb9WNDJuBCzm1lYTtlLiqxmImmEePacxpWl6OE9cojZBVg2bEwYK6kVM+vFB yPQw== X-Gm-Message-State: APjAAAUPppNzAiJLiIZZIP+W2zOR1RTm7jJOipj4wHFmBdTdFeiY1EkI 5fMyOqqxq23WuymbMisK8sGQ+Q== X-Google-Smtp-Source: APXvYqzqGGBcw7DFlPv+otwQ0w3RiZKgcp8+SLyvczVN3qOKx/Avebiidsp25pQR1it9FVAZvTuIWg== X-Received: by 2002:a05:600c:c4:: with SMTP id u4mr1809023wmm.96.1559211902477; Thu, 30 May 2019 03:25:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:51 +0100 Message-Id: <20190530101603.22254-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 14/26] tests/vm: python3 fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Add proper unicode handling when processing strings. Also need to explicitly say we want int not float. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-3-kraxel@redhat.com> [AJB: fix conflicts with tests/vm: Port basevm to Python 3] Signed-off-by: Alex Benn=C3=A9e --- tests/vm/basevm.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 083befce9f5..4847549592d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -73,7 +73,7 @@ class BaseVM(object): "-vnc", "127.0.0.1:0,to=3D20", "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] if vcpus and vcpus > 1: - self._args +=3D ["-smp", str(vcpus)] + self._args +=3D ["-smp", "%d" % vcpus] if kvm_available(self.arch): self._args +=3D ["-enable-kvm"] else: @@ -85,12 +85,13 @@ class BaseVM(object): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] - return sha256sum =3D=3D checksum.decode() + return sha256sum =3D=3D checksum.decode("utf-8") =20 cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) - fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdi= gest()) + fname =3D os.path.join(cache_dir, + hashlib.sha1(url.encode("utf-8")).hexdigest()) if os.path.exists(fname) and check_sha256sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) @@ -134,7 +135,7 @@ class BaseVM(object): raise NotImplementedError =20 def add_source_dir(self, src_dir): - name =3D "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5] + name =3D "data-" + hashlib.sha1(src_dir.encode("utf-8")).hexdigest= ()[:5] tarfile =3D os.path.join(self._tmpdir, name + ".tar") logging.debug("Creating archive %s for src_dir dir: %s", tarfile, = src_dir) subprocess.check_call(["./scripts/archive-source.sh", tarfile], @@ -256,7 +257,7 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd =3D [vm.BUILD_SCRIPT.format( configure_opts =3D " ".join(argv), - jobs=3Dargs.jobs, + jobs=3Dint(args.jobs), target=3Dargs.build_target, verbose =3D "V=3D1" if args.verbose else "")] else: --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212225; cv=none; d=zoho.com; s=zohoarc; b=DQrYf5r7HK4JWgVm52ChsExbFrgmfCNungxVuWw1qOiLGueyve8nEeXSHHxqupRjNt2YEWJ6AA13jSb4iK19Il1ZJ66PuVi6z8BHvk1Xvy/zja2HVSciAM7647lkhIKQ1nk8srHjDuYKlQd3/uTc4wJq76wK0u/XxsJHYgSsQuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212225; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tKMybXLMRDSBfHxe/ATk9ylSYfLE+dz7XRu9VYKxKSs=; b=EoSH+Ha6v+EPaOAoygwUW1dB3kDoFD8T+hCLrKGTA0anQVwaD2WnHGyKrSB2+scrTkHBotgy3tYPTAzvFy5oa/8eTZ/pL1nxv8EDW8ip7X1M1kPhZ+g7FR71Ut2SjZhowhwYupcbBbKS/cTSC11Aub3AoKCGF8qDIQoMKGahn5Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155921222557832.61497684451888; Thu, 30 May 2019 03:30:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:50728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIKD-0005Kk-8n for importer@patchew.org; Thu, 30 May 2019 06:30:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFE-0001EH-BS for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFC-0000GS-TQ for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:12 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFB-00007H-RY for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:10 -0400 Received: by mail-wm1-x342.google.com with SMTP id c6so564940wml.0 for ; Thu, 30 May 2019 03:25:06 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s8sm2386491wra.55.2019.05.30.03.25.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4A9231FF9F; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=tKMybXLMRDSBfHxe/ATk9ylSYfLE+dz7XRu9VYKxKSs=; b=tXn3mjEuMwSRnFRjLzCtDSFvdXivMZdk2BXVccr37weXGO8Odahf4ImzjpoAsiXLzn kkma9tEZYI9TF3sQXR4Fg0k/wGJSp77b/35eiUoaF9M772SUBet2i7JPLq3iiWnIstif veJ+LM7K3S2kFAap0cW/qKP816kRQIW4RV+n6ajayUFeJc605EJT77+5fSLwjTRVQHM0 ZoM156VcLNCEm0ZMmysjcbxW3GZvvtGK/JswnpQFeKLSChdncboL/pHRBihAZ4wfN93m MFVBTC6FNZwS2/B9lE8novrMxwtCDPnBhxaj1Pc/1CRU1xPusDnx0VHHH07La+x8Nhqm PFGA== 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=tKMybXLMRDSBfHxe/ATk9ylSYfLE+dz7XRu9VYKxKSs=; b=MF6nCG9gLfvn2jfBDdQfop/nP+boDLelgnYapx0nU77dsTnMwXa7vSFfV4Seo5AO/p Yfr7xZsk1i/7i5eDLTNfe/qaZsTW32DsTWvLIfSZBQ163IbP1X2EoZmr3kGuo5+/wPOb B9RGeicn+mLu05fip0dZqvDmhq5wCaab57UML+mfO0OKj1LQDw5gResM2Ep86UZl/r/I +z6Jkrzeg6kiF3DgMk175pA0I0nM+t2aNtuS3I57bwENzaPfY7NX5OB7br2fuvhsB3tw kysSqPO0me4/PNDF4drf19TylXu0t9ag7y2+MPv4aiNFJzWncXOLMxbiATMyWifg0wzn HsrA== X-Gm-Message-State: APjAAAUrsj8pR4kke1J93gen5hJyyWzc4ECM3fxNZ+4CS5GrO1M2+AUr BShXzLYBqMQrJeXmz8MPuasTNw== X-Google-Smtp-Source: APXvYqwqXsyY5KPJicZ1i1D436y1KKJmly/46fes3q8WvEDwBVaaHQeBQqAD3fVME+36Y6hUamq3aA== X-Received: by 2002:a7b:c043:: with SMTP id u3mr1259501wmc.56.1559211905274; Thu, 30 May 2019 03:25:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:52 +0100 Message-Id: <20190530101603.22254-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 15/26] tests/vm: send proxy environment variables over ssh X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Packages are fetched via proxy that way, if configured on the host. That might be required to pass firewalls, and it allows to route package downloads through a caching proxy server. Needs AcceptEnv setup in sshd_config on the guest side to work. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Thomas Huth Message-Id: <20190520124716.30472-4-kraxel@redhat.com> --- tests/vm/basevm.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4847549592d..5e30bac6615 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -38,6 +38,13 @@ class BaseVM(object): GUEST_PASS =3D "qemupass" ROOT_PASS =3D "qemupass" =20 + envvars =3D [ + "https_proxy", + "http_proxy", + "ftp_proxy", + "no_proxy", + ] + # The script to run in the guest that builds QEMU BUILD_SCRIPT =3D "" # The guest name, to be overridden by subclasses @@ -106,6 +113,8 @@ class BaseVM(object): "-o", "UserKnownHostsFile=3D" + os.devnull, "-o", "ConnectTimeout=3D1", "-p", self.ssh_port, "-i", self._ssh_key_file] + for var in self.envvars: + ssh_cmd +=3D ['-o', "SendEnv=3D%s" % var ] if interactive: ssh_cmd +=3D ['-t'] assert not isinstance(cmd, str) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212544; cv=none; d=zoho.com; s=zohoarc; b=HzfxJ1bHEEf7/vd3pSyO8hUoXztAvZEb/9tS3sJ9co9k0w6jmlvduKeN11jDWOjyIt7edZ7pd9XAhmregWN/BOCoIPmM7DnbJYcQfCjw0yZdnmZFs6diitOrwbUlt+NUfuVHTmaKUDvwBLeD+MbHU8bt6l/CjiDoBXxV7Iu9hLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212544; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9J8E5pdedqRlrr8v2PQK1sYVyobiXRzGN2v10P6ZPKk=; b=R7jCB8rb3Pfz9L6lhDUu6GGZBq8R9IfHqk6QfgdM8fJ5NpA+CLbNs46VfVFjTo8aijM03DdKOUdw0TI6lA2a5IFQJoNTbq5a+GLhI3ASRFCmFoYcthsWxjbI3mK3G8v/3Nj1/rvSXdWe3cFPjldAV/7CIdHecvXNtpm+i4XFJZQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212544348170.2907142332159; Thu, 30 May 2019 03:35:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:50949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIPF-0000rj-AP for importer@patchew.org; Thu, 30 May 2019 06:35:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6g-0002jI-5c for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6f-0006dY-6O for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:22 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44681) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6e-0006ct-VY for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:21 -0400 Received: by mail-wr1-x442.google.com with SMTP id w13so3790631wru.11 for ; Thu, 30 May 2019 03:16:20 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 32sm5445495wra.35.2019.05.30.03.16.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5FEA81FFA3; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=9J8E5pdedqRlrr8v2PQK1sYVyobiXRzGN2v10P6ZPKk=; b=tMhGNvsXWK1d8mDUvvdqV7C9zC2/n+/THau0y1371lKEvNRNUKDZUQ9Cy6q6uSZWKj FVByZuJI+k8nOrf4FKdJNo/EyKYe6cEq2n3IxVL+an7Xm2/XiL1P1crZWLRi00Y5ALyT YGV7zudJQnKsGm1UTeY/vTNo4vS6yjdvtaEhU3miGYxqjF591oU/ZJOsxOsglfUgsAT2 zD86++d3933l0kQQbth+3eJu2ciEiK0DOXZSkUwiP9gF0b6YITdfb5LDbL9cNxefD3B1 LeDt2h6ZKgafBJR7oinzDcEhX9cejKyWtlnnpYVFNh8+zKwJhMgOigVK+6UMvMNpyqs2 7oHA== 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=9J8E5pdedqRlrr8v2PQK1sYVyobiXRzGN2v10P6ZPKk=; b=tqHgcfXcWrDZf2I1MWMkuqMlyfvzfT3Qqsfoks+jswxS665ljsLM6ZKuyxxbRZLy2H Q6uOMT9IMzlVR9aWYfeSxMQCQPLMmqcsiLnSVR+B/Rtd1Vie4/KKoqNDPxqVPncA0UWH RohbBrMQ9bLMHksI+PKKL5k/7VepWq+Sa1MnhLH5AhNSOcMGwjQIt3OTTp+7Ce1pZtty E/4ExAzyiPiEWUqo3QiabTIC12gQk5k/B5AZB897FEuKyHjrbhKzhDY9E96vtBF+jLMb oLA2fgYXg3UopHYd++n6uOt1fxyjagU5UQutHycPnxCVBwap+cvox5iL/kme1kfA37Ix XBtg== X-Gm-Message-State: APjAAAXPaIZCJVLHuWrg5uA0W0oMqYbIzsVoEQY09WY40A+cV1zTEI7G bx/bwECL7wsPSMCfsFy2NYZLJDeqAGM= X-Google-Smtp-Source: APXvYqzjUiVGwtR65OWMLZfXyQsukgAjM//aQXBTnaXw6SiRdYXtnASARs3JV9AaNGQpL+I3sVxmiQ== X-Received: by 2002:a5d:638a:: with SMTP id p10mr2048522wru.273.1559211379486; Thu, 30 May 2019 03:16:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:53 +0100 Message-Id: <20190530101603.22254-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 16/26] tests/vm: use ssh with pty unconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Allways ask ssh to run with a pseudo terminal. Not having a terminal causes problems now and then. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-5-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/basevm.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5e30bac6615..395eefaec94 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -107,16 +107,14 @@ class BaseVM(object): os.rename(fname + ".download", fname) return fname =20 - def _ssh_do(self, user, cmd, check, interactive=3DFalse): - ssh_cmd =3D ["ssh", "-q", + def _ssh_do(self, user, cmd, check): + ssh_cmd =3D ["ssh", "-q", "-t", "-o", "StrictHostKeyChecking=3Dno", "-o", "UserKnownHostsFile=3D" + os.devnull, "-o", "ConnectTimeout=3D1", "-p", self.ssh_port, "-i", self._ssh_key_file] for var in self.envvars: ssh_cmd +=3D ['-o', "SendEnv=3D%s" % var ] - if interactive: - ssh_cmd +=3D ['-t'] assert not isinstance(cmd, str) ssh_cmd +=3D ["%s@127.0.0.1" % user] + list(cmd) logging.debug("ssh_cmd: %s", " ".join(ssh_cmd)) @@ -128,9 +126,6 @@ class BaseVM(object): def ssh(self, *cmd): return self._ssh_do(self.GUEST_USER, cmd, False) =20 - def ssh_interactive(self, *cmd): - return self._ssh_do(self.GUEST_USER, cmd, False, True) - def ssh_root(self, *cmd): return self._ssh_do("root", cmd, False) =20 @@ -284,9 +279,9 @@ def main(vmcls): return 2 =20 if args.interactive: - if vm.ssh_interactive(*cmd) =3D=3D 0: + if vm.ssh(*cmd) =3D=3D 0: return 0 - vm.ssh_interactive() + vm.ssh() return 3 else: if vm.ssh(*cmd) !=3D 0: --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212225; cv=none; d=zoho.com; s=zohoarc; b=kbMfzYXwyCPGxyRih49qyIk0opsuUlt7JuDbXyy7uE3pnn2VZ4rZndQptuvalEBozVQ+GGSOCGwlkevjyHNbzvG6rrFk7UScqe5ciU/Tf6UcIE2Dpvju5ANLu3M4mPBkdiUfZzNoAQyEd7IHMT5h7Mx1IbXVyruPPHY+vzx9eLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212225; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=f1LzSCynUI6fUnn106lFa25PqYUY/YDKYZafY8tD3Yg=; b=oi9X/wz9jzq2Xikgzvx3lHE+75sXr7DC2ur8vyR6n4v41bUqY76ioq4x2YWk5n7cJcCXaNLy0QABqhXOS5KA/nZT+Y+ncf8jk2da/RgBvR4zJD3/thn/1SseuE/1ZABFAFlmjAOpmzCkdxaKBWfwBIK71ugdtgy9XqZW8uzKQ9A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212225575567.6592756591947; Thu, 30 May 2019 03:30:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:50725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIK9-0005IE-HF for importer@patchew.org; Thu, 30 May 2019 06:30:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFG-0001Ej-AL for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000Iz-Tj for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:55521) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFD-0000BY-Dj for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wm1-x334.google.com with SMTP id u78so3603731wmu.5 for ; Thu, 30 May 2019 03:25:09 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y132sm3811044wmd.35.2019.05.30.03.25.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:07 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7428F1FFA5; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=f1LzSCynUI6fUnn106lFa25PqYUY/YDKYZafY8tD3Yg=; b=tL38zyF0BhsVozr95jh31CUABlgftio1pK336oAi9rr4l0aYWXBMCRVE71Me+u9AFH P9e9Vp4KmdyIwYL8cCKyOAcI/hAaWOYrVGuobcQTne+YKUrgZcWW5Y3P06h5ac3Yi+en 4oqpF7I3hqnebO5BEB/ZYox1iTnwUottJWXpzo2frLimSFkxRnZO61mdCk2Bd1aB11Ja s7/yzCHbglYed+bUTxnOG5fwIMXdKJqL6+8jbcm4BoPT6vW16dHfPPB8oDstVtq6iHH+ MmYzwlsf7zU4Cur692GcnUitumsTfCfeyhjKRGm6HI62SewUdMaZ7DM2Hrx7/iJUqydU N9Aw== 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=f1LzSCynUI6fUnn106lFa25PqYUY/YDKYZafY8tD3Yg=; b=Z6jUofCJHWm6ljlyCLi08DlyftFQ6l1r/9pwHIFL1xnWnI5Acdqjz55+dHIFODVrgV jU9Q1DCitapF2ceUR3l+UqSbRyIpxim4YCJfCWQxdGmD981tLzth/OcanBsKiOhkWcBh cm9+oSIjLmN72ywurU7c9T2ElXSJj9amNFqw5ZdINhuHPfDGY9o9gWSnD9JOP2kgIUkq nBENMsi3U9m739mtPEWPQBH09jDqCips/krjiR1/BqYXrpFGpt9ckkEU1Sfr3oxqwnMQ EqXXh4NIjurdqCYKjsnH2N3Zc0rCwaGmbJ/9deDWb/JJbVourWpTwaIEljxeSP3C6+sc 35yA== X-Gm-Message-State: APjAAAUuA8eK6BiVbVilCCNA1HSBxPLKjhTCEXpWvbgTF58jpvkvYMBv io1GF+Nii+SCTRNQiXhzUDXh3w== X-Google-Smtp-Source: APXvYqzyZLa5HM3V3vBkGjUkCfCmt/DZglm6u6rTjZMbugLlBdvsqGk2ozyKeZb2hAHwmPCUWn/k9w== X-Received: by 2002:a1c:7510:: with SMTP id o16mr1893664wmc.154.1559211908713; Thu, 30 May 2019 03:25:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:54 +0100 Message-Id: <20190530101603.22254-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH v1 17/26] tests/vm: run test builds on snapshot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , Ed Maste , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann The build script doesn't shutdown the guest VMs properly, which results in filesystem corruption and guest boot failures sooner or later. Use the --snapshot to run builds on a snapshot, That way killing the VM doesn't corrupt the base image. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Ed Maste Message-Id: <20190520124716.30472-6-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index c59411bee01..276b870216c 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -57,6 +57,7 @@ vm-build-%: $(IMAGES_DIR)/%.img $(if $(V),--verbose) \ --image "$<" \ $(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \ + --snapshot \ --build-qemu $(SRC_PATH) -- \ $(if $(TARGET_LIST),--target-list=3D$(TARGET_LIST)) \ $(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \ --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212655; cv=none; d=zoho.com; s=zohoarc; b=lB/zJZADQMQrZXLcHQ7LPi0hoBCMvjO7KcBZ30/hPK40a8DvuX24kpIxhuE63wVh/SGgF+bu+LzA3LE8udFsQRmVfv5znXT6XPDiTn7WDMlWfl6j3tZF3OVILtfTpsEwX/nVKqDkMOlDFsFkkU0/+cn1bMfUGU0v0vQ6D47jdOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212655; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9uHkcMcsE9fyEwD5PKdvI++8JESJlTBOyqyYuFuuSZE=; b=QCGLQrXIjzwF30AKGV883Dz7HsJt0Kceq9gu7927rgDZYl6/P0tN6bSP4YSqU/KQbRYFxm6eUtkKUb/fZLj6p8ryDqgvMlOzUaPHSpquoOqKVHb5xBEKkyYTxaURWEEt61k/FM0GjN4p8t8Ki7zFaz+K3GDXFMdSXVA0gFwg11s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212655618605.3238070008334; Thu, 30 May 2019 03:37:35 -0700 (PDT) Received: from localhost ([127.0.0.1]:51034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIR6-0002St-Kl for importer@patchew.org; Thu, 30 May 2019 06:37:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6g-0002js-OO for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6f-0006eO-RV for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:22 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:39180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6f-0006dD-K0 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:21 -0400 Received: by mail-wm1-x32f.google.com with SMTP id z23so3460006wma.4 for ; Thu, 30 May 2019 03:16:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h90sm7066459wrh.15.2019.05.30.03.16.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:18 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 86F201FFA6; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=9uHkcMcsE9fyEwD5PKdvI++8JESJlTBOyqyYuFuuSZE=; b=X1sEQNqZbd4mlCH6UlYXnKT8C5RngBph4LPyHKT0/zM7GR4nhpA75kDAL+Hms7IWCA LrOnEJ6LlbWNxqgyqqvyfyS2/DFzGpTD1PA4kWiA9DwJ46B76SBNb/1v6vjcyaQHzYS1 70Rc20sQy7y0EIWNLUDJ0nszdSw27mARIMVgSlLx/ZOeJf8KD8iL+SRmDLIwGRyqruo5 761cw5G/Kgaqx8qOr64v3MwwQblCnwTZi7qcV0qncZjr8L8NH2dxfySxr2jkLKwKh3Gt fEAoYbVu3zuixIMvgWGbsmPtQxil7MHDQ007hkIclLv10jqDwD6W0r8TAxpCg+b1YFqI u7Wg== 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=9uHkcMcsE9fyEwD5PKdvI++8JESJlTBOyqyYuFuuSZE=; b=ngmkxG520l0WXvNZPhQuljcQeEzK0m84pEj1xkT3ttreFNj+rMIuB3UlE1vqurexmr huVN9QpVtd1tHPtNCSOWOgk+XQo9+59Ggq+8tBGtm99BKcyw63OCWdqCB0zDmcJurCpg RJHtuvhEbRq6VLC36n8Q3MWdo3C6wTu8ahu6oTcK1qsI8AUt4ny6xBpsTD16brWkxvHl u9mFmxDe//BBswa3Ud4ANcv/oVcmL/4XeWhMgNt0yRtljUOTFqX9yybxDaocMYtz+gHJ HCh+e5r6euQGaaxY81iFtS9v5D0AL8dlYZGalzMvjXPVNuJjfXijMHDQPat2r2srBN+B TMxg== X-Gm-Message-State: APjAAAXyoLA/UxeZCz8mb3P9HsKEe6o5DFbytfLIDDLDzDNo/VVts30c cLEh1+ul7TZOEpQj1uyHhrjjlA== X-Google-Smtp-Source: APXvYqyIkMhQYYZ0CApOcZbBcjaNPMmTg9qio/noONhXDjVQsco7L5f9nddIuw1x9kixtBGT+qikNg== X-Received: by 2002:a1c:6154:: with SMTP id v81mr1648078wmb.92.1559211380553; Thu, 30 May 2019 03:16:20 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:55 +0100 Message-Id: <20190530101603.22254-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PATCH v1 18/26] tests/vm: proper guest shutdown X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann When not running in snapshot mode ask the guest to poweroff and wait for this to finish instead of simply quitting qemu, so the guest can flush pending updates to disk. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-7-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/basevm.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 395eefaec94..f27178f3c7c 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -51,6 +51,8 @@ class BaseVM(object): name =3D "#base" # The guest architecture, to be overridden by subclasses arch =3D "#arch" + # command to halt the guest, can be overridden by subclasses + poweroff =3D "poweroff" def __init__(self, debug=3DFalse, vcpus=3DNone): self._guest =3D None self._tmpdir =3D os.path.realpath(tempfile.mkdtemp(prefix=3D"vm-te= st-", @@ -202,6 +204,10 @@ class BaseVM(object): def wait(self): self._guest.wait() =20 + def graceful_shutdown(self): + self.ssh_root(self.poweroff) + self._guest.wait() + def qmp(self, *args, **kwargs): return self._guest.qmp(*args, **kwargs) =20 @@ -278,11 +284,13 @@ def main(vmcls): traceback.print_exc() return 2 =20 - if args.interactive: - if vm.ssh(*cmd) =3D=3D 0: - return 0 + exitcode =3D 0 + if vm.ssh(*cmd) !=3D 0: + exitcode =3D 3 + if exitcode !=3D 0 and args.interactive: vm.ssh() - return 3 - else: - if vm.ssh(*cmd) !=3D 0: - return 3 + + if not args.snapshot: + vm.graceful_shutdown() + + return exitcode --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212825; cv=none; d=zoho.com; s=zohoarc; b=POtRDMLI/7ymDRBNbARdJupFYTDkdHdETPnjEoBK/rUOFZ417FeymQrcWo+phqOU+kNk0pJIfSy/MelwhHKwuJIFD1nhMq/lgPxhhNQ3ZipN7BsCnGSJusLh9gXFcw27LaW6Idje+iTO7/SPlwVnvVkKcgmmL9xwsoZi3RzYads= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212825; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=pxbSV5w1/gsrwx8qszzFPSyV1J05+UPofdUUztDCX0k=; b=Quag4tdLlRPrxNli5I+P3WIpROnXAGu5ezLQHtVIgQvSfk81qzP8vnCbboKHZiEdYNVG7FtT1h1SCVfgP2jJEl7kxww222J/nTsUyQlaI3B3Z0OMSVEAkHC+CjoQ4GuwEhM5RWiAtvP/9veRD3v98LlkuqmqPQfNVgdx1bVB5xQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212825062361.7712730202966; Thu, 30 May 2019 03:40:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:51214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWITn-00041V-2U for importer@patchew.org; Thu, 30 May 2019 06:40:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFF-0001Ef-WE for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000Il-QB for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:13 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFD-0008WJ-CD for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wr1-x42b.google.com with SMTP id w13so3809897wru.11 for ; Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q17sm1492690wrx.74.2019.05.30.03.25.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:00 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9AA201FFA9; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=pxbSV5w1/gsrwx8qszzFPSyV1J05+UPofdUUztDCX0k=; b=Z92u7mgnl/2wSQgta1S1HUVwByky2RwKi/PW9uUGu52frrFQGVyjBMxZwtJvdtYstb OJEfmgTGSMDZpwEzwH9G6WI6paDYJH9QWg7E85jOu4W3ABn20f6W45x66ZusQWk+M6Z4 CfYS1CTr09figWeaFQUdxG6KsZbNK06ueNRrGc0wgu92QherBU7TQ6Ouz2R6NAbpu2KZ 3SKeVVNVuyVltpKZapFUYKSvcyO9NGgJROivdwBqWVLc/R4pJy4kJL3OGTWuBsEJEC+H blL5E04yAWXt1aw8QRRJZT4RzEDE1h6X38OU04THCqlrgjoUQdTXtWzg1XCwov3k/yik /IPQ== 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=pxbSV5w1/gsrwx8qszzFPSyV1J05+UPofdUUztDCX0k=; b=L+JOBHg6Xk0gBYS53KEO9Y1mzirwrXX4j7c41snolo74ctfG1nUfZ6sSVpJkTz0MfD lZDtjPANLMjUBrGHnqofCcFbX9ihfTLWS14Xb+rgpsc0xXizzFFIRkwWBn1ONdns6PGg xDXv1Ejqvc4UMb44idH30L6aErOzoTvDzc7A4FLdrO+1c5CJjl0j2eQipDoTsDU96JJU NrJD17CyDruRM8h+0ES/Gdd2TNhlzcTDOAPEhdiB34AT1bfiDBjshj2mJvEfG3SZqP64 gtf/VEiJ112/wlaL602RoJ9hp7NwoeYtue0o86Mxwr5FKtxmrJmwU8JANRdEtRSovGvR MtwA== X-Gm-Message-State: APjAAAW41oRYxM5AStV9eLZLiGc+S/ylRftj/sczNhgbPD43G4wmvve1 VaG3S+c6F0CgBLMriOe+lKwKVQ== X-Google-Smtp-Source: APXvYqxa2oWhUCl3s1Ssa/aWp0U26++d3BrRisemenNA9JV6StUszD+mwpPFXd5FR1dvM+AU0cFMyw== X-Received: by 2002:adf:afd0:: with SMTP id y16mr2141025wrd.22.1559211901966; Thu, 30 May 2019 03:25:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:56 +0100 Message-Id: <20190530101603.22254-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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] [PATCH v1 19/26] tests/vm: add vm-boot-{ssh, serial}- targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-8-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 276b870216c..e329129bd65 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=3Dfoo - Override the build target" @echo " TARGET_LIST=3Da,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 $*") =20 +vm-boot-serial-%: $(IMAGES_DIR)/%.img + qemu-system-x86_64 -enable-kvm -m 4G -smp 2 -nographic \ + -drive if=3Dnone,id=3Dvblk,cache=3Dwriteback,file=3D"$<" \ + -netdev user,id=3Dvnet \ + -device virtio-blk-pci,drive=3Dvblk \ + -device virtio-net-pci,netdev=3Dvnet \ + || true + +vm-boot-ssh-%: $(IMAGES_DIR)/%.img + $(call quiet-command, \ + $(SRC_PATH)/tests/vm/$* \ + --image "$<" \ + --interactive \ + false, \ + " VM-BOOT-SSH $*") --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212124; cv=none; d=zoho.com; s=zohoarc; b=W1K3rvcLx7i54d2P99i/7mB8MLmVQ1v5fdgetJxkGQbdOEHF0MdDJ4yEqJEaot9Qv1MxrLuo0h0qsReFyohs7nVQVDPGzymFKWfBjZtA4hZbJtqw3ufEs1tIrOWb/x6X2la5/AlLI/RE6w/Z4878X55nJMovhQnMz0lmknmYYzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212124; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ULMYDzDhsSMCX4YzAm5KDo0Ff4IgPy209ucg+FKeKHM=; b=ZP/ubsdQYu2/LHsVli+GKXNKK48AwovFuGYsLp/Ul3PXPMCynl86Pcio8JX9pUW7sUD5u7hdVwBxG56XzLxRfC2n3Xz45JxibRTafWkCLLHKQXTB7wOPhlewogC4EE0x5dXPKTYKynOj5bJdmIZ/DMWnoM53A+9GEqUX2wCvyYI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212124389616.7045722889118; Thu, 30 May 2019 03:28:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:50701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIIY-0003vR-CS for importer@patchew.org; Thu, 30 May 2019 06:28:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFG-0001Ek-At for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFE-0000JA-07 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFD-00008r-F3 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wr1-x431.google.com with SMTP id w13so3810123wru.11 for ; Thu, 30 May 2019 03:25:07 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j9sm2297440wrr.90.2019.05.30.03.25.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AE5B31FF87; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=ULMYDzDhsSMCX4YzAm5KDo0Ff4IgPy209ucg+FKeKHM=; b=D03hb4mjDfpx448Oph86YwD6jxyYp+jxB2vt3SOVA7eoNHOMFlMfG92dAMqv2dQ0V/ aX7VPgrmUwLDABImVrGqIn/LsTqQP5MUb9bdP9fXtO5EhcQBT89lWC/LpRDNlKLW8zM1 RJQ1DKWuvUiar7JFNIl6lnWSLab2ajSUjKh7PIoC7B8IDyi4O0nkStmsXfnTTR4PyPF8 fRifYyrp7480MZOwUkwOjVhiVxBQJC3qzhj8ILyCtiV94t1C3alknzwsBcKLr61ZQ5P9 o6E9OK6xQtV/m2fQaaaau8jYCmIQzXljLZvylpvdkEnMHcx7EDNczQZN4I8HkDpJ38dB G4gw== 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=ULMYDzDhsSMCX4YzAm5KDo0Ff4IgPy209ucg+FKeKHM=; b=T+uGeRZRDd+zLecSES8mj1ijWdv5E6CyjNP0pxyGLPHRcBkT/bv1BUQlpbVlcEPKGF QkuZRLECin+a7D/w/qBju0qEh9WIwp1hEPpBZ3MgQEFfg6L4tkdU6xnTmnv8AartHs/j gE6sUJxjneEjmQZN0KTEfBfg1NQCJLmIKAn0TOtw9dzH26ApssgT2Z0Z1L5PICJuzPat 12g4xj1tDfY6u0vvKWcDkNDcb6F1rLW3o1Z0/JJ1MccbwdoxzoRrtGceU8GeKP9MMAdd F5qV2J84+NRsWhl5y/Sw56I/IGOnFPK2iH/2x+hXy4eUPWH6o5R5nSm9KuTm+4O5Tzqq 5Jkw== X-Gm-Message-State: APjAAAWkEvBFBapGaIJdckjCiPKeMVJept72prg0WKgGMX03iuS8vI5e gMpNvaZL7rL1uJSF459tEOunEBY7hTM= X-Google-Smtp-Source: APXvYqwY1y9nJKAF9CrdAhZ32M7rNLKM3C9crXbvP+RVHCBBYfp+QZzxjG2eTUww4MfSZ7ljKKfU1A== X-Received: by 2002:adf:f951:: with SMTP id q17mr2033922wrr.173.1559211906831; Thu, 30 May 2019 03:25:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:57 +0100 Message-Id: <20190530101603.22254-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PATCH v1 20/26] tests/vm: add DEBUG=1 to help text X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Thomas Huth Message-Id: <20190520124716.30472-9-kraxel@redhat.com> [AJB: fix minor conflict] Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index e329129bd65..628eecade78 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -25,6 +25,8 @@ vm-test: @echo " vm-boot-ssh- - Boot guest and login via ssh" @echo @echo "Special variables:" + @echo " DEBUG=3D1 - be verbose, also start inter= active" + @echo " shell on build failures" @echo " BUILD_TARGET=3Dfoo - Override the build target" @echo " TARGET_LIST=3Da,b,c - Override target list in builds" @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212443; cv=none; d=zoho.com; s=zohoarc; b=jTSHXtIexkA7W7HuE7g/Y0TvLSnenS+mJpfGDRKcZvVJ+9QSO2LCDMv+XTGWpykvt0qBkp3aX8cfpWoPI/3WT53I70raKOp8+CNxbvcRQBnHB8Hp3RTLsY1hwaalU6rpJ4AHJGhQ14YZ6YTZhYJ0Bbr6/Z6dspmY9a/sb391RSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2471IffjmNwT1ZIHN+LiHQt5WCW20wr0QmjXYo3CRl8=; b=eVzi7I+PqvzQBED+dySTMxxTWq2E/3eXjV40JG+hY+JlD4luLTvNm21iHqrZZZ/QTd//GGICjrTpMYwKZIwyzUs+oj8bDq6bEifPDzYXBfKdumL1+azXAA0VXOfIJnPy8ZrdBuuD8774ok/8YyXFaaMWP7dkukhuGbAPE5+OWoc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212443410481.1330373814337; Thu, 30 May 2019 03:34:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:50831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIN0-0007t4-E2 for importer@patchew.org; Thu, 30 May 2019 06:33:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFF-0001Ed-Pi for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000Ha-C9 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:13 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFC-0000Af-TB for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wm1-x343.google.com with SMTP id f10so3617872wmb.1 for ; Thu, 30 May 2019 03:25:09 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w2sm1744827wru.16.2019.05.30.03.25.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:04 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C4FBF1FFAA; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=2471IffjmNwT1ZIHN+LiHQt5WCW20wr0QmjXYo3CRl8=; b=GhP6pyvgxpZHNbcmuwIEZapIcPwTGrWK0KZLjWSykCKgyPcPg2c1rfpruDvYzZsjt6 MMzu1U5NZa7LdAGOfNQm5KJDcjnzTbl+hFh7iHD+eNMY4yboMipXfdtjtMTRYtoEX/Uh bZYiSPwFsYtuFGSVQHMAJdiKdAhTowkASDpUA8uFlqTUsKeq1UNMnfZZt9sKD1XAYamM q79zSr5dkeLTSPI0b7H6Td1KqyX5TdHLXbpoHPGLaPIlSQp0UMUSAUhUA7dJdykWM9vU xxj+Wp4WmedLwGahsLBEu9vQ4VEP6F66xvC0fiKsBvXGNzTGB1W9JK214ORoHdSUnkWi q8fQ== 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=2471IffjmNwT1ZIHN+LiHQt5WCW20wr0QmjXYo3CRl8=; b=GjjV/JBiFVLYKaUGDxIgM6J+2DT8peDzDzDVvyOlm5E5PNLvWwCSlj1drtfRbHKGMy gEkVda7RX3t1rNdsNjeeGC64FEWLjyiNImAoQvNnVd5uWoZy9UP6FqH9ETN7EPKgV2Ls mPxrCDWir/v2tnecQeGaBzgFOHOnfMoe2Ns5H7dkJp8Qj2bYLewiDTahgZr2Pwl9410Z c/9EQaj0YRirDovy2TjtyznlijRFrCBjl+yXgxb/+ueS2L5tedmDcIUzEw9D+sOrc8h+ LpqumTf6Ji232szEdEh4zZcrEo5j6El96nUy7sveH0S1b6GLCalGdHetgIGakUfJP43u m/RA== X-Gm-Message-State: APjAAAWwV5nMlnu94cqZUbwBO05aGZbPA781E+GMIhm/r+hDjVnv5YUb ZT4PDWlRlCXUrk2DBqpN5sJNNJUfy2k= X-Google-Smtp-Source: APXvYqyW9Iqbs65U6v8JWEmqsWuxobq7L/pVtQOWf2xVlngb/kvOEdicMkKa5lrXYcSjWE8k45uxOw== X-Received: by 2002:a05:600c:1101:: with SMTP id b1mr1855856wma.154.1559211907916; Thu, 30 May 2019 03:25:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:58 +0100 Message-Id: <20190530101603.22254-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 21/26] tests/vm: serial console support helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Add a bunch of helpers to talk to the guest using the serial console. Also drop the hard-coded -serial parameter for the vm so QEMUMachine.set_console() actually works. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-10-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/basevm.py | 85 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index f27178f3c7c..8894267f078 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -2,10 +2,11 @@ # # VM testing base class # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,7 +14,9 @@ =20 from __future__ import print_function import os +import re import sys +import socket import logging import time import datetime @@ -79,8 +82,7 @@ class BaseVM(object): "-cpu", "max", "-netdev", "user,id=3Dvnet,hostfwd=3D:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=3Dvnet", - "-vnc", "127.0.0.1:0,to=3D20", - "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] + "-vnc", "127.0.0.1:0,to=3D20"] if vcpus and vcpus > 1: self._args +=3D ["-smp", "%d" % vcpus] if kvm_available(self.arch): @@ -162,6 +164,8 @@ class BaseVM(object): logging.debug("QEMU args: %s", " ".join(args)) qemu_bin =3D os.environ.get("QEMU", "qemu-system-" + self.arch) guest =3D QEMUMachine(binary=3Dqemu_bin, args=3Dargs) + guest.set_machine('pc') + guest.set_console() try: guest.launch() except: @@ -184,6 +188,81 @@ class BaseVM(object): raise Exception("Cannot find ssh port from 'info usernet':\n%s= " % \ usernet_info) =20 + def console_init(self, timeout =3D 120): + vm =3D self._guest + vm.console_socket.settimeout(timeout) + + def console_log(self, text): + for line in re.split("[\r\n]", text): + # filter out terminal escape sequences + line =3D re.sub("\x1b\[[0-9;?]*[a-zA-Z]", "", line) + line =3D re.sub("\x1b\([0-9;?]*[a-zA-Z]", "", line) + # replace unprintable chars + line =3D re.sub("\x1b", "", line) + line =3D re.sub("[\x00-\x1f]", ".", line) + if line =3D=3D "": + continue + # log console line + sys.stderr.write("con recv: %s\n" % line) + + def console_wait(self, expect): + vm =3D self._guest + output =3D "" + while True: + try: + chars =3D vm.console_socket.recv(1024) + except socket.timeout: + sys.stderr.write("console: *** read timeout ***\n") + sys.stderr.write("console: waiting for: '%s'\n" % expect) + sys.stderr.write("console: line buffer:\n") + sys.stderr.write("\n") + self.console_log(output.rstrip()) + sys.stderr.write("\n") + raise + output +=3D chars.decode("latin1") + if expect in output: + break + if "\r" in output or "\n" in output: + lines =3D re.split("[\r\n]", output) + output =3D lines.pop() + if self.debug: + self.console_log("\n".join(lines)) + if self.debug: + self.console_log(output) + + def console_send(self, command): + vm =3D self._guest + if self.debug: + logline =3D re.sub("\n", "", command) + logline =3D re.sub("[\x00-\x1f]", ".", logline) + sys.stderr.write("con send: %s\n" % logline) + for char in list(command): + vm.console_socket.send(char.encode("utf-8")) + time.sleep(0.01) + + def console_wait_send(self, wait, command): + self.console_wait(wait) + self.console_send(command) + + def console_ssh_init(self, prompt, user, pw): + sshkey_cmd =3D "echo '%s' > .ssh/authorized_keys\n" % SSH_PUB_KEY.= rstrip() + self.console_wait_send("login:", "%s\n" % user) + self.console_wait_send("Password:", "%s\n" % pw) + self.console_wait_send(prompt, "mkdir .ssh\n") + self.console_wait_send(prompt, sshkey_cmd) + self.console_wait_send(prompt, "chmod 755 .ssh\n") + self.console_wait_send(prompt, "chmod 644 .ssh/authorized_key= s\n") + + def console_sshd_config(self, prompt): + self.console_wait(prompt) + self.console_send("echo 'PermitRootLogin yes' >> /etc/ssh/sshd_con= fig\n") + for var in self.envvars: + self.console_wait(prompt) + self.console_send("echo 'AcceptEnv %s' >> /etc/ssh/sshd_config= \n" % var) + + def print_step(self, text): + sys.stderr.write("### %s ...\n" % text) + def wait_ssh(self, seconds=3D300): starttime =3D datetime.datetime.now() endtime =3D starttime + datetime.timedelta(seconds=3Dseconds) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212523; cv=none; d=zoho.com; s=zohoarc; b=OGGSYw+cgsV3nGOq9oI3uH7pVzICHTni+yKG4VpCwgxp4vT3akMDmqtzfv7VG+zqATym+GaLu/4y0OJQFFHIAKMwF46GlDtyrZY/A44fESINbvw/OZEHrnczLyy6VbnRrwUm7x3UV6joBDgyNvS+qCF8d7Rdj8ifA4gWyk8bawk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212523; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=i/i2ywuXLTtPSClMKCvPqBuSnYnrMH6w3mkxq4w23A4=; b=iiQzFFzqrPkv6BKxGZj5vi4KqmgrGp/3OycsTvQlkMF0VbL0GIESI9FlthTBmjpDrwic24JNFRwbSbOgDqaqPEXfOzMVPLD6QKxbfiK5tvM1Sh7c6NgA8QzV1zIOVRkiVfg1ErMB8YG4gLLl7Er6A0ZlfDApyqBpgXAZBqFK0Go= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212523950559.6289947994209; Thu, 30 May 2019 03:35:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:50919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIOy-0000jC-Tc for importer@patchew.org; Thu, 30 May 2019 06:35:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFH-0001Fy-EM for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000IU-MC for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFD-000063-93 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wm1-x332.google.com with SMTP id 7so3479010wmo.2 for ; Thu, 30 May 2019 03:25:04 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n4sm2145728wrp.61.2019.05.30.03.25.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:02 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DABD61FFAB; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=i/i2ywuXLTtPSClMKCvPqBuSnYnrMH6w3mkxq4w23A4=; b=TNcxgGyp5olZtcGwMrsQZz9b1DiB1Qg6J72RCiIIFI8KfjP50Hm7kLdE+BNF43CVL0 yQUCUg8lALISTJOPr03WIWH5vSMeBu+HaD8kUyMIVZmggwzKa410X3+GhAmB6oMXHYXO O96P7XMjKxxwoLlbnf1IsmDL48z/CUWzwDgAxcIIoEPTczWCgG+AiRRkrCgKF3fkfkbZ 78jcOLi7uYQpiy1FGjXsa7cstlFAJENKKlLm/gmJph3ivyfbJAwxbFIu5PAFz61PPSz5 kJl4kG5Wov8hbWd75Wj+7wpxaaxRC/GKreNAALgVB+0vaA5QKRi6Q/F36ubLqZkfgiCH RIRQ== 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=i/i2ywuXLTtPSClMKCvPqBuSnYnrMH6w3mkxq4w23A4=; b=ByCCSwD04DhP9av0+TNW5TstqeZy1Vc0jtQvifZCPHvJ5vFL7JlH3aCsnYSLZKgoA+ 74JNzuUAjTjgB/OL7/RyDwg4bbGAhqT+Ez6qb7dVUJfufGy8ugxk5mjbhz1DDYoZbqV0 1KhSGRdTlviCWCt+bc25v3e0rAsPgmv3/97N7B6k6dw04fkUT93QxoGt6Tg6h5mbHZxm sU443O5NHWDApkrJ38sjMIj92zWdc6ojfuNHfzJlFYky3ejLVY3vdKttrEuXzSvpn5+K 0HLC3qDEBoTiy+32r1NifRBqBGOpe7Zy6Wirh+YJ9oZ7trvu8DvmJtZS0jdKukDTDwZ0 HTSw== X-Gm-Message-State: APjAAAW4D/nGPxfYMFAHxVNW1jFVvEBdInOePQJsoKBg9dpTn/gAyecu f/p7WY3hTrzDiPmjnEgkrvECFQ== X-Google-Smtp-Source: APXvYqyc0UG19jjbB87M/dlL+IjWMEbEtaIEdM70TUl48hejadU+sWYm/OzDuMGpwwipkH7sHsOdmw== X-Received: by 2002:a1c:9a16:: with SMTP id c22mr1852538wme.39.1559211903728; Thu, 30 May 2019 03:25:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:15:59 +0100 Message-Id: <20190530101603.22254-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PATCH v1 22/26] tests/vm: openbsd autoinstall, using serial console X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Instead of fetching the prebuilt image from patchew download the install iso and prepare the image locally. Install to disk, using the serial console. Create qemu user, configure ssh login. Install packages needed for qemu builds. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-11-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/openbsd | 158 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 145 insertions(+), 13 deletions(-) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 2105c01a267..c5f0a152183 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -2,10 +2,11 @@ # # OpenBSD VM image # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,34 +14,165 @@ =20 import os import sys +import socket import subprocess import basevm =20 class OpenBSDVM(basevm.BaseVM): name =3D "openbsd" arch =3D "x86_64" + + link =3D "https://cdn.openbsd.org/pub/OpenBSD/6.5/amd64/install65.iso" + csum =3D "38d1f8cadd502f1c27bf05c5abde6cc505dd28f3f34f8a941048ff9a54f9= f608" + size =3D "20G" + pkgs =3D [ + # tools + "git", + "pkgconf", + "bzip2", "xz", + + # gnu tools + "bash", + "gmake", + "gsed", + "bison", + + # libs: usb + "libusb1", + + # libs: crypto + "gnutls", + + # libs: images + "jpeg", + "png", + + # libs: ui + "sdl2", + "gtk+3", + "libxkbcommon", + ] + BUILD_SCRIPT =3D """ set -e; - rm -rf /var/tmp/qemu-test.* - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; tar -xf /dev/rsd1c; - ./configure --cc=3Dx86_64-unknown-openbsd6.1-gcc-4.9.4 --python=3D= python2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; - # XXX: "gmake check" seems to always hang or fail - #gmake --output-sync -j{jobs} check {verbose}; + cd ../build + ../src/configure --cc=3Dcc --python=3Dpython3 {configure_opts}; + gmake --output-sync -j{jobs} {target} {verbose}; """ + poweroff =3D "halt -p" =20 def build_image(self, img): - cimg =3D self._download_with_cache("http://download.patchew.org/op= enbsd-6.1-amd64.img.xz", - sha256sum=3D'8c6cedc483e602cfee5e04f0406c64eb99138495e8ca5= 80bc0293bcf0640c1bf') - img_tmp_xz =3D img + ".tmp.xz" + self.print_step("Downloading install iso") + cimg =3D self._download_with_cache(self.link, sha256sum=3Dself.csu= m) img_tmp =3D img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + iso =3D img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["cp", "-f", cimg, iso]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args =3D [ + "-machine", "graphics=3Doff", + "-cdrom", iso + ]) + self.console_init() + self.console_wait_send("boot>", "set tty com0\n") + self.console_wait_send("boot>", "\n") + + # pre-install configuration + self.console_wait_send("(I)nstall", "i\n") + self.console_wait_send("Terminal type", "xterm\n") + self.console_wait_send("System hostname", "openbsd\n") + self.console_wait_send("Which network interface", "vio0\n") + self.console_wait_send("IPv4 address", "dhcp\n") + self.console_wait_send("IPv6 address", "none\n") + self.console_wait_send("Which network interface", "done\n") + self.console_wait_send("DNS domain name", "localnet\n") + self.console_wait("Password for root account") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Password for root account") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait_send("Start sshd(8)", "yes\n") + self.console_wait_send("X Window System", "\n") + self.console_wait_send("xenodm", "\n") + self.console_wait_send("console to com0", "\n") + self.console_wait_send("Which speed", "\n") + + self.console_wait("Setup a user") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("Full name") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("Password") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Password") + self.console_send("%s\n" % self.GUEST_PASS) + + self.console_wait_send("Allow root ssh login", "yes\n") + self.console_wait_send("timezone", "UTC\n") + self.console_wait_send("root disk", "\n") + self.console_wait_send("(W)hole disk", "\n") + self.console_wait_send("(A)uto layout", "\n") + self.console_wait_send("Location of sets", "cd0\n") + self.console_wait_send("Pathname to the sets", "\n") + self.console_wait_send("Set name(s)", "\n") + self.console_wait_send("without verification", "yes\n") + + self.print_step("Installation started now, this will take a while") + self.console_wait_send("Location of sets", "done\n") + + self.console_wait("successfully completed") + self.print_step("Installation finished, rebooting") + self.console_wait_send("(R)eboot", "reboot\n") + + # setup qemu user + prompt =3D "$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt =3D "openbsd#" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'chmod 666 /dev/rsd1c' >> /etc/rc.local\n") + + # enable w+x for /home + self.console_wait(prompt) + self.console_send("sed -i -e '/home/s/rw,/rw,wxallowed,/' /etc/fst= ab\n") + + # tweak datasize limit + self.console_wait(prompt) + self.console_send("sed -i -e 's/\\(datasize[^=3D]*\\)=3D[^:]*/\\1= =3Dinfinity/' /etc/login.conf\n") + + # use http (be proxy cache friendly) + self.console_wait(prompt) + self.console_send("sed -i -e 's/https/http/' /etc/installurl\n") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("pkg_add %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.wait() + if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") =20 if __name__ =3D=3D "__main__": sys.exit(basevm.main(OpenBSDVM)) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212310; cv=none; d=zoho.com; s=zohoarc; b=M/SR1zOcjqacrxrqF+7MVXuHaQtCiFzb7dBmYclNbEy3d1GshHo6uYtzSO2jPkdgXUQPyQDLwcmxsz1NQBrVYBJ1hDc/l6+eMDf6sjxpVjDXT4Bin4KbAowFHdyA+87QQJJAABmOUhLEcpNtvsAVW+MeQhhvImh//77pe0oR9Xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212310; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=va2aVkiTrZ/koDvdRJBXUCzzwNDsrPnddM8kRf0oauo=; b=l4Vg8kyIFwwhiBVRtSVY2lQkLDLZnphQ6Muhaa1E7za2uCPLBwGfj21e31t97A5MDfpp+bG99uxlNDovme1/xvkXd+IZSQ8JXz61lpOrD+ly+G6adIAJYfXnVrVd0xTKiCasTWIQtz4powStuyMAfC9pc0iRZclRzEUL6qNjHY4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212310489794.9650477656825; Thu, 30 May 2019 03:31:50 -0700 (PDT) Received: from localhost ([127.0.0.1]:50762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWILY-0006Lm-CU for importer@patchew.org; Thu, 30 May 2019 06:31:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFH-0001FU-0Y for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000Hf-Ck for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38370) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFC-000084-Tj for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wm1-x344.google.com with SMTP id t5so3485440wmh.3 for ; Thu, 30 May 2019 03:25:07 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k17sm1516486wrm.73.2019.05.30.03.25.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F03CC1FFAC; Thu, 30 May 2019 11:16:05 +0100 (BST) 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=va2aVkiTrZ/koDvdRJBXUCzzwNDsrPnddM8kRf0oauo=; b=FhZr4sq/npVp5hp155MS1l9IwHy5BynqFOrKZ2FsshYjC1YveSAwlfYIaBoL8TVzAY 2yOeHpYRQO+QVaEmKd5CZ/aiBSwvWbPCJMpqKezXLjghTM61O2B3FiBsoRSuEd3sriG3 OnP2AZG3omLerTyYfHkrMW2lvEbNfuOZ4k6dSbhkeJVfvyMFak+mBbKVNFTOzqA8j+g6 hPHgIIRRRP2tgafoPJsBiqes+FPG92OuTvP6+dAODJFxPI8gfHUWDC3gllM6i5gsvRF/ ShiN2/e4Wf21n+1jS4buFsFgHfc2MEyZc6wS2VMbSevLMJ9AA/N1P8RJdOriXVOW7w4V fORg== 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=va2aVkiTrZ/koDvdRJBXUCzzwNDsrPnddM8kRf0oauo=; b=g1SJ+kGOt9nGRfZKjMIm/HySlyCINBjFTxNaRqusujiNAdMslDJM0he141nkfoXVNN Zi41LA6nkWDBdeV6S6jYpm53UQah6uyyYnEB216dlk8d5ocDbzCjPAXKBUM/8j8A+7oG TBUmeBzIYblSFCQAZ3r5DpOSU9EFapeHver7Uo3KFADqNUzTlK2ulLmnIF/3G6UiMz7o hV+2K6NMNdcdm74Khm7C36n/2meWxuCaydsFVTRbJlFDmw3NlhSHot2E2iL8JFVAgmob jx6aRqsB5zswGNiBEQZ3kNkFxjUSel1i7PcP1dasK5CExjnSHIpP9Vjf5DVlYz5XzzmZ N3sQ== X-Gm-Message-State: APjAAAVi2v2w6yez6rtxfQiWoJpoLqRGaW90JvXTFSyqI5ScfxqCcFJL mtm/jjrNN0KWi0FGlmBfgrI8x1U6gAA= X-Google-Smtp-Source: APXvYqwvWSSjztdX2J8UhR7c2KNjflR28b4Ee63xFSdF0whXjGMMAC9Za5xAB1pv6gcwev0LK3rCdg== X-Received: by 2002:a1c:f111:: with SMTP id p17mr1859994wmh.62.1559211906225; Thu, 30 May 2019 03:25:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:16:00 +0100 Message-Id: <20190530101603.22254-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 23/26] tests/vm: freebsd autoinstall, using serial console X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Instead of fetching the prebuilt image from patchew download the install iso and prepare the image locally. Install to disk, using the serial console. Create qemu user, configure ssh login. Install packages needed for qemu builds. Note that freebsd package downloads are delivered as non-cachable content, so I had to configure squid with "ignore-no-store ignore-private ignore-reload" for pkgmir.geo.freebsd.org to make the caching actually work. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Thomas Huth Message-Id: <20190520124716.30472-12-kraxel@redhat.com> --- tests/vm/freebsd | 179 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 169 insertions(+), 10 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index b0066017a61..eb029bdfede 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -2,43 +2,202 @@ # # FreeBSD VM image # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. # =20 import os +import re import sys +import time +import socket import subprocess import basevm =20 class FreeBSDVM(basevm.BaseVM): name =3D "freebsd" arch =3D "x86_64" + + link =3D "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/Fr= eeBSD-12.0-RELEASE-amd64-disc1.iso.xz" + csum =3D "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb= 99db" + size =3D "20G" + pkgs =3D [ + # build tools + "git", + "pkgconf", + "bzip2", + + # gnu tools + "bash", + "gmake", + "gsed", + "flex", "bison", + + # libs: crypto + "gnutls", + + # libs: images + "jpeg-turbo", + "png", + + # libs: ui + "sdl2", + "gtk3", + "libxkbcommon", + + # libs: opengl + "libepoxy", + "mesa-libs", + ] + BUILD_SCRIPT =3D """ set -e; - rm -rf /var/tmp/qemu-test.* - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; tar -xf /dev/vtbd1; - ./configure {configure_opts}; + cd ../build + ../src/configure --python=3Dpython3.6 {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ =20 + def console_boot_serial(self): + self.console_wait_send("Autoboot", "3") + self.console_wait_send("OK", "set console=3Dcomconsole\n") + self.console_wait_send("OK", "boot\n") + def build_image(self, img): - cimg =3D self._download_with_cache("http://download.patchew.org/fr= eebsd-11.1-amd64.img.xz", - sha256sum=3D'adcb771549b37bc63826c501f05121a206ed3d9f55f49= 145908f7e1432d65891') - img_tmp_xz =3D img + ".tmp.xz" + self.print_step("Downloading install iso") + cimg =3D self._download_with_cache(self.link, sha256sum=3Dself.csu= m) img_tmp =3D img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + iso =3D img + ".install.iso" + iso_xz =3D iso + ".xz" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["cp", "-f", cimg, iso_xz]) + subprocess.check_call(["xz", "-dvf", iso_xz]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args =3D [ + "-machine", "graphics=3Doff", + "-cdrom", iso + ]) + self.console_init() + self.console_boot_serial() + self.console_wait_send("Console type", "xterm\n") + + # pre-install configuration + self.console_wait_send("Welcome", "\n") + self.console_wait_send("Keymap Selection", "\n") + self.console_wait_send("Set Hostname", "freebsd\n") + self.console_wait_send("Distribution Select", "\n") + self.console_wait_send("Partitioning", "\n") + self.console_wait_send("Partition", "\n") + self.console_wait_send("Scheme", "\n") + self.console_wait_send("Editor", "f") + self.console_wait_send("Confirmation", "c") + + self.print_step("Installation started now, this will take a while") + + # post-install configuration + self.console_wait("New Password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Retype New Password:") + self.console_send("%s\n" % self.ROOT_PASS) + + self.console_wait_send("Network Configuration", "\n") + self.console_wait_send("IPv4", "y") + self.console_wait_send("DHCP", "y") + self.console_wait_send("IPv6", "n") + self.console_wait_send("Resolver", "\n") + + self.console_wait_send("Time Zone Selector", "a\n") + self.console_wait_send("Confirmation", "y") + self.console_wait_send("Time & Date", "\n") + self.console_wait_send("Time & Date", "\n") + + self.console_wait_send("System Configuration", "\n") + self.console_wait_send("System Hardening", "\n") + + # qemu user + self.console_wait_send("Add User Accounts", "y") + self.console_wait("Username") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("Full name") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait_send("Uid", "\n") + self.console_wait_send("Login group", "\n") + self.console_wait_send("Login group", "\n") + self.console_wait_send("Login class", "\n") + self.console_wait_send("Shell", "\n") + self.console_wait_send("Home directory", "\n") + self.console_wait_send("Home directory perm", "\n") + self.console_wait_send("Use password", "\n") + self.console_wait_send("Use an empty password", "\n") + self.console_wait_send("Use a random password", "\n") + self.console_wait("Enter password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Enter password again:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait_send("Lock out", "\n") + self.console_wait_send("OK", "yes\n") + self.console_wait_send("Add another user", "no\n") + + self.console_wait_send("Final Configuration", "\n") + self.console_wait_send("Manual Configuration", "\n") + self.console_wait_send("Complete", "\n") + + self.print_step("Installation finished, rebooting") + self.console_boot_serial() + + # setup qemu user + prompt =3D "$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt =3D "root@freebsd:~ #" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup serial console + self.console_wait(prompt) + self.console_send("echo 'console=3Dcomconsole' >> /boot/loader.con= f\n") + + # setup boot delay + self.console_wait(prompt) + self.console_send("echo 'autoboot_delay=3D1' >> /boot/loader.conf\= n") + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("pkg install -y %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.console_wait("Uptime:") + self.wait() + if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") =20 if __name__ =3D=3D "__main__": sys.exit(basevm.main(FreeBSDVM)) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212895; cv=none; d=zoho.com; s=zohoarc; b=Q2JBK+LEivIPq6KRsxxLxhC08LMCNBh0xc0piLP/PWuUmk25UXUtE5NrRVF709yzirRNQh0aQwElTpihxrtR6EPg/45mhN7QHCIZJIb3zQsP/kNuKZw6BgcxWLoZgJYodoL70Rhra1IZB7ags9zhWpOzTer2ipdEKWzp3Wc76K8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aZAe5/QuAbq/RHBzy6OF/4DQuFxdnGK9gRe+n2IiOXg=; b=dpK9BhaVbz+Qx68Cq8sIk8GoR/NltWFYvt4QYqsyefZ8vulpKF8k3AKMGPbXGaHKpxwZrfbAM6mp8Wg7Rj3pn35tFyM9sgcM6FvukeW/nbpiNuNPONdOCsUDEzGDBwFlvnuNNog8dGw9HiwPP0rfpE8woiYXab8c4o7/TNqcjco= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212895030403.31812685647776; Thu, 30 May 2019 03:41:35 -0700 (PDT) Received: from localhost ([127.0.0.1]:51262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIUw-0004id-0f for importer@patchew.org; Thu, 30 May 2019 06:41:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFG-0001FS-WA for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000Hl-D4 for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:14 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36419) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFC-00005N-Rf for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wr1-x444.google.com with SMTP id n4so784452wrs.3 for ; Thu, 30 May 2019 03:25:04 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s9sm2304564wmc.1.2019.05.30.03.25.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:01 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 113A61FFAE; Thu, 30 May 2019 11:16:06 +0100 (BST) 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=aZAe5/QuAbq/RHBzy6OF/4DQuFxdnGK9gRe+n2IiOXg=; b=QTSBLr0XWHCd/iJm3vSaH+EHQOXGEqP1yZOPE4f8BN7VS1vZcEFHqyF0dn0Qr8ou0t Qi3umUy1mH+xWYgoQam6C+XdNTOO0iwpvt7DCiyc9nX+U8+aBUV+9sAqre4vgca9JocE 3F9O3eBH9AyjbpAlkVJMpkMzHanuT+yFMWAqghPiIYSsna4gyaxpvvhrgFt8196ayndS GmkOUcxbjng5xCovVxuoTFty3CQDzYwNlW2SaOM0acCrf+i7qikEY0c6mbc5gimPc/7L IYvrAUhqQYq5o6thYdLdhj9+INjPePBS6ONdDgUXOzM25P18fCH1KQ3BLcK6Cjn7nFk3 stKQ== 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=aZAe5/QuAbq/RHBzy6OF/4DQuFxdnGK9gRe+n2IiOXg=; b=ZCPSlx6UKXlhejQEo8D+/BlyUhKardzspy3BraRBLQvqwKhIcYgF6k3Ac4Gbbsiaba tisYN61punv+n1uMBMAoGb+7EJek3YEeUNCYBTrQusX/WtQGTLRe1b5Woq7QQv6ipgjt Gt3gCyz7GXB1Dvc6phO6Cn3LyFwZudDPLhSkv0UBFBYpgnnRVLP0yOCs30cCjL1czbmF nEryXNIUiyFhOhH8rPYTrmC5V2eivc6V+ajLp8NNGBz5ah/KFRqBNRvrphxuR9rGR7nD Wj3wfE79reZbT1M3u4GvQXEgcs+6iMI0GIdlnJJLqFJWM+Ah4Tj68PX7isT8jPA9Vqf+ VAUQ== X-Gm-Message-State: APjAAAVvaPr/qXCPS5zx2t2s2lovtIujo64icJoZbXhvi4kGhBlP97MQ /09MEYIAWLP1R02g/a4rv+7k7XlULFs= X-Google-Smtp-Source: APXvYqx6eaCcEk+CMFQDC7PJdU1LAmQuFbecWSvKdj39mX0/q21zqFWbTH9YKj4j4K0RhQMA+6XjJw== X-Received: by 2002:a5d:4f0d:: with SMTP id c13mr2141228wru.117.1559211903205; Thu, 30 May 2019 03:25:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:16:01 +0100 Message-Id: <20190530101603.22254-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 24/26] tests/vm: netbsd autoinstall, using serial console X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , Gerd Hoffmann , Kamil Rytarowski , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Instead of fetching the prebuilt image from patchew download the install iso and prepare the image locally. Install to disk, using the serial console. Create qemu user, configure ssh login. Install packages needed for qemu builds. Signed-off-by: Gerd Hoffmann Reviewed-by: Kamil Rytarowski Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-13-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/netbsd | 187 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 177 insertions(+), 10 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 4c6624ea5ed..6dbfc1b0fbe 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -2,10 +2,11 @@ # # NetBSD VM image # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,32 +14,198 @@ =20 import os import sys +import time import subprocess import basevm =20 class NetBSDVM(basevm.BaseVM): name =3D "netbsd" arch =3D "x86_64" + + link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8= .0-amd64.iso" + size =3D "20G" + pkgs =3D [ + # tools + "git-base", + "pkgconf", + "xz", + "python37", + + # gnu tools + "bash", + "gmake", + "gsed", + "flex", "bison", + + # libs: crypto + "gnutls", + + # libs: images + "jpeg", + "png", + + # libs: ui + "SDL2", + "gtk3+", + "libxkbcommon", + ] + BUILD_SCRIPT =3D """ set -e; - rm -rf /var/tmp/qemu-test.* - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; tar -xf /dev/rld1a; - ./configure --python=3Dpython2.7 {configure_opts}; + cd ../build + ../src/configure --python=3Dpython3.7 --disable-opengl {configure_= opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ + poweroff =3D "/sbin/poweroff" =20 def build_image(self, img): - cimg =3D self._download_with_cache("http://download.patchew.org/ne= tbsd-7.1-amd64.img.xz", - sha256sum=3D'b633d565b0eac3d02015= cd0c81440bd8a7a8df8512615ac1ee05d318be015732') - img_tmp_xz =3D img + ".tmp.xz" + cimg =3D self._download_with_cache(self.link) img_tmp =3D img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + iso =3D img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["cp", "-f", cimg, iso]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args =3D [ + "-device", "VGA", + "-machine", "graphics=3Doff", + "-cdrom", iso + ]) + self.console_init() + self.console_wait("Primary Bootstrap") + + # serial console boot menu output doesn't work for some + # reason, so we have to fly blind ... + for char in list("5consdev com0\n"): + time.sleep(0.2) + self.console_send(char) + self.console_wait("") + self.console_wait_send("> ", "boot\n") + + self.console_wait_send("Terminal type", "xterm\n") + self.console_wait_send("a: Installation messages", "a\n") + self.console_wait_send("b: US-English", "b\n") + self.console_wait_send("a: Install NetBSD", "a\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("a: ld0", "a\n") + self.console_wait_send("a: This is the correct", "a\n") + self.console_wait_send("b: Use the entire disk", "b\n") + self.console_wait("NetBSD bootcode") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("b: Use existing part", "b\n") + self.console_wait_send("x: Partition sizes ok", "x\n") + self.console_wait_send("for your NetBSD disk", "\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("b: Use serial port com0", "b\n") + self.console_wait_send("f: Set serial baud rate", "f\n") + self.console_wait_send("a: 9600", "a\n") + self.console_wait_send("x: Exit", "x\n") + + self.console_wait_send("a: Full installation", "a\n") + self.console_wait_send("a: CD-ROM", "a\n") + + self.print_step("Installation started now, this will take a while") + self.console_wait_send("Hit enter to continue", "\n") + + self.console_wait_send("d: Change root password", "d\n") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.ROOT_PASS) + + self.console_wait_send("o: Add a user", "o\n") + self.console_wait("username") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("to group wheel") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("a: /bin/sh", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.GUEST_PASS) + + self.console_wait_send("a: Configure network", "a\n") + self.console_wait_send("a: vioif0", "a\n") + self.console_wait_send("Network media type", "\n") + self.console_wait("autoconfiguration") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("DNS domain", "localnet\n") + self.console_wait("Are they OK?") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("installed in /etc") + self.console_wait_send("a: Yes", "a\n") + + self.console_wait_send("e: Enable install", "e\n") + proxy =3D os.environ.get("http_proxy") + if not proxy is None: + self.console_wait_send("f: Proxy", "f\n") + self.console_wait("Proxy") + self.console_send("%s\n" % proxy) + self.console_wait_send("x: Install pkgin", "x\n") + self.console_init(1200) + self.console_wait_send("Hit enter to continue", "\n") + self.console_init() + + self.console_wait_send("g: Enable sshd", "g\n") + self.console_wait_send("x: Finished conf", "x\n") + self.console_wait_send("Hit enter to continue", "\n") + + self.print_step("Installation finished, rebooting") + self.console_wait_send("d: Reboot the computer", "d\n") + + # setup qemu user + prompt =3D "localhost$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt =3D "localhost#" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'chmod 666 /dev/rld1a' >> /etc/rc.local\n") + + # turn off mprotect (conflicts with tcg) + self.console_wait(prompt) + self.console_send("echo security.pax.mprotect.enabled=3D0 >> /etc/= sysctl.conf\n") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("pkgin update\n") + self.ssh_root_check("pkgin -y install %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.console_wait("entering state S5") + self.wait() + if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") =20 if __name__ =3D=3D "__main__": sys.exit(basevm.main(NetBSDVM)) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559211895; cv=none; d=zoho.com; s=zohoarc; b=WWQsZXktRdlzYt7AcXg4tuDkThwSY0zPlVBzybgorrk3W9UO0lqe4zCim1r1oWxkUobxslpBPa+FyQ3UTk3GDsyyrtEvnBO88Cgz4HU+/0my29AHh1rMDlGP6zxqMHNXaIK/wREfFEZjMzDgIZC82bm9ADCgk+KEubydBGjefEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559211895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dF2Xpj04JhKy3oIojWgfJAl18N1uBEDIDiQKZRkPPHE=; b=OplzSzYmKRuNd9twpAhe7en+Zz7bnCBMgzl9OjtZdIORrfYAi6lzdzjr8djQUjMjTPUv5bPHs1OQtaM4Sp4B6nvqMwEkPvjeyTbcdtRX/2pu8x08o6aEaPLVZXtdw7xF06/3D/HNsw2Uz9wxZKhmNFFrRTgbgb7EHRI+M99IIZs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155921189562387.97294121121229; Thu, 30 May 2019 03:24:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:50640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIEo-0000N5-G8 for importer@patchew.org; Thu, 30 May 2019 06:24:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWI6i-0002kt-3o for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWI6f-0006du-Fv for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:23 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWI6f-0006d3-6r for qemu-devel@nongnu.org; Thu, 30 May 2019 06:16:21 -0400 Received: by mail-wr1-x443.google.com with SMTP id f8so3845051wrt.1 for ; Thu, 30 May 2019 03:16:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b5sm1949162wrx.22.2019.05.30.03.16.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:16:17 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 29EE21FFAF; Thu, 30 May 2019 11:16:06 +0100 (BST) 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=dF2Xpj04JhKy3oIojWgfJAl18N1uBEDIDiQKZRkPPHE=; b=p5E84X6snfABOEe9EKK76wKIzgtBZXLsSB6Ur1wZJFpEI6VPJI7X9EfbW+SIXKM/GB AuPKs4IvKa8rLXWqDnofhEoqR+O4qUCVgz0m3vOoGK0T1RTv7tdwOHHgLc8xIrRRwKAn JmBUPTmuuMUukCGssynri+mOqIQVNHKl64nHEPSDQ59DMwBjml0ZUQ725NXbwW4xyLPq G2FAyD0tXTYaOSwOrlkCjMB9Zb3JRXIemc2w9kieCjGdxcuuESH7gO8eC94EIGX6rbX3 gMXUKwhOkPCc7313P70HR/9gvXbK3gITzBKj6WmT9aU4ystUTBT/ORZgwC/w/yeNFsKu rkBA== 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=dF2Xpj04JhKy3oIojWgfJAl18N1uBEDIDiQKZRkPPHE=; b=qWILPlCny7b08Wlzsq+k99n43rC3X64hLZFzRwJ2sbmUt5AONYLF74BwTU+BpY5E7C yjTsqPIIdk7L45/Ni5WIP/7jctsnLRf+PntVXXiwsLDKrE4NghZ82lYKaC8udLS0xzUo WlkmuN7ecK+L9mQhOLPycxnNl+6P8uBTvjHTzmYveoxME1S5Rj+xmQ2bRZ+VDkZUvlPO t4IQKdWyccq5XnKQbyqV2oXEVfxv6l0qAjUK6Az4AifqSTJGFRLkTzk+w5rFer/els+L nm1jjbauC7cDkBfz4K216y9O4BaMKsGx8yMCsxpncJsBDZAgosCQ5D0JoU+Y6o91SIEz ONUw== X-Gm-Message-State: APjAAAU1z3ZAmBhC5Re8ACdjsMjTF+LQgYlwYxYgidTTs/YndbO+ncmJ 3HO04SFnAP5fzYfJcwHHFgikzg== X-Google-Smtp-Source: APXvYqyM5bmeAHRqgkQasAOykLx3nf/mYYS+334PMfgn/r1YvcqmPXiWpBtNPWT40cVjKLtz7+NgXw== X-Received: by 2002:a5d:4104:: with SMTP id l4mr2066716wrp.302.1559211380121; Thu, 30 May 2019 03:16:20 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:16:02 +0100 Message-Id: <20190530101603.22254-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v1 25/26] tests/vm: fedora autoinstall, using serial console X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Download the install iso and prepare the image locally. Install to disk, using the serial console. Create qemu user, configure ssh login. Install packages needed for qemu builds. Yes, we have docker images for fedora. But for trouble-shooting it might be helpful to have a vm too. When vm builds fail you can use it to figure whenever the vm setup or the guest os is the problem. Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-14-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 3 +- tests/vm/basevm.py | 9 +- tests/vm/fedora | 187 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+), 2 deletions(-) create mode 100755 tests/vm/fedora diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 628eecade78..5e37063d32d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,7 +2,7 @@ =20 .PHONY: vm-build-all vm-clean-all =20 -IMAGES :=3D ubuntu.i386 freebsd netbsd openbsd centos +IMAGES :=3D ubuntu.i386 freebsd netbsd openbsd centos fedora IMAGES_DIR :=3D $(HOME)/.cache/qemu-vm/images IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) =20 @@ -16,6 +16,7 @@ vm-test: @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" + @echo " vm-build-fedora - Build QEMU in Fedora VM" @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 8894267f078..d4b816be14d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -205,7 +205,7 @@ class BaseVM(object): # log console line sys.stderr.write("con recv: %s\n" % line) =20 - def console_wait(self, expect): + def console_wait(self, expect, expectalt =3D None): vm =3D self._guest output =3D "" while True: @@ -214,6 +214,8 @@ class BaseVM(object): except socket.timeout: sys.stderr.write("console: *** read timeout ***\n") sys.stderr.write("console: waiting for: '%s'\n" % expect) + if not expectalt is None: + sys.stderr.write("console: waiting for: '%s' (alt)\n" = % expectalt) sys.stderr.write("console: line buffer:\n") sys.stderr.write("\n") self.console_log(output.rstrip()) @@ -222,6 +224,8 @@ class BaseVM(object): output +=3D chars.decode("latin1") if expect in output: break + if not expectalt is None and expectalt in output: + break if "\r" in output or "\n" in output: lines =3D re.split("[\r\n]", output) output =3D lines.pop() @@ -229,6 +233,9 @@ class BaseVM(object): self.console_log("\n".join(lines)) if self.debug: self.console_log(output) + if not expectalt is None and expectalt in output: + return False + return True =20 def console_send(self, command): vm =3D self._guest diff --git a/tests/vm/fedora b/tests/vm/fedora new file mode 100755 index 00000000000..c5621d08322 --- /dev/null +++ b/tests/vm/fedora @@ -0,0 +1,187 @@ +#!/usr/bin/env python +# +# Fedora VM image +# +# Copyright 2019 Red Hat Inc. +# +# Authors: +# Gerd Hoffmann +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# + +import os +import re +import sys +import time +import socket +import subprocess +import basevm + +class FedoraVM(basevm.BaseVM): + name =3D "fedora" + arch =3D "x86_64" + + base =3D "http://dl.fedoraproject.org/pub/fedora/linux/releases/30/" + link =3D base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2= .iso" + repo =3D base + "Server/x86_64/os/" + full =3D base + "Everything/x86_64/os/" + csum =3D "5e4eac4566d8c572bfb3bcf54b7d6c82006ec3c6c882a2c9235c6d3494d7= b100" + size =3D "20G" + pkgs =3D [ + # tools + 'git-core', + 'flex', 'bison', + 'gcc', 'binutils', 'make', + + # perl + 'perl-Test-Harness', + + # libs: usb + '"pkgconfig(libusb-1.0)"', + '"pkgconfig(libusbredirparser-0.5)"', + + # libs: crypto + '"pkgconfig(gnutls)"', + + # libs: ui + '"pkgconfig(sdl2)"', + '"pkgconfig(gtk+-3.0)"', + '"pkgconfig(ncursesw)"', + + # libs: audio + '"pkgconfig(libpulse)"', + '"pkgconfig(alsa)"', + ] + + BUILD_SCRIPT =3D """ + set -e; + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; + tar -xf /dev/vdb; + cd ../build + ../src/configure --python=3Dpython3 {configure_opts}; + gmake --output-sync -j{jobs} {target} {verbose}; + """ + + def build_image(self, img): + self.print_step("Downloading install iso") + cimg =3D self._download_with_cache(self.link, sha256sum=3Dself.csu= m) + img_tmp =3D img + ".tmp" + iso =3D img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["cp", "-f", cimg, iso]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args =3D [ + "-machine", "graphics=3Doff", + "-cdrom", iso + ]) + self.console_init(300) + self.console_wait("installation process.") + time.sleep(0.3) + self.console_send("\t") + time.sleep(0.3) + self.console_send(" console=3DttyS0") + proxy =3D os.environ.get("http_proxy") + if not proxy is None: + self.console_send(" proxy=3D%s" % proxy) + self.console_send(" inst.repo=3D%s" % self.repo) + self.console_send("\n") + + self.console_wait_send("2) Use text mode", "2\n") + + self.console_wait_send("5) [!] Installation Dest", "5\n") + self.console_wait_send("1) [x]", "c\n") + self.console_wait_send("2) [ ] Use All Space", "2\n") + self.console_wait_send("2) [x] Use All Space", "c\n") + self.console_wait_send("1) [ ] Standard Part", "1\n") + self.console_wait_send("1) [x] Standard Part", "c\n") + + self.console_wait_send("7) [!] Root password", "7\n") + self.console_wait("Password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Password (confirm):") + self.console_send("%s\n" % self.ROOT_PASS) + + self.console_wait_send("8) [ ] User creation", "8\n") + self.console_wait_send("1) [ ] Create user", "1\n") + self.console_wait_send("3) User name", "3\n") + self.console_wait_send("ENTER:", "%s\n" % self.GUEST_USER) + self.console_wait_send("4) [ ] Use password", "4\n") + self.console_wait_send("5) Password", "5\n") + self.console_wait("Password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Password (confirm):") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait_send("7) Groups", "c\n") + + while True: + good =3D self.console_wait("3) [x] Installation", + "3) [!] Installation") + self.console_send("r\n") + if good: + break + time.sleep(10) + + while True: + good =3D self.console_wait("4) [x] Software", + "4) [!] Software") + self.console_send("r\n") + if good: + break + time.sleep(10) + self.console_send("r\n" % self.GUEST_PASS) + + self.console_wait_send("'b' to begin install", "b\n") + + self.print_step("Installation started now, this will take a while") + + self.console_wait_send("Installation complete", "\n") + self.print_step("Installation finished, rebooting") + + # setup qemu user + prompt =3D " ~]$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt =3D " ~]#" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'KERNEL=3D=3D\"vdb\" MODE=3D\"666\"' >> %s= \n" % + "/etc/udev/rules.d/99-qemu.rules") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("rm -vf /etc/yum.repos.d/fedora*.repo\n") + self.ssh_root_check("echo '[fedora]' >> /etc/yum.repos.d/qemu.repo= \n") + self.ssh_root_check("echo 'baseurl=3D%s' >> /etc/yum.repos.d/qemu.= repo\n" % self.full) + self.ssh_root_check("echo 'gpgcheck=3D0' >> /etc/yum.repos.d/qemu.= repo\n") + self.ssh_root_check("dnf install -y %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.console_wait("sleep state S5") + self.wait() + + if os.path.exists(img): + os.remove(img) + os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") + +if __name__ =3D=3D "__main__": + sys.exit(basevm.main(FedoraVM)) --=20 2.20.1 From nobody Thu May 2 00:00:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1559212788; cv=none; d=zoho.com; s=zohoarc; b=m5+3OHmDz1VtHfHLNeac1e9qgMbF3E72zd8EM5gmr7KoLO6iGE5d2mLh0Uh1Y/2qPO+cczfcFU5a9wYveor0/GS68x3WzRzz6OWmfQFdiIJ4NRsiiUDXNzfKGhf7h12KX/qu/snAH24oSyvZZOMhXPZL5Zx9jHb4T88E5QY6ytI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559212788; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=CpnAoS/0GcDEawDwz3KOhZJ7qTcVFE5i2TefLG4nXpc=; b=QYNZCaJtX/1jjyKo5H6jJAkX5OEUZdxgIENZ9A9RjX+i76pH/s9ymCOGk/WpuEJGspJLCoG5E+HVWw6cz8rfOrYoG27jr6nUOVDoeO/RaHq0T4IdV+EgSOTm8qpIkC2Y9OYlk09wipfUeVr8hZ1tU2Z3if0WESa00qdR3ZHEuuc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559212788565724.1334631694218; Thu, 30 May 2019 03:39:48 -0700 (PDT) Received: from localhost ([127.0.0.1]:51192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWISb-0003Pb-2a for importer@patchew.org; Thu, 30 May 2019 06:39:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWIFF-0001Ee-RR for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWIFD-0000IW-Lp for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:13 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWIFD-00006h-AK for qemu-devel@nongnu.org; Thu, 30 May 2019 06:25:11 -0400 Received: by mail-wr1-x442.google.com with SMTP id r7so3808391wrr.13 for ; Thu, 30 May 2019 03:25:05 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p16sm4156798wrg.49.2019.05.30.03.25.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 30 May 2019 03:25:03 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E06B1FFB1; Thu, 30 May 2019 11:16:06 +0100 (BST) 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=CpnAoS/0GcDEawDwz3KOhZJ7qTcVFE5i2TefLG4nXpc=; b=GK2VeXpKbHRBUYHZ7j7VMimnF5DLHkozn5ZPwW/6q3H97FNgcCI7K4F2fiRUIVEshy G8cf6CDAVzIG3dw4cZjUU0RaP/v5q72ZtmQPZU+BcZIAOvzk2lF+6L7hOoYuIjNxv/ww RAtkT3judKRtxA88y79MLUew2Fx/dfp9KcOJU+qj2wHvE/IOnJGevtUbyMo0Jnv0PxIf WBQ7Qi1UZEWA66dLCC0BKb0nm8AVot4UO133jMd9wLw/6cQ0EhO+XAmkRwu8/0bwDMiv Fii3C19vJ2cw7iOTtgRxTkxf/7h/gTK/JuXyx/91yUw1l67y0UeRw4VcP2AqCYOJTRFA CePg== 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=CpnAoS/0GcDEawDwz3KOhZJ7qTcVFE5i2TefLG4nXpc=; b=K8TnCsLYip2GtkVRB47LHv0FSWfZ7jhSGeaULfY1DQu1ZRfD/nwFe5cBXwKtCYNglk t9l5Wa8b2uiUS07OWbPPt6SxET7ymn6apLY4/4ELitZbu2Dpm8N0entVGfYOCF+JPp2l d0+B2NRMVZ5ZPFADcH+5GHlpzG4xDleSFvUN2lbBVSIalonj+HH05CZtyzzXcRsFgVhI fN5WOldbTcTQ2U/V00nWUGa7Mm+OKFIJwcgs0lrg6EJS4d6UzRdQAA4oQpEg32GWVpQX VP30PKpHnDThDDTmbJm0iRPMjHSNE9pQMhCl0P18x16vFzV++ihtre6Hn7UWdKwBg/jo iHYg== X-Gm-Message-State: APjAAAWpUkOshhtA1fFQcFhP2Vy6IgHI2zkkmzsvndhDJHhfuq68WoeV 34fScFBdGQ6nhCqf8xpH6R83jQ== X-Google-Smtp-Source: APXvYqxV0pPYFLsJpTdZJyw5wtHVgYWzQCsqXtO6V94uUu7ujlit5hz+WG4kKW4DZqmtM2lCJWJZSQ== X-Received: by 2002:a5d:4d46:: with SMTP id a6mr2176257wru.142.1559211904702; Thu, 30 May 2019 03:25:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 30 May 2019 11:16:03 +0100 Message-Id: <20190530101603.22254-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530101603.22254-1-alex.bennee@linaro.org> References: <20190530101603.22254-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 26/26] tests/vm: ubuntu.i386: apt proxy setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Configure apt proxy so package downloads can be cached and can pass firewalls. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520124716.30472-15-kraxel@redhat.com> --- tests/vm/ubuntu.i386 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index a22d137e76d..b869afd212f 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -51,6 +51,10 @@ class UbuntuX86VM(basevm.BaseVM): " ssh-authorized-keys:\n", " - %s\n" % basevm.SSH_PUB_KEY, "locale: en_US.UTF-8\n"]) + proxy =3D os.environ.get("http_proxy") + if not proxy is None: + udata.writelines(["apt:\n", + " proxy: %s" % proxy]) udata.close() subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", "-volid", "cidata", "-joliet", "-rock", --=20 2.20.1