From patchwork Wed Jun 19 19:40:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 167253 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1125184ilk; Wed, 19 Jun 2019 12:40:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVdn+AnpaGTOortQ4eUJd72iewEHSTX0jPqe6buQAtXTSMP93A9PkEC1ppKVFEKGZ6cvwe X-Received: by 2002:a17:906:25c9:: with SMTP id n9mr84942654ejb.51.1560973256234; Wed, 19 Jun 2019 12:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560973256; cv=none; d=google.com; s=arc-20160816; b=TvzhMQJQH7gc0vKfn45indGjN1Dg7y00yvjg2729qSeP7ufAe1MQiuSiTVpwDn02gv 4FzkWlJt+dEorzwGQYc4NaaRVHVwaNg6d1tIL2yYgxuE4OGGzjxVFm4LHbjl/g558AF0 8Z33KlkYn/QZS7Z3O4WG6J18TM8ukSk0i5ISW4aV/3aYDuT5TP7RwCeuTIzQSdcdIyjV QGFaR424hDykzv32ZRZNMj4JiCUsyS7v3gVTSIug3RoZ4eWYr3nRpnjkAHYb8ops1HB9 WmU2K8uj1oAXG/Cxd7tN+9uAyj5RJOPgAdRKjQHJAz6sRCmMHHpprJGlpeH6MZO7uepz 8e1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ahgJcoAG7RlG7q4icivLXPe7IKp6EgtWsDrDvy33nsw=; b=Rna1rvizfW+ojgtdu0aP5LsOYQd5jytRXc9utsdSjTUZVDJkYmeFcAJAFBUSh/nJBW 0SnR2FJ67kiZhVQJ8QEJM6ndNutJBn1MyQazhSI8feprC8ZEZwN13lt/KhE1Hnw8U4AU Vb6uEy90q4Z69jJSKHaxfdz3rgnINl0L/YjY+J+fFN4rtJWN5Xat0vADZjFx8s0sZN7I aDsxCGEvILRMS59AeHEH7uap+DQoz6F+LsERhStF+O5trfNtXzLLahqPvLeMEuCNzIQa /aURJg41dM7gaZP7wme0Avcmb0SyYfEyAkVHEmoq32OZbUa3eqM3JO+s9XjUPsGOEnIo 1zwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pudx98c+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f25si14531004ede.206.2019.06.19.12.40.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Jun 2019 12:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pudx98c+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdgRz-00067w-5f for patch@linaro.org; Wed, 19 Jun 2019 15:40:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53862) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdgRV-0005zF-MO for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdgRU-0008Rs-Ec for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:40:25 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdgRU-0008R3-7R for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:40:24 -0400 Received: by mail-wm1-x341.google.com with SMTP id x15so676346wmj.3 for ; Wed, 19 Jun 2019 12:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ahgJcoAG7RlG7q4icivLXPe7IKp6EgtWsDrDvy33nsw=; b=pudx98c+j8ZzDliq4YExa9ZVynTLKf/yqrj/3IvRabsx6+gwOY4wcobzJ2LOPOPOhz NWD6QguqQ9xKrYKgIqt7nwc02Qpot4/Plj+gmJHdgpaLAnReM2T2UVL/kh3AU0T3jWtu AugUyumRiBAA7JQ9IKaqBvC6AbN1N2LYIpOqCRpjZs7quG7fNaB9ZT76jgNCDt/ZH00i nn//+5Q5hKlZfU/XfWf6p4pN95BXuXQ73z8DBZF9op20avcfZxGJIFcbgur0GudZkdJe j0B1EJlbB0VN8aRzW+qe2W1IB6AORRKgO+s75e7hKbXxykAkijOLKMhLC4FDpJSsxZ1b WQGA== 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=ahgJcoAG7RlG7q4icivLXPe7IKp6EgtWsDrDvy33nsw=; b=OFsbvChHIMD5eusd0t+ZO9TUi62Oy2y+NDD4FCTwNsCPUVWcfTf4o0Wtdiwfr5/Z1n P1P+C6KgEHRMkfNfM9qDPIBD+hMRnmw0U6mEd8b30US4AgQJuY4/DWc20KXuLbmWR/Af 1KIM2drf7t3WF9+XS+Frs7uaKhfAzL+NEG3aNqSAEBnZ+3woExEcwcFagqTsjKqDeBCd lgJJRAdXpuUBRVb/2EpUpdzP+iyIi8LojLeEc/vPC+xcLCceRM4+T4soB1cpyDbvjuuc 30ui1CDSnRKPqr241nLFH1PVL06av4tg4Owesl7C2pP8haVQXVLguGqHY+lMmjPuM1Bg ZoIA== X-Gm-Message-State: APjAAAUxVczliCu5wqiCGMMuSmBZL1QMoSnPKRnF38aFlbP9MtS2MizA PDuZ5UCBwaGrkPn5xrmTMu02gA== X-Received: by 2002:a1c:720e:: with SMTP id n14mr9641760wmc.53.1560973222964; Wed, 19 Jun 2019 12:40:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f12sm27114958wrg.5.2019.06.19.12.40.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 12:40:21 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BB3E1FF8C; Wed, 19 Jun 2019 20:40:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 19 Jun 2019 20:40:05 +0100 Message-Id: <20190619194021.8240-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190619194021.8240-1-alex.bennee@linaro.org> References: <20190619194021.8240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 01/17] tests/vm: avoid extra compressed image copy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa The image copy is only really needed because xz doesn't know to properly decompress a file not named properly. Instead of decompressing to stdout, and having to rely on a shell, let's just create a link instead of copying the file. Signed-off-by: Cleber Rosa Message-Id: <20190613130718.3763-2-crosa@redhat.com> Signed-off-by: Alex Bennée --- tests/vm/centos | 4 ++-- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.20.1 Tested-by: Philippe Mathieu-Daudé diff --git a/tests/vm/centos b/tests/vm/centos index 7417b50af4..b00b46a8dc 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -66,8 +66,8 @@ class CentosVM(basevm.BaseVM): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = 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"]) + subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh() diff --git a/tests/vm/freebsd b/tests/vm/freebsd index b0066017a6..5575c23a6f 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -34,8 +34,8 @@ class FreeBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = 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]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 4c6624ea5e..d0508f4465 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -34,8 +34,8 @@ class NetBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = 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]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 2105c01a26..87ec982489 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -36,8 +36,8 @@ class OpenBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = 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]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)