From patchwork Mon Jan 8 15:13:42 2024 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: 760770 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp935597wrz; Mon, 8 Jan 2024 07:15:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IG80Sncn3e1HIYt+mvFRS510jQtOGP3/jSbv4nNHul3uhU/3a1xnXqCuuHrW8bdxh/rWN3B X-Received: by 2002:a05:622a:130a:b0:429:8bdc:ce5d with SMTP id v10-20020a05622a130a00b004298bdcce5dmr3304699qtk.87.1704726903554; Mon, 08 Jan 2024 07:15:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704726903; cv=none; d=google.com; s=arc-20160816; b=PMVjuIyQwODYgzEitbkjuVF/+4LDFUJdRJg3Nhuk0bt4LSn9ZdFMLCheXT13I9dH6a iAX9/SWKu0hjOfzclaHH60z6d1fdVW3e7M8AdGWKp5VGpOZ997ultIGrdet11/g4JG4z xm7GySfXO6ltJlCGKx+9SSsqXGwkJZb9aKhQ0le2rswBuxWKDjw1UjgbZRS5yS9aKGem 4p5LJcFd8D9vOjmlS7++gLq4Qa3v5mYYu3UIiVEDtXJ+hK1dfFIbZmOTq6cXuTnavtIj s+SiyKKXrGl9sStO8LlKRZKlqlyqvZEs4sPgZQZ8fnHLjZfZv/2rZLfaUVsbtcYyC9AS 1B6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=D+qYSiNuHCw9vpeOMvQUbkSg7Ml8q939vYKp9TceBTU=; fh=Arx73Mj5ZbsiQoNGhMleF485LHX8jGL6juntVeo59X8=; b=gY2qtSR8N88DtxIRXPcnTLWZnTFQ6MDdB+zatgTyCkB22/2b8zKccL+lHXnKBGSNrE YEETRTes+GSUVZOwDYFgFKKSBIHxwMXWR9BF10GKfJQ2MIrGJh9EA4jBw6Xk+7V08HRa 9RLamZVVFpsdLxgFBqvkdw/uyClfVjQsiN+glIgjc42hN3sNSGwLO9SaesvEIFaplgxf N5ONaaOVmUn4EZBQAIxT9q76gmTp2xSxSGTrWLQJuhK7mFDdOuSuPcor6394fNvNREJo 721jtW5TWztfc/wzaAVoEq8j1z5PIH5U48vESUyWb8URAiRZwYajpXmS3ElfByibUHQl vTAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="o/FI/5r+"; 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=pass (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 f9-20020ac85d09000000b004281e7364f5si4458718qtx.455.2024.01.08.07.15.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jan 2024 07:15:03 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b="o/FI/5r+"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMrKN-0004JM-Hu; Mon, 08 Jan 2024 10:14:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMrKL-0004Gk-Ml for qemu-devel@nongnu.org; Mon, 08 Jan 2024 10:14:09 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMrKA-0001YJ-WC for qemu-devel@nongnu.org; Mon, 08 Jan 2024 10:14:09 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e45504006so7481445e9.1 for ; Mon, 08 Jan 2024 07:13:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704726836; x=1705331636; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D+qYSiNuHCw9vpeOMvQUbkSg7Ml8q939vYKp9TceBTU=; b=o/FI/5r+Uum1O0bvD5lHergn1BHTM4ASLdPgayHTsdzkBUPQ6k56oa7um9OeiAEMn5 SjS/7/04CzB62fEuoUPmy1dgABJJcG9DyD6nbzBWT1+pmh756qMSh0J7eYJeR4Z0C23a P+HpzMolEoOu8phodHcMoudtP5iS4cESy/liOUs76CORtRmOlyjvSFBxxELTpz8rafgI CK8+Sq6bSEzFvF4bDRWDRb0mtSsiHg46BmaY/3CthBBQ6Vq5UA25MLEsQkM94lpwNfQs jf5kFQkgjBMJPNHvCT6zgRH/r2yTGNTeQWBDpTPRh846+/DjEO4qD4UScr3WIL3unYkO 6z2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704726836; x=1705331636; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D+qYSiNuHCw9vpeOMvQUbkSg7Ml8q939vYKp9TceBTU=; b=HhJrrTZyHvE2DpQTyatNPaS3vdZK6uCNx0oRfQHbVP8RYvwHSIGRbEh2WtRUnWv4rL j8dSNs7tPhKhgUyt0EujL8mGYaLfYVBEWKjSNgbm6dvcxV9o5PWkgI8NoSftv/RlWWLq jlgnzQeCz1j1jXWmFpVL6YGrKG8gteh0CIfKqpEgVRsEGIDrI4hV5KezlIlbeieiYtVY Bqvcaehz+E0XPm/4DWo52eFIrk0LuoHSBVESTGa41/NdZoG3T/iczPEEqsUPjowkjYl5 uDx+RNcagZg+baz3dnumVBx7tfSYhPrKiFIITk/qGy9Xk011xjY4JJsM3YZduvx2+qH4 6Ouw== X-Gm-Message-State: AOJu0YyMnSxhjZf+XTBJv5eHwC7nB09pnzzZ2e2o9nbsJNcy2DmQORH1 0FN/bWMlpJkKUL1unHYlbIluk+1EH7TMeA== X-Received: by 2002:a05:600c:3f87:b0:40e:44c3:e0eb with SMTP id fs7-20020a05600c3f8700b0040e44c3e0ebmr1167197wmb.28.1704726836343; Mon, 08 Jan 2024 07:13:56 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j23-20020a05600c1c1700b0040d8ff79fd8sm150554wms.7.2024.01.08.07.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 07:13:53 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 28A885F942; Mon, 8 Jan 2024 15:13:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pavel Dovgalyuk , Paolo Bonzini , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/13] tests/avocado: modernise the drive args for replay_linux Date: Mon, 8 Jan 2024 15:13:42 +0000 Message-Id: <20240108151352.2199097-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240108151352.2199097-1-alex.bennee@linaro.org> References: <20240108151352.2199097-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org QEMU complains about us not being explicit with setting snapshot so lets do that. Also as cdroms are RO media we don't need to jump the hoops of setting up snapshots and replay disks - just declare the drive is a cdrom and nothing should change. Signed-off-by: Alex Bennée Message-Id: <20231211091346.14616-4-alex.bennee@linaro.org> diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index e95bff32999..f3a43dc98c2 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -48,12 +48,15 @@ def vm_add_disk(self, vm, path, id, device): bus_string = '' if self.bus: bus_string = ',bus=%s.%d' % (self.bus, id,) - vm.add_args('-drive', 'file=%s,snapshot,id=disk%s,if=none' % (path, id)) + vm.add_args('-drive', 'file=%s,snapshot=on,id=disk%s,if=none' % (path, id)) vm.add_args('-drive', 'driver=blkreplay,id=disk%s-rr,if=none,image=disk%s' % (id, id)) vm.add_args('-device', '%s,drive=disk%s-rr%s' % (device, id, bus_string)) + def vm_add_cdrom(self, vm, path, id, device): + vm.add_args('-drive', 'file=%s,id=disk%s,if=none,media=cdrom' % (path, id)) + def launch_and_wait(self, record, args, shift): self.require_netdev('user') vm = self.get_vm() @@ -65,7 +68,7 @@ def launch_and_wait(self, record, args, shift): if args: vm.add_args(*args) self.vm_add_disk(vm, self.boot_path, 0, self.hdd) - self.vm_add_disk(vm, self.cloudinit_path, 1, self.cd) + self.vm_add_cdrom(vm, self.cloudinit_path, 1, self.cd) logger = logging.getLogger('replay') if record: logger.info('recording the execution...')