From nobody Thu Jan 8 13:32:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1767390607; cv=none; d=zohomail.com; s=zohoarc; b=PXgRqmwXWs28dKU3/ZQUAY+y7rSBgCOZIQIOfz1zMpe2om+jsaeBCNeWThTgglXgm6zOfK3rtQ9hkb8uqgAF6ELVbTKSuKsgx2/cBY+/DPTcuGay0fdN/AHlyN3BhKoyIu58jGIxNsY9craNdHqj2Jg8oCdXJaQur1V9uTMgtN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767390607; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JDaUMXNl3FZj4WBz+kjiCzD7DUw0YTyswTIoriwfuY8=; b=jHfW3uJeuyh1cNPtwyi9s5eW6zUOSc2u/TVxGphx+4BnoFLbL5QA4SmhGBZ6V3Ho/ziMBX4CNhC+ERmsNWxAsf1K4Li5c2AkpE/Hfe9LGegU8BJmTYGqliYBHS2dVxLysIz95NZqKw3L5yA0WrGuFShc5SAvAzocBYsnj6IIkuk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767390607273275.1985887466881; Fri, 2 Jan 2026 13:50:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vbn0e-0006ml-Kg; Fri, 02 Jan 2026 16:48:36 -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 1vbmzi-0006fw-Ny for qemu-devel@nongnu.org; Fri, 02 Jan 2026 16:47:44 -0500 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vbmzg-0000Jb-SH for qemu-devel@nongnu.org; Fri, 02 Jan 2026 16:47:38 -0500 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-34c7d0c5ddaso134155a91.0 for ; Fri, 02 Jan 2026 13:47:36 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34f476f8f3fsm62925a91.5.2026.01.02.13.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 13:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767390455; x=1767995255; 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=JDaUMXNl3FZj4WBz+kjiCzD7DUw0YTyswTIoriwfuY8=; b=M3eo6WKNwfJ96eWcRcHQx3TUNiLxhpg4C8PT5qT2qDllqhOBftFem8UDBLFwujaIGH Vzv84uhC9A2MurfFc2PsAw/bWENGY7mpEj3wbHCr34zpT1LtZgSLPfSh6AJirmPOZV8Y 6tFg4W3Yv33bH8KjRa+oBWghIpLNft3xcopDoVa6+8o9JiyAYoLPDOjkNYg7urHxWIta bj7ChkTY8xr/F0tXhpkUdSSNG4Y0MiWDEALo8ZUvz2W6iDkV0otlq4TBUCEkKh7g7VF5 Pgs+0gFgsQ5ZOATe6Y1PjPtixmLD0ya0EmaSpHAaGbW8fJANJrkkzTCEk97ugUqoD//d gC3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767390455; x=1767995255; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JDaUMXNl3FZj4WBz+kjiCzD7DUw0YTyswTIoriwfuY8=; b=BFtKxwuMXLlXg6dTW+cFUQ5Y+IDcUg7G2j+XRUeRThUktui79eaK9AbTZ+mftIVFBn gHqXJCLKiYzUo1x2f2REq6NBIiJwlcc4FPzGq2KhdSKDQyZrz4Qnv7W3gB5Cy4drxZDL jM9w4oCZwTWxp11tli7qJO6OV5JJUTmnNxs39Mcf5kN47R4VuDXchrCCVyMHQIrH95zZ VVyMF6sBnJlSf6HKfVcKnLGAQ/FF3HgC+JtS+uTs9MTlHbzTPLYdVxXDzgtwwkXnCA8w IWX2uZNHuKxvQeTHELyarj9shSFIt3ysYOMdodK03uq4tQxFIULqH+lEXC1y/0/iy5Q0 A5gg== X-Gm-Message-State: AOJu0YzDMO10lI2qcrS1gcBmSDgt83jgPh7STpTVvr7jsx/t+sMd5wv9 QNxNFx/3Ge0yurBWC/Lcu+CbpXuMGKLvboUeLWKMQD4X99oB4LGkVjsml2DG5DxAptFS4jhdCbO pzUsN X-Gm-Gg: AY/fxX7Hlhcc8wwnnuzQbCI54Bl2stj9j5uyts3wLAf7NEo4QB3I8oO749n/beffOQS G4jjCq6jTk2QpF7F8fWdxAvw7M4tcRx9CeekqnnptFfguz8aDYNGaKveRLJ+eaHfw6RGnM4Hx8N Kz2RNLSxoHtkjoiw38Avn2tX8nYtb2yHlTS5+xUykUZKVii30QNFg/q3GaaDpnxvqVO+oDu0wCz gb2MhZf0RJ6mfzJbfyYG39aAvKua0v9i9OKPfcdBO7PVfBAwu9Y68K2p1//IYutJbRTcW4qouS2 x5bbY9X0JE1h9L/nu6OrOtzY4OMhN3cIaFoYS0V8WXS931V0rhTyreBxOqwlxrB746ZFbt68Ept BMQ0SHTlu0kO6CbTUsqOMvBkS61SxRwFQz8lay92khp2DqvksQWJOALvh89O29a4wpwDRLhYS0t tCPKlUErpQhNFXnttu+ylphGQeDyj0ksYeNioRDg7MwvFkLAtPpK3H6HBkC83n79ZT X-Google-Smtp-Source: AGHT+IG/xSh91TxI0VCaXOESTfemCoMwAoINTDHrQBTpUzWJE3NcUqg56/BXMs0ELuXg32Poffk6rQ== X-Received: by 2002:a17:90b:5867:b0:34e:6e7d:7e73 with SMTP id 98e67ed59e1d1-34f453c9e48mr732515a91.11.1767390454765; Fri, 02 Jan 2026 13:47:34 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Gustavo Bueno Romero , Richard Henderson , =?UTF-8?q?Phil=20Mathieu-Daud=C3=A9?= , Manos Pitsidianakis , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Pierrick Bouvier Subject: [PATCH v2 05/11] tests/tcg/plugins/mem.c: remove dependency on qemu headers Date: Fri, 2 Jan 2026 13:47:18 -0800 Message-ID: <20260102214724.4128196-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260102214724.4128196-1-pierrick.bouvier@linaro.org> References: <20260102214724.4128196-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1035.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1767390608800158500 Content-Type: text/plain; charset="utf-8" This plugin uses endianness conversion primitives from QEMU headers. As next commit will strongly isolate plugins code from those headers, those primitives can't be used anymore. glib.h provides such primitives: https://docs.gtk.org/glib/conversion-macros.html#byte-order-conversion Signed-off-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis --- tests/tcg/plugins/mem.c | 59 ++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c index 9649bce99ca..7d64e7018f2 100644 --- a/tests/tcg/plugins/mem.c +++ b/tests/tcg/plugins/mem.c @@ -12,16 +12,7 @@ #include #include =20 -/* - * plugins should not include anything from QEMU aside from the - * API header. However as this is a test plugin to exercise the - * internals of QEMU and we want to avoid needless code duplication we - * do so here. bswap.h is pretty self-contained although it needs a - * few things provided by compiler.h. - */ -#include #include -#include #include =20 QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; @@ -152,56 +143,52 @@ static void update_region_info(uint64_t region, uint6= 4_t offset, ri->reads++; } =20 + void *ri_data =3D &ri->data[offset]; switch (value.type) { case QEMU_PLUGIN_MEM_VALUE_U8: + { + uint8_t val =3D value.data.u8; + uint8_t *p =3D ri_data; if (is_store) { - ri->data[offset] =3D value.data.u8; - } else if (ri->data[offset] !=3D value.data.u8) { - unseen_data =3D true; + *p =3D val; + } else { + unseen_data =3D *p !=3D val; } break; + } case QEMU_PLUGIN_MEM_VALUE_U16: { - uint16_t *p =3D (uint16_t *) &ri->data[offset]; + uint16_t val =3D be ? GUINT16_FROM_BE(value.data.u16) : + GUINT16_FROM_LE(value.data.u16); + uint16_t *p =3D ri_data; if (is_store) { - if (be) { - stw_be_p(p, value.data.u16); - } else { - stw_le_p(p, value.data.u16); - } + *p =3D val; } else { - uint16_t val =3D be ? lduw_be_p(p) : lduw_le_p(p); - unseen_data =3D val !=3D value.data.u16; + unseen_data =3D *p !=3D val; } break; } case QEMU_PLUGIN_MEM_VALUE_U32: { - uint32_t *p =3D (uint32_t *) &ri->data[offset]; + uint32_t val =3D be ? GUINT32_FROM_BE(value.data.u32) : + GUINT32_FROM_LE(value.data.u32); + uint32_t *p =3D ri_data; if (is_store) { - if (be) { - stl_be_p(p, value.data.u32); - } else { - stl_le_p(p, value.data.u32); - } + *p =3D val; } else { - uint32_t val =3D be ? ldl_be_p(p) : ldl_le_p(p); - unseen_data =3D val !=3D value.data.u32; + unseen_data =3D *p !=3D val; } break; } case QEMU_PLUGIN_MEM_VALUE_U64: { - uint64_t *p =3D (uint64_t *) &ri->data[offset]; + uint64_t val =3D be ? GUINT64_FROM_BE(value.data.u64) : + GUINT64_FROM_LE(value.data.u64); + uint64_t *p =3D ri_data; if (is_store) { - if (be) { - stq_be_p(p, value.data.u64); - } else { - stq_le_p(p, value.data.u64); - } + *p =3D val; } else { - uint64_t val =3D be ? ldq_be_p(p) : ldq_le_p(p); - unseen_data =3D val !=3D value.data.u64; + unseen_data =3D *p !=3D val; } break; } --=20 2.47.3