From patchwork Mon Jan 8 15:13:51 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: 760777 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp936751wrz; Mon, 8 Jan 2024 07:17:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoMplPOpWG+tIleLK3c9/hWfExM7fwtSprsaklikrxFIVgzby+ytrXFqoLH+fbjxpXtODf X-Received: by 2002:a05:6214:5195:b0:681:b69:6565 with SMTP id kl21-20020a056214519500b006810b696565mr833846qvb.87.1704727025479; Mon, 08 Jan 2024 07:17:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704727025; cv=none; d=google.com; s=arc-20160816; b=yJjXWGuvNsfqxr0GHCVBYHbtwkZLQlYtUxVAgSdZ8bd+ETbXzM/8g+JErerRuyw3VJ GTIAvDv3eQxwMjubbgdC1bHNi+yj+Yi1zJnL7zhtnShhAI1QZX+Adw4+zYsAK8wFFP8e omkanHwffqGZwqK+S5rj7VAISIAv5hdOIGGjwH9qecEFMm/Laq6jZn4hBDDvkT1JfF2w j9y181V5uTVHuQ+QBPpRW4oNJIoiVvnO2bPny1a2tYSvNcAe+jGvym63HowTc6IOjDb9 QUyXntZpSwcA2B2iswIw7j55suasdnge2VSri9Vo2ZoN2pEopANsMC3ma2qE42GbZPh8 T8LA== 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=p2vXh+pSNK2Iht3pnXQCJkC17vaS5mbAQ1w3JtGP+qY=; fh=9Hwe9/PrniLSkf2HOIame21WnQQ7cqLwRKrPSOIAEU0=; b=VGgLHZRYP5Zns9UG28rws2/VyjLIe1PqPIees4en2pLIKvUvA/8mMMXU+gNJ9KHCyy XUsny3T3nHtxOLbo5cLFt/z4tPAeI9vHjBwy+Uag238J3KYMXvCTePjsHueNU+YpmGp5 tQtEjGGgG4g4Vuyn6AFxy4+5RlOyiT075ozb8TFRYzghraRDwzqXCnqsVUrHwcN5gE98 /fvJ1X5iCULx/L6vnqC5ajOB+u/mg0pXuzX5Vbyt9HbdFj4aLqs6sukWDc7hSwsexKku Mi/3/O4h2+WY2QNskb55wKnF330XTCwINu0RIWzMDO/et4Cm2Hbw1HkhztJbN6YaK9Wz GkvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oWZf1+8b; 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 y15-20020a0ce04f000000b0067f7b58a4e1si79265qvk.212.2024.01.08.07.17.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jan 2024 07:17:05 -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=oWZf1+8b; 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 1rMrKO-0004K8-51; Mon, 08 Jan 2024 10:14:12 -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 1rMrKK-0004GN-J1 for qemu-devel@nongnu.org; Mon, 08 Jan 2024 10:14:08 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMrKF-0001c7-Sv for qemu-devel@nongnu.org; Mon, 08 Jan 2024 10:14:08 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e4b499b4aso1418595e9.0 for ; Mon, 08 Jan 2024 07:14:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704726842; x=1705331642; 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=p2vXh+pSNK2Iht3pnXQCJkC17vaS5mbAQ1w3JtGP+qY=; b=oWZf1+8b2crFBvFf7ptRGSu05YyKKtSSPiU95RbOImfmPJc1j1vfOzMmJnJdCxS3m7 /v7jkt7HcA6/Z+rwNmEKHHgvpNO/m2+XBip9sFqLR14grlw14h+mqMASqcYxKbwBQH5R VFk4CBoKDby4sWQ/N1kLLAiAZwz3y2I+kt48PfP1149/rH2Xg2g5o2ltV+IApV0V2FfU VMWlXMSPy0+bUisBykangTpzJDhNUnKVmXU6wTQb4UfdCLcAN5GGlwIKxP48rAav5gNF /5aEXv0qRp7I7BJXKilSmi6/76e9vNv3on/ot/jLwMPiJfs/zBSJZAdgljm2Yj0PlW66 /QFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704726842; x=1705331642; 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=p2vXh+pSNK2Iht3pnXQCJkC17vaS5mbAQ1w3JtGP+qY=; b=lml8cNW1kJ/o6tLOFO4vs6d5BSQbxJeePBMx/JkuRTKTm9F4ESpPCTrfA9IlTgE5Gc LIFhtggV1jqP5OPubJj7Es5wTVCJ82lhbOSvSc4sixeop7gt2KT2eKWmGalW4cUFMMpt 1OycIgL6R29DsoAi7Yd1yaZ9Pm/v0x8GFGuBUWCljqKE/z9rUsbfOHp0fNx9LNgryXwP IadVz9BhbnGjke1EjVHi1BP3uFypGIEyziWOUnjEdiM05Ak8a5c54NT42eQ6WjE5DzCK Aeu2fCg5odNrHTgHQE0B475SmNKDgyKEVOJgW6Iwoy2xQYB8TnQArk0ueYIrVaPApQsQ EPlQ== X-Gm-Message-State: AOJu0YwCt1J6Lf8JF5as4p1pyWZ+2h9FI6FdkbU+zejeUuftACSx8ul5 iXdO+bzo7Wk8JgR0oAY0m+G6bG0LXHVwoA== X-Received: by 2002:a05:600c:4e8c:b0:40e:435b:4a41 with SMTP id f12-20020a05600c4e8c00b0040e435b4a41mr1573362wmq.89.1704726842394; Mon, 08 Jan 2024 07:14:02 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id cg2-20020a5d5cc2000000b00336c120855dsm8018677wrb.84.2024.01.08.07.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 07:14:01 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DF2525F93F; 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 , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , Paolo Bonzini Subject: [PULL 12/13] chardev: force write all when recording replay logs Date: Mon, 8 Jan 2024 15:13:51 +0000 Message-Id: <20240108151352.2199097-13-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::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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 This is mostly a problem within avocado as serial generally isn't busy enough to overfill pipes. However the consequences of recording a failed write will haunt us on replay when the log will be out of sync to the playback. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2010 Acked-by: Pavel Dovgalyuk Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231211091346.14616-13-alex.bennee@linaro.org> diff --git a/chardev/char.c b/chardev/char.c index 996a024c7a2..48f28881c28 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -171,6 +171,18 @@ int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all) return res; } + if (replay_mode == REPLAY_MODE_RECORD) { + /* + * When recording we don't want temporary conditions to + * perturb the result. By ensuring we write everything we can + * while recording we avoid playback being out of sync if it + * doesn't encounter the same temporary conditions (usually + * triggered by external programs not reading the chardev fast + * enough and pipes filling up). + */ + write_all = true; + } + res = qemu_chr_write_buffer(s, buf, len, &offset, write_all); if (qemu_chr_replay(s) && replay_mode == REPLAY_MODE_RECORD) {