From nobody Fri Nov 14 18:19:18 2025 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=1761079690; cv=none; d=zohomail.com; s=zohoarc; b=AO4SveXU6rzE+/sBY87BFsHDgNnOE3JnzyJ6AwiPFkkp0hhJ5ns/v8SzU+ahsFDLPpstDwIR/5moA2JOeVHvtyaybjxg8fAqEVNHyLxlYarz5kl2mGTAukF9Xf+n3dL8u79qb0vMSQ90cVkdsl9sPSZGkFZ4UoxmgDrsZ6U6mFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079690; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=h2Si+mJWkJrlCMUzyJdIDCI/yIQ7Fr+yrGGAP8w/vlU=; b=gz18YkLY+oAD42ayj7VZrR1luvjgLhngA58ZkI8anDcoo2wDHYfZgPqgWj2jm3RGte7PfVRy5eZPGZk2b0mtHg1bbFSdHGflTet/x8MC/sGkbAS3OciJo3euh9IhTQaM4UajsDlT06C/bJ+GDOSbv2yWjZcxRHB8Syn9GuhqeVI= 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 1761079690084379.8163633168457; Tue, 21 Oct 2025 13:48:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGD-0004jJ-PK; Tue, 21 Oct 2025 16:47:13 -0400 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 1vBJGC-0004iw-Eb for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:12 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGA-00012I-82 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:12 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-4285169c005so487084f8f.0 for ; Tue, 21 Oct 2025 13:47:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ba01bsm21596285f8f.41.2025.10.21.13.47.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079628; x=1761684428; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h2Si+mJWkJrlCMUzyJdIDCI/yIQ7Fr+yrGGAP8w/vlU=; b=S2WVc5W2sivWyabA0PPVSesJX2jIsU+sMrkMOGecjPo3vN7aS8PunCUOis3jHKeemw kK2V8mMpVfmCo1nAjgzepzUtsB54QKrt06VB/3AWgGNVLlxEhbTqEMYHFMmy4kIbKIQU PSCHlps7gHlkqdCffnsCEQSa/ghbxqA6/b5toqC5uDE8kNL1VNyo1SjKaEqk5jfzIscM PKJWQldc0RwUy8yK1IS++pXy9lEzsCC6ZKgh6Ms+R1QKPHD+jduEJXH2/PbXWKj+X/iT Df+OMYcRpoGYGSY3ZdKaXo/2OJsImFUBIDuhiOF6UMLVVhW0NuMPDTkoes9z8t7beXaA W+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079628; x=1761684428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h2Si+mJWkJrlCMUzyJdIDCI/yIQ7Fr+yrGGAP8w/vlU=; b=lshr01E0hiwi05AmwDYjIj8WIsRIYSz15JSbNByQJ2uK9RWKBRD6RndYGuaV1de75U fWJ8wM/Izz8ORxbqs/ToZ99m34dPPSsuhqgV5/+CLY/bU3kqGrJ5P1C6Tk0AOG3KWfja FmY5aU4vS3elQxdJRFFqyVA2lC/+cLaGwIKK4Ity/ZvcMEpbcv9+VG+lTbKAshGMuq7o oN012HUatr9PK8xanQAcrN5AD/VLBjg48//HsJ5Pj09asygcP6LFDh9cyY61bNnT5ECa Bg8ELvqxseVNXtMWHSTZzrTZRcWS0rdmK5sL416RsfB337jIoHdaNs7ykUrC7/ZyjHDk AFDg== X-Gm-Message-State: AOJu0YwoV4asxl6L5qt/MCAEj4cY6VohkfU3+wCK/DrVhgURqhv3JT9t AN5ag8TW9miMKlfzxg97gQee8agUCObQPN1ENyH2mWMQ4EJPEWfoK+uxqLIv7J7ZTzL42qFpSbi nO1fJqRA= X-Gm-Gg: ASbGncsj99SElRZrh5bKAVJTmrzO4rOllWqlalWfKVAEA2LTD58g/AOsUrpkdY93+VC E4Jh0N4yVMcBVhZZTGg/gaZYtqBFD7alWoL83F1/MW5vvFfZmKs8bpYRG/+26Afwfy144BNa0rT qWU/twM+nvPLZ5m2B7QrLEsLM1ZiNnNjtjLsJvLr9VswIMJbe5/k7fzeM+XhkAP6SYO+FfvId8B iV1Ma11fYayog9pajgi98phznp5gWPN+YhS51YAAlxUfkomT9bAbSnkuuu6fO+vQlCMifeSebYG hT/WBLCcSXeIFu/vLGY/DMn1GqlWfnju4zD5mxsxWeymbKSHn1AvZRpzRKqpl6+a9R8Qrf2D8AY cTtf7yAx3ZSM59X7oZHPQX4fApRZ+P8+oxU66rAbVi19jcp8P06c9xSR0BqFFpoR7lVwdk++FVN 4pd5seW4Qf4cpyL9gkxHyYYooz4PWySu323SWWSkrfcZx9gJPWqg== X-Google-Smtp-Source: AGHT+IFns7fQqBu0rwakO++TuxNGLsQP+qNtcuIaKEQzTSdtPd35VB3+sfGVbHjUawFHuaE4zMt6oA== X-Received: by 2002:a05:6000:22c5:b0:427:492:79e5 with SMTP id ffacd0b85a97d-42704d7504emr11058490f8f.21.1761079627784; Tue, 21 Oct 2025 13:47:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/45] hw/virtio/virtio-mem: Convert VIRTIO_MEM_USABLE_EXTENT to runtime Date: Tue, 21 Oct 2025 22:46:15 +0200 Message-ID: <20251021204700.56072-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1761079693751158500 Use target_arch() to check at runtime which target architecture is being run. Note, since TARGET_ARM is defined for TARGET_AARCH64, we check for both ARM & AARCH64 enum values. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Message-Id: <20250502214551.80401-4-philmd@linaro.org> --- hw/virtio/virtio-mem.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 15ba6799f22..f16445b9347 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -15,6 +15,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/units.h" +#include "qemu/target-info-qapi.h" #include "system/numa.h" #include "system/system.h" #include "system/ramblock.h" @@ -170,13 +171,20 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *= rb) * necessary (as the section size can change). But it's more likely that t= he * section size will rather get smaller and not bigger over time. */ -#if defined(TARGET_X86_64) || defined(TARGET_I386) || defined(TARGET_S390X) -#define VIRTIO_MEM_USABLE_EXTENT (2 * (128 * MiB)) -#elif defined(TARGET_ARM) -#define VIRTIO_MEM_USABLE_EXTENT (2 * (512 * MiB)) -#else -#error VIRTIO_MEM_USABLE_EXTENT not defined -#endif +static uint64_t virtio_mem_usable_extent_size(void) +{ + switch (target_arch()) { + case SYS_EMU_TARGET_I386: + case SYS_EMU_TARGET_X86_64: + case SYS_EMU_TARGET_S390X: + return 2 * 128 * MiB; + case SYS_EMU_TARGET_AARCH64: + case SYS_EMU_TARGET_ARM: + return 2 * 512 * MiB; + default: + g_assert_not_reached(); + } +} =20 static bool virtio_mem_is_busy(void) { @@ -699,7 +707,7 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *= vmem, bool can_shrink) { uint64_t newsize =3D MIN(memory_region_size(&vmem->memdev->mr), - requested_size + VIRTIO_MEM_USABLE_EXTENT); + requested_size + virtio_mem_usable_extent_size(= )); =20 /* The usable region size always has to be multiples of the block size= . */ newsize =3D QEMU_ALIGN_UP(newsize, vmem->block_size); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079662; cv=none; d=zohomail.com; s=zohoarc; b=AehtAyS8ypCciNmlux1UxIeIkKq5NknhF/dZNZ1q4Yu6wlznEcu2iSlSVxeYsEs2H/IoUqtrnJrIsGs6itWWYIhCa0dfVNjI4aw+lw/xt/WIBRm8XXkY+KeoPdljEiyCtmx4wD2foaivbp6Eei0H9d9AAGU3DBzWo6mQUARF+sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079662; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=6GDqFIZkytfcW4kR5euLzra3hfD6+X1ZoENb96SSNU8=; b=VGH3A5Z69f3JiwVD/mg6vtN2hfjTf9tQNRzNjeiYi1SMZKOGclWpV2VWxqV0A+1XwvKc2JAptTzg6Zzs4PVr4H8esx0gvoQ7fLdbqognfTjWo6fL6QksjkXmk2B5Szj51xL5dcNDDOjsdCqkNy83YqFpDGOC2Yp82cqhFFpxFOw= 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 1761079661994853.1043519726619; Tue, 21 Oct 2025 13:47:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGH-0004ja-BR; Tue, 21 Oct 2025 16:47:17 -0400 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 1vBJGG-0004jS-Pm for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:16 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGE-00012f-MN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:16 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-47103b6058fso1511955e9.1 for ; Tue, 21 Oct 2025 13:47:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42b1260sm11158005e9.13.2025.10.21.13.47.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079632; x=1761684432; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6GDqFIZkytfcW4kR5euLzra3hfD6+X1ZoENb96SSNU8=; b=AF6Vm/v3B0KERVcM2OmZ/ChGBnwOdUxjmF433tnzMTNlgcqF2LigSWZ714Kei2hF8+ NJ0Gf9+8TTlnYgMj4fWKyZTKjmciOcLVAzjtNABPGQ5AXY02fm1A1aRiNe/1J9PLOPOg XYgGhtwBR4B2EIx6Rmr5c4EIDIV1GheEejNBibLouxkaEiedSZYvgmY4YHxhNQGAtDMe eAi1b6bGL6sFDJtLJYORpVuyXkTed6VVtNjd1GlHgRQoyfONl7R/suekImsed+4hiAmj rsXIAN9i109VkJvYxtAHNxO+lytOgYzCo/Kv3yySP0tcCw45OB4bubeST9Mk7vIjPdEl n6tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079632; x=1761684432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6GDqFIZkytfcW4kR5euLzra3hfD6+X1ZoENb96SSNU8=; b=PNSAmoLm2A2XlziinFlRU96XAtyWQKWoP3m9FH7vFVytqGFQ1obBOhNTl4wThCkTeq RD/jk+Mf/fo/xtimuKI9mtHTrpRp5nHfVXk+XW3TeakOYweg2+sThNC7dgzJuDyziy+9 SEPmzDAViTxxAOXhlFFrAmSHwz2KBFJo5HEQcKZ0tHys8I6d2kpNC8Dg8Vbt2dBpa1gx zTLtPrFpm2iE9J67yQkEhwLx+xbtWvLhg50CJNWzvfnhd2ZwkQNMstmZjSIC3db2tnRh ospKm5f4GIzeke5GTA2oCT9kXLuVMGArFua4+Bh8c0V1pDKoUOpQX2ednA1YgsbMQ0bj VNmA== X-Gm-Message-State: AOJu0YwnJRlWY1DRzMqFXYjDfM16NXO5xZSQzyBMg0s3f9pcMgYcq+Fy TyN2j/4c+Jn7c1Yk/g/XvcvVBSRhZLmossnyPh7FCUPt3HpNxsekTEE+r1thd3NSazaHeYIpNAv 6vMJLXW0= X-Gm-Gg: ASbGncvE23X79BgWMUD4lKyxUa5znG9PaVcgbHJQvg9WfFczNtKRnerXFnGAHA9WCwM 7vNjY+qsKJ/hwHz6bQqCDtfqUNKNOAtuw905jyGqE70KNix8+ohObtuHfjQHf886aBTyD1S68Tn oXgBt4NG3fq8MIx1LUHYQoJ+ma3jrvMYnDybVHlOD34ip9jjSwSgYoQZkhsEzlSZjUNmIGbjJKf ggUVNwLY1PKEbKf0Np50dYoh03Do3SHKw0EdFsfmJwVE57/NpLjfygkD5V1PB1SANeLsLco3rGd DXKyAITX1siX7e6ctOnwoh3rjRoTKB7JHBON3YGqCeh5nwNFW6Shm1VZhYVQlYHrEy/Kwsmxw2y R8Ebm23udcqXnnohQ9IQfgRMllvy1GjMfJgVs/8wAdHYbw5+Ps+YCVwWV8HUtv0d/k9fLuz7ZaY QZ5K/XdVxXwxJOaKyxax308p1KZPDCcsZw3mq5q+o5QsIQyUAwBw== X-Google-Smtp-Source: AGHT+IE42lrk0VVa9u4lEB+uqAtfl2H5oSiNZG2YNil9EoQHDy5k26EvsQoHAzkKM9uzGUrQzjT0Rw== X-Received: by 2002:a05:600c:24e:b0:46f:b42e:e363 with SMTP id 5b1f17b1804b1-475c3eedebbmr5646545e9.20.1761079632299; Tue, 21 Oct 2025 13:47:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/45] hw/virtio/virtio-mem: Convert VIRTIO_MEM_HAS_LEGACY_GUESTS to runtime Date: Tue, 21 Oct 2025 22:46:16 +0200 Message-ID: <20251021204700.56072-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1761079665508158500 Check legacy guests support at runtime: instead of evaluating the VIRTIO_MEM_HAS_LEGACY_GUESTS definition at compile time, call target_arch() to detect which target is being run at runtime. Register virtio_mem_legacy_guests_properties[] at runtime. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Acked-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Message-Id: <20250502214551.80401-5-philmd@linaro.org> --- hw/virtio/virtio-mem.c | 76 ++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index f16445b9347..ae7c13e33cf 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -34,13 +34,21 @@ =20 static const VMStateDescription vmstate_virtio_mem_device_early; =20 -/* - * We only had legacy x86 guests that did not support - * VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE. Other targets don't have legacy gu= ests. - */ -#if defined(TARGET_X86_64) || defined(TARGET_I386) -#define VIRTIO_MEM_HAS_LEGACY_GUESTS -#endif +static bool virtio_mem_has_legacy_guests(void) +{ + /* + * We only had legacy x86 guests that did not support + * VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE. Other targets don't have + * legacy guests. + */ + switch (target_arch()) { + case SYS_EMU_TARGET_I386: + case SYS_EMU_TARGET_X86_64: + return true; + default: + return false; + } +} =20 /* * Let's not allow blocks smaller than 1 MiB, for example, to keep the tra= cking @@ -144,7 +152,6 @@ static uint64_t virtio_mem_default_block_size(RAMBlock = *rb) return MAX(page_size, VIRTIO_MEM_MIN_BLOCK_SIZE); } =20 -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) { /* @@ -155,7 +162,6 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) return !qemu_ram_is_shared(rb) && qemu_ram_get_fd(rb) < 0 && qemu_ram_pagesize(rb) =3D=3D qemu_real_host_page_size(); } -#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ =20 /* * Size the usable region bigger than the requested size if possible. Esp. @@ -983,28 +989,28 @@ static void virtio_mem_device_realize(DeviceState *de= v, Error **errp) rb =3D vmem->memdev->mr.ram_block; page_size =3D qemu_ram_pagesize(rb); =20 -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) - switch (vmem->unplugged_inaccessible) { - case ON_OFF_AUTO_AUTO: - if (virtio_mem_has_shared_zeropage(rb)) { - vmem->unplugged_inaccessible =3D ON_OFF_AUTO_OFF; - } else { - vmem->unplugged_inaccessible =3D ON_OFF_AUTO_ON; + if (virtio_mem_has_legacy_guests()) { + switch (vmem->unplugged_inaccessible) { + case ON_OFF_AUTO_AUTO: + if (virtio_mem_has_shared_zeropage(rb)) { + vmem->unplugged_inaccessible =3D ON_OFF_AUTO_OFF; + } else { + vmem->unplugged_inaccessible =3D ON_OFF_AUTO_ON; + } + break; + case ON_OFF_AUTO_OFF: + if (!virtio_mem_has_shared_zeropage(rb)) { + warn_report("'%s' property set to 'off' with a memdev that= does" + " not support the shared zeropage.", + VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP); + } + break; + default: + break; } - break; - case ON_OFF_AUTO_OFF: - if (!virtio_mem_has_shared_zeropage(rb)) { - warn_report("'%s' property set to 'off' with a memdev that doe= s" - " not support the shared zeropage.", - VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP); - } - break; - default: - break; + } else { + vmem->unplugged_inaccessible =3D ON_OFF_AUTO_ON; } -#else /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ - vmem->unplugged_inaccessible =3D ON_OFF_AUTO_ON; -#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ =20 if (vmem->dynamic_memslots && vmem->unplugged_inaccessible !=3D ON_OFF_AUTO_ON) { @@ -1701,16 +1707,17 @@ static const Property virtio_mem_properties[] =3D { DEFINE_PROP_BOOL(VIRTIO_MEM_PREALLOC_PROP, VirtIOMEM, prealloc, false), DEFINE_PROP_LINK(VIRTIO_MEM_MEMDEV_PROP, VirtIOMEM, memdev, TYPE_MEMORY_BACKEND, HostMemoryBackend *), -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) - DEFINE_PROP_ON_OFF_AUTO(VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP, VirtIO= MEM, - unplugged_inaccessible, ON_OFF_AUTO_ON), -#endif DEFINE_PROP_BOOL(VIRTIO_MEM_EARLY_MIGRATION_PROP, VirtIOMEM, early_migration, true), DEFINE_PROP_BOOL(VIRTIO_MEM_DYNAMIC_MEMSLOTS_PROP, VirtIOMEM, dynamic_memslots, false), }; =20 +static const Property virtio_mem_legacy_guests_properties[] =3D { + DEFINE_PROP_ON_OFF_AUTO(VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP, VirtIO= MEM, + unplugged_inaccessible, ON_OFF_AUTO_ON), +}; + static uint64_t virtio_mem_rdm_get_min_granularity(const RamDiscardManager= *rdm, const MemoryRegion *mr) { @@ -1862,6 +1869,9 @@ static void virtio_mem_class_init(ObjectClass *klass,= const void *data) RamDiscardManagerClass *rdmc =3D RAM_DISCARD_MANAGER_CLASS(klass); =20 device_class_set_props(dc, virtio_mem_properties); + if (virtio_mem_has_legacy_guests()) { + device_class_set_props(dc, virtio_mem_legacy_guests_properties); + } dc->vmsd =3D &vmstate_virtio_mem; =20 set_bit(DEVICE_CATEGORY_MISC, dc->categories); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079679; cv=none; d=zohomail.com; s=zohoarc; b=J0ziWS4qWwq9dnrSCDPy5SFHHSyHhbyAvomZB7VVBUenag6jU8bFinvrVg7WLC5qZx8QC1X2kslHKCImZYbbIcZDUfuew0CkZtYo/1A7RwZcuEhgTbgdGQDKhY1Lr7/4WD8pP11wnIF4uTlYh8/lkS9Mp8F4nWeJpwON/cJujPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079679; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KBC6i3+MkunkUVGrLLzktXv08p0y8JKjQ+ZBub6zkz0=; b=Kiw+IRRRf8/4CGnsbmQ7sPCz2I3KMAvZ6JiRmSi5g6oO28nnGGfeRm4hk0cJEEIWbhznqRw05kbmphkUaYRrxG8cJQVXWff594u7Zw9xdTCzss4A2FIhbciG80I7grLDDwgwlwxeE6G/Tcle0Y9/KrLKzs6mmA92yXYs7CMCbcs= 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 1761079679577286.16849702964066; Tue, 21 Oct 2025 13:47:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGS-0004nP-PO; Tue, 21 Oct 2025 16:47:28 -0400 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 1vBJGQ-0004kO-IO for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:26 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGJ-000131-56 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:26 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-42701b29a7eso162192f8f.0 for ; Tue, 21 Oct 2025 13:47:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a102fsm21995469f8f.1.2025.10.21.13.47.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079637; x=1761684437; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KBC6i3+MkunkUVGrLLzktXv08p0y8JKjQ+ZBub6zkz0=; b=u30Cdq++sWEtXvlyYu9N7XCiYxhnGUc/S3dDhVTjFNkstHfnaUb6UOTYbbqssWkULY 4aLgxCRiVEpwDNA6BIxwUjcaJpYxDKWBzjlZmxOufWcrNqQUenqR/0usgWp/5hXofJ3Q iqW7UfTIxkJiDKxqlwLjZxgMqdmgl3GpKwcVwRwxSq1g0BNTZ3dyJ8nBoUSb+theAmSK sP9RmGNg3imwUixJjtmW4xql7mGrUwV+3pO4X9S4cTUdn++rKZYcWK8pIBVvKr5/l+1o DOS7tNTLaMn4UbJYo7y2CA2NhFGVOvRk3U5vpg0EeZN42Egs/yFFIYHNnEYOAHHhwF+8 Sf0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079637; x=1761684437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KBC6i3+MkunkUVGrLLzktXv08p0y8JKjQ+ZBub6zkz0=; b=T6dZ9jGhZcSMLqgP23hE9hXD06m0Nn+bT3Jwxlo0NgIqg41lrA+nWVh2khLNOLiO0d CRzmbSgtNOVjo5O2PQeaoklpVeSGT3H9Thejw6cwA4UJFoCQGXEobEpVqLG1rsEIw+P1 Cije2uCU3wFcZZbM1v9Di+Fhv0mZnPwEXtAfzA4Ew8MOA9+BA0mDtPfYpzdZNGUNdFXM 2JAneduShKSDeGNu1AzUPFwCcldcHF9hxpD4KuzrUnq810T9JvKZQ0AF6eGo1WA3XWnr AN5rtFLZ2ULWLq+ppGdLF3ANgOypUOxsFbhk/dx69IsArR5PuiZkQ4t9TD5cwO6FWILE YLSw== X-Gm-Message-State: AOJu0Yx5BcDAgp6YzUhGfRSm1SUgeOqQWG8cbPfnG0DR1ItJHeCWroZd Iz7QOhQZjR6eGlqeX724rnI39zDRI+RdtMmHM4DZkH7J5qod4UsTfXsJjy9PRi6b5MN3oTo6KPF VpF27U0c= X-Gm-Gg: ASbGnctTwcK5UFMB2tjpt/KPgTP8rcsiANl3hrigqroaj8h5cjZWpTeJB1HsGEqg9Oi 50ElV7xD/Y4KtpqgniOFQf4qPcBxsNAIiYYIG+7OiN8Wd+pEtB75yf1j9EAXd7WNqBWZKGmTnMx eRUMwOJTLPmfGg/9S55BM2hQI9u10iSku4bbBut4EmLV0zam0OcLmCgaTxzp+Niy3Zv3nsR+Y7D TEBXIBdww+BmwcCWhlHyrcRTn4LyubGY8VFv10Cpc8pbKPLzLGN25wqYGJPfEbvlUyVs3p83mXV Tw+Lbc4xtkn9hGGL62Cji5Zuj5gomoWrV1jNDFO8WvNUORpwaSt818IlFaV25NJ4CxMPw/1v2Wz azkWXriPMyBg2SJbLhO6CMSdkguHWcujAyZ9OB8zBl1M/1CPhukQZQKX7EuxJD7T7IPZ/2PXeeK x6PTOMrqxxr/27PaIk7T4OfrUdlZzDVpiq+JTltlZNtFs0SnVtpQ== X-Google-Smtp-Source: AGHT+IHnLdnMmTbkUjNXGUHggtxg4iuU2A0hrWWQjX7MLFRqPTa2tri0jrlcUwU3+hAlbOQ/3FP9+w== X-Received: by 2002:a05:6000:248a:b0:3e9:54d1:e708 with SMTP id ffacd0b85a97d-4285326f900mr656353f8f.20.1761079637046; Tue, 21 Oct 2025 13:47:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/45] hw/virtio: Compile virtio-mem.c once Date: Tue, 21 Oct 2025 22:46:17 +0200 Message-ID: <20251021204700.56072-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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, 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: 1761079680458154100 Remove unused "system/ram_addr.h" header. This file doesn't use any target specific definitions anymore, compile it once by moving it to system_virtio_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Pierrick Bouvier Acked-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Message-Id: <20250502214551.80401-6-philmd@linaro.org> --- hw/virtio/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 48b9fedfa56..affd66887db 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -57,7 +57,7 @@ specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_= true: files('virtio-bal specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost= -user-fs.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-= pmem.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-v= sock.c')) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-m= em.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem= .c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_NSM', if_true: files('virtio-nsm= .c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_NSM', if_true: [files('cbor-help= ers.c'), libcbor]) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_SCMI', if_true: files('vhost= -user-scmi.c')) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079675; cv=none; d=zohomail.com; s=zohoarc; b=K2bwwKsr7Jathh69vwyC9vUo9mOwKXi/B4tiQ6xc/h0i5fikcEuGvPucPqkphgH62to6TzM/swb4M+zRfFd9eTrCfARPMWbHyrT/ecZ42l6/N+lRaQ2Ivd25rbKppRy7cN2fCiHv8hE7XFZ4Z0vSlwKocA5ZueVEQKhLmAurXtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079675; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=5qQhUmfu0ijfC215SBBbz2xixP8xuF3X5oCDjiJUZ2A=; b=j1oHEHI4Xq+RdN91w2OjsVCszwQB2/BiGiYHThfagOT7j0fKIhlSi3NjHoajHIDkKNQsWHmHkIrHmH5K0xDvofYiKFpx6npDepHkFkC2qze61hsyHVTtSlpkzDH7xShcPYGW1OigXdQYGxYe2EFZkKFCGdckqP6tBQb1PkU04Xo= 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 1761079675480497.802926262405; Tue, 21 Oct 2025 13:47:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGT-0004nq-F9; Tue, 21 Oct 2025 16:47:30 -0400 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 1vBJGQ-0004kH-6R for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:26 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGO-00013d-9L for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:25 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e6a689bd0so57697215e9.1 for ; Tue, 21 Oct 2025 13:47:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42b4867sm9603925e9.14.2025.10.21.13.47.20 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079641; x=1761684441; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5qQhUmfu0ijfC215SBBbz2xixP8xuF3X5oCDjiJUZ2A=; b=St09JX1WXvMi3TuZtFCdhu7tgrA69CFNeKk9pfUf/QuICf2rSa9rKVQRtWgHMrU16P ejPVt9EyZACF44L2NQi0/laBfhpOrJ57gu1zdtrib/x2dHxoF8hvSFoVOtVuv47V5h9z ZnAXgK6qhwmHk79q9T1ZU8wFgdLucNxWxUGju7LNDemvCk3JvzrMsRx/0YwToeYXmlGD DbPFB4s2L+lL4sckEZs4sKFwPI0a8mjUj05hS+0dp60E+/LDa8XCpfUheLsYT4/YNtnE gw4O7vwgBUZWE5onOVzVHGw2TChGeflClOK6IXnw2wpN7mLzfVHFDFb6tufuO7Qitr/T bCCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079641; x=1761684441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5qQhUmfu0ijfC215SBBbz2xixP8xuF3X5oCDjiJUZ2A=; b=pANizN5CFCZgnV1ToAh34oPvU6yr3MGF4ovQuVOFBksx7h265IOYQpG8qlrJwY2ReQ Bxim4WC7ZgmB63KDHldMmye2MfU/bP7O4N/BOhM0TTuJnaQEXTOLaYSEzzQ25a81NxYc yU757pqOgIAu6Qaqg5WS5zWQ8F5Vix1Hk9UkG6Ofr7L3QNY0k3vKAzhaswWP2OWjFhXJ sa6D7Tvb8gFgm310b2IFI8S2iMeatJsFcs/hfFgTPiSbRWQupICB3E6zfftuRLx3kNHB dr8S0D3/FzEslV8vkCmwQUTWpk8A8N1o33hTyWyiPIJYCvnX7/Ui9rLSVJ36KjNs+bC5 oI/w== X-Gm-Message-State: AOJu0YzVfAFy4RqKdCyIjRpelMIuxjJwER4mdVP5s3EtQRvo9L54UWXO 9Bwa4BIi+wLdvaPkrLMBjhJ4mQY16cs6QwxharIjkomaCRX1uMO8w6LhvpRvhudhYcn+I34muNU rU+YILNk= X-Gm-Gg: ASbGncu1ACtb5UHz01JNECXLCtjQ6OAgHRcebnC8TdTBlSL36q9s6q/u7VQnTi4leR7 be4FqV/iRvcRiMz0k5faTS9FLHoMmBPG6akEv3Wh0Boh8BeFdP455stRMnFg7694yAbTTfCkG0i v7eqFCeFWaQT1dxM1enM3vIrbPN+ZgHP2TSDeP/yUvnbdKzW0rbdYz0R2GScmDxGRerD+q1Dw4a jennh0OVrP06wDmLbncjJYRkUG3W2wUwQyLpNupmwEBeEZkmolK+MLmjqdnC/CMOQxP1dPYrG0i vPy1kBxQGNHQlKTpRyj/IDJvJs6Iw9qoTQNc6+KAf5+i4d42XmEGDOVP848wWQ5LkbGsa7zWSy7 0BEQC5/gnrCDPSax9dwPZIm7iVZpObOkjnB6eK+W24LxNl7H9n6BtWS4gzsRIn5vIADp8NNdKMH VrZUqtYBxVNqUS/j8UWJo19IIuYkjuDOuWaG193bpA//bFbyRjSA== X-Google-Smtp-Source: AGHT+IHL43kyulivHlVCJS6paN4cUn6qlNtFfSWej8eFue1H4lrFvaNuevJDG70UFO/41MiB0eeQLA== X-Received: by 2002:a05:600c:1f93:b0:46e:761b:e7ff with SMTP id 5b1f17b1804b1-4711791c66fmr151450385e9.28.1761079641565; Tue, 21 Oct 2025 13:47:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/45] hw/pci-host/raven: Simplify direct config access address decoding Date: Tue, 21 Oct 2025 22:46:18 +0200 Message-ID: <20251021204700.56072-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1761079678135154100 From: BALATON Zoltan Use ctz instead of an open coded version and rename function to better show what it does. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <68c038fd225463db282d0277d80cb525e0551413.1760795082.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/raven.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index f8c0be5d21c..ee9058e262a 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -72,16 +72,9 @@ struct PRePPCIState { =20 #define PCI_IO_BASE_ADDR 0x80000000 /* Physical address on main bus */ =20 -static inline uint32_t raven_pci_io_config(hwaddr addr) +static inline uint32_t raven_idsel_to_addr(hwaddr addr) { - int i; - - for (i =3D 0; i < 11; i++) { - if ((addr & (1 << (11 + i))) !=3D 0) { - break; - } - } - return (addr & 0x7ff) | (i << 11); + return (ctz16(addr >> 11) << 11) | (addr & 0x7ff); } =20 static void raven_pci_io_write(void *opaque, hwaddr addr, @@ -89,7 +82,7 @@ static void raven_pci_io_write(void *opaque, hwaddr addr, { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - pci_data_write(phb->bus, raven_pci_io_config(addr), val, size); + pci_data_write(phb->bus, raven_idsel_to_addr(addr), val, size); } =20 static uint64_t raven_pci_io_read(void *opaque, hwaddr addr, @@ -97,7 +90,7 @@ static uint64_t raven_pci_io_read(void *opaque, hwaddr ad= dr, { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - return pci_data_read(phb->bus, raven_pci_io_config(addr), size); + return pci_data_read(phb->bus, raven_idsel_to_addr(addr), size); } =20 static const MemoryRegionOps raven_pci_io_ops =3D { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079686; cv=none; d=zohomail.com; s=zohoarc; b=fwgOBSolqEQ5mGplc7YLfoyGlaTzWTVT2VKNzmVCUdQX42Y0uMG85b3uPlEdNeSIbZMec8NS4Ccf5nkvLklo8Lb4QwpESQOkzl0syBnkxIqj11YShwIclNzLgYyqqg3qrkPFVR61Htp4WqR3YkHBeEwQQPdootKosMEoVyiiIVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079686; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=VVFA48+wwFEfCjJAr08Wk2/47EEpFuLvgqa9uV1JQUw=; b=CpkOxJad6WWNZ5ZBy5G13rkPZQDXYCZc6PWTJ51o/j/pgTcysrLSldNzOhkAfTa1x+x3OHYByQwsc41FUbxj5Zcgc+z9EpBE7OTi7jwOPyooTrNzxy5L0mM2KbP3MfwW5TN6fVKNSNa/o5QVDOyk1vPGa2W/8UdotWvtzAgOGy0= 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 1761079686139881.4596596482895; Tue, 21 Oct 2025 13:48:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGW-0004ru-Vd; Tue, 21 Oct 2025 16:47:33 -0400 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 1vBJGU-0004pi-JJ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:30 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGS-000143-5W for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:29 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so1501564f8f.3 for ; Tue, 21 Oct 2025 13:47:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3c34sm21760533f8f.17.2025.10.21.13.47.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079646; x=1761684446; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VVFA48+wwFEfCjJAr08Wk2/47EEpFuLvgqa9uV1JQUw=; b=Fu3V+FuCq4HvJxTXJJuaC1Y7H64/f/s6PCcGEgFJ3ratvU8uxFLhNKfCcfmYsJPXFD MY4qG6rnI6g4fKLktsH11gdNqg3RT3fOJR38JIXaLXPthJ9Phb/D6KkkbpBx6Hu43NM8 4HHW2M0ZsHZZ3mbFRsIKJciP5pHARdTBVkg9iy9PuHbNWVMlN7KAfGFJOQyBmslkWFXN jdBVY9JARZOi5cm+zpxY13iagdWOmsi51CqBP1YdMfDucZGQtHZ7uVN2oPFd+9pPRD7Z Ov5WO6l24OtiXP8ByufpIUJIgDtRF29a0n8knaeu6dsW2Acl1VSnrmr/kdI8Lk68EV0c 7iDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079646; x=1761684446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VVFA48+wwFEfCjJAr08Wk2/47EEpFuLvgqa9uV1JQUw=; b=hP1sGYILSBLSlQpTjCDvusjTPfk+AkilSNZ++i9tZOS4glxP8VJKf1v4sUiItnFswB TbMc9xnpnn4AB16LYD2/UfXVuRz9v2yo6NPcW7Jn4YO4LWIZ7IpI7iUnCC5D6ihmx/AJ HCAN4Tf4Sjx0k1W0tiPYPf36gCsImcl/kxOZExzCNZj5kGmJHjXNBhLQMOQYny5lel37 rkneh4yhy4Ljj/7dnwZ1EyrLnaWCBTkYUvjdA+DjWXHXohR7hOOBe16aD97eqN6pttm8 3VV2uLp43e4t5DhtzdWDwAfVC5vlwC8M9xC4c0ltr7q3pZE55v4IHmseV/DYoZR4dqn8 +nbg== X-Gm-Message-State: AOJu0YyVfGrdQJg+cS1UlEw+QudqAaNoV4xJ1K7Tqtp0ID4neIvhpriw LnlYmX1S4EiPuhQSt2DPnejBzLwo2hyVVn683M7AIZ1xg3Y+aFlIEmatjg1byRnWL5y3vEjrfyG saCWyeXo= X-Gm-Gg: ASbGnctxogO9rg7pM9GHG1x0RURMi0auIpvB+sX9ZsDVwTTu1Dc7DOrHw3CSN2M4ioJ FumsEZO9P2j/tx+viXcFNWIVeSYaFB9QW2pnjiX5nJuDDvwecpVhkC+wTw4vX3K57nL1HcYa2oN FHb7ZVwJfIBQjbwTUsqByFkrx53BVaYJNhvreqzQC63Qw0hnxdRC3k66VYtkhPR/GQ2aIMYrah0 y/XpmfWBqxrL2FgHajx3a8PbALxBwBgFmueQUq82vvUxDsjLUygAPyx5wrbnYW3rQaNptzyCaNp Bveg3Hob4UVUL1KoMA+7eu3X7mhHbVyvN7H7Ys9Q9/rb7Uy75akKaYlYkmIocXA32Tsih3Ns29/ 56VXXujVUnPKxb4UW5uz1K9kn0Cek7uiJkfTpmZyc7RZxUAxQvqNTq3/g+mIdc7rSyvIciloPYb jlpvATGD9E6IC47LUwAiFP8kpOWcCwSWm6nwWVaCUBP+E5MW2BVA== X-Google-Smtp-Source: AGHT+IE7pVkehO3E+ccpe1mlhe27kGiHRGX6OYRZBA8E+P2kNym0gKM+bWvMLa4rTa9Op8ovQLEzXw== X-Received: by 2002:a05:6000:2c09:b0:3ee:15bb:72c8 with SMTP id ffacd0b85a97d-42704daececmr14800970f8f.36.1761079646084; Tue, 21 Oct 2025 13:47:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/45] hw/pci-host/raven: Rename direct config access ops Date: Tue, 21 Oct 2025 22:46:19 +0200 Message-ID: <20251021204700.56072-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1761079691686158500 From: BALATON Zoltan Rename memory io ops implementing PCI configuration direct access to mmcfg which describes better what these are for. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <74fcd70106289663ea426161aada78e879995d6c.1760795082.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/raven.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index ee9058e262a..e0ebc81c247 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -77,25 +77,24 @@ static inline uint32_t raven_idsel_to_addr(hwaddr addr) return (ctz16(addr >> 11) << 11) | (addr & 0x7ff); } =20 -static void raven_pci_io_write(void *opaque, hwaddr addr, - uint64_t val, unsigned int size) +static void raven_mmcfg_write(void *opaque, hwaddr addr, uint64_t val, + unsigned int size) { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); pci_data_write(phb->bus, raven_idsel_to_addr(addr), val, size); } =20 -static uint64_t raven_pci_io_read(void *opaque, hwaddr addr, - unsigned int size) +static uint64_t raven_mmcfg_read(void *opaque, hwaddr addr, unsigned int s= ize) { PREPPCIState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s); return pci_data_read(phb->bus, raven_idsel_to_addr(addr), size); } =20 -static const MemoryRegionOps raven_pci_io_ops =3D { - .read =3D raven_pci_io_read, - .write =3D raven_pci_io_write, +static const MemoryRegionOps raven_mmcfg_ops =3D { + .read =3D raven_mmcfg_read, + .write =3D raven_mmcfg_write, .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 @@ -253,8 +252,8 @@ static void raven_pcihost_realizefn(DeviceState *d, Err= or **errp) "pci-conf-data", 4); memory_region_add_subregion(&s->pci_io, 0xcfc, &h->data_mem); =20 - memory_region_init_io(&h->mmcfg, OBJECT(s), &raven_pci_io_ops, s, - "pciio", 0x00400000); + memory_region_init_io(&h->mmcfg, OBJECT(s), &raven_mmcfg_ops, s, + "pci-mmcfg", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg); =20 memory_region_init_io(&s->pci_intack, OBJECT(s), &raven_intack_ops, s, --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079739; cv=none; d=zohomail.com; s=zohoarc; b=TmabtmvKiQl+zaGIdZaDrg2hGCGjD+qb7NhxS0T7378KoxvnPzFdzqHM2a3VFmmLOnYzXk7jNNMdIqLeikPFj4cBaPzgIkSOtxKdwLreTOhJcWfIDpFpH++EiRVpsl45kfTXvqB5OrcimO7VOrongbvUuAGmvg5Y1i1njIR18mQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079739; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=vkfjenACGdmDby4HSj/Tls/WuVgzSU93DPeVdbTcqK0=; b=T96sAInpDYVBZM0MSWD7jcB6GlVF/ZLJUvVC2FZO7litDFIzrdA3RPbre5yRLb/d/ZD/XFznFl+b0f5xRUqPk8JKc9T0zSIaB1MnO13o51W2z2d1jF1nzWCwMQnYSReESYFOCtULGlBz9mhBePXWou++j22oDV9d0by6+HBbJuw= 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 1761079739369574.2440038916868; Tue, 21 Oct 2025 13:48:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH1-0005Qk-Rk; Tue, 21 Oct 2025 16:48:03 -0400 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 1vBJGe-0004wF-Kk for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:47 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGW-00014Z-Kg for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:38 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47495477241so12032575e9.3 for ; Tue, 21 Oct 2025 13:47:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c429e745sm10619525e9.9.2025.10.21.13.47.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079651; x=1761684451; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vkfjenACGdmDby4HSj/Tls/WuVgzSU93DPeVdbTcqK0=; b=AshTeHY/MGniy2bhUYXJuM4Blt/g9fT15mZSfqDISHTy0YApN651IybQ3FAhNsbfwj 38QeHVT7PgJqz4KKjZp7p2TA/Ge4MDcziHtFE6p8oolVmQufJxADX8TTzlFaBeDu7brj W0pkXjqhAjOJ8nTZkr2F48Tkc3HnBDThfCuuTtWUyINbAFKHldQtF/U1NXLOtsVBWHlw jq86LT6hEomvEly9uHio7lShx5rRs4Ude5oeoMAD3jXVkFntLUSHASkQXsp8yUG8Dtt+ XCQ0FzniIE90dA42SxyWwudQAVrZ+6tewvxqtlz+Ft0JzVomZXFwZ1QETKgZE5P53WGt Mqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079651; x=1761684451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vkfjenACGdmDby4HSj/Tls/WuVgzSU93DPeVdbTcqK0=; b=a+vYU7+j00+gnjW8i1oo4qWEcZUrOcYwHZ+SNArUtofKT/Cc6vv9XyS2p17q7kzd2/ XxPpPeYwYU+wRb2I83u8hq90+HaszsgZ9vQoCYBZIH9IVjOGkhxAoHIUxhJACbtAIzGC +VbZC5p9AJlqUnSIdw0JzZ+6csWw0PNW8Jveq0Fph8Pug9io7HMg39P1HSvq886OWltH k7ejwe/jwPDkYIYVyaI2VaiTf3EQLGhy0w88NLyDWIznNBopbVDmXjkOA1MLwQVLyUzR 2cWlIpDhdJFV55BUFsnencrzy/DbPPO0Ov3Af9oAEiy+fruA2+IfDKowJCkXi4kf+jVu QTOA== X-Gm-Message-State: AOJu0YzrApBeNfPPysJxbnkMYcef61KelmOwQA+1Pf6p5qCbWlYuXMeh yC4Jw7BaYE3jITTqpLlc0lFwxvr/G5q8Dn6C2dzlPkT++o3gQx3vMyBoztzJ4lSY2ZoMYFV1Pw/ 8cT1lXdo= X-Gm-Gg: ASbGncuiSyn8ZUZc4g0A2Y/VQr9mPsVq/0x3yZDSBfzO+WZzm6hfNGxqpbGkC+yPl/M lP4aOO5/WePqy8BvNwtFHpSgqT+HBo/bnjYC+Sp4Gdj1b6aV4wGT3FmOY7V3Gc0UhD3EoSh+BQp SsWWHmTN/l8yIjJMXg+z9nQ9YAsEsQnr7XF6lQFDkfSyM8K8wCDq+PTpBBH2UtU+kB9b0mhQ5oY nK00/WlH2Z24rssLkLLImUvyLcq7WZGB8bJ8fOZLE6JMWESG828UA852hxQE2XhdCT/T2Xnvh5c GnXaxW70ty8R/CAOg1iF5kGadpxfs0O8Zy77P0Bfh+BlbKK82V4D/5BlqEGI0++bSGNDBYYAKtn ClRFxVmzQr6xhA3z0MO8IhSsUuhSL2H/PNBbr5DId+8xu03CMn4OqqYp1QWoQW/vG/k9QZuG9i0 zuV8erN7AVhhoGkjlrSwQVIaAEVbxlVy2EICx5rlAV0ZdbMbeT3pTvy5FytZUH X-Google-Smtp-Source: AGHT+IE1W6hc8UJf/gnlYEgM61KC6RA11l7SXpbB9VWjUbiWQBGiyvArmboEyGzB2ulB9ee7D8Q0kA== X-Received: by 2002:a05:600c:64cf:b0:46e:3dad:31ea with SMTP id 5b1f17b1804b1-471178af7cemr124960245e9.17.1761079650688; Tue, 21 Oct 2025 13:47:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/45] hw/pci-host/raven: Use correct parameter in direct access ops Date: Tue, 21 Oct 2025 22:46:20 +0200 Message-ID: <20251021204700.56072-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1761079740857154100 From: BALATON Zoltan Instead of passing unneeded enclosing objects to the config direct access ops that only need the bus we can pass that directly thus simplifying the functions. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <226e0756661e72a03ba363887730112a58acde85.1760795082.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/raven.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index e0ebc81c247..eacffc86d84 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -80,16 +80,16 @@ static inline uint32_t raven_idsel_to_addr(hwaddr addr) static void raven_mmcfg_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size) { - PREPPCIState *s =3D opaque; - PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - pci_data_write(phb->bus, raven_idsel_to_addr(addr), val, size); + PCIBus *hbus =3D opaque; + + pci_data_write(hbus, raven_idsel_to_addr(addr), val, size); } =20 static uint64_t raven_mmcfg_read(void *opaque, hwaddr addr, unsigned int s= ize) { - PREPPCIState *s =3D opaque; - PCIHostState *phb =3D PCI_HOST_BRIDGE(s); - return pci_data_read(phb->bus, raven_idsel_to_addr(addr), size); + PCIBus *hbus =3D opaque; + + return pci_data_read(hbus, raven_idsel_to_addr(addr), size); } =20 static const MemoryRegionOps raven_mmcfg_ops =3D { @@ -252,7 +252,7 @@ static void raven_pcihost_realizefn(DeviceState *d, Err= or **errp) "pci-conf-data", 4); memory_region_add_subregion(&s->pci_io, 0xcfc, &h->data_mem); =20 - memory_region_init_io(&h->mmcfg, OBJECT(s), &raven_mmcfg_ops, s, + memory_region_init_io(&h->mmcfg, OBJECT(h), &raven_mmcfg_ops, h->bus, "pci-mmcfg", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079685; cv=none; d=zohomail.com; s=zohoarc; b=MCY+yu9zgrfZv9c9cTrJA1OVMorDjHl9AuIaM6w868q0HEyALUMkgzO2g49b2o73s4T6LCJOJagSdnJ/dUKO98WdoWYilr8fyjg5FsO2Mr8r3D57hES3KeWG78TsPjmAIBG73sJfSe10u8iK8LSux+OBrYY086XZOr+5/RIlDQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079685; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=143/y5s/Vd8n0Hn2bxYMjnN4uzh0g8+kJFFukw13gN0=; b=KJVnj6TqxVT7pUQu/PvJRzcLuOWV2b+AprgsxPDjwowoxLyvzMNDzUW6P3aT5dXrC/nmoUFbdkxbMazmo+q4hXNYcxpNw7vgUwmWZothBbrvAvbOYwNVKV+cm6CjQHeUBEI5p6VTnETicPb1xEEHiYEMMMKJGb4a80WfX/Mx6Wk= 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 1761079684957784.9523189723841; Tue, 21 Oct 2025 13:48:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGx-00054H-VA; Tue, 21 Oct 2025 16:48:00 -0400 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 1vBJGi-0004xx-JX for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:47 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGf-00015H-IY for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-471066cfc2aso14340715e9.0 for ; Tue, 21 Oct 2025 13:47:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce586sm22403052f8f.49.2025.10.21.13.47.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079657; x=1761684457; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=143/y5s/Vd8n0Hn2bxYMjnN4uzh0g8+kJFFukw13gN0=; b=xJibc5ggTWdlB6efdqYvT3kDFqrUn2DKOD1XrDhOvZ2OjPqL5iwUy+axO/PK+XIwIr 4jPhIhSPCjijk0EL1otPmQ5W2T0eGgDzv6fDVI3Wn1EYWgwLQyT+JCTCFHhxRv9Sl2jt K8nCeoloJSbFlA84raQPCpYtjJzrjA3oJByKsTwwBy2r7K7t7IF4j1oi012ARhnITCml U0QYVezog653u/dgdVAVcbYBzvGxZzhx/DxkFkAVbzP6S3LUXCng9RHixNWUXOZxV6Lt l7hp3z8cEt4hK9nlDQL7l/cu5ByqpBegJegn6+MSQODQ09gPnbxv60U/bn2rH/VU/ZSX Z2kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079657; x=1761684457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=143/y5s/Vd8n0Hn2bxYMjnN4uzh0g8+kJFFukw13gN0=; b=P/w/tJWNIDilIg6TiRhZ83mzcKSgA6nH3mtd1YDSVhXxq3tgWik+/RxF3AQy0yxYOE GZuTdjbmpqLTh4TifJNydaf+96/AjhxE/QlzEhexfBF+6s82T8joaU6ms9zDGVXUV069 LwUcdKM23bfkWMfkR598GL72pW+Ubz69t9iAwwqPYEFXsqB1D+ljP/mt1+MkJ0OknMZF 3eQUTI728JlzZSAaJQ/ouqGN4L85dZA2VtXakypAebrm/9vwrV8VyDx2OB8yJmoXzLzt t2bEJMp3H4ZW701e8ZWvWkegJ4HrTPVYa2kqJfOh9/UfZAJVko9v5d4gg1j9/2xAZW+x kF0w== X-Gm-Message-State: AOJu0YzsYbNPHQkcq+NBak4dpGErIA2T/sDlzNdIhJ4cl+/cSFJegOuX NePDoCo1oUXRDr43Ac+2AP1QjcKBD8RfLmthuKtYXPFvhsIThI9HCE8SiWBc9I68XKG2FlZPC2n EVFiXejY= X-Gm-Gg: ASbGncuzD8R2RlXyPpEFYyfipQYCY9F5BPRi48rjG5ePtYRAzgJNCLGmYPA0jGv+0fx Kq53HnYUEfu3wsATKCZEELF2cAEafoH0l3yi0DNRVO7h2dvJvmjX9waagkm7/77KJWV82yuJxmj hFh2o/ueRrv2mwU509JYCWKy2eozDklndMcEOR5nyXxUEI16UX1NBmekW2m78AyzqWnfda/ueli YbkDVf01oqf1Dni0ITz4ADZlYguPRRFaTSJw0DVyIL0jwq4vJ/cvnX804gQc4HbKd/EoUNWQx3n 7eECWpnouzsJQE/uPUrdveApjIfW2Pq4ZLTR2loeBZgQT5n111ZNZUuknCd5fDoZcp7pNuHrjMc JKips7K1U23sFU/nPSBF/+ran7wkLDoH4nxcoO86N5e0CoehgGtnLqBjm946xnpP9czt5uXg5DU AaZsICDIXDiG54C4qHmHNbVd6d1uA6pYNpH26DzFzlp/lgfym67w== X-Google-Smtp-Source: AGHT+IGL58exd3XSoWGVbMb8B9CeCRHWSdOQZkDgYOhFx9gs88WiXAo7b668WHJMxcaHcNLGttYAgA== X-Received: by 2002:a05:6000:24c8:b0:427:690:1f7e with SMTP id ffacd0b85a97d-42706901f8dmr12796260f8f.45.1761079656672; Tue, 21 Oct 2025 13:47:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/45] hw/core: Filter machine list available for a particular target binary Date: Tue, 21 Oct 2025 22:46:21 +0200 Message-ID: <20251021204700.56072-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1761079687677158500 Binaries can register a QOM type to filter their machines by filling their TargetInfo::machine_typename field. Commit 28502121be7 ("system/vl: Filter machine list available for a particular target binary") added the filter to machine_help_func() but missed the other places where the machine list must be filtered, such QMP 'query-machines' command used by QTests, and select_machine(). Fix that. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20251020220941.65269-2-philmd@linaro.org> --- hw/core/machine-qmp-cmds.c | 4 +++- monitor/qemu-config-qmp.c | 3 ++- system/vl.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 51d5c230f7e..28dfd3e15bd 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -20,6 +20,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/type-helpers.h" #include "qemu/uuid.h" +#include "qemu/target-info.h" #include "qemu/target-info-qapi.h" #include "qom/qom-qobject.h" #include "system/hostmem.h" @@ -94,9 +95,10 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_pro= ps, Error **errp) { - GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); + GSList *el, *machines; MachineInfoList *mach_list =3D NULL; =20 + machines =3D object_class_get_list(target_machine_typename(), false); for (el =3D machines; el; el =3D el->next) { MachineClass *mc =3D el->data; const char *default_cpu_type =3D machine_class_default_cpu_type(mc= ); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 9a3b183602d..8bd28fc2328 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" +#include "qemu/target-info.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qobject/qlist.h" @@ -128,7 +129,7 @@ static CommandLineParameterInfoList *query_all_machine_= properties(void) ObjectProperty *prop; bool is_new; =20 - machines =3D object_class_get_list(TYPE_MACHINE, false); + machines =3D object_class_get_list(target_machine_typename(), false); assert(machines); =20 /* Loop over all machine classes */ diff --git a/system/vl.c b/system/vl.c index 646239e4a69..a96063f9901 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1672,7 +1672,8 @@ static MachineClass *select_machine(QDict *qdict, Err= or **errp) { ERRP_GUARD(); const char *machine_type =3D qdict_get_try_str(qdict, "type"); - g_autoptr(GSList) machines =3D object_class_get_list(TYPE_MACHINE, fal= se); + g_autoptr(GSList) machines =3D object_class_get_list(target_machine_ty= pename(), + false); MachineClass *machine_class =3D NULL; =20 if (machine_type) { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079711; cv=none; d=zohomail.com; s=zohoarc; b=nwvo5R3SZ1+5/C99tXmHjq4GBSuaTAX3QMzT3/aoBUpulmRkKeSxn0U/EXd1vmf7wblXggebBg0HgKWl9YhbI9AUOQ7GfqQ0qhm/+bZZeSwjiPu+4eBr1aUsZ8wU+FZuQUPZnZNLGKlySKX2HiyrOnSBC1SUhh5WOU46Ik3//Rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079711; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XQQ5psxWRgNiatcKRVUGVhz6uu63XiXm8T64eSiUx9s=; b=lGcTsocwaVFtS2iKYzHS6klqtX+fuLtf31t2M8E3giRbvT1fmZn2kt84XFegrw0ljpyO+TPgBoPqDKUMQzRNuaefB2stPGUs6phF4YYxWR6NkNXVIoAmOXW4CWZgWKS/sqybr9z7DA/IQJMgAcQA40OUq5HRPhAELjguk8tPRIg= 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 1761079711670470.9008779785959; Tue, 21 Oct 2025 13:48:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJGz-0005Jw-Sz; Tue, 21 Oct 2025 16:48:01 -0400 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 1vBJGk-0004y7-9W for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:47 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGi-00015t-Co for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:46 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47118259fd8so37842575e9.3 for ; Tue, 21 Oct 2025 13:47:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427f77bsm10042785e9.3.2025.10.21.13.47.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079661; x=1761684461; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XQQ5psxWRgNiatcKRVUGVhz6uu63XiXm8T64eSiUx9s=; b=Yh6xAlyxDL6wGILeqtykZGKs+pg9KBT9Upcis6d3zy/suzcSix8HISaofJYdyGPq9i oBeTkLSWXMl2Lo8hu25xzDAPPG9f0gphDutG0U/o0GDiZN9/tsktbWr/0A5kQwcOuZoR BQtoVkUgz9Cty1ZONMkq1Bu39yEsJEjsvmGxq+OMTDZPawoNDSRxzD2EqXVuCD+U5Shy 6dY0yD2RCGZ/8yf8D8/cVqszJC9d8kmFaAaWhWY6x0xRqREzuRgTxP1mx9F9HstbQzAz IhLh+zjW8XPP/HkL9oJbaa2QdSesHnAYq0cqgJ/a8WpN/0V8Net76hMtciXpyknUhMKv TE9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079661; x=1761684461; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XQQ5psxWRgNiatcKRVUGVhz6uu63XiXm8T64eSiUx9s=; b=IcMTSypv5/22Z5FPhnw5AgRbpHBPvRH1T953gL4X15yesalkFJZNG0qSegD78dKlnz M9z1bEjnbTtr32RLK6GH5ME00deV6H8+Fn8fuCENBjGkgcnMK0PuTcAnYeKtkdn/Fpxo 8o63iNSZOSzJnalVlRIUp4xVO/ZdmW7Zp5BnF5/zI80UcVuez15eFF1gOKkyFwQXxXqF umZfVY6No27JYUuvodLqmkFX3G/PhMSWXJbd+fyYdiSo10d5KDN8u31JtgqoV9RZ4LT4 3wlDbJxPjPwKnrWE5gmyeD0AlQlWSg5pgFkMUV1sGFTm+cXyUxmvUhOEHvVLoge76vsj BjRQ== X-Gm-Message-State: AOJu0YyZPWbnmt9sHa4mvrRr4185k2zxLThAIvzdWaXP7J2d6E9aodR0 LbZNtQQwKMV8fgs+vJCBTjqppmQWpc8p+FKLVDaDBNLm6r8MLM1EI6WVzGQWahEzHkrndn2GnNq YkhUftsk= X-Gm-Gg: ASbGncsjuF2IfqA79g3i0lJQSjNTBW/o53GcZZQ1BDgjwe3Prx9+Ivxahfdn4HXQ2JN h4xNwN9ubq2Zv/UPJGlQOc7W5An1DC0j880ptaddNZeD1gB4uslntj+E6LVuBVIxgxTLgu8/UKo NOvbfw9qVNpAdgyMVE0BjKMB0Rde16zk52I2YddydTCC5ISkWPSpu8vtqO5LCHUvsw5jMNVVXY7 9fOLgo3Gn+PXvTrhBcPgm9HqjnZT1KqPc9ON9m7xRkN6VVJgF0O58+4asDbD0XCRtdGTWOfqJGp ZrHOL12KheeRvMQMhjI/luB6A8OZz7zclnCN8nW5J0iocD/yaQbWSOMZBGPLxxpdXi8dROOV/Wl VnUGSaBHvfHU5wOQY3/KpJJZwSGNOO0chH61nWvIq/4h09FP7mJqEijDU9XyDE3KSrubGhMWLRd 8CFk3T7eZboVeW2QyI9as99oTQDMfxHMcWOUk9rrephKnqF7Q5PQeolCxK+R2GKFNONs9WlQA= X-Google-Smtp-Source: AGHT+IFD1N3bpaDZizMwReNy1Um64LrLL22FZCa17VDuRV4mh+iFz17s3VGAB+2P7aEsjYJF+CnA0A== X-Received: by 2002:a05:600c:800f:b0:471:700:f281 with SMTP id 5b1f17b1804b1-471179041b6mr137163555e9.25.1761079661188; Tue, 21 Oct 2025 13:47:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/45] hw/core/machine: Allow dynamic registration of valid CPU types Date: Tue, 21 Oct 2025 22:46:22 +0200 Message-ID: <20251021204700.56072-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: 1761079712588154100 Add MachineClass::get_valid_cpu_types(), a helper that returns a dynamic list of CPU types. Since the helper takes a MachineState argument, we know the machine is created by the time we call it. Suggested-by: Pierrick Bouvier Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20251020220941.65269-4-philmd@linaro.org> --- include/hw/boards.h | 4 ++++ hw/core/machine.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index d0a69cd490b..c45272b7414 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -253,6 +253,9 @@ typedef struct { * @smbios_memory_device_size: * Default size of memory device, * SMBIOS 3.1.0 "7.18 Memory Device (Type 17)" + * @get_valid_cpu_types: + * Returns a list of valid CPU types for this board. May be NULL + * if not needed. */ struct MachineClass { /*< private >*/ @@ -299,6 +302,7 @@ struct MachineClass { bool ignore_memory_transaction_failures; int numa_mem_align_shift; const char * const *valid_cpu_types; + GPtrArray *(*get_valid_cpu_types)(const MachineState *ms); strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index 7aec3916e80..cd2f1414a77 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1570,6 +1570,8 @@ static bool is_cpu_type_supported(const MachineState = *machine, Error **errp) */ if (mc->valid_cpu_types) { assert(mc->valid_cpu_types[0] !=3D NULL); + assert(!mc->get_valid_cpu_types); + for (i =3D 0; mc->valid_cpu_types[i]; i++) { if (object_class_dynamic_cast(oc, mc->valid_cpu_types[i])) { break; @@ -1596,6 +1598,32 @@ static bool is_cpu_type_supported(const MachineState= *machine, Error **errp) error_append_hint(errp, "\n"); } =20 + return false; + } + } else if (mc->get_valid_cpu_types) { + GPtrArray *vct =3D mc->get_valid_cpu_types(machine); + bool valid =3D false; + + for (i =3D 0; i < vct->len; i++) { + if (object_class_dynamic_cast(oc, vct->pdata[i])) { + valid =3D true; + break; + } + } + + if (!valid) { + g_autofree char *requested =3D cpu_model_from_type(machine->cp= u_type); + + error_setg(errp, "Invalid CPU model: %s", requested); + error_append_hint(errp, "The valid models are: "); + for (i =3D 0; i < vct->len; i++) { + g_autofree char *model =3D cpu_model_from_type(vct->pdata[= i]); + error_append_hint(errp, "%s%s", + model, i + 1 =3D=3D vct->len ? "\n" : ",= "); + } + } + g_ptr_array_free(vct, true); + if (!valid) { return false; } } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079881; cv=none; d=zohomail.com; s=zohoarc; b=HUE0nJptiIlRC8nuIccpOCkD4JBTY7VRYK6EMPFA1v7NQzY3EsEYNRJ50ZWiwSw+1WJrx+9FbLWSbU4V2P5/oyO2MnUdIQkGpJ1egHHoeICZx+96adLSSjEiUSs936UuJfv2GQGk/EPiFDbBhLOxVg2PR8U/l+KIHS94/G9B5HY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079881; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=kLrXAGfmdWrgxLaTu8U7Tv+AagNM/KHjl/sq9+z40ow=; b=i1sIT3mylbWFXIFbpJHswatyJHzWR6SSQnvfB1EWvO8g9+FMIf7avXhuGbmJuxSTZY2C14Jw8YvWcg1UkEJlfaoaPeLxe7WR6D98qblftLumnP+D8dGSWuIVFm8KmzZBe5ReoO8P/eZgDZnfzoIx/GU8cPtI1cmJ2HoKIdJWZpg= 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 1761079881013415.57406667823955; Tue, 21 Oct 2025 13:51:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH2-0005Vc-RV; Tue, 21 Oct 2025 16:48:04 -0400 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 1vBJGp-00050l-3h for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:57 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGm-00016O-KY for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:50 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4711f3c386eso30320775e9.0 for ; Tue, 21 Oct 2025 13:47:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42b4867sm9617325e9.14.2025.10.21.13.47.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079666; x=1761684466; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kLrXAGfmdWrgxLaTu8U7Tv+AagNM/KHjl/sq9+z40ow=; b=HuqXrX87NHLCptbeUolbxJI7dAe9LjdsxICxuhOAXON4tQc9SWAPsBrb4Y49TPXPY8 qvbEiuppoY2+cA2lCByRIw8p69HiU/a21aIZdypuD8U3RW146cuJlUZX5FLtlm5C2k8F UyeLJIUsqyjC0O9Lmz/z1OfgSNps047JqbMcby5IrNCKWaljxybj4fLuPttrzIRJpGNl 0kAW2XU9J6OC2Aju4nP77ZMOVUZSf5tJU+Mwb8L/fWj+s6TLOc+vEpKE/fTr5iD68UtR MWEnji/6/IY5rqbigXM34FuMRAEW6IIitO5F0MzKcau2uFa3Fsu5oLEgexX4gEaPXGm7 S9Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079666; x=1761684466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kLrXAGfmdWrgxLaTu8U7Tv+AagNM/KHjl/sq9+z40ow=; b=tJVXrb13nKaS+s5uKF8rgwcjT5QVr8XplZIk+XY5Gwbfq0DmD+FOCcj+45YGUWf/WU MmPEiavPBSRgJH7z4TpSCA2a88FOs6bR792WU0b7WccShld1hXs5b1DEq052mhVU8gu9 vaD1ERtzsPL9FSytOfx6q0Ry+jDGboPp6lIze+Sccih5t4M+BLJoJq9ZEol3kJB9P5vL gpurKkOaqPZycKnOpdqIiO/zeK9y/S5QPuegN0pQBOKDy8bk/h0aIXFjfPt7zE6Ly3/s AqGC7Tqe7jXLKER9ag3b6OY7G+uWJ4dGUb/xJUmSaduLtl8c9lijhz6XT5nrIZPOQQQH pIjA== X-Gm-Message-State: AOJu0YwZELPsAe/s+GmMfTG7oF6fJWzo5R3Hog0zhbxUFHy1xn5s73ch 7wsteJmhBLsdW+pvJ3iPPIdoT8Nfbg/b34RImoqOH4hJHR0qe27ckDqwTzoOllLKqAizJChdr5W tinokVNE= X-Gm-Gg: ASbGncvBYH7E+xp81NXWfnF5Dr6w0GSeYOhXPm0VZi2Rc11lXpMJLDVi3rYObS/Of1f 3GVFCELp3jiOJHBbPcxHM+P9wIfyR2v9EiQ5TWCx8bVMW0ZbIOucEZ9AeONiBVRfNbvc4KLu318 yMDAPUSgv+8Fnhmr0qe8dANSednsA2DiPGJndAjlA1FNkQi9VXb17ZgFA39FT4JvR6fcsTjdqen WbGaoOtF0gM3tmGsPBcLcIoo9/mqp85v8xOPbAn/Vu8qbpsdRkKyvk+E/raLKlusN0/MLBMRI9o Lvv3KKTq/H19epM3gE5dfh0OCVyb/zvAcKyyF6kkPHAdvP1EQRRWfKjb1qa2HaN4Yl+8Q5cBOLP uJgzb3ZMvzpht0s8kYgP1ULTr8RY7U9D2ah2kp32wy1lXPzJnKna2qDH/ESEgYS7HFR6hbD6+/V VbL9hrZof9J/MjNglIupZHr+ZyoZeBzAhEhQZDAY00q25UU3OO9Q== X-Google-Smtp-Source: AGHT+IFYCvuUWE3CC9vjZou4ht1ko0skcZlXIvwOSYlX9dWIRoNsLdynSz4CTTu6Fbz5U6JSeEtlLw== X-Received: by 2002:a05:600c:468d:b0:45f:28d2:bd38 with SMTP id 5b1f17b1804b1-471178b14acmr130860395e9.18.1761079665776; Tue, 21 Oct 2025 13:47:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/45] hw/core: Introduce MachineClass::get_default_cpu_type() helper Date: Tue, 21 Oct 2025 22:46:23 +0200 Message-ID: <20251021204700.56072-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1761079882488154100 MachineClass::get_default_cpu_type() runs once the machine is created, being able to evaluate runtime checks; it returns the machine default CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20251020221508.67413-7-philmd@linaro.org> --- include/hw/boards.h | 6 ++++++ hw/core/machine.c | 10 ++++++++++ system/vl.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index c45272b7414..014007920dd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -25,6 +25,11 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE) =20 extern MachineState *current_machine; =20 +/** + * machine_default_cpu_type: Return the machine default CPU type. + * @ms: Machine state + */ +const char *machine_default_cpu_type(const MachineState *ms); /** * machine_class_default_cpu_type: Return the machine default CPU type. * @mc: Machine class @@ -303,6 +308,7 @@ struct MachineClass { int numa_mem_align_shift; const char * const *valid_cpu_types; GPtrArray *(*get_valid_cpu_types)(const MachineState *ms); + const char *(*get_default_cpu_type)(const MachineState *ms); strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index cd2f1414a77..cd63803000c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1556,6 +1556,16 @@ const char *machine_class_default_cpu_type(MachineCl= ass *mc) return mc->default_cpu_type; } =20 +const char *machine_default_cpu_type(const MachineState *ms) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(ms); + + if (mc->get_default_cpu_type) { + return mc->get_default_cpu_type(ms); + } + return machine_class_default_cpu_type(mc); +} + static bool is_cpu_type_supported(const MachineState *machine, Error **err= p) { MachineClass *mc =3D MACHINE_GET_CLASS(machine); diff --git a/system/vl.c b/system/vl.c index a96063f9901..fd98ea52d9c 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3817,7 +3817,7 @@ void qemu_init(int argc, char **argv) migration_object_init(); =20 /* parse features once if machine provides default cpu_type */ - current_machine->cpu_type =3D machine_class_default_cpu_type(machine_c= lass); + current_machine->cpu_type =3D machine_default_cpu_type(current_machine= ); if (cpu_option) { current_machine->cpu_type =3D parse_cpu_option(cpu_option); } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079731; cv=none; d=zohomail.com; s=zohoarc; b=LqHa1gtXtmFd8ar+ILu6sMSKBKoM8dkTmvi+rP1FUUl+wbToGivYdlKo4spD6+q6lYwRBCh+lYvqQPpHH49KfnaGH+HFJT0yYXslHxa264sd6Jap8o5qQhVbRrAynNDIv2hJYt9PX2ED53+4lQAj9+/oBbE8jYHAn15Gn+nDUNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079731; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EJemuqupst2Ai9qCdTK6nCWULI+YOTVngNae3E/sjFk=; b=ask7kTNuf5r+AwHVGTYFqa1b0fwvAqRoVNdpwtrAXQMhCnynmena6hZqjfMo/EgHEhUC5hwjhgGMlnk0y7frSEkM94tbtlVI+31GSa4Nre38uZqW3yrdeSlQgRpSOfL+OJZQ5vU5BgpB+WcOWcx9SXijAg/lat+5//Mo8FLN7qU= 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 1761079731237578.4528446591546; Tue, 21 Oct 2025 13:48:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH3-0005aO-U8; Tue, 21 Oct 2025 16:48:05 -0400 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 1vBJGv-00052n-FR for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:57 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGr-00016x-EG for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-471075c0a18so63482475e9.1 for ; Tue, 21 Oct 2025 13:47:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c429e7ecsm9577485e9.10.2025.10.21.13.47.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079670; x=1761684470; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EJemuqupst2Ai9qCdTK6nCWULI+YOTVngNae3E/sjFk=; b=GqRkBD8ephUjoG2C6H2jAKCULHjoTHRraRvaP+Vl+ysuaI75Uic4VA7nsFoLWOm3rt lN2g/x6ou/wvwbVReuqxIrqy62v9xaI/Sqlw5P70oEFoVx6kpekLk+vj8Pny9gDxwqgz RVvM94L68w8i0/zM3B3hCvljc/RQ3x4MEsV8dJDZyvX0L2MfOjpMXOfNXhyYenhtgzVp 6ogSfqXUoGGnQxslOaFKA5SvU9dZmJWvUtyK9OoZEjuwdjXV4pKxKhA9o/BJPvB7oEIx lH/d6wgLKY3ovrzmSv1WC6fkc2QJEClVVRHHUk2sUb3Oluw3Eg1/G4GTN0D1r3kCANUN D2cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079670; x=1761684470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EJemuqupst2Ai9qCdTK6nCWULI+YOTVngNae3E/sjFk=; b=NI2q8zqvo6RryQEfMaCxRbhh0UCmfIljX95GMCM7RD722f3wq8Bk719fon/zVaWm0m jVKAXWXC6fYR37yp1B32/sPOyoHtE6tUjXCMlrbsJrXzJg/vkN1+SUEM6txAv1C7GOGH kbEYjF/WrdDNgLgmzwiKWrzPEiCZU0p6+z48iPKedPZTRNKgI8UarUMMEagcmdsBhkDw t59u/vxefFb//npyehvYL5XDnVfKqzybWxdP8/Dsj/vZwqA+Zvw9921TZIdMb+0ePCzE FIrYWnzZmGRllFkhMsEZJkLUU/nU0Ca8cNQK+DvoisElXakS3naIwenJ/0sclZt/4Jb9 C6mw== X-Gm-Message-State: AOJu0YzgS+/+vp1NH5szE3eGSCkTQqAvanr9R4//ltIgnQu6TPxACSwN hqIe7bdRAzLunkjOnBguFSfHzlTsrH7Ics13dEMOhQCnG2zKQM9r8PUOXGQAkMIzlcaqpcSCSnI 9o18r10k= X-Gm-Gg: ASbGncs9XGpxaWTDzJvPqquCBacMlfsfJ/XvxoUxumL8Og0uW6rxa94RLYK6j0nD8lR BWzQplHLqJWU2vM0aMj9GloVztM/q43XkYI/2pTV725drEMGEx8fnPQVji882arsZzKeIHYoCti ndAVOj4mczoGadFtBxfoowgUGeVfMrHHkUML8O/nPnK6W9pzOUxx6sgy3JjGjov8cZby4565ukn G73IyDsP8oLQOAhpP9rhr5NQmMCNGBa7LMZoT6EDQEMhn6kJ0awA3cZeHjGSXa9Wbfua68ICb3a 2X2XNl4ZSfzd1fNVy9mZ0FyCSTIOZXvIL1VCA7VON++6lB97ORgBMnY5/AERG6wgKl19IVQl0fR NOBrmYdxWEirv6ejKWPfQyx1nS4EvUa7sBYziWa9QfDTa594IEqPzxdu2E7z/bc1vBO7HNAfEZg 6IscaLVL0sLsMoSN76QMCjVtPHjv8yJAbL3EqHKAVhTR3utp83ag== X-Google-Smtp-Source: AGHT+IHSORdgmZcUET0S8ZpPmEAoJpYctNxZHRpLR6bSm9ZYyor4wKtdDsPVf3sfNgHtvgspHPLwYQ== X-Received: by 2002:a05:600c:818f:b0:46f:b42e:ed86 with SMTP id 5b1f17b1804b1-4711791fbdemr127820105e9.39.1761079670289; Tue, 21 Oct 2025 13:47:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/45] hw/boards: Move DEFINE_MACHINE() definition closer to its doc string Date: Tue, 21 Oct 2025 22:46:24 +0200 Message-ID: <20251021204700.56072-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1761079736245158500 Code movement to have the DEFINE_MACHINE() definition follow its usage documentation comment. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20251020220941.65269-3-philmd@linaro.org> --- include/hw/boards.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 014007920dd..a214e3322ad 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -506,6 +506,23 @@ struct MachineState { * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro, _, tag) */ =20 +#define DEFINE_MACHINE(namestr, machine_initfn) \ + static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ + { \ + MachineClass *mc =3D MACHINE_CLASS(oc); \ + machine_initfn(mc); \ + } \ + static const TypeInfo machine_initfn##_typeinfo =3D { \ + .name =3D MACHINE_TYPE_NAME(namestr), \ + .parent =3D TYPE_MACHINE, \ + .class_init =3D machine_initfn##_class_init, \ + }; \ + static void machine_initfn##_register_types(void) \ + { \ + type_register_static(&machine_initfn##_typeinfo); \ + } \ + type_init(machine_initfn##_register_types) + /* * Helper for dispatching different macros based on how * many __VA_ARGS__ are passed. Supports 1 to 5 variadic @@ -765,23 +782,6 @@ struct MachineState { } \ } while (0) =20 -#define DEFINE_MACHINE(namestr, machine_initfn) \ - static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ - { \ - MachineClass *mc =3D MACHINE_CLASS(oc); \ - machine_initfn(mc); \ - } \ - static const TypeInfo machine_initfn##_typeinfo =3D { \ - .name =3D MACHINE_TYPE_NAME(namestr), \ - .parent =3D TYPE_MACHINE, \ - .class_init =3D machine_initfn##_class_init, \ - }; \ - static void machine_initfn##_register_types(void) \ - { \ - type_register_static(&machine_initfn##_typeinfo); \ - } \ - type_init(machine_initfn##_register_types) - extern GlobalProperty hw_compat_10_1[]; extern const size_t hw_compat_10_1_len; =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079733; cv=none; d=zohomail.com; s=zohoarc; b=X37pFXuiTZB/SWvbZRc12kxPgfTWdaNiwL51LEh0KuTYmtggDJmoypcbKHSXgy9x00NhRahSBiFwaxiHYIutESQOGrSqUDucZENEhHWdkBpslYbaCJjmD3vNyBgxHjFXq7EtVX/UXC3SVFzmLbiuUh+nsl/i+qVMVNhqwDEydf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079733; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ILn6TZC3aXNMH7tywHnGYU/8txkiq+rZxzoji89G1ds=; b=Mhv1o4JQZeku/H2uqWiukEs5E6u/VFSgc5xD9eJTJ60o+gd5n486DeUQTtmIr7QT0J9A4NhLp8vMX/y7mgmSDs4J7e12ApsqU8JJ4kRBJ4b+9ArlS8l02hQSeOn+Vt9t83NyCf5xkz+NpYdCjDu+P+n+D545nwXTKRT+zTkfDTA= 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 1761079733466384.32562414440326; Tue, 21 Oct 2025 13:48:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH1-0005QS-QI; Tue, 21 Oct 2025 16:48:03 -0400 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 1vBJGx-00059i-DC for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:59 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGv-00017J-8J for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:47:58 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-42557c5cedcso3492778f8f.0 for ; Tue, 21 Oct 2025 13:47:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427c3f7sm10897795e9.1.2025.10.21.13.47.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079675; x=1761684475; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ILn6TZC3aXNMH7tywHnGYU/8txkiq+rZxzoji89G1ds=; b=NckajO6csHHrGsbglIE18S2GFUm/ISb6tJ3ZUyD9f1uItEzNsSMNnHtbgIzjaJvoQs TxFpPebRWAwAGEzMnlKLNv5/+Izy+rxrT8ZjtcYkHyt4D+7QfwklDNZjoBsmYBSjkXA+ m4dSwnT5ZjhET4dARM5zmuRcwEq1nDGvqrb0uiKgEdmKlENcP5bVO11gYCEoxe0Blld7 hLYqdYz3yqzC5Nnt0/haAPC7xh200jo9/h8LC1G99j2UjnivG0VxJn43bg/KfjXfvPA5 rfMVbKBqM/ZZs5OmF+kCJ6R3YfyJ9yZhidZ0mVnCSbL/W7suqhfxrEhlxIygjpPslNKu sN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079675; x=1761684475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ILn6TZC3aXNMH7tywHnGYU/8txkiq+rZxzoji89G1ds=; b=ky2/NQdg00d1TrQSxRHh9Ysb+tHdfF/07OlT9Fc9NvelIm8FsqXCj52D3nJzWq373o qORvKwKFbXkeNq7X/eu1TN9pTFhhAfqwD7gUhCuBysYSTb4K048IOCYS2Mf3M5Mdtpp0 mLeQ2/NUcHwR3+LxPlYVuTiPlEUIZ3t88dxz3VHVBu8gi/rf7NEHFeSakvBxCJMxF5rR /F26N+VAKWPQKyJfTtZyyi8xeNmfruBMxyQwEzwga4ForYM/n1XZYixWj2AXRgK6wSZy 4VyiYiFL69I4t7bvlz3VzOZUefdW6mbpbihnHKhRnCkM07z2PS2gUOtKSy4gEHHcrMLa SbZA== X-Gm-Message-State: AOJu0YzoWFNm36oitKDRQO3793JSM45lI0sLhW/nDdVQfAwM9yVGIUZM jghwolHJ3JObWsT2ZSThVA4+Tbcvm2A/t1fFTRUL0eYk2aNcqvLk56KTVSHkkcOnNoJRQOgM5cV wJm3qSZs= X-Gm-Gg: ASbGncv4ninJffiH5AveJ0QWs+TNlviCbh7Lfyb34ZF7wJYpigvfUuAKnnprkK0cgUC E/dFSFtITlcivPu4IZIu3Xp/nbMH+GMDbtmiVurqbxkctB+mmjdWd7xAg5oZ5pEwWOrnjoSRCzf XlvINEkrk+bmf8oeKNkT7zFMOWdWWgO0t6lVMyks+6SUSamI/7zMbRpFY75QOV2kciXXizweraV OM1UX7tBHaLwZ4VCypPz3VIGA62GVr4PZON0BjeXdFd9EOiBk2JzJ3dRypcPaOBaakaU2AdkNpK h6Q5nZkEbILtxsTY/b50g1tJcAs/JDDCM6rdoO39frqJU/v7tOP2n+YdIFZZjIOWZzA4HkhYxFZ ttuUnrNACdMJHmxqsbPcWbmALDNx/ZvPI6qqV/tQhSTpSfqVuyS46DasvsHbxVas2YnZ+t409yX SQzL2Lk+sAJH/9MzhpRDXP9wwglMtZKPeKYkYXfqmgCBaxgRVthg== X-Google-Smtp-Source: AGHT+IGJ+Gb8liWynGaGYXWWq/DX/bVyMNWhIhlYLkddZzRRzaOhZ8wuAPiLrZCeNAokVY6it5iRBw== X-Received: by 2002:a05:6000:18a5:b0:428:bb7:1740 with SMTP id ffacd0b85a97d-4280bb71efemr8502355f8f.57.1761079674778; Tue, 21 Oct 2025 13:47:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/45] hw/boards: Extend DEFINE_MACHINE macro to cover more use cases Date: Tue, 21 Oct 2025 22:46:25 +0200 Message-ID: <20251021204700.56072-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1761079736185158500 From: BALATON Zoltan Add a more general DEFINE_MACHINE_EXTENDED macro and define simpler versions with less parameters based on that. This is inspired by how the OBJECT_DEFINE macros do this in a similar way to allow using the shortened definition in more complex cases too. Signed-off-by: BALATON Zoltan Message-ID: Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index a214e3322ad..b2964cf0556 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -506,7 +506,8 @@ struct MachineState { * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro, _, tag) */ =20 -#define DEFINE_MACHINE(namestr, machine_initfn) \ +#define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ + machine_initfn, ABSTRACT, ...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ { \ MachineClass *mc =3D MACHINE_CLASS(oc); \ @@ -514,8 +515,11 @@ struct MachineState { } \ static const TypeInfo machine_initfn##_typeinfo =3D { \ .name =3D MACHINE_TYPE_NAME(namestr), \ - .parent =3D TYPE_MACHINE, \ + .parent =3D TYPE_##PARENT_NAME, \ .class_init =3D machine_initfn##_class_init, \ + .instance_size =3D sizeof(InstanceName), \ + .abstract =3D ABSTRACT, \ + .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ }, \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -523,6 +527,14 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) =20 +#define DEFINE_MACHINE(namestr, machine_initfn) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, { }) + +#define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, __VA_ARGS__) + /* * Helper for dispatching different macros based on how * many __VA_ARGS__ are passed. Supports 1 to 5 variadic --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079741; cv=none; d=zohomail.com; s=zohoarc; b=DDSLVt7WyF33M2HS2BvgyHw4AxjOKipKl3EvkoqVn/6erBsfziha+QYoM2S9870KOi2SFIfmZ6bP+/D/Ul+9RMtaa7qCZ/vk34+VDFqxaEu2rCfNovvwP0nf1UEuq5+5kaR68izMhzMs/koA9Rq2oOWgpdgHb+FOjc8I95yN88E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079741; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=mcuDkGb+DgMEBmqhUyNSjRYCplIAiUNB//076H3m6Is=; b=gGSxr61qlG51bLQDAYUnxOQpHu1sdpu3oCa7FdLrKBZoV1qIzNg91c39+9KOFVlJqRs3/IinbFWX1u5xs2pdxODefZ8LfXd/uZxhMV3SaJ/XMbcl34cPAOASPjDbgpHCVwbxv+43d2LOvdyI3fea8U/z8fa21IX2CBvxlsO9JY0= 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 1761079741280798.9275272750307; Tue, 21 Oct 2025 13:49:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH3-0005a4-Qu; Tue, 21 Oct 2025 16:48:05 -0400 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 1vBJH2-0005VC-Fg for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:04 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJGz-00017t-JM for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:03 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47103b6058fso1514965e9.1 for ; Tue, 21 Oct 2025 13:48:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c41ca845sm10439055e9.0.2025.10.21.13.47.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079679; x=1761684479; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mcuDkGb+DgMEBmqhUyNSjRYCplIAiUNB//076H3m6Is=; b=utkCs6iBSxr38NYA+TtsscuJzPyQpZ5KBXBWjxLpWE/faXmBPDA/8E0e6MwO9L2+9X jibx2d/n6Lt4c2Y+GPZwp2sFh+M4+XhvtqNVfldk5lDDtN+4aQoZ9zYBrEBpwJBtJKdi GDtYthPNT74socMMSrCdHT62/fZHxGwLQ0V3VlhfVObxuFhB2MDWfSvibF81Kspu3fuV RlfbnosXodSgNDEd+fFn+G6g8MpWg/t17C5W2X8OLbQOHPq8Au7AjTTKa0zW9LjJ2TTI U1mZTKMEC9ZyFyTW160y71lsVzMTuq9zUupFjCVdyel5iIMOlbZoeofDYSpF6yq4q6Ps gyyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079679; x=1761684479; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mcuDkGb+DgMEBmqhUyNSjRYCplIAiUNB//076H3m6Is=; b=Kp/BgM2KSsahzwpNs2j0LH7TIu/SBsvM5Z/8gCh86AbOPt9FcC8BaGL2fZwDPbj2nu 7XRZMfp8fcA5h2N1FfI0hCsH2A8h32HINYsKnSdec6x3pVXKn3vBhHxZHCn2lxbiJyUO tjR5EUfUWD7ywpkOws2f/GMIm2+Vu6RUjdnIXHBgar+2i3nFHleaPfQTZPnIelKQ+ugr /V4mHYI4hksoJrpqpKuVXo9D7qcfFo2C43B1tGPdgnLCF/KsBZ/0powrL8wp5qN7E79y UTGQJGU5k0IKhRg8VSZbWlaTimhsCXy5zLhllWSBUi0iFIpgd2DWPdg0N2tHSV4sg8P1 HhPg== X-Gm-Message-State: AOJu0Yxi+f2Tk9pQQHkKkDPlv3CtGCALN/voWsO6uTy3GztOyyfhmahJ wkFqSaw6Ni2i+U2ECqFiOWxVnG4j31ytqLGsIIKzWvuaGNt+Y8+tsUS0Yd0O4MwGIQwIbw1WUiu jlGfQnw4= X-Gm-Gg: ASbGncueqArjBjaT5qZ7E6wSjPaPcYBVNXk+ZsU1fYFUu32PbV75aeaMAKTmIwLx8LK juV7RTU7Nj3he/kXfXtVX8TThNcKqYMPaVpyDkCagiW/f+grFNsnYMZchD+jvodEG1pE+qXvi0s w+itRhrksP6I60/XJeCVot3K93KqJCJ6aRYAXhNxSGjsFXOcqYd11UCvUWTjvz1dCAjYD2U+bow 5exE0X0sJrbdHZfefUlcGcTmP44bhDSq8F2bpEJZBddBcCdcTyv1WfYVGNWkpVHcxZgYugFnvz0 OYj1cXIBBnVpNoDYIeVSwQaJsYZ1lqg1DhDFrHqVkN4pvhXU1gtw9uszXDazFg9122o2yBPG2rF Z/9H4s+BN0fA3uv+VruZYxIY4eJg9wemhzMAQFbWFvawlP2uvIO8VHx+eQhr/VAXW+YIc/s91wp rqm+y+LProldYVkVsQt4mvfI2W0H9XyXu9VFBGIAuXKGeeJ+6qWFmnFVFvIe8Y X-Google-Smtp-Source: AGHT+IEjkErrE+kPg3hjMHbcHkpHTqI9PntpyQzrtdsjGjJe7kdxGr4P8NB3DBde98XnsHOTDWNwSQ== X-Received: by 2002:a05:600c:34d2:b0:46f:b42e:e38f with SMTP id 5b1f17b1804b1-475c4004b2emr8490165e9.19.1761079679191; Tue, 21 Oct 2025 13:47:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/45] hw/boards: Introduce DEFINE_MACHINE_WITH_INTERFACE_ARRAY() macro Date: Tue, 21 Oct 2025 22:46:26 +0200 Message-ID: <20251021204700.56072-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1761079742871154100 DEFINE_MACHINE_WITH_INTERFACE_ARRAY() is similar to DEFINE_MACHINE_WITH_INTERFACES() but allows to pass an InterfaceInfo[] pointer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20251020220941.65269-5-philmd@linaro.org> --- include/hw/boards.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index b2964cf0556..a48ed4f86a3 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -507,7 +507,7 @@ struct MachineState { */ =20 #define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ - machine_initfn, ABSTRACT, ...) \ + machine_initfn, ABSTRACT, ifaces...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ { \ MachineClass *mc =3D MACHINE_CLASS(oc); \ @@ -519,7 +519,7 @@ struct MachineState { .class_init =3D machine_initfn##_class_init, \ .instance_size =3D sizeof(InstanceName), \ .abstract =3D ABSTRACT, \ - .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ }, \ + .interfaces =3D ifaces, \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -529,11 +529,15 @@ struct MachineState { =20 #define DEFINE_MACHINE(namestr, machine_initfn) \ DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ - false, { }) + false, NULL) + +#define DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, iface= s...)\ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, ifaces) =20 #define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ - DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ - false, __VA_ARGS__) + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + (const InterfaceInfo[]) { __VA_ARG= S__ }) =20 /* * Helper for dispatching different macros based on how --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079889; cv=none; d=zohomail.com; s=zohoarc; b=kZn62W+ql5Mp1PuvWVUV0Rd/b/Q6KA3wVupDrdUn3aTORPgYeyiWEjEZht3rreUkgcsZdn0c3AX4z98h5cL13qyj6P+ciPJbOcB9pNY8uk372QqETqK/uMRRh/8ia9riwgF7REWGRsaWsa2dw0JuV8luT6joRC5lrR6XqBNXFpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079889; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=PCJUsmctVJ9G/52a/hBFRs7P+qmJ1PG9K4Gu5Uohdn8=; b=hFHiHJVTZLar+PvVixaKmEb4kkagICxAjoJfdOso0ppbP3VjIZpDlbx86ors8oA0CV4jSUU/AKqQAf7Xa17VmRYEYgRiGHLeJSseheXr/F4cMUQTX0BQVblA43RdQrSXKdl4Yi/TEKR6oK/C9Qv1LDWuIDVKw9qnRQh9fX5lFiI= 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 176107988988626.18199365880048; Tue, 21 Oct 2025 13:51:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJH8-0005q3-Kt; Tue, 21 Oct 2025 16:48:11 -0400 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 1vBJH7-0005nA-FZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:09 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJH4-00018J-FZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:09 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-427060bc0f5so2045030f8f.3 for ; Tue, 21 Oct 2025 13:48:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a0f19sm22008525f8f.9.2025.10.21.13.48.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079684; x=1761684484; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PCJUsmctVJ9G/52a/hBFRs7P+qmJ1PG9K4Gu5Uohdn8=; b=bHFfc174wW80NuiAztp2dnrO5vBLn3XlY2VUS970mNvUNTtaRszaVSq7SfVc1Bhi9Z n3H8jHyjKUdngyxtQCoWYL3wv0IkCaS4b192PVhs2dTpojGvuF/c4tztcP9TQtJSM6sx 36drqZ9ZYiyc6bJ7YqHLbjFa/ncnmcLBSB+aHb/Q6OJoWS/SIvBIutXYV08oi8OxdKIO XkmjigENObWqXc2lUgXXwQwTzLBAWcG48UqqTD6Tj/awrODXFvjU6zcNgb3ZF7mmgb/9 xb7VWQappjI4p4UnbG60IRIQYDveDMpdY5/O8PnnI80s90CqOorio9l8FZqK+YV5/POt q1Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079684; x=1761684484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PCJUsmctVJ9G/52a/hBFRs7P+qmJ1PG9K4Gu5Uohdn8=; b=NvprgK6i5c5syVxEb0VwWsVi/jA2y9uNnACCbto2EhtJUc/VQn4ys6Hu6cQv1rMXoD r3IBu8LAErtb1aJcTD6Ch6+Vo4h/4+rdBgyDeGlfTESP9gBE3WkPrSYfcJmUZwKKAPBJ nx769aGOtfXcWuVT+ox4CpqPtfqmDYpTe98BtxC/W7ai9EkGDXtRBLotca3z7hhU/s2h KosGR1duwni9QWLYxqCB8uFic7tSca9CVcMo8BgcZijbaCphV/mYc626eWepAL9FM94k kDeTV1sMyf/P0pe6lLAzpqDmQj/guwl3ITOatwlr7YN4yOvkcm0fk7/nCGAeMbDtBbx9 kqqw== X-Gm-Message-State: AOJu0YymCG2JNA5Mbu+E16xZCYZybsPM3D3os0PWlFg7qWnjPL/zko7b QYFSqWxyV1gUmO2oE4XAxRtiASo+d+ufnNWrb8t9AgLGiG7Du3ZVzw+sH/GH9ijv4CmgyelOgD7 vAWqo+fI= X-Gm-Gg: ASbGncuMHtkBweGNnBq63NjICNQPcFzdqbU0LQ5ZXitEIJcKcdR1kcC+8hL3gxj3dk5 dPDXWoRyKL2wRVQ6g/BHbs85EiajwCdT7izsMLw93o/SmwqvxiIYIT3Ts+EcpHqSutfA/4Q9wJh V3pg3MPH7teHLeKtS4pqF3gEWJe1J0y51saehQ6mspPNNaDWfgLsoFhde2RU4LhyNRLHE6DtFtu 8NnpvI5ImPM0vAX2zw6kgCTCL3aOU0HbnEsIG/wyZpqMPGRCX77GMr4fY5H3EI86wtnHcSab7zN n35VVkldyGPM+YhSzXp7m/rLhFQO77N1k5+BFpNzHuSF/jmps/txFNkImvR3XZAcOnaKU5Qk8iQ rTYiGK0M+UgFvOEfSYZjp4fGe8SjDcgCUq876GyiCXYfNsurkFAt0KPQYw8xscIj3niemen9XZS Uj63jAS3SfeOfACuXUS7++rQwU2rmCl0GK5dF3TYZGcSklZhsqBvOMTKcExE73 X-Google-Smtp-Source: AGHT+IHPG1Enz8eZd8UMMAXbzzgM5jPGeK1RyxPZeLYslY1zOZ23jAeA6CZ02FitgRFXgLO7SW9+6g== X-Received: by 2002:a05:6000:4718:b0:426:f10e:6b56 with SMTP id ffacd0b85a97d-42704db1df0mr13457479f8f.27.1761079683646; Tue, 21 Oct 2025 13:48:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/45] hw/i2c/smbus_eeprom: Add minimum write recovery time for DDR2 Date: Tue, 21 Oct 2025 22:46:27 +0200 Message-ID: <20251021204700.56072-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1761079892623154100 From: BALATON Zoltan This is needed for newer u-boot-sam460ex versions to pass the DRAM setup. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251008122502.9DA8956F301@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/smbus_eeprom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 0a1088fbb0a..26e211b31ad 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -288,6 +288,7 @@ uint8_t *spd_data_generate(enum sdram_type type, ram_ad= dr_t ram_size) spd[33] =3D 8; /* addr/cmd hold time */ spd[34] =3D 20; /* data input setup time */ spd[35] =3D 8; /* data input hold time */ + spd[36] =3D (type =3D=3D DDR2 ? 13 << 2 : 0); /* min. write recovery t= ime */ =20 /* checksum */ for (i =3D 0; i < 63; i++) { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079736; cv=none; d=zohomail.com; s=zohoarc; b=S1NAdb0Yntu4fK5hQUSXnViKG+5uKrmNUTKwHbRgY9SFG9eYE9CguV10afv0wyv65szLxYYwFBPCRo8t2gB8/ELfNjonDizi7WTyXfbg4+oj4HB5YgXYT67/koLzChZTHGtIItWOIjiRwz0RG8UiT8VMjrlgFsDQ+MH6Xtr/mq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079736; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Vutle4YXIOFFrBvcNunmt19xjODe06KxvyMmRyQ1onQ=; b=T9lyCOk/mRfhbCCND9FiwEcRfEPxMFZG42M9ZG3Z4/ySMLfB+TSyQxpnmU36rKoaNelQgP4A8h3jgOXCXasxkndn2L40qYLI27onhrTKFVKCEvwLI1OpjAtjRe68PufAKWQ35VkNNwlHoCfT/lgahFrJkn63AhDPF5UPWTKnfqE= 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 1761079736484707.768822436284; Tue, 21 Oct 2025 13:48:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHE-00063w-Mn; Tue, 21 Oct 2025 16:48:16 -0400 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 1vBJHC-0005yM-MQ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:15 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJH9-00018o-6A for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:13 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46b303f7469so48892315e9.1 for ; Tue, 21 Oct 2025 13:48:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f009a9a9sm22537515f8f.29.2025.10.21.13.48.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079689; x=1761684489; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Vutle4YXIOFFrBvcNunmt19xjODe06KxvyMmRyQ1onQ=; b=Os/M8WOM/UQSyyEWo/mF3s4FzkiwXOoa+LZnJmLgroG9Z2qn7mxvV0qq1COkqpgBS/ +kxS4nIorHTU75BIBsqedoMXKjukmIDfztPu0jiVRy8gOOgwtCpCQ/Iw4Mgzk8fMeeGz QGlRIhD0gMGjOqyxk+nJlmKhMoDqzEbX0nLleg8AeacZflbLLjoHryo/fgCr8M6kEygg I1KoPUJZHEpdKyzvTjToEaMkk8em5L8RDeye9q45dFTyreQtmPJK6b5Kui4iKUTHmdlF NnPjMtOZ1XeOEJ+XFcPj26YLP1CwdnPwufgi76vjiLSRvAjkvjRLJPq580FNitZr3kq1 Tscw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079689; x=1761684489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vutle4YXIOFFrBvcNunmt19xjODe06KxvyMmRyQ1onQ=; b=DAotKQ5cLjYF/Dj6hiNKM7n5MHWDh5/NNBlgHYV1peB7QhG7MxslCw5wyfPXSeHtvW Mzui5koYJdi3dcPcDwo63tX8ph0Ab8XD9qfVNSGw+p0k+wQf1t2b0hB4z7JYTHtJ7S3t WBELqn313yWZePSMod+HUR8FKWHaMq9zs8+6fInW+EzQ97X5A/YM8Q1/jJatqPBlPnMf BIQxHDYW8D3TAaC7IwVuiQqOun+e1eYuNjxNqCX9Wl0cCGARyDXHkD3KjuzJRpxyiVfF rgM4r3O5odbebgADBIs+QRBtUCuFYSsUiHEMCUlXdqlVLevzv2a+Q8qeY4LtL1oTx8LW X6cw== X-Gm-Message-State: AOJu0YyiNys1Ot+x2tnlnPt1wtHEyRzWS79XYJuBTj9BJd99Dx7rauta RkM3U9utT8DgFsPipvd20YEWFCGYguEqkP1z916acjQP5xLNGzVURyhIBj0A+x9mKA4+9eyEI2x HMQAy370= X-Gm-Gg: ASbGncsnrLautBb9qPsCqqtBHfvpWgEh/C3hIWkQb8AXH5fBoc5jhvAaT/U7g8sCbJ9 9RBOgAx/2iahD7BfbIPZfcBUpUuQsKSRS1oU1f/E85QoDv5EQymyB2VgQuUzBpoR4DkpQ71HU8A xMJca4btLUq22UN+5jnz+bZw9yG0a7KKYHp581F6G5tV1dDXIE7wWR/B3Zj1IizJNh7+AECotFv gr3wDVxOOyPlYessaCh0/09PQAgSYUI99HAjX1iMl3OhpaKXrCTucTPFtzSvJETp/syhfLEPwyZ hwl7kSG5Mly6lbgDGbQzkVW+0onk+1hORzoEcK9FlDxnm+x7Ph3PYsCTWBwqyTdRZsXK4LCLP0T VvIF9086O70c+BYa8I2RB1q+hQgp4MA5l8uVuDZAJouZg863p8LaOA6H2C91i4nLH3vEh4kr9xa 5iNWL1+NZ1+YLFzHBondkKJsYYCZpHjBLQeac6qMnJRaUn4dcPjMiObUCHY+fN X-Google-Smtp-Source: AGHT+IHHhz0PfA4M2bG/xsFIM88eKoKfDlYj8m8DXImZxQr/P1sFLrzxhwCGvoejWOU2po78eDzrMg== X-Received: by 2002:a05:600c:548a:b0:471:669:e95d with SMTP id 5b1f17b1804b1-4711787dcc8mr120147665e9.12.1761079688803; Tue, 21 Oct 2025 13:48:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/45] hw/ppc/e500: Check for compatible CPU type instead of aborting ungracefully Date: Tue, 21 Oct 2025 22:46:28 +0200 Message-ID: <20251021204700.56072-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1761079738232158500 From: Thomas Huth When using the ppce500 machine with an embedded CPU type that has the right MMU model, but is not part of the e500 CPU family, QEMU currently aborts ungracefully: $ ./qemu-system-ppc -machine ppce500 -cpu e200z5 -nographic qemu-system-ppc: ../qemu/hw/core/gpio.c:108: qdev_get_gpio_in_named: Assertion `n >=3D 0 && n < gpio_list->num_in' failed. Aborted (core dumped) The ppce500 machine expects a CPU with certain GPIO interrupt pins, so let's replace the coarse check for the MMU_BOOKE206 model with a more precise check that only allows CPUs from the e500 family. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3162 Signed-off-by: Thomas Huth Acked-by: Bernhard Beschow Reviewed-by: Harsh Prateek Bora Reviewed-by: BALATON Zoltan Message-ID: <20251015111243.1585018-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/e500.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 723c97fad2e..3d69428f31c 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -20,6 +20,7 @@ #include "qemu/guest-random.h" #include "exec/target_page.h" #include "qapi/error.h" +#include "cpu-models.h" #include "e500.h" #include "e500-ccsr.h" #include "net/net.h" @@ -942,9 +943,8 @@ void ppce500_init(MachineState *machine) env =3D &cpu->env; cs =3D CPU(cpu); =20 - if (env->mmu_model !=3D POWERPC_MMU_BOOKE206) { - error_report("MMU model %i not supported by this machine", - env->mmu_model); + if (!(POWERPC_CPU_GET_CLASS(cpu)->svr & POWERPC_SVR_E500)) { + error_report("This machine needs a CPU from the e500 family"); exit(1); } =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079764; cv=none; d=zohomail.com; s=zohoarc; b=f1pStN12Re0SLK+ztQ3MNCvC0oNt8DPMQYOCjUOnZBrXb29VESY5Uw+5X9ldOQGkOpUVa/W4AnRuji6LmAsUotuNgdg1MjfTrG/EOtnXTb2Ij7BXheoSZoOmqjvBbwDbGlmivFdFjt6WFZ2xCqMdO5swjnn+R+2EjvJi/q0wXrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079764; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Q+nGj84oA5Nf5HI4XwQsUpDQo9dIo/p1hzBMc/Uthic=; b=OYSMtGgf6an5qSAZxaw5ervsD0oKm/JUtFgWkOoQUbazOD8ZMkfve9GmdD4xpLgsdVzcUERayDMMRUaSv5LB01AesHJecj32YG9Kk5CUxmYqy5gapFbrSIAm+mDELi41bmuRsTxFNJsDBBTyfIa2skB6U2AwHEO3iKHq+WInVD0= 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 1761079764338759.3503966930064; Tue, 21 Oct 2025 13:49:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHM-0006mR-08; Tue, 21 Oct 2025 16:48:24 -0400 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 1vBJHJ-0006eM-Mg for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:21 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHF-00019G-JS for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ee130237a8so3922469f8f.0 for ; Tue, 21 Oct 2025 13:48:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9fa8sm22364672f8f.38.2025.10.21.13.48.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079694; x=1761684494; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q+nGj84oA5Nf5HI4XwQsUpDQo9dIo/p1hzBMc/Uthic=; b=ghgZjyuvcFcF0/0LFBEMC3V3P5BXQIep9kX1rnXhty3WxiMKfOzk8JTcxVzkXD6n2l NRxztGreg6DMIhoL0ocbe5L61D+4c42D5vNOGPLSyBXzG9kNb3LIKApL+CKRm04Foe1I WheeOiOQnAgoJdmeVduuKag91ISrXzaS0Q/f2ECewaoOig3GuR5y8agQtqa3qQnjdfdw HurNQJrxhseOrycHUvzrkUjyxcOdq59SjnsyVqsxXfh+gZV4RbYpGgfD5HCYuuHqJGJh U+bYxcbDjbI2kRkrk+wIQGetVt0VCKPHE03pPsDJ+i03yNL9Re9qmoaXGn1yXYbRJnc7 yLfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079694; x=1761684494; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q+nGj84oA5Nf5HI4XwQsUpDQo9dIo/p1hzBMc/Uthic=; b=Hm86biZQ/s9eNgcmpuTjrQWczgm2epUtgrCnHLjq0COHPcydQnjVUC/tRhv5aqScYG Hm5H1TAPfegv/Hw2VRpjmX5lz24SZuS9BKQQI70bXkDqK8WtOYpvq0c/TkoS+oqmGOmp EgE6UTa6VxOvUnOqzY30VaJcMKYPcdDiM96GY3FDxbnR3wkfnVR/QydZtF86mWZCHvNF j/rIx4LOT09XkTAp19zYp1q+PK5mSMLzKtc5pS7qDeZMi2gLOIzxRLlezQCtW6XtPlzl fzBX5ObTDugbpWhalfJQ0Uyx19SUHzkiTwh/j3RwWCZ4n6bCQA4Y9fJqAEbXI/bk5/b2 Skww== X-Gm-Message-State: AOJu0Yx7m3P5jkPf1R41fvdxjBI6/eAYKU2VI3YUxKSTVniB5iNFoOAz EZ3S6fvJ06tWE9UBH46B5lw2YYGXUG+2+poo4xQ+nnu7ZXCIFhbTV/T41zI8L8zbUIj7euRTZlG SCVaKIIw= X-Gm-Gg: ASbGncsdOzdA2WIAKYxKtAD8IItfcyuEuipAowgCrlkYf/xvkxP8uFlkuZrr+rG6QJs 1LdeLh2iGucLHSe7Vcma78ywzwhXbTpsIYMZQGRTMiiB+HNsM+kmNvokxLWpXON9LLbFLvsatp+ a3rdhCUM9NVLV9Q8d0+HAxhPb6fjdnOPFU+aoaGAy4+fer7YPhWdUyFb19+B2yEO+H2g1AoSjV4 Jn79bskE6UmtqFPKUF5TIkNGg06YttDnEWvsT++Bou0P/85i+3tprdlFWooDuAAWsnfdL/ygMBG H9TtaDugjj4UP9thT4yth+FuBwAOKxmacEZRUAkY4XshH0Hzic98BMZXkFXqjrI7vcdAeBSDVPB Daxr1wHOc0TAjqos8jUFxCb65RF1DFCCjAvDFR1arl2oqk3UShG4vFaF9cdP3yxRRyqBBFlTWvA YTusJPi+cjhdmMeFjyy1uij3BDspRpMoREKnaMoRacbXvyW1laOQ== X-Google-Smtp-Source: AGHT+IHHbxFhLgwcCn6aezB1693narYiwd2irD1vYqde0u/HTlK17e1WmlBn706iGD4kVPiO0Wy+Yw== X-Received: by 2002:a05:6000:1884:b0:3e5:394d:10bb with SMTP id ffacd0b85a97d-42704defebdmr12687402f8f.41.1761079694524; Tue, 21 Oct 2025 13:48:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/45] hw/openrisc/openrisc_sim: Avoid buffer overflow build error Date: Tue, 21 Oct 2025 22:46:29 +0200 Message-ID: <20251021204700.56072-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1761079768610158500 From: Jan Kiszka Resolves this build breakage (which is actually a false-positive) ../hw/openrisc/openrisc_sim.c: In function =E2=80=98openrisc_sim_init=E2=80= =99: ../hw/openrisc/openrisc_sim.c:284:45: error: =E2=80=98__builtin___snprintf_= chk=E2=80=99 output may be truncated before the last format character [-Wer= ror=3Dformat-truncation=3D] snprintf(alias, sizeof(alias), "serial%d", uart_idx); ^ In file included from /usr/include/stdio.h:964:0, from /data/qemu/include/qemu/osdep.h:114, from ../hw/openrisc/openrisc_sim.c:21: /usr/include/bits/stdio2.h:54:10: note: =E2=80=98__builtin___snprintf_chk= =E2=80=99 output between 8 and 9 bytes into a destination of size 8 return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __glibc_objsize (__s), __fmt, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __va_arg_pack ()); ~~~~~~~~~~~~~~~~~ by using a modern, more robust allocation pattern. Suggested-by: Peter Maydell Signed-off-by: Jan Kiszka Reviewed-by: Peter Maydell Message-ID: <298bd904-1ee9-439e-8220-7a24e0952861@siemens.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/openrisc/openrisc_sim.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 880c8ebbb8b..b7d9cdd9007 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -247,10 +247,10 @@ static void openrisc_sim_serial_init(Or1ksimState *st= ate, hwaddr base, OpenRISCCPU *cpus[], int irq_pin, int uart_idx) { + g_autofree char *alias =3D g_strdup_printf("serial%d", uart_idx); void *fdt =3D state->fdt; char *nodename; qemu_irq serial_irq; - char alias[sizeof("serial0")]; int i; =20 if (num_cpus > 1) { @@ -281,7 +281,6 @@ static void openrisc_sim_serial_init(Or1ksimState *stat= e, hwaddr base, /* The /chosen node is created during fdt creation. */ qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename); } - snprintf(alias, sizeof(alias), "serial%d", uart_idx); qemu_fdt_setprop_string(fdt, "/aliases", alias, nodename); =20 g_free(nodename); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079958; cv=none; d=zohomail.com; s=zohoarc; b=AJLyG5GIzbDyJF5forPx6YjIEqNsBUr/m+L22kcpc9fn4EBq3IMWhpuVQLr7Dtz6RsG16h9dSlUcKxdrVlCnZi1uYvKzpFPKGN+F0FCUcW9qFftoIQoEeo3VYkG9W7UElnLvZNIFLhENsXLLEv20NRmGOPoTnj4GJK0Qpsk8yAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079958; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=MIqpoD4tAWeMFdopoink0YdKGCEbz9DmSRX0eUBynUQ=; b=Ka3xn7KUW3Q+eBYHv5/SgW4uafAfQUMjLG9bs51HH+GQigU+od9GbmlYKvkyePjTsUshodY+I6iMpZ4Ad901h4b+fMKthUPdfCSjUQ1xQ3jdRxmStUZ0/7CLT1crDqu3V2Q4bsl6tQCvJ7cajw8ZM7PdOp8xWebov+qgy7SDy64= 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 1761079958181136.10391503456697; Tue, 21 Oct 2025 13:52:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHn-0008Qm-TI; Tue, 21 Oct 2025 16:48:51 -0400 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 1vBJHl-00088q-7b for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:49 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHf-00019f-HG for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:47 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4711f156326so46973335e9.1 for ; Tue, 21 Oct 2025 13:48:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427c3ecsm10312065e9.2.2025.10.21.13.48.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079699; x=1761684499; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MIqpoD4tAWeMFdopoink0YdKGCEbz9DmSRX0eUBynUQ=; b=e6Bj4QwFMalRZPNI636gHuTO+ZkJCmiVFljgCZEvExZY6JqUSP65IRWCj9+3mH5a7c 4XMAH54vvu3fNfrpZTOGssKQTorGX80Nc1bp49c6LskFWpAKfwz38vRRdXuybOnb8WLc hgvdtcUwg3yFlIi3g4sogcjNrqd3IB9nuITxbu6kObriIsG0yo+K80sn3pzMu/XeF16J +zbL79aZJMJ4vhCXmMcGcj9B0XMjHcQDZL1u5Bf6WDM+KjcQpQwpIt+4c9bnxccBncdX /3q5qEIHGjP79Mi1Aleo09dcpAedrSNq4GUMOuEC4cg2doDMXyuLnevZwMbD+GuHQjr7 6PRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079699; x=1761684499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MIqpoD4tAWeMFdopoink0YdKGCEbz9DmSRX0eUBynUQ=; b=CFY3k0jR36iHoOiD6W/lEefTMiX9biQBxvEaHWe/7VMMN13MUCAlXOH/LZxe1GcIi0 TL+Wy4yS4dQLy9Y5AF9+6oiTMVvaXfpBGLfczIzJSDgcI+HHtevaZdpriz5tTueGYSk0 0omeI9dwr1Kq8ONsFzEyokOT6d0nMWq69x08AhQXUk5Ld2b3eUr7efUr4mnvBG7tPS55 Azb6Xr7DyjTARfrXyjknl3vQFCbFLO6AryudJaaNNwaEEbssr5hFfqeOEvMFG7VWYyzf qqMd3djalYjXv4V2urK7+NOczfxGjnFdwxCSliOOp/3w/QiIfPi64Gj7M49Qy+QyAqqF 6E1A== X-Gm-Message-State: AOJu0YxIEcxM3u/zBRv/X6AB6/01umkDVshMEIcdCrDiEPmgq3Wl+Ktj TAysHAHhj0/GVXlJEIAQxITvN0z+BvWeLYUGIbmw1rkhEINfCaIkK9eK38JMr++qOVdGUyWW8El 1b/ejP04= X-Gm-Gg: ASbGncu1JXLzaTVJbtdV+JfwisipbbrWsC64pPuw+fcTwsBextwI2bZ/uQ3qQOnSBvU IV83AMAvGwWirH5LTp9e0w+40tuQR+33OlSiRNPnCMfaqSlyrdRBWbafYPTbeq4urNvjRyVjkL3 93tCp7juJI84avGgJuf+vQnl4sYLRTgizzEKWz5P6A/7SVu7N2zS6HkS6cI7BTyfUEctciDynju YAqL+az0ISgCJ5ktsXo4mHzGWSV5YdliyM1XcA2JAQB+YR0lxVNNv0iWQIU+zP+xodOEh12VEw1 DweHwp+qCHXn9ZcI5yEwvOIV9k/OX+T0jhrT7sV3bPvf14tPitHtK5NnZhTeqF6Pn553iqgtj7L 9cImelIbQmOBfnfAal6qoQkvBMuOSdkBzJpBEE8lUw3YpAGO6wnjQS6Bec2PxBGopBDsWl/10Ju Fd0krDrYCqvV3c2b+OuMW/WrZwAzzB92C5ODWCOck0snKxLiHJ4PmOUZd+3dRI X-Google-Smtp-Source: AGHT+IHwGlFup/+fggBxT4JWJGPof9Oe4dijyG6xB8tsiBjrnjm7r9vcGZUFnqFchanohQ9oPsH+6g== X-Received: by 2002:a05:600c:4e89:b0:46f:b42e:e392 with SMTP id 5b1f17b1804b1-47117931c1dmr125611325e9.39.1761079699035; Tue, 21 Oct 2025 13:48:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/45] hw/xen: pass PCI domain to xc_physdev_map_pirq_msi() Date: Tue, 21 Oct 2025 22:46:30 +0200 Message-ID: <20251021204700.56072-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1761079961450158500 From: Roger Pau Monne It's currently impossible for passthrough devices on segment different than 0 to work correctly, as the PCI domain is not provided to xc_physdev_map_pirq_msi(), and hence it's unconditionally assumed that all devices are on segment 0. Adjust the call to xc_physdev_map_pirq_msi() to pass the PCI domain in the high 16bits of the bus parameter. On versions of Xen where this is not supported the passed segment will be ignored and assume to be 0, no worse than the current state. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Frediano Ziglio Reviewed-by: Anthony PERARD Reviewed-by: Edgar E. Iglesias Message-ID: <20251017155136.16540-1-roger.pau@citrix.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/xen/xen_pt_msi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index e9ba17317ab..df15ccf0d03 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -138,6 +138,7 @@ static int msi_msix_setup(XenPCIPassthroughState *s, rc =3D xc_physdev_map_pirq_msi(xen_xc, xen_domid, XEN_PT_AUTO_ASSI= GN, ppirq, PCI_DEVFN(s->real_device.dev, s->real_device.func), + ((uint32_t)s->real_device.domain << 1= 6) | s->real_device.bus, msix_entry, table_base); if (rc) { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079928; cv=none; d=zohomail.com; s=zohoarc; b=hcePOspAhwxWDHVlRPNE7Hbx4lEpC3+9yQ8l549Z5Bw3s13YkQ8GjluD2ddaQgwPoCbXys3FBDFZvH/vqMMmx5ApAcsBFuML6Fj8W/XCHJ856OchyDguXsdJmWNF/d43G2AZEfZRBWdVsQS9AH7Yt1l46CJf5+Yv09MFc+8YncU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079928; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=im+OEuCaVAw5x7x2mUEPI+ZYBfpg88mOANk8NkPxsC0=; b=NinRpmGEoWxyoNaWpGSxWFpEUQVh2GW7xXEtGt+IU0q6R8HVkbRz8Ldv29wI7PC/j3gXijMI+yfvoGvPANnjCdDWE7ezVBXCHs6azeZ2riJfLvdKoVccrpGeVapN06qMs1jgai8PH2ITlPGwAfXjMOI9kJOdKgFrdA++S5HeXu0= 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 17610799286401017.3835024996323; Tue, 21 Oct 2025 13:52:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHg-0007nC-Ok; Tue, 21 Oct 2025 16:48:45 -0400 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 1vBJHd-0007ak-Tw for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:42 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHR-00019p-8p for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-471066cfc2aso14345795e9.0 for ; Tue, 21 Oct 2025 13:48:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c428e9b2sm9680685e9.5.2025.10.21.13.48.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079704; x=1761684504; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=im+OEuCaVAw5x7x2mUEPI+ZYBfpg88mOANk8NkPxsC0=; b=hu/SCg0Z6gAuBUlRnxaU9ObpNn3xtFJfMn08ac/p2NfGD57SY/ZlRlgcGoY5oQk4GW W6SWE3uymki/AUbB/cOuR7XOgo2+BCFX5ISVN7XReziU/p47pIGV3UQQNLs8SoINVT7i 2c2yhIQmPkz3xGUMVkri1T9b+3BuV/MmAyJI+hugGW1cfIWqYbLUHGJss9FJ9+qjsQ5r e947jsx2RANpO25AF+Bjsef/jhQ7+hRdLgmn3wqLC3+5fiC0cIlaIaG5fVYRmlMJrZSy xA4t2rC8Eb1Xl5vXcJl7s+RE/oGyMJgj5wQhKzyALrUt4B6iV/zC8Is29isMAZ4UCmzi 2+sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079704; x=1761684504; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=im+OEuCaVAw5x7x2mUEPI+ZYBfpg88mOANk8NkPxsC0=; b=BmlnkPExFoTHKlL1mbLnVNXm2gcbFTsfFx3TcSg8qDwNszrr72wNhG4AA7AxuaWD7V wISfnySHpSnem9ci+/4W3mnH7h2O3eP4qqQwUoxtHzDO21Tyg2YQd+YsU26khDSC1dfa xsj+uqYNH8h97XUhL3ZRrkv+sJHcewr7AKCq5Y6+3o2tkSzHmOqgxbql9QwSa78PL7pe 5YzaR+RYnA5KBmAERtc4rMYtK8GyG0Dw9jDCp5vTezt8hxKTfrz5wxfOTfluzF9o0+zy WUtLV98IMsa8hXQ1JE1vKxGij21iEzTNgII7heUz1s3w9R0KxATuTRU0FrUCfXlEQNq3 Phlw== X-Gm-Message-State: AOJu0YwWS7sV/182hS1cAZsp70EtvZUFC1SAQgPCr7GF2+Wt5iXoZwTm RzTj2aFz+FGxjXwPWUIodvIBgGpWcfiAQh16xGgMEoGiJ7b8m21LqnwyJLFBYmnHh5hr3xmFnuG ldIdRMUk= X-Gm-Gg: ASbGncsZY3ETxFEOj4Z0/yvlpfqaRr7DeGDIqc0Jh7ZhwQNUSO4jqWzF4M3Ucyk33tl 6wWwwuRzgCnvLxfOKQsA4jftIMfwn5usaRwQorpEH9g4BwhTN9+jXKgl7qixlnr7VZ+WVZt8Yp0 t86sj1fYQrpi60RmaJU4TVBN4fExym4y+Rtil8N48+D3+BPIEsvSDYqrR5ck84U1RGXS6jmiJzM uzj2qetQuWE+WY2E1cf14BdZ/gr3qcJ7nn3Nwm2aZZlUFQYdgVaYpv5Ow2VYzTv5SWS67gJCSkY FA3LPkRv7DW6v1GZhWNpIjPZpNO81w6pNFRww4SSnn/wa/UemmTxZ5G72Ze36A0OtXe7Tz7w95O /KcvOgNhH1E/9Z+v6dE+8lSkQKvpBg/+hASBqv3RxEIT4PxGWZtgd09UgkXo7/Dq5tsSzCFrdkv vKdKSf+8Fg2rqIt4yD04nLPNNXgK6aJrgpGaCdc+IEUzBPH5b8vPK2rDfP+Cwv X-Google-Smtp-Source: AGHT+IETgh478E3vvkI5VMl3KmOPE93VhkJeXNs7JngB+USmWlOp4L1BQXawj3X5Y5Hedw7qe+251A== X-Received: by 2002:a05:600d:4395:b0:471:a259:cdbe with SMTP id 5b1f17b1804b1-471a259d086mr55392225e9.23.1761079703625; Tue, 21 Oct 2025 13:48:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/45] hw/core/register: remove the REGISTER device type Date: Tue, 21 Oct 2025 22:46:31 +0200 Message-ID: <20251021204700.56072-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1761079931235158500 From: Luc Michel The REGISTER class (RegisterInfo struct) is currently a QOM type inheriting from DEVICE. This class has no real purpose: - the qdev API is not used, - according to the comment preceding it, the object_initialize call is here to zero-initialize the struct. However all the effective struct attributes are then initialized explicitly. - the object is never parented. This commits drops the REGISTER QOM type completely, leaving the RegisterInfo struct as a bare C struct. The register_register_types function is left empty here because it is reused in the next commit. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-2-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/register.h | 7 ------- hw/core/register.c | 18 ------------------ hw/net/can/xlnx-versal-canfd.c | 2 -- 3 files changed, 27 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index a913c52aee5..4d13ea183c7 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -75,10 +75,6 @@ struct RegisterAccessInfo { */ =20 struct RegisterInfo { - /* */ - DeviceState parent_obj; - - /* */ void *data; int data_size; =20 @@ -87,9 +83,6 @@ struct RegisterInfo { void *opaque; }; =20 -#define TYPE_REGISTER "qemu-register" -DECLARE_INSTANCE_CHECKER(RegisterInfo, REGISTER, - TYPE_REGISTER) =20 /** * This structure is used to group all of the individual registers which a= re diff --git a/hw/core/register.c b/hw/core/register.c index 3340df70b06..2553cb15aba 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -258,9 +258,6 @@ static RegisterInfoArray *register_init_block(DeviceSta= te *owner, int index =3D rae[i].addr / data_size; RegisterInfo *r =3D &ri[index]; =20 - /* Init the register, this will zero it. */ - object_initialize((void *)r, sizeof(*r), TYPE_REGISTER); - /* Set the properties of the register */ r->data =3D data + data_size * index; r->data_size =3D data_size; @@ -318,24 +315,9 @@ void register_finalize_block(RegisterInfoArray *r_arra= y) g_free(r_array); } =20 -static void register_class_init(ObjectClass *oc, const void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - - /* Reason: needs to be wired up to work */ - dc->user_creatable =3D false; -} - -static const TypeInfo register_info =3D { - .name =3D TYPE_REGISTER, - .parent =3D TYPE_DEVICE, - .class_init =3D register_class_init, - .instance_size =3D sizeof(RegisterInfo), -}; =20 static void register_register_types(void) { - type_register_static(®ister_info); } =20 type_init(register_register_types) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 343348660b5..99bbdd7d3fe 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1868,8 +1868,6 @@ static int canfd_populate_regarray(XlnxVersalCANFDSta= te *s, int index =3D rae[i].addr / 4; RegisterInfo *r =3D &s->reg_info[index]; =20 - object_initialize(r, sizeof(*r), TYPE_REGISTER); - *r =3D (RegisterInfo) { .data =3D &s->regs[index], .data_size =3D sizeof(uint32_t), --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079760; cv=none; d=zohomail.com; s=zohoarc; b=RIivTnm2f9r8REOzU86NNAI8BV++RFuqxkwlzDRnwq3M2Z0ZoszF3d85KGOBH+RSXEWey/Zf8otqyl/klNakGlt/jG8MMtCsO4lThqMiPO/NgO1k+WW1K28gIpuUFrgHm9+eZ0SNa3XfqpW3lRvZrWRXN54PxsIOO8AE+mZyC0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079760; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=lWr7qEOB0Wvdd9KbFII+oaJFwDA5Ps8upXl6LmkSiEU=; b=Aw369WhTPWndRqqU80L8GGMj7ld4iOFAU9hmhqbRtvx0tHKunY7gUjft20CIMMj/yUyE5sjAg8nWM+RNnFm/WkDW54qXlTR3G+SXQwgBdNvuNSxzHoAPGh3lcGtmfqBO90T14ex0YQIMJyXBFP4yv7QhQ9FwtnwtsEDoJXZSzEo= 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 1761079760178923.2536729835548; Tue, 21 Oct 2025 13:49:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHm-0008M0-NF; Tue, 21 Oct 2025 16:48:50 -0400 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 1vBJHk-00089X-Bq for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:48 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHf-0001A3-HD for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:48 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47117f92e32so40256245e9.1 for ; Tue, 21 Oct 2025 13:48:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427c3ecsm10317625e9.2.2025.10.21.13.48.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079708; x=1761684508; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lWr7qEOB0Wvdd9KbFII+oaJFwDA5Ps8upXl6LmkSiEU=; b=wIuaSOFIMQaxhZ4Ji8o+gPYgYDw9HI35ItrMHm6q0VuZM2d4lVrx10tKwMIj6eg8jf lLQ5OQf5Quhj3aCeih2/fh+jJu2VR5bQ1Rg9ioJ7Pa6mW3pTzPoSIhvZThSjnYhVJMwK 0gE/5cSex0gBYWOyoufxtu60fERw/vMPgGcUBa9k4yK9SxfVtpgFp50FMFgKg9t4HXE0 YUY13PnUTP2QQU2qRAomIMGy53v8G9EGH8dWJCRDofQP8y4t5NkzBlv93TKAEd489mM1 Vb+s5O9mqI27o5Tnb9DnwXtssGWkKDPUrxHpNF6MPhM58ZyPp9SDsqmomwfochTgqbf1 222A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079708; x=1761684508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lWr7qEOB0Wvdd9KbFII+oaJFwDA5Ps8upXl6LmkSiEU=; b=q1PvG8VdECJR+aDmspxFdPY5YpEhrW+Qcn54pdjRudERcwCNG7ji2IhsnImAmNdzoS lSnUpP8wg7RFN079cizAcGeTeNrRIU5x1i2EJfPvIsiber5D0y934z/L6dCrkjsJRmQD zphwE4+Nz3n0Jqdc3gha2Qdioq+9K10SDlWuNac4a5OwgER9+unocN9WYWorNkm5gfFO boiburhPCqIdPaFk7zXvkOOXlA8dnGrMZskga2p4Fq+mQd432YpFrTC1msM2CClC25ax OpCWV31SugFC0R+bn1uH3uvIgL2AOYcrGCrGRAvKguEJEK/Em9mgosDVQtxf6HZ7ZAI5 iI4w== X-Gm-Message-State: AOJu0Yz61aRotw9Ev0JwLV3DKQcTZJ2z9CRtN0l4uS2aifPuQbA21vN3 nr2objT26GyM9A7IMzrR6L0Dc6+n7reyT+59FhjHfW6ytgDe9uze9SgGxuCGttTgf5BEsL3LsYC b+qUB2OI= X-Gm-Gg: ASbGncs/Yco7V6Rl4sqtzlxP3lVcSmRlTZx2iJj+UBeJNTPq+FIr0MQ+ADk6/pTnigo OxRL73X9CfxP4JNLLL9auZwNH2TFcE26KkTHlwUtUAT8n+lN5KrXXZ4tDTvx56WpJeogfbyfIjS 5JvI/mj4lbRuE4OdicUMi1a7YccFNTzz3Tsb2XqfOLJFnwJq0+c+a+9wgEkuPAob99gBGpWyr+W mj5FlOjRqJtWr3mSJHiP/7koRTqN652LP05JJ9PlkWoby1AWh7b//ETTR+Vb90ms+2uDUe6CYAt 8s0r6XQxGaFzhBslhzN89Q0TEamOQgXXz7nfOJMnj8NYuHygD1JRd4ERzRffJuChPqu43CUUVJD duzgcYMWrQ9YFqp8pxzoE16YWSIYvDd6GOuTnWqp00gqa7D74B96dhvi4XVZGvDfJo60qvSkd7b 5udhUDduUeqN08Rh3YIsCnLK9JR6c1wugAN9MAKdC+BO7O698bMlCiKmJg1u0Q X-Google-Smtp-Source: AGHT+IHktbrj0wKz0uueX9HDEMPfrSrxwKAIdGEAQhgBb6Dka2ESQ9O2jE00dpxIS4WpA0CKySfQlw== X-Received: by 2002:a05:600c:4e89:b0:45d:dc85:c009 with SMTP id 5b1f17b1804b1-471178a236cmr128546155e9.10.1761079708023; Tue, 21 Oct 2025 13:48:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/45] hw/core/register: add the REGISTER_ARRAY type Date: Tue, 21 Oct 2025 22:46:32 +0200 Message-ID: <20251021204700.56072-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1761079764498158500 From: Luc Michel Introduce the REGISTER_ARRAY QOM type. This type reuses the existing RegisterInfoArray struct. When `register_init_block' is called, it creates a REGISTER_ARRAY object and parents it to the calling device. This way it gets finalized when the device is. The memory region is parented to the REGISTER_ARRAY object to ensure correct finalizing order. The finalize function of the REGISTER_ARRAY type performs the necessary cleaning that used to be done by `register_finalize_block'. The latter is left empty and will be removed when all the register API users have been refactored. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-3-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/register.h | 4 ++++ hw/core/register.c | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index 4d13ea183c7..65c82600e06 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -83,6 +83,8 @@ struct RegisterInfo { void *opaque; }; =20 +#define TYPE_REGISTER_ARRAY "qemu-register-array" +OBJECT_DECLARE_SIMPLE_TYPE(RegisterInfoArray, REGISTER_ARRAY) =20 /** * This structure is used to group all of the individual registers which a= re @@ -96,6 +98,8 @@ struct RegisterInfo { */ =20 struct RegisterInfoArray { + Object parent_obj; + MemoryRegion mem; =20 int num_elements; diff --git a/hw/core/register.c b/hw/core/register.c index 2553cb15aba..1612ad174f9 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -245,10 +245,16 @@ static RegisterInfoArray *register_init_block(DeviceS= tate *owner, size_t data_size_bits) { const char *device_prefix =3D object_get_typename(OBJECT(owner)); - RegisterInfoArray *r_array =3D g_new0(RegisterInfoArray, 1); + Object *obj; + RegisterInfoArray *r_array; int data_size =3D data_size_bits >> 3; int i; =20 + obj =3D object_new(TYPE_REGISTER_ARRAY); + object_property_add_child(OBJECT(owner), "reg-array[*]", obj); + object_unref(obj); + + r_array =3D REGISTER_ARRAY(obj); r_array->r =3D g_new0(RegisterInfo *, num); r_array->num_elements =3D num; r_array->debug =3D debug_enabled; @@ -267,7 +273,7 @@ static RegisterInfoArray *register_init_block(DeviceSta= te *owner, r_array->r[i] =3D r; } =20 - memory_region_init_io(&r_array->mem, OBJECT(owner), ops, r_array, + memory_region_init_io(&r_array->mem, OBJECT(r_array), ops, r_array, device_prefix, memory_size); =20 return r_array; @@ -309,15 +315,27 @@ RegisterInfoArray *register_init_block64(DeviceState = *owner, data, ops, debug_enabled, memory_size, 64); } =20 -void register_finalize_block(RegisterInfoArray *r_array) +static void register_array_finalize(Object *obj) { + RegisterInfoArray *r_array =3D REGISTER_ARRAY(obj); + g_free(r_array->r); - g_free(r_array); } =20 +void register_finalize_block(RegisterInfoArray *r_array) +{ +} + +static const TypeInfo register_array_info =3D { + .name =3D TYPE_REGISTER_ARRAY, + .parent =3D TYPE_OBJECT, + .instance_size =3D sizeof(RegisterInfoArray), + .instance_finalize =3D register_array_finalize, +}; =20 static void register_register_types(void) { + type_register_static(®ister_array_info); } =20 type_init(register_register_types) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080006; cv=none; d=zohomail.com; s=zohoarc; b=blQ/q+TzeN3vGn4ElA9tV3MjshrlIUm/OuSDza6ke0YlVt0QOsiGZz1Otlo7ShB0uRjQrdB0uzcGLgFvVdP1tCGASOuvRVCOTlamKRQjNxAEdgkQU7IIOrgsINO1rXwb55qNlGD1be1rxXa98Xf+mxKbJdhAre9rHXXWYJ6l9TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080006; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pei0AdkMqlz6V/L6oMzpf8FvPBD/sRAI8O8+4qZkUW8=; b=SNTowiyir7I1TDMStju36cKLMjkWuYsYJnLgnZm0FtPXL7kKskNHr14awJOQSaowNLatSuCsdgR/mbtaKwJxcRxBIzRTYuugSh4vw2waDvKaVOoFPQXylk8hulVYgtSzmF/CRLn/svNyBZ9/pxoFg+FitDgfwerPJBwosixnoO0= 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 1761080006324977.0917805831141; Tue, 21 Oct 2025 13:53:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHo-000066-H3; Tue, 21 Oct 2025 16:48:52 -0400 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 1vBJHm-0008MM-PW for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:50 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHf-0001AM-HF for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:50 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4711b95226dso49330595e9.0 for ; Tue, 21 Oct 2025 13:48:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4378cbesm9195005e9.16.2025.10.21.13.48.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079712; x=1761684512; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pei0AdkMqlz6V/L6oMzpf8FvPBD/sRAI8O8+4qZkUW8=; b=qiiMEh4/jc+jC0lgk3hj596oDw/5/k34C2CdOZTlWV6IsiT6f6HNAfePI/PCQoVj8Y btfncNyP8QpnudN6SjyYgZbuDGGVlZ8QTmGpGhKfA7UBF82IbUb0+7YiSUklYKB+YOLd Vi+NbTkZJsJB64Z0NBPSTxt8RCKtFtf4aT7/HGBvElyzZ8S1fVNmxO2Xzz4jdXxouJru 2MfwRhVXO6K3xA4g9P8J1P67ev/wFMcDOCNqFAjTTsvBvHx4PaHJmDTWqCGXYwx4voma 3bwDnjPFXGBOpQ/5OEswCxS11sh2xXUYN7Y4JYuCLbEqzeMwE+lgAIfKbovR8pxjauXr WBOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079712; x=1761684512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pei0AdkMqlz6V/L6oMzpf8FvPBD/sRAI8O8+4qZkUW8=; b=CzLOG5RrL0jgIWcNX+yyAqf8W4y50EjCg5yZZFklNO0MgZ/lD2XlLoOGUhMuI3o/D1 0JIwTDtdrmudeLGlKjrs52F+Ty7qtL85YVYq6nx8pYEY+M3abXZPSipT8B62HBaI2qal 6QFtZ3uidxm8VpkHBd07CMOxZ4JLORhM8VMzak+k7yG493oyR7+wx8e9br6NE8LVz8DP cRU+5MSqMZ8Fu09t2W6XXSs3uQm8Wo5DvfQtJp/uc9jiM9HI7ASNTBQwmfdLCjTJMGWJ JFDJNEnAHf2wmE9PvhaOJEEbZ9IyXI3HCHmw+DK1gemyyN3aG9BR/FikZ9YWIDIjffwW /lIw== X-Gm-Message-State: AOJu0Yw5OzAD++srY5tHvMrIlX3rJibhs7q7zcA0tNuxmiNxEIG3/orK BzKb+TDQCjVxhSwlnV3vkESB6BAuXKrrY6XKVeJkmlyUSK/6WDIh1s3Gu/1w2aUbBG5g/NF0bXC VBcr4YsY= X-Gm-Gg: ASbGncuuCgtG0Kl7DFSs3q6iDoWnaME1WveXs5hlc90rEbAnWQZOLytZl0RJKaTRVN1 ahEWXFoSmzHSexlDjbdbTfJQZ0VJWWsOsR8tO4XOO0Z3tkLFAzQbodHyx0Sh1ADM6Ycj0pBqr1N eCdkK+l8GXq5TMZhjA54ijP1G084SLqx7HugGFKvRi3v/JJL5zgvfCk+0c9Mp5iqjuYCoz4Urkt V1acqZt5ks1XsolfkY5cEz7XbsRyjocLehwhiF4sXbqIiPMJpjnMdQjEYyyl/DrdVxkoD7wqZcL 3eLWb30N/Gp4GGQc+y3PejVnhIPpR8Dhb+mNuoQVnNmYW2fb0kzPIryNoDcoYFzUnHXIpr5rZO8 D7+h3RrobS8kb48WHe8KvffpG+JJCxrkY7LI0ACYzxi1gUE7iwtbpxZXZWBMCtDBf9ROkBRDta0 HlN3ii4u362gbw2Vce5QMYFWEQX06rpulh9win4O5WuqEuCLg9ig== X-Google-Smtp-Source: AGHT+IHuwOWcJFZkWWTKV3RGK4+mLSBbXoeQsLIDXhvbLPv6GINQYv7MAY6ql2HK2qzEx5orV3g7eg== X-Received: by 2002:a05:600c:4e11:b0:471:c72:c807 with SMTP id 5b1f17b1804b1-471179079c7mr151247325e9.22.1761079712462; Tue, 21 Oct 2025 13:48:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/45] hw/core/register: remove the calls to `register_finalize_block' Date: Tue, 21 Oct 2025 22:46:33 +0200 Message-ID: <20251021204700.56072-20-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1761080007983154100 From: Luc Michel This function is now a no-op. The register array is parented to the device and get finalized when the device is. Drop all the calls to `register_finalize_block'. Drop the RegisterInfoArray reference when it is not used elsewhere in the device. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-4-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/misc/xlnx-versal-crl.h | 1 - include/hw/misc/xlnx-versal-xramc.h | 1 - include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 1 - include/hw/misc/xlnx-zynqmp-crf.h | 1 - include/hw/nvram/xlnx-bbram.h | 1 - hw/misc/xlnx-versal-crl.c | 38 +++++++++++--------------- hw/misc/xlnx-versal-trng.c | 1 - hw/misc/xlnx-versal-xramc.c | 12 ++------ hw/misc/xlnx-zynqmp-apu-ctrl.c | 12 ++------ hw/misc/xlnx-zynqmp-crf.c | 12 ++------ hw/nvram/xlnx-bbram.c | 13 ++------- hw/nvram/xlnx-versal-efuse-ctrl.c | 1 - hw/nvram/xlnx-zynqmp-efuse.c | 8 ------ 13 files changed, 28 insertions(+), 74 deletions(-) diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versa= l-crl.h index f6b8694ebea..49ed500acde 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -533,7 +533,6 @@ REG32(VERSAL2_RST_OCM, 0x3d8) struct XlnxVersalCRLBase { SysBusDevice parent_obj; =20 - RegisterInfoArray *reg_array; uint32_t *regs; }; =20 diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-ver= sal-xramc.h index d3d1862676f..35e4e8b91dd 100644 --- a/include/hw/misc/xlnx-versal-xramc.h +++ b/include/hw/misc/xlnx-versal-xramc.h @@ -90,7 +90,6 @@ typedef struct XlnxXramCtrl { unsigned int encoded_size; } cfg; =20 - RegisterInfoArray *reg_array; uint32_t regs[XRAM_CTRL_R_MAX]; RegisterInfo regs_info[XRAM_CTRL_R_MAX]; } XlnxXramCtrl; diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-= zynqmp-apu-ctrl.h index c3bf3c1583b..fbfe34aa7e5 100644 --- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h @@ -85,7 +85,6 @@ struct XlnxZynqMPAPUCtrl { uint8_t cpu_pwrdwn_req; uint8_t cpu_in_wfi; =20 - RegisterInfoArray *reg_array; uint32_t regs[APU_R_MAX]; RegisterInfo regs_info[APU_R_MAX]; }; diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqm= p-crf.h index 02ef0bdeeee..c746ae10397 100644 --- a/include/hw/misc/xlnx-zynqmp-crf.h +++ b/include/hw/misc/xlnx-zynqmp-crf.h @@ -203,7 +203,6 @@ struct XlnxZynqMPCRF { MemoryRegion iomem; qemu_irq irq_ir; =20 - RegisterInfoArray *reg_array; uint32_t regs[CRF_R_MAX]; RegisterInfo regs_info[CRF_R_MAX]; }; diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 58acbe9f51b..af90900bfc6 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -47,7 +47,6 @@ struct XlnxBBRam { bool bbram8_wo; bool blk_ro; =20 - RegisterInfoArray *reg_array; uint32_t regs[RMAX_XLNX_BBRAM]; RegisterInfo regs_info[RMAX_XLNX_BBRAM]; }; diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 10e6af002ba..5987f32c716 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -634,17 +634,17 @@ static void versal_crl_init(Object *obj) XlnxVersalCRL *s =3D XLNX_VERSAL_CRL(obj); XlnxVersalCRLBase *xvcb =3D XLNX_VERSAL_CRL_BASE(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; int i; =20 - xvcb->reg_array =3D - register_init_block32(DEVICE(obj), crl_regs_info, - ARRAY_SIZE(crl_regs_info), - s->regs_info, s->regs, - &crl_ops, - XLNX_VERSAL_CRL_ERR_DEBUG, - CRL_R_MAX * 4); + reg_array =3D register_init_block32(DEVICE(obj), crl_regs_info, + ARRAY_SIZE(crl_regs_info), + s->regs_info, s->regs, + &crl_ops, + XLNX_VERSAL_CRL_ERR_DEBUG, + CRL_R_MAX * 4); xvcb->regs =3D s->regs; - sysbus_init_mmio(sbd, &xvcb->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq); =20 for (i =3D 0; i < ARRAY_SIZE(s->cfg.rpu); ++i) { @@ -688,17 +688,18 @@ static void versal2_crl_init(Object *obj) XlnxVersal2CRL *s =3D XLNX_VERSAL2_CRL(obj); XlnxVersalCRLBase *xvcb =3D XLNX_VERSAL_CRL_BASE(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; size_t i; =20 - xvcb->reg_array =3D register_init_block32(DEVICE(obj), versal2_crl_reg= s_info, - ARRAY_SIZE(versal2_crl_regs_in= fo), - s->regs_info, s->regs, - &crl_ops, - XLNX_VERSAL_CRL_ERR_DEBUG, - VERSAL2_CRL_R_MAX * 4); + reg_array =3D register_init_block32(DEVICE(obj), versal2_crl_regs_info, + ARRAY_SIZE(versal2_crl_regs_info), + s->regs_info, s->regs, + &crl_ops, + XLNX_VERSAL_CRL_ERR_DEBUG, + VERSAL2_CRL_R_MAX * 4); xvcb->regs =3D s->regs; =20 - sysbus_init_mmio(sbd, &xvcb->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); =20 for (i =3D 0; i < ARRAY_SIZE(s->cfg.rpu); ++i) { object_property_add_link(obj, "rpu[*]", TYPE_ARM_CPU, @@ -750,12 +751,6 @@ static void versal2_crl_init(Object *obj) } } =20 -static void crl_finalize(Object *obj) -{ - XlnxVersalCRLBase *s =3D XLNX_VERSAL_CRL_BASE(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_versal_crl =3D { .name =3D TYPE_XLNX_VERSAL_CRL, .version_id =3D 1, @@ -804,7 +799,6 @@ static const TypeInfo crl_base_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxVersalCRLBase), .class_size =3D sizeof(XlnxVersalCRLBaseClass), - .instance_finalize =3D crl_finalize, .abstract =3D true, }; =20 diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index f34dd3ef352..2b573a45bdb 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -627,7 +627,6 @@ static void trng_finalize(Object *obj) { XlnxVersalTRng *s =3D XLNX_VERSAL_TRNG(obj); =20 - register_finalize_block(s->reg_array); g_rand_free(s->prng); s->prng =3D NULL; } diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index 07370b80c0d..d90f3e87c74 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -190,24 +190,19 @@ static void xram_ctrl_init(Object *obj) { XlnxXramCtrl *s =3D XLNX_XRAM_CTRL(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), xram_ctrl_regs_info, ARRAY_SIZE(xram_ctrl_regs_info), s->regs_info, s->regs, &xram_ctrl_ops, XLNX_XRAM_CTRL_ERR_DEBUG, XRAM_CTRL_R_MAX * 4); - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq); } =20 -static void xram_ctrl_finalize(Object *obj) -{ - XlnxXramCtrl *s =3D XLNX_XRAM_CTRL(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_xram_ctrl =3D { .name =3D TYPE_XLNX_XRAM_CTRL, .version_id =3D 1, @@ -241,7 +236,6 @@ static const TypeInfo xram_ctrl_info =3D { .instance_size =3D sizeof(XlnxXramCtrl), .class_init =3D xram_ctrl_class_init, .instance_init =3D xram_ctrl_init, - .instance_finalize =3D xram_ctrl_finalize, }; =20 static void xram_ctrl_register_types(void) diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index e85da32d99c..08777496d56 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -179,16 +179,17 @@ static void zynqmp_apu_handle_wfi(void *opaque, int i= rq, int level) static void zynqmp_apu_init(Object *obj) { XlnxZynqMPAPUCtrl *s =3D XLNX_ZYNQMP_APU_CTRL(obj); + RegisterInfoArray *reg_array; int i; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), zynqmp_apu_regs_info, ARRAY_SIZE(zynqmp_apu_regs_info), s->regs_info, s->regs, &zynqmp_apu_ops, XILINX_ZYNQMP_APU_ERR_DEBUG, APU_R_MAX * 4); - sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->reg_array->mem); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), ®_array->mem); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq_imr); =20 for (i =3D 0; i < APU_MAX_CPU; ++i) { @@ -208,12 +209,6 @@ static void zynqmp_apu_init(Object *obj) qdev_init_gpio_in_named(DEVICE(obj), zynqmp_apu_handle_wfi, "wfi_in", = 4); } =20 -static void zynqmp_apu_finalize(Object *obj) -{ - XlnxZynqMPAPUCtrl *s =3D XLNX_ZYNQMP_APU_CTRL(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_zynqmp_apu =3D { .name =3D TYPE_XLNX_ZYNQMP_APU_CTRL, .version_id =3D 1, @@ -241,7 +236,6 @@ static const TypeInfo zynqmp_apu_info =3D { .instance_size =3D sizeof(XlnxZynqMPAPUCtrl), .class_init =3D zynqmp_apu_class_init, .instance_init =3D zynqmp_apu_init, - .instance_finalize =3D zynqmp_apu_finalize, }; =20 static void zynqmp_apu_register_types(void) diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index cccca0e814e..d9c1bd50e4f 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -211,24 +211,19 @@ static void crf_init(Object *obj) { XlnxZynqMPCRF *s =3D XLNX_ZYNQMP_CRF(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), crf_regs_info, ARRAY_SIZE(crf_regs_info), s->regs_info, s->regs, &crf_ops, XLNX_ZYNQMP_CRF_ERR_DEBUG, CRF_R_MAX * 4); - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq_ir); } =20 -static void crf_finalize(Object *obj) -{ - XlnxZynqMPCRF *s =3D XLNX_ZYNQMP_CRF(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_crf =3D { .name =3D TYPE_XLNX_ZYNQMP_CRF, .version_id =3D 1, @@ -255,7 +250,6 @@ static const TypeInfo crf_info =3D { .instance_size =3D sizeof(XlnxZynqMPCRF), .class_init =3D crf_class_init, .instance_init =3D crf_init, - .instance_finalize =3D crf_finalize, }; =20 static void crf_register_types(void) diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 5702bb3f310..22aefbc240d 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -456,8 +456,9 @@ static void bbram_ctrl_init(Object *obj) { XlnxBBRam *s =3D XLNX_BBRAM(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, ARRAY_SIZE(bbram_ctrl_regs_info), s->regs_info, s->regs, @@ -465,17 +466,10 @@ static void bbram_ctrl_init(Object *obj) XLNX_BBRAM_ERR_DEBUG, R_MAX * 4); =20 - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq_bbram); } =20 -static void bbram_ctrl_finalize(Object *obj) -{ - XlnxBBRam *s =3D XLNX_BBRAM(obj); - - register_finalize_block(s->reg_array); -} - static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -542,7 +536,6 @@ static const TypeInfo bbram_ctrl_info =3D { .instance_size =3D sizeof(XlnxBBRam), .class_init =3D bbram_ctrl_class_init, .instance_init =3D bbram_ctrl_init, - .instance_finalize =3D bbram_ctrl_finalize, }; =20 static void bbram_ctrl_register_types(void) diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse= -ctrl.c index 90962198008..6f17f32a0c3 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -728,7 +728,6 @@ static void efuse_ctrl_finalize(Object *obj) { XlnxVersalEFuseCtrl *s =3D XLNX_VERSAL_EFUSE_CTRL(obj); =20 - register_finalize_block(s->reg_array); g_free(s->extra_pg0_lock_spec); } =20 diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index 5a218c32e84..ce35bb0cc1f 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -816,13 +816,6 @@ static void zynqmp_efuse_init(Object *obj) sysbus_init_irq(sbd, &s->irq); } =20 -static void zynqmp_efuse_finalize(Object *obj) -{ - XlnxZynqMPEFuse *s =3D XLNX_ZYNQMP_EFUSE(obj); - - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_efuse =3D { .name =3D TYPE_XLNX_ZYNQMP_EFUSE, .version_id =3D 1, @@ -857,7 +850,6 @@ static const TypeInfo efuse_info =3D { .instance_size =3D sizeof(XlnxZynqMPEFuse), .class_init =3D zynqmp_efuse_class_init, .instance_init =3D zynqmp_efuse_init, - .instance_finalize =3D zynqmp_efuse_finalize, }; =20 static void efuse_register_types(void) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079751; cv=none; d=zohomail.com; s=zohoarc; b=SvnIsUYzO1p1Es35Bqw4EhjFJRqam/R421rcfL/UE6tGpbkj/f7f+RL/uIsBJUqxlnq+CmncE1DEyU+780hwzvB/5cX8p0I1l8vmA9usAW8O5a0tEQR20HlSRmRklqM0a5OVqty4x6GHUS56MKtzLE8jMHmbHeciuPtIvfxkYdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079751; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Iz5ofpUjr7hlyFIjNQUXcsNNAzKh5yHExm0kdxC5s4g=; b=eb4353YQVcN7jx/etMtCgVMbZlhoPnXqWh0SPQ+n5OBR6QB9bGJwS9cW3jujaWHNTuK2+tkk78LR11N7qVHo836yTU4saXTlm0LOxrGmRL9tf26baPG2Qss/bs0Y3YsldbsRJTLlyEuojOUXFUKdxG03mzPQyIZVF3PyW5HSfdI= 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 1761079751424587.6529998054078; Tue, 21 Oct 2025 13:49:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHj-00084g-Sw; Tue, 21 Oct 2025 16:48:47 -0400 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 1vBJHh-0007up-PC for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:45 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHf-0001AW-HI for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:45 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46b303f7469so48895405e9.1 for ; Tue, 21 Oct 2025 13:48:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9853sm21721571f8f.33.2025.10.21.13.48.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079717; x=1761684517; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Iz5ofpUjr7hlyFIjNQUXcsNNAzKh5yHExm0kdxC5s4g=; b=Ocggc9bszjPXmKN9YrTMYmwBYujuUMNqm1GVNsbwXBgKQCsgE+rJyfmhWQJ5Jkhlqz JH5KniI7yAqjiR00Nf6cUhhyIds7LsRVz3Eo4BTEoU0qukeX4WUSyxfSOXQgZbrtUzSQ esUIP3jZ6CX9iRAUgojRTqWBi6ZqYRriXLX9vofS6mdzxA5hOykr/pBO18/6rDcfQkIK uMkMWbjm1CyeT6F1NCWX8e7o0sdXdBzFIQsMcxI6V5o/S2FDRcStAKYx+XKNSdsnWNHz Cm8z27wKWh6nynJgwrnBG/37OooJTBWr062PTbHUAp/Fe3NtqqeBlyRZ0EBhvn2Xsja3 dkUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079717; x=1761684517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iz5ofpUjr7hlyFIjNQUXcsNNAzKh5yHExm0kdxC5s4g=; b=s1GyWLMC6xa+tESgZVVibf7YSZQFVCuq1n0hpdoWz1gniGeE+zfWwrz3aAyduGZpIg 5c3jIx/8AxPQq+6OS3L1ExalWI2/FEypG8O+8ETKBw1WCE1WqYXdExUrxvFOCSy5Y/mf OPinP5LRuAWKNrm+iJK3AZIpkzeWJdYwjRsnAFKFpLDw3g3ug8qsg/8jcu3NZFHGhnh2 Ao7PSksbghcf3uFbhbplRyy1ALRHJBUkbgWweN9gC6UwTrX53o6HOpwgLluo7ySXIdJ4 MsDp/j8HSBd/706Qf9SqAK3nWzdfnJf3WR6FI4xODfRIs2PqSTbDfpO6mGs1CT0TaQ8R o9mQ== X-Gm-Message-State: AOJu0YxsJojQnRm+JRHZjm/q2mUBUn9I8F0QCTxxPcMOHQNsYdisH84K mQx+ZhnalmarycHRVu+5rsaTcCtxesgCX92erqbr9MzdOgOn4TTTba4qHQqBJHlYsvgAWtq+4H9 zDlmN58Q= X-Gm-Gg: ASbGncucLZFBqLyDcfm20ad40/ypgyXLqBgwYERYrxlFKyFy5IW37yY44u7iCvhNyqU wqv9ttHRoBrbv7d0ZwMgUlxVGaLpdjgxN5b7ADnktCoGDsCosXgnMxYG86kJS613zeInettPOF1 8UJcNpZBnUYHGTXTdpH4nyJ+edCiJfGs/kH5jz4bVu3bcfg5QS+32S2Z7a0Kvv2372lyRPKhwlB vIkA1dRRxO1E4MX4p5s2l1+kGhliFWAw06m7h6YPM+0Ac+AWtumK+0p6bTaw3HdG7jZFeujYWT6 Mk11PnX+w5gsfLATP5FMpG70zT0oMq1DRI6GvVJ3RSXUaP69W63qyBpBGA4S/k1QqQsMo0aw3cv 8M0AMVqRt3vLXitdCcwAHlzPnSMYBRORLSPcj4tz4gbnxbK77zaZGdlw+zcYzbu7EP9476o73gD 31ks6TJcut991Hb2P1lyE5U/be5qVi5OfqiBgOMf2knxiQ/qdnSg== X-Google-Smtp-Source: AGHT+IEcHsFwc9UFzBVJEG8iB++b+nS/YevSOIFTO1lzsNkhZ849MApEwW4vPDX9UI7x5vNVBbpnBQ== X-Received: by 2002:a05:6000:2287:b0:3ea:80ec:8552 with SMTP id ffacd0b85a97d-42704e0eda4mr11022149f8f.57.1761079716912; Tue, 21 Oct 2025 13:48:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/45] hw/core/register: remove the `register_finalize_block' function Date: Tue, 21 Oct 2025 22:46:34 +0200 Message-ID: <20251021204700.56072-21-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1761079752996154100 From: Luc Michel This function is now unused. Drop it. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-5-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/register.h | 14 -------------- hw/core/register.c | 4 ---- 2 files changed, 18 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index 65c82600e06..7b0f4c8b7a6 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -209,18 +209,4 @@ RegisterInfoArray *register_init_block64(DeviceState *= owner, bool debug_enabled, uint64_t memory_size); =20 -/** - * This function should be called to cleanup the registers that were initi= alized - * when calling register_init_block32(). This function should only be call= ed - * from the device's instance_finalize function. - * - * Any memory operations that the device performed that require cleanup (s= uch - * as creating subregions) need to be called before calling this function. - * - * @r_array: A structure containing all of the registers, as returned by - * register_init_block32() - */ - -void register_finalize_block(RegisterInfoArray *r_array); - #endif diff --git a/hw/core/register.c b/hw/core/register.c index 1612ad174f9..81316d48597 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -322,10 +322,6 @@ static void register_array_finalize(Object *obj) g_free(r_array->r); } =20 -void register_finalize_block(RegisterInfoArray *r_array) -{ -} - static const TypeInfo register_array_info =3D { .name =3D TYPE_REGISTER_ARRAY, .parent =3D TYPE_OBJECT, --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080045; cv=none; d=zohomail.com; s=zohoarc; b=A4NXGCiwukkTNu/a/MQLBIx0IFILLEmzyQuEubRzgVpzIEmg7uwLoMzItsLobP32XzuBGeWFCOsbSyGUcwxQGTcz8eMRMPDU9u1yujiUqyxZsMWwITVz7CSAuMt7G+YfN9fzEIYriRqVXxdJC7i0TSl0ScxyEykhqsNPDeHfwsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080045; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KarjRMReFBr6aXs6DXwNVmSxe1Qqf0rq+Hp4zCMDXIw=; b=USTCkQ9jc68Rfe+QeV726cCPUu9OH17KOTkUAzsXSgvpRf0E0t5xOZoN491Hk4JkuGqD/eM+BSGAQLEaR+QrOKW+bscjkGgD3lRfo3nfS/Kj6AIUSV/LHtwdsh8idEqtez8WUCWj5UvRBux5EEQgY7+fkMF+j15nnJtR6fgauVo= 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 17610800458401018.2722878953663; Tue, 21 Oct 2025 13:54:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHr-0000ER-4W; Tue, 21 Oct 2025 16:48:55 -0400 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 1vBJHo-000075-KO for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:52 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHg-0001B5-0r for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:52 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-46b303f755aso64862905e9.1 for ; Tue, 21 Oct 2025 13:48:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427ed3fsm11788005e9.1.2025.10.21.13.48.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079721; x=1761684521; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KarjRMReFBr6aXs6DXwNVmSxe1Qqf0rq+Hp4zCMDXIw=; b=kvtJbHfyf8OBcxD1Of72yGSzcQN0i17qPiDCmm2sUmPNWFFOez0jxK+NUv/Zp6ZMUy 44fiP2KeSlM0Bg4jVuQrmgfWfEed9DDFvExXoMmS1GZLD5aOT94Tut2vsJUKj7ygv//T 11MH3cUJTnMCWvS4o/DTmdDGn1QR1nDLEEM7tCVLH/OIp3fjlNQrleyqcnmTvxqwiUP2 byvuqEryzPbe/IaszDv18JbhBy2w2Gl3DNvBLyEsdaFf2VIsqQrxtKzUkCfxXidbVunn ARk1HVUbXNt9V2dHdV6CMNGpZN1TizfX5Ql1bOhKa+QTHnR3QNaXh4ScZqflwBFQJFtp URDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079721; x=1761684521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KarjRMReFBr6aXs6DXwNVmSxe1Qqf0rq+Hp4zCMDXIw=; b=sBfDPwPbFiis+3yxKFi+A8JcDsM/c0kaNLv0rwRIHTkUqG9QUjPi/iyqhykfKhsqae 5mWdTfRtdYfw5iZ1AWDvkpfU7JkWtP1SGYWU8+ZLLt5lrBjRh18fY6tm4FeSOwiOOUUp RnruME7RdU5l4HdXBg7bzNjJs8wmSrO0/9lklE800RfL+cfCi+gZS+GoL/zuJf93WllM +6Pc3zkyrjcfIxfoQdn15O2jxkHcFmmRqEmOmAmhaVpS1f0fFdaHVi3LPRHIDkch5dcS gorA+418X5gbOcJxvXlAdViQi9xviRojr/2UGP5tU9ODwkaV8zogrXdrbqo4GMBmsaMm Xzfg== X-Gm-Message-State: AOJu0YzK31BH4vyIFYzFt1uBorfUNB3EbG3eR8AmIVIU6hCXKvfiCWcS LVMfHpAHOpVwOfiA4AQEx983y5CcuGXO4MBRxVCSfpBJoTHhyoGdGM3z/q0YdYD5DRoD0cSyFl5 Oof7xe9U= X-Gm-Gg: ASbGnctvBPNZMYCFAbjh6NVukTjfdniHxVa/BGAlx4Z9KZ/46UZco2zx6Uc+NnO4yL6 840tQEVJjsfCh6eMs0gtO39Y3Gte1AG9ExmTnf/g7c9F3zg1C0T2l1JGSbJStvXYf9eVAH4fl/R /KxiDACcyXZkHLFVKU0eqsWVLRSi1kVbzlH7BX9LNV8e7ecUyb5j2JPiCHOrYWfYde0Fq5xfme+ 66x1Lf1+NQ5jmGiatocxBH1INLj+6IEp1JzaVn414cISjdIdoUzQ+xRlcHtwH11CRMDmtxJfx4o IUlOU99d8/tVHP2C1W3nBUFpy6hjG8rqGCIBEMkZwXG2csmpMhmef4bPSdm1MquVwPoL+eZkxbG 0sN+GUN7nHNs/h+Td28npIFso/DcHI1CputeZCg1fSMsn1J1Fd2ktupbA+8c9GXS7DiX8V6yYov ocOd7TtAUqW2zUUGHJnbY6qhqXJrXyJoO+WAwGBFRkxlwWKs4jwg== X-Google-Smtp-Source: AGHT+IGAJhewCXhBudnXN1xErnFhAK2LieWkMn/v0aeG2RhSEB29iRjOdQsaATDfvlMNNT5GgayXYw== X-Received: by 2002:a05:600d:416b:b0:46e:1f92:49aa with SMTP id 5b1f17b1804b1-4711787c0b3mr141642025e9.15.1761079721363; Tue, 21 Oct 2025 13:48:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/45] hw/net/can/xlnx-versal-canfd: refactor the banked registers logic Date: Tue, 21 Oct 2025 22:46:35 +0200 Message-ID: <20251021204700.56072-22-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1761080050606158500 From: Luc Michel The CANFD device has several groups of registers: - the main control registers from 0x0 to 0xec - several banks of multiple registers. The number of banks is either hardcoded, or configurable using QOM properties: - Tx registers - Filter registers - Tx events registers - Rx0 registers - Rx1 registers As of now, all the registers are handled using the register API. The banked register logic results in a convoluted code to correctly allocate the register descriptors for the register API. This code bypasses the standard register API creation function (register_init_block). The resulting code leaks memory when the device is finalized. This commit introduces decoding logic for the banked registers. Those registers are quite simple in practice. Accessing them triggers no side-effect (only the filter registers need a check to catch guest invalid behaviour). Starting from the Tx events registers, they are all read-only. The main device memory region is changed to an I/O one, calling the new decoding logic when accessed. The register API memory region still overlaps all of it so for now the introduced code has no effect. The next commit will remove the register API usage for banked registers. Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-6-luc.michel@amd.com> [PMD: Have canfd_decode_reg_bank() take optional @idx, types fixups] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/can/xlnx-versal-canfd.c | 150 ++++++++++++++++++++++++++++++++- 1 file changed, 146 insertions(+), 4 deletions(-) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 99bbdd7d3fe..04f9a6d57d7 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1410,6 +1410,22 @@ static uint64_t canfd_srr_pre_write(RegisterInfo *re= g, uint64_t val64) return s->regs[R_SOFTWARE_RESET_REGISTER]; } =20 +static void filter_reg_write(XlnxVersalCANFDState *s, hwaddr addr, + unsigned bank_idx, uint32_t val) +{ + size_t reg_idx =3D addr / sizeof(uint32_t); + + if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & (1 << bank_idx))= ) { + s->regs[reg_idx] =3D val; + } else { + g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); + + qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter register 0x%" + HWADDR_PRIx " changed while filter %u enabled\n", + path, addr, bank_idx + 1); + } +} + static uint64_t filter_mask(RegisterInfo *reg, uint64_t val64) { XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); @@ -1763,9 +1779,135 @@ static void xlnx_versal_canfd_ptimer_cb(void *opaqu= e) /* No action required on the timer rollover. */ } =20 +static bool canfd_decode_reg_bank(XlnxVersalCANFDState *s, hwaddr addr, + hwaddr first_reg, hwaddr last_reg, + size_t num_banks, unsigned *idx, + hwaddr *offset) +{ + hwaddr base =3D addr - first_reg; + hwaddr span =3D last_reg - first_reg + sizeof(uint32_t); + unsigned index =3D base / span; + + if (index >=3D num_banks) { + return false; + } + if (idx) { + *idx =3D index; + } + + *offset =3D base % span; + *offset +=3D first_reg; + + return true; +} + +/* + * Decode the given addr into a (idx, offset) pair: + * - idx is the bank index of the register at addr, + * - offset is the register offset relative to bank 0 + * + * @return true is the decoding succeded, false otherwise + */ +static bool canfd_decode_addr(XlnxVersalCANFDState *s, hwaddr addr, + unsigned *idx, hwaddr *offset) +{ + if (addr <=3D A_RX_FIFO_WATERMARK_REGISTER) { + /* from 0x0 to 0xec. Handled by the register API */ + g_assert_not_reached(); + } else if (addr < A_TB_ID_REGISTER) { + /* no register in this gap */ + return false; + } else if (addr < A_AFMR_REGISTER) { + /* TX registers */ + return canfd_decode_reg_bank(s, addr, + A_TB_ID_REGISTER, A_TB_DW15_REGISTER, + s->cfg.tx_fifo, idx, offset); + } else if (addr < A_TXE_FIFO_TB_ID_REGISTER) { + /* Filter registers */ + return canfd_decode_reg_bank(s, addr, + A_AFMR_REGISTER, A_AFIR_REGISTER, + 32, idx, offset); + } else if (addr < A_RB_ID_REGISTER) { + /* TX event registers */ + return canfd_decode_reg_bank(s, addr, + A_TXE_FIFO_TB_ID_REGISTER, + A_TXE_FIFO_TB_DLC_REGISTER, + 32, idx, offset); + } else if (addr < A_RB_ID_REGISTER_1) { + /* RX0 registers */ + return canfd_decode_reg_bank(s, addr, + A_RB_ID_REGISTER, + A_RB_DW15_REGISTER, + s->cfg.rx0_fifo, idx, offset); + } else if (addr <=3D A_RB_DW15_REGISTER_1) { + /* RX1 registers */ + return canfd_decode_reg_bank(s, addr, + A_RB_ID_REGISTER_1, + A_RB_DW15_REGISTER_1, + s->cfg.rx1_fifo, idx, offset); + } + + /* decode error */ + return false; +} + +static uint64_t canfd_read(void *opaque, hwaddr addr, unsigned size) +{ + XlnxVersalCANFDState *s =3D XILINX_CANFD(opaque); + hwaddr reg_offset; + uint64_t ret; + + if (!canfd_decode_addr(s, addr, NULL, ®_offset)) { + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": read to unknown register at address 0x%" + HWADDR_PRIx "\n", addr); + return 0; + } + + switch (reg_offset) { + default: + ret =3D s->regs[addr / sizeof(uint32_t)]; + } + + return ret; +} + +static void canfd_write(void *opaque, hwaddr addr, uint64_t value, + unsigned size) +{ + XlnxVersalCANFDState *s =3D XILINX_CANFD(opaque); + unsigned bank_idx; + hwaddr reg_offset; + + if (!canfd_decode_addr(s, addr, &bank_idx, ®_offset)) { + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": write to unknown register at address 0x%" + HWADDR_PRIx "\n", addr); + return; + } + + if (addr >=3D A_TXE_FIFO_TB_ID_REGISTER) { + /* All registers from TX event regs to the end are read-only */ + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": write to read-only register at 0x%" HWADDR_PRIx "= \n", + addr); + return; + } + + switch (reg_offset) { + case A_AFMR_REGISTER: + case A_AFIR_REGISTER: + filter_reg_write(s, addr, bank_idx, value); + break; + + default: + s->regs[addr / sizeof(uint32_t)] =3D value; + } +} + static const MemoryRegionOps canfd_ops =3D { - .read =3D register_read_memory, - .write =3D register_write_memory, + .read =3D canfd_read, + .write =3D canfd_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, @@ -2018,8 +2160,8 @@ static void canfd_init(Object *obj) { XlnxVersalCANFDState *s =3D XILINX_CANFD(obj); =20 - memory_region_init(&s->iomem, obj, TYPE_XILINX_CANFD, - XLNX_VERSAL_CANFD_R_MAX * 4); + memory_region_init_io(&s->iomem, obj, &canfd_ops, s, TYPE_XILINX_CANFD, + XLNX_VERSAL_CANFD_R_MAX * 4); } =20 static const VMStateDescription vmstate_canfd =3D { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079758; cv=none; d=zohomail.com; s=zohoarc; b=C/ej7FjpWVL/p8Llwjy2bpf5inZQzOXBgBBeqDGCRBIAkpcu32LOmll/YiUkq+C8BhloALldPK0j5M31d5e1D9QYf/aeIn9ncXlWy7oAV3V4hDiBGtQ5KeHZHOoo5MlgGrWcHMMVcaBAbpXrqSJMcZDxpRvK2r2oaKmCs3C+n5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079758; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pm3cCQ10tYk8d37QLddrP30Ira7iE5Xo6EG/tSdEOMU=; b=kL2H66t49KswxS2ntwoGBN6gkMTvdUD8A5h2+Zp0qDQecZkudPBmYSWDT/rNQTUw6ltBVHa1Tgnce6Hrnys/LJvxag1ophrUPwgCgRn7KG9qOyWrzLl7dCpnseEMjuihBx2Z3JzP1HCreegw91KxeaYbiimWcUNKBkZNEepQG8k= 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 1761079758540481.5425749564695; Tue, 21 Oct 2025 13:49:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHs-0000Fd-Fe; Tue, 21 Oct 2025 16:48:56 -0400 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 1vBJHp-0000B3-II for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:53 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHm-0001Bf-2j for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:53 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-471b80b994bso43074905e9.3 for ; Tue, 21 Oct 2025 13:48:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4378cbesm9203365e9.16.2025.10.21.13.48.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079726; x=1761684526; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pm3cCQ10tYk8d37QLddrP30Ira7iE5Xo6EG/tSdEOMU=; b=ONPl/mviAiPnYPpO+s+pG5C/7W7YWnywePAT/DuR8iockeRHOSRf5h+HmYcZ733WHc BPkxpb5ej5QgrBpxisdPWNokAgVAHuGAkVwDhMVauHMu3Ctz21cYqvd50AQiVIBb6v6S /XoR9Q5qAqusNF2gGo7JRLNrHBq9MmXId88qxCFoVnoxJQAbayV/H35VTjOJB1J0SRoW 7I5n+QtK67/mciFAlelID+R/LhrdQCEP2biRfMOMfmQtn+sVKzebeq6rd91ZWyMYsEad o7AJfTkW/jB2V16Y1RSUb8RzLk+kDxec0ywkSGf0ijFk9b9Ni74dNfn55N7KKeI+7rEt EfBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079726; x=1761684526; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pm3cCQ10tYk8d37QLddrP30Ira7iE5Xo6EG/tSdEOMU=; b=foo4mai//5npxfImu9cvVDREQGK2sg7VbUURtMde1ZNw95xsdMdXk5sZLJY07uZxvS 7gVLm1nJEx1QP6c4NAnXCCFGWxq8CQMS22VKtozkT6vsywgwIRcKj+JFKAzO2YNdFWTp VdajEljqVysBxGRN8dObSHPv2c5HHn3HdU3b5yoNpZSXtl50U+tqRVLet5gYZuk20TjY rKATPBvt/FKV3CNTWsM2MA6Oh8C19IJpf8Re71T6RuasZFk6ZwNKtiAw7hWFXxu1r+s7 8HVCrAnn+WRk0YUSPg+ALd06D68UeaZQQ5OdP4fZjVdEcou+PXpTku9ZAKnTwEDFt08K P7kQ== X-Gm-Message-State: AOJu0YxrNQq2L7gTKAsTLeYXi7e6KFU4yfmmt4nwGnEFkvF9ILuQ9YDU 7tnWXrV+Spm5X0BCaP2UHMzzqytrbakNwC8B2bvsIHiJF+XC594TljBCzs+OIuj5wA2a75pVdXl w6n9h8OU= X-Gm-Gg: ASbGnctA09ZQHM/ezRyX5dLOLS5YeyX8xmeGxTs+e2yC3zIlXn20I2i40rAgWM3Yv4s Smd0SAKvGqvtRTm5Zmy2moobHYzAQIQSV02ZTEn2jU8TzuWsgL1N/BtTAqv57DWSjR1xF+j2I3a rK1scXjSOmYEmduBu2EIqm8zlNb8HcDc3wBwJcln7lGQaefpZzPsHNOdodVVcMei9hqMyd7Sa4X xzp4eYrAJ3Y4mcbmHjroO/wt0aN9fmajqBmyYLZ9AUIcM77KZQF7QYFxTEJmhvBUE8d9JfaVvWj E92HM1s9lMin+65kasfRJeHWzTiTPGZyhnFjfKbksg6N9vP5ALIvrRsUU5utDX2x8AnSM63rdmb y3ERzSgB5fJLaaSqFMpgc3R8pc2qsDtRHRYFeUdIvNrHpVJq79nHaKzm+cv4P/sI2c6fPWIgM0e Ajjq/A/L/5xbi/J/twiU2i9Tz8z+kcjSRxVbUXepgmkhkI/RIQDw== X-Google-Smtp-Source: AGHT+IF9xeU35tnwNruu0VbMQf5zaeTVg+1Ap70Go1+m30PtINYvI0CUtLPXw/XQ05R1ZZ/o/vlrmA== X-Received: by 2002:a05:600c:470d:b0:471:7c8:ddf7 with SMTP id 5b1f17b1804b1-471178a7447mr121045525e9.14.1761079725951; Tue, 21 Oct 2025 13:48:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/45] hw/net/can/xlnx-versal-canfd: remove register API usage for banked regs Date: Tue, 21 Oct 2025 22:46:36 +0200 Message-ID: <20251021204700.56072-23-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1761079761172154100 From: Luc Michel Now that we have a simple decoding logic for all the banked registers, remove the register API usage for them. This restricts the register API usage to only the base registers (from 0x0 to 0xec). This also removes all the custom code that was creating register descriptors for the register API and was leading to memory leaks when the device was finalized. Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251017161809.235740-7-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/net/xlnx-versal-canfd.h | 8 - hw/net/can/xlnx-versal-canfd.c | 303 ++--------------------------- 2 files changed, 15 insertions(+), 296 deletions(-) diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versa= l-canfd.h index ad3104dd13f..396f90d6dc1 100644 --- a/include/hw/net/xlnx-versal-canfd.h +++ b/include/hw/net/xlnx-versal-canfd.h @@ -54,14 +54,6 @@ typedef struct XlnxVersalCANFDState { qemu_irq irq_addr_err; =20 RegisterInfo reg_info[XLNX_VERSAL_CANFD_R_MAX]; - RegisterAccessInfo *tx_regs; - RegisterAccessInfo *rx0_regs; - RegisterAccessInfo *rx1_regs; - RegisterAccessInfo *af_regs; - RegisterAccessInfo *txe_regs; - RegisterAccessInfo *rx_mailbox_regs; - RegisterAccessInfo *af_mask_regs_mailbox; - uint32_t regs[XLNX_VERSAL_CANFD_R_MAX]; =20 ptimer_state *canfd_timer; diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 04f9a6d57d7..5735639b85a 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1426,46 +1426,6 @@ static void filter_reg_write(XlnxVersalCANFDState *s= , hwaddr addr, } } =20 -static uint64_t filter_mask(RegisterInfo *reg, uint64_t val64) -{ - XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); - uint32_t reg_idx =3D (reg->access->addr) / 4; - uint32_t val =3D val64; - uint32_t filter_offset =3D (reg_idx - R_AFMR_REGISTER) / 2; - - if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & - (1 << filter_offset))) { - s->regs[reg_idx] =3D val; - } else { - g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); - - qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter %d not enabl= ed\n", - path, filter_offset + 1); - } - - return s->regs[reg_idx]; -} - -static uint64_t filter_id(RegisterInfo *reg, uint64_t val64) -{ - XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); - hwaddr reg_idx =3D (reg->access->addr) / 4; - uint32_t val =3D val64; - uint32_t filter_offset =3D (reg_idx - R_AFIR_REGISTER) / 2; - - if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & - (1 << filter_offset))) { - s->regs[reg_idx] =3D val; - } else { - g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); - - qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter %d not enabl= ed\n", - path, filter_offset + 1); - } - - return s->regs[reg_idx]; -} - static uint64_t canfd_tx_fifo_status_prew(RegisterInfo *reg, uint64_t val6= 4) { XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); @@ -1591,125 +1551,6 @@ static uint64_t canfd_write_check_prew(RegisterInfo= *reg, uint64_t val64) return 0; } =20 -static const RegisterAccessInfo canfd_tx_regs[] =3D { - { .name =3D "TB_ID_REGISTER", .addr =3D A_TB_ID_REGISTER, - },{ .name =3D "TB0_DLC_REGISTER", .addr =3D A_TB0_DLC_REGISTER, - },{ .name =3D "TB_DW0_REGISTER", .addr =3D A_TB_DW0_REGISTER, - },{ .name =3D "TB_DW1_REGISTER", .addr =3D A_TB_DW1_REGISTER, - },{ .name =3D "TB_DW2_REGISTER", .addr =3D A_TB_DW2_REGISTER, - },{ .name =3D "TB_DW3_REGISTER", .addr =3D A_TB_DW3_REGISTER, - },{ .name =3D "TB_DW4_REGISTER", .addr =3D A_TB_DW4_REGISTER, - },{ .name =3D "TB_DW5_REGISTER", .addr =3D A_TB_DW5_REGISTER, - },{ .name =3D "TB_DW6_REGISTER", .addr =3D A_TB_DW6_REGISTER, - },{ .name =3D "TB_DW7_REGISTER", .addr =3D A_TB_DW7_REGISTER, - },{ .name =3D "TB_DW8_REGISTER", .addr =3D A_TB_DW8_REGISTER, - },{ .name =3D "TB_DW9_REGISTER", .addr =3D A_TB_DW9_REGISTER, - },{ .name =3D "TB_DW10_REGISTER", .addr =3D A_TB_DW10_REGISTER, - },{ .name =3D "TB_DW11_REGISTER", .addr =3D A_TB_DW11_REGISTER, - },{ .name =3D "TB_DW12_REGISTER", .addr =3D A_TB_DW12_REGISTER, - },{ .name =3D "TB_DW13_REGISTER", .addr =3D A_TB_DW13_REGISTER, - },{ .name =3D "TB_DW14_REGISTER", .addr =3D A_TB_DW14_REGISTER, - },{ .name =3D "TB_DW15_REGISTER", .addr =3D A_TB_DW15_REGISTER, - } -}; - -static const RegisterAccessInfo canfd_rx0_regs[] =3D { - { .name =3D "RB_ID_REGISTER", .addr =3D A_RB_ID_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DLC_REGISTER", .addr =3D A_RB_DLC_REGISTER, - .ro =3D 0xfe1fffff, - },{ .name =3D "RB_DW0_REGISTER", .addr =3D A_RB_DW0_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW1_REGISTER", .addr =3D A_RB_DW1_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW2_REGISTER", .addr =3D A_RB_DW2_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW3_REGISTER", .addr =3D A_RB_DW3_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW4_REGISTER", .addr =3D A_RB_DW4_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW5_REGISTER", .addr =3D A_RB_DW5_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW6_REGISTER", .addr =3D A_RB_DW6_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW7_REGISTER", .addr =3D A_RB_DW7_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW8_REGISTER", .addr =3D A_RB_DW8_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW9_REGISTER", .addr =3D A_RB_DW9_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW10_REGISTER", .addr =3D A_RB_DW10_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW11_REGISTER", .addr =3D A_RB_DW11_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW12_REGISTER", .addr =3D A_RB_DW12_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW13_REGISTER", .addr =3D A_RB_DW13_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW14_REGISTER", .addr =3D A_RB_DW14_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW15_REGISTER", .addr =3D A_RB_DW15_REGISTER, - .ro =3D 0xffffffff, - } -}; - -static const RegisterAccessInfo canfd_rx1_regs[] =3D { - { .name =3D "RB_ID_REGISTER_1", .addr =3D A_RB_ID_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DLC_REGISTER_1", .addr =3D A_RB_DLC_REGISTER_1, - .ro =3D 0xfe1fffff, - },{ .name =3D "RB0_DW0_REGISTER_1", .addr =3D A_RB0_DW0_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW1_REGISTER_1", .addr =3D A_RB_DW1_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW2_REGISTER_1", .addr =3D A_RB_DW2_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW3_REGISTER_1", .addr =3D A_RB_DW3_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW4_REGISTER_1", .addr =3D A_RB_DW4_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW5_REGISTER_1", .addr =3D A_RB_DW5_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW6_REGISTER_1", .addr =3D A_RB_DW6_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW7_REGISTER_1", .addr =3D A_RB_DW7_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW8_REGISTER_1", .addr =3D A_RB_DW8_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW9_REGISTER_1", .addr =3D A_RB_DW9_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW10_REGISTER_1", .addr =3D A_RB_DW10_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW11_REGISTER_1", .addr =3D A_RB_DW11_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW12_REGISTER_1", .addr =3D A_RB_DW12_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW13_REGISTER_1", .addr =3D A_RB_DW13_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW14_REGISTER_1", .addr =3D A_RB_DW14_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW15_REGISTER_1", .addr =3D A_RB_DW15_REGISTER_1, - .ro =3D 0xffffffff, - } -}; - -/* Acceptance filter registers. */ -static const RegisterAccessInfo canfd_af_regs[] =3D { - { .name =3D "AFMR_REGISTER", .addr =3D A_AFMR_REGISTER, - .pre_write =3D filter_mask, - },{ .name =3D "AFIR_REGISTER", .addr =3D A_AFIR_REGISTER, - .pre_write =3D filter_id, - } -}; - -static const RegisterAccessInfo canfd_txe_regs[] =3D { - { .name =3D "TXE_FIFO_TB_ID_REGISTER", .addr =3D A_TXE_FIFO_TB_ID_R= EGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "TXE_FIFO_TB_DLC_REGISTER", .addr =3D A_TXE_FIFO_TB_DLC= _REGISTER, - .ro =3D 0xffffffff, - } -}; - static const RegisterAccessInfo canfd_regs_info[] =3D { { .name =3D "SOFTWARE_RESET_REGISTER", .addr =3D A_SOFTWARE_RESET_R= EGISTER, .pre_write =3D canfd_srr_pre_write, @@ -1915,6 +1756,16 @@ static const MemoryRegionOps canfd_ops =3D { }, }; =20 +static const MemoryRegionOps canfd_regs_ops =3D { + .read =3D register_read_memory, + .write =3D register_write_memory, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + static void canfd_reset(DeviceState *dev) { XlnxVersalCANFDState *s =3D XILINX_CANFD(dev); @@ -1994,140 +1845,16 @@ static int xlnx_canfd_connect_to_bus(XlnxVersalCAN= FDState *s, return can_bus_insert_client(bus, &s->bus_client); } =20 -#define NUM_REG_PER_AF ARRAY_SIZE(canfd_af_regs) -#define NUM_AF 32 -#define NUM_REG_PER_TXE ARRAY_SIZE(canfd_txe_regs) -#define NUM_TXE 32 - -static int canfd_populate_regarray(XlnxVersalCANFDState *s, - RegisterInfoArray *r_array, int pos, - const RegisterAccessInfo *rae, - int num_rae) -{ - int i; - - for (i =3D 0; i < num_rae; i++) { - int index =3D rae[i].addr / 4; - RegisterInfo *r =3D &s->reg_info[index]; - - *r =3D (RegisterInfo) { - .data =3D &s->regs[index], - .data_size =3D sizeof(uint32_t), - .access =3D &rae[i], - .opaque =3D OBJECT(s), - }; - - r_array->r[i + pos] =3D r; - } - return i + pos; -} - -static void canfd_create_rai(RegisterAccessInfo *rai_array, - const RegisterAccessInfo *canfd_regs, - int template_rai_array_sz, - int num_template_to_copy) -{ - int i; - int reg_num; - - for (reg_num =3D 0; reg_num < num_template_to_copy; reg_num++) { - int pos =3D reg_num * template_rai_array_sz; - - memcpy(rai_array + pos, canfd_regs, - template_rai_array_sz * sizeof(RegisterAccessInfo)); - - for (i =3D 0; i < template_rai_array_sz; i++) { - const char *name =3D canfd_regs[i].name; - uint64_t addr =3D canfd_regs[i].addr; - rai_array[i + pos].name =3D g_strdup_printf("%s%d", name, reg_= num); - rai_array[i + pos].addr =3D addr + pos * 4; - } - } -} - -static RegisterInfoArray *canfd_create_regarray(XlnxVersalCANFDState *s) -{ - const char *device_prefix =3D object_get_typename(OBJECT(s)); - uint64_t memory_size =3D XLNX_VERSAL_CANFD_R_MAX * 4; - int num_regs; - int pos =3D 0; - RegisterInfoArray *r_array; - - num_regs =3D ARRAY_SIZE(canfd_regs_info) + - s->cfg.tx_fifo * NUM_REGS_PER_MSG_SPACE + - s->cfg.rx0_fifo * NUM_REGS_PER_MSG_SPACE + - NUM_AF * NUM_REG_PER_AF + - NUM_TXE * NUM_REG_PER_TXE; - - s->tx_regs =3D g_new0(RegisterAccessInfo, - s->cfg.tx_fifo * ARRAY_SIZE(canfd_tx_regs)); - - canfd_create_rai(s->tx_regs, canfd_tx_regs, - ARRAY_SIZE(canfd_tx_regs), s->cfg.tx_fifo); - - s->rx0_regs =3D g_new0(RegisterAccessInfo, - s->cfg.rx0_fifo * ARRAY_SIZE(canfd_rx0_regs)); - - canfd_create_rai(s->rx0_regs, canfd_rx0_regs, - ARRAY_SIZE(canfd_rx0_regs), s->cfg.rx0_fifo); - - s->af_regs =3D g_new0(RegisterAccessInfo, - NUM_AF * ARRAY_SIZE(canfd_af_regs)); - - canfd_create_rai(s->af_regs, canfd_af_regs, - ARRAY_SIZE(canfd_af_regs), NUM_AF); - - s->txe_regs =3D g_new0(RegisterAccessInfo, - NUM_TXE * ARRAY_SIZE(canfd_txe_regs)); - - canfd_create_rai(s->txe_regs, canfd_txe_regs, - ARRAY_SIZE(canfd_txe_regs), NUM_TXE); - - if (s->cfg.enable_rx_fifo1) { - num_regs +=3D s->cfg.rx1_fifo * NUM_REGS_PER_MSG_SPACE; - - s->rx1_regs =3D g_new0(RegisterAccessInfo, - s->cfg.rx1_fifo * ARRAY_SIZE(canfd_rx1_regs)); - - canfd_create_rai(s->rx1_regs, canfd_rx1_regs, - ARRAY_SIZE(canfd_rx1_regs), s->cfg.rx1_fifo); - } - - r_array =3D g_new0(RegisterInfoArray, 1); - r_array->r =3D g_new0(RegisterInfo * , num_regs); - r_array->num_elements =3D num_regs; - r_array->prefix =3D device_prefix; - - pos =3D canfd_populate_regarray(s, r_array, pos, - canfd_regs_info, - ARRAY_SIZE(canfd_regs_info)); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->tx_regs, s->cfg.tx_fifo * - NUM_REGS_PER_MSG_SPACE); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->rx0_regs, s->cfg.rx0_fifo * - NUM_REGS_PER_MSG_SPACE); - if (s->cfg.enable_rx_fifo1) { - pos =3D canfd_populate_regarray(s, r_array, pos, - s->rx1_regs, s->cfg.rx1_fifo * - NUM_REGS_PER_MSG_SPACE); - } - pos =3D canfd_populate_regarray(s, r_array, pos, - s->af_regs, NUM_AF * NUM_REG_PER_AF); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->txe_regs, NUM_TXE * NUM_REG_PER_TXE); - - memory_region_init_io(&r_array->mem, OBJECT(s), &canfd_ops, r_array, - device_prefix, memory_size); - return r_array; -} - static void canfd_realize(DeviceState *dev, Error **errp) { XlnxVersalCANFDState *s =3D XILINX_CANFD(dev); RegisterInfoArray *reg_array; =20 - reg_array =3D canfd_create_regarray(s); + reg_array =3D register_init_block32(dev, canfd_regs_info, + ARRAY_SIZE(canfd_regs_info), s->reg_= info, + s->regs, &canfd_regs_ops, false, + A_RX_FIFO_WATERMARK_REGISTER + + sizeof(uint32_t)); memory_region_add_subregion(&s->iomem, 0x00, ®_array->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq_canfd_int); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079815; cv=none; d=zohomail.com; s=zohoarc; b=A5mCVLVXi+ndMaNF64YNEnb7XuCIpYyYFhBDC792aI1utXgeuX7qe1ljQ9d+SwmFFxfYVIDIrq0K0Qvf1dJBoNUbbumiR0JlUAN2WpWbikZp03EU+wIzkqVvCzvEWdbCO0DVr/n4knYL4QcI4zqi+eG4xZ1g2oCow35GeshAytA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079815; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=1eGb/qWicD87v06dVtQ6TfIwBX5R3IiSQQ+m6Usu1EA=; b=dQVQBA4cIJTCi3KDIfOI2Y86xM0dqfkvLTdQskHocTuotGqU3e/Kq0qMw/Bl1z5ZMW8gVXAiOH4HA4sP9pbpo8/JEjbsDSvagISJrr+c8VD7nQAJv+/rkpfNrTEgSbiQNKlruUCXtZCgGKC8J1H6x522j2b6tRRhuyO/Rm41aRg= 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 1761079815555502.5678310170391; Tue, 21 Oct 2025 13:50:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJHy-0000QA-8T; Tue, 21 Oct 2025 16:49:03 -0400 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 1vBJHs-0000GP-34 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:56 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHp-0001C4-7l for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:48:55 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47114a40161so18069755e9.3 for ; Tue, 21 Oct 2025 13:48:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47494b02475sm24800085e9.4.2025.10.21.13.48.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079730; x=1761684530; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1eGb/qWicD87v06dVtQ6TfIwBX5R3IiSQQ+m6Usu1EA=; b=ix2sFrRhLEbQn/2iGSmegEzgb240YZeUsja8qUKft+gQJ5Hp18y/DW44w9CnR7660D q5viV81cNm40XQHVApahUNnYi7LxtNcgoGbfIZO7uiT1NQ3dni7CTSjdxOU+Vc9UlP1G ERnhIUeWlcH8tdY0qbMikbdXb9Uj+0o+/3vSDrtHrhpWgfcB4v0HtJoRnFKJ6g3glnrQ ybrmvZVC4t3Gm3nEf3enY7QfIVrCo0UCyVtLDpr4Jt3+C2iwtD+rP0sEG6HmhO1IKuXj OIxjjqRhZjdI8cF+Cqoh1+4gSNjAyATqQmn9YS4GyNq4BS03ENkxDqVcMraoQvXgf8dv FfwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079730; x=1761684530; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1eGb/qWicD87v06dVtQ6TfIwBX5R3IiSQQ+m6Usu1EA=; b=ecSDphg/wwJJfkrPj/1ajUt8n1WAxv+A6ehFPQYt3/GMaLOlynupPmx4MCLFCEfoKA SfxGR+d0G4RE6ikyBWXnIWfIvhgEH2SzNyulmKyyTFyHu8w+71q2f/CEVC95b9plxCuH q4K3JkofQA7A5RTgdqfoiSueHvwd5IL4VG3jwGje8MoK0dQDjcbX7RQbXOn8bv7Jg1r6 5ushl2TYfxXVc5YRi8bqCC1/lRocUkSMgFMcLjRIQgtzqbPASfYN+DhiR9g4vxsRibG3 maAUZNBr31n49jCuNkdLhBuAnwQCIvf2CqCKRGcrCMKF6JVbrAqr3VWghgm4fKmX57Lp dnNg== X-Gm-Message-State: AOJu0Yw8w869JXR4XyLubPpeChxITjzmzlEVIvaxzWsXXlJyZYjJLq85 Cow0G/QADktdre6rqy+NkgjXhDDBQadYpdx8M9s+3Fi57s568CfKaqU4DlSOSYVBVcADejsq05F RFEXxNP0= X-Gm-Gg: ASbGncsYKDC0PZngzmW36JYONmSXGkb/uP/IRSQsrvNwlyRrG8rwqbFOpgWViLSUrhf 8msSW6f/5KClmxIQnMelrgPpgTnixbBgV1It+ozmgg7q/yXC+vHOb35XsxBP5eksJogGz356Eyl 0z4wOmEqIr46GKep4XZa2yp1JGtwyExzpQxJoc5GEP6hraVBDV6qycW9q3P60s4FLs3lGadId8W JgbTpyCjFg+yKBhiVgB/nSCj38xaUWe79l5Zx26Nw1MGN1mVgF4VJwHvakS8Iv5/E0/6eyQD++T lxZ0SkekFWbYqxZE622zPlvmpqgdYA4N3m9LQIUXi1c1U4otE+r5mRsViYymrf9ObnPNhq2sBFR j2DhENmGk5iOvIXquzV4Mmxp0mcjn62dysboUAbyfWHtJ4j+LbUq3pZPdtw9qCVaGwBBtyiKmCF gBfEJIWm4fjV8FniGlJSjmqU/IbmxqeSVy4AI9tSHKInfSz6w1YnVd3+GQie92 X-Google-Smtp-Source: AGHT+IHMtTUsCeDArJeD/9daPczhMPGY8RM1UoZBRhQSnbMXC5+UPgeBXWny49LTqpzMVdmKkwJx5A== X-Received: by 2002:a05:600c:3e07:b0:46e:450d:e037 with SMTP id 5b1f17b1804b1-4711786c560mr143291925e9.5.1761079730576; Tue, 21 Oct 2025 13:48:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/45] hw/ppc/prep: Always create prep-systemio Date: Tue, 21 Oct 2025 22:46:37 +0200 Message-ID: <20251021204700.56072-24-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1761079821181158500 From: BALATON Zoltan The prep-systemio device models the system control ports of the 40p machine which is not an optional pluggable device but part of the system so it should not be disabled by -nodefaults but always created. Additionally remove some line breaks to make lines related to one device appear in one block for logical separation from other devices. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/prep.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 982e40e53e1..c730cb3429e 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -308,6 +308,13 @@ static void ibm_40p_init(MachineState *machine) sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15)); isa_bus =3D ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0")); =20 + /* system control ports */ + isa_dev =3D isa_new("prep-systemio"); + dev =3D DEVICE(isa_dev); + qdev_prop_set_uint32(dev, "ibm-planar-id", 0xfc); + qdev_prop_set_uint32(dev, "equipment", 0xc0); + isa_realize_and_unref(isa_dev, isa_bus, &error_fatal); + /* Memory controller */ isa_dev =3D isa_new("rs6000-mc"); dev =3D DEVICE(isa_dev); @@ -333,7 +340,6 @@ static void ibm_40p_init(MachineState *machine) dev =3D DEVICE(isa_dev); qdev_prop_set_uint32(dev, "iobase", 0x830); qdev_prop_set_uint32(dev, "irq", 10); - if (machine->audiodev) { qdev_prop_set_string(dev, "audiodev", machine->audiodev); } @@ -344,14 +350,7 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_uint32(dev, "config", 12); isa_realize_and_unref(isa_dev, isa_bus, &error_fatal); =20 - isa_dev =3D isa_new("prep-systemio"); - dev =3D DEVICE(isa_dev); - qdev_prop_set_uint32(dev, "ibm-planar-id", 0xfc); - qdev_prop_set_uint32(dev, "equipment", 0xc0); - isa_realize_and_unref(isa_dev, isa_bus, &error_fatal); - - dev =3D DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(1, 0), - "lsi53c810")); + dev =3D DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "lsi53c= 810")); lsi53c8xx_handle_legacy_cmdline(dev); qdev_connect_gpio_out(dev, 0, qdev_get_gpio_in(i82378_dev, 13)); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080011; cv=none; d=zohomail.com; s=zohoarc; b=kWbDj1JGVKLgpjemu45X6HPTcvLLH63aMzThqBgTtmaxt40E79TxN6c3fatNfAL5S4ciQyrzfKtsV8/hFX/Dvt72UNgTLpB422bBQ30uQ1kggiY68R6eBfRXteSgQcdG9sz8T8htZrBPqzUNPqOwtQrCJBv/5+ae7dG1MKWqUOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080011; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ldA81TOhO5CyCm5FfejA2XOTZsnGVZH3vj2puivaEgs=; b=KwKH+rttxWgPEJWUZ2qUskq/7yizxi9812qbAuICoX0qA81tEF71gId3BATlJVxTyzhDuKO7yqUjhYUgsbpnCirTfakYLmDdsbgExCmzoOQUBkxGyMAQumGc73unmRhgOy8ca1/2RN0+svI/skkLdIfI8RDSrerMs2O+VERADdA= 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 1761080011303420.663009916998; Tue, 21 Oct 2025 13:53:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJI3-00010T-VZ; Tue, 21 Oct 2025 16:49:08 -0400 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 1vBJI2-0000dp-5x for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:06 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHt-0001Ci-Kl for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:01 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4711b95226dso49332715e9.0 for ; Tue, 21 Oct 2025 13:48:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42b48c9sm10820645e9.15.2025.10.21.13.48.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079735; x=1761684535; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ldA81TOhO5CyCm5FfejA2XOTZsnGVZH3vj2puivaEgs=; b=TPk+MFFVr5jIXHrUQ0A6ttXJnjjJWThs0RrvAiPrxKeimJHa3z3zZtw03QTGDrVHCb ENO4fHyXGZmAuODX2uYpVtx+wgTSULqhFiuhoDmr0lbcqmrXTMZv+gvvMD+Rj/KBfDwK Rr8N/pLtTIZKnRTA/3B+XC9oi/qz0DbQxU/lR3/tAlCkdOy0d8grGv5YLrGGgy/l+p70 FstGtORhxxqMDqbnuu8NmcCdN9amPOibBkuDyIwS5/uTgzcsOFMnFMMT2mWKaGy1TzsM VCtNSXzpHw+LOwEXGyqgyEEWIx4ZCB3XVmheNMA2JJMgImhWUE+A6ZUUKvu1MVhpNBYn xvwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079735; x=1761684535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ldA81TOhO5CyCm5FfejA2XOTZsnGVZH3vj2puivaEgs=; b=sqzzb6PrZi0hCRgIY86Z1NNpkMnRJLJd3E827e62PerD2I2PRUajWxrinQl79lJrPx RLvo1eMx+jftgxAOulxS+2zDpTCmBuDEZR7ILhUIP2fMbIe3Z5f+0N4kehTALRtGvAoX cKDAb2I+UHXzpFBAjnLdT7yCPyvrLJJqENylndIqnoZrjc/8y8HOxHk//5T+4y1i2oQv FCqsbguWqlJELnX4MJ+nJ6jamdPCTDhqxYsOUnJLvXabDDiYqRxPH2PTwAbuSUrelaGR 73IDQvPGiOXQ3jP687zbpCJp4kafIIsOXF4yG5c5QqgRiWafm8OFgDyGNxu/6PZtS8tt RCXw== X-Gm-Message-State: AOJu0YwrlDrFiMrkpTI6EFc4qu8dyMflO4YYNQCSTNx0HJB7SE1hiVDQ KnM4Uzs3tzwFGSDiON2YDvDWJr0QdEU0rMo9Fq0p0v8ITUUYgyIbRAmiy9X9E1grgqomjjdrfRb Nsi//4zw= X-Gm-Gg: ASbGncu62maidQDveyOOeRNUxs3ymsM6J9T6IjQ2X6xZMLpzYMwcvAPCNrwy9s4pjLk NYNIG23NzJ2G6+61wkAkYBiQxXRpU5XpW+l/IoAg8oF7W6ZEdbCM8ojEB0XRZSbb1ijQG1eBglB ThtJzd3xWWRrfNFJoq3/KbEzXJcCwFuPwFHxnS05IXiojbHrVdaF2lk3WAMmSbFQrUXb7mZMk7E 0Uw8i+KAhwSZxYxQqB8qv7/OIR95tjQpHB0ovQeHRwoAno2h8FG94tdA/fRdd47DkYuPCAxjuL1 Pj+7MWekJN5n7wvHXdE9nYAkBTg0mRnJkrgGYS25iGTyb7bvv5wXgS+HjrLDu+iiJPuYN/ET9CB AKYpAnP+IwzpVGFUMaQHMdZNKMMKaY3soBfYIyBfwZZPOzy02Va45hS0YT3XaeQZsaBzoROBbI3 3Q7EbF3s2yxJvcNqY08Vpx3j7FYLl01aeCtGYKgsqMvsNeXgIO0TZEsfVSVfcd X-Google-Smtp-Source: AGHT+IEjwL4Pt02bvRQBC/REJhqK2MnjVJeC7iXTfXnmhvQnvyk71tYbxZ0pmKAAz4HQPPvMYOyNjg== X-Received: by 2002:a05:600c:3e86:b0:46e:36f8:1eb7 with SMTP id 5b1f17b1804b1-471178a3a94mr131546405e9.10.1761079735065; Tue, 21 Oct 2025 13:48:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/45] hw/timer/i8254: Add I/O trace events Date: Tue, 21 Oct 2025 22:46:38 +0200 Message-ID: <20251021204700.56072-25-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1761080012049158500 From: Bernhard Beschow Allows to see how the guest interacts with the device. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-2-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/i8254.c | 6 ++++++ hw/timer/trace-events | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 4b25c487f79..7033ebf50da 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -29,6 +29,7 @@ #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" #include "qom/object.h" +#include "trace.h" =20 //#define DEBUG_PIT =20 @@ -130,6 +131,8 @@ static void pit_ioport_write(void *opaque, hwaddr addr, int channel, access; PITChannelState *s; =20 + trace_pit_ioport_write(addr, val); + addr &=3D 3; if (addr =3D=3D 3) { channel =3D val >> 6; @@ -248,6 +251,9 @@ static uint64_t pit_ioport_read(void *opaque, hwaddr ad= dr, break; } } + + trace_pit_ioport_read(addr, ret); + return ret; } =20 diff --git a/hw/timer/trace-events b/hw/timer/trace-events index c5b6db49f58..2bb51f95ea8 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -49,6 +49,10 @@ cmsdk_apb_dualtimer_read(uint64_t offset, uint64_t data,= unsigned size) "CMSDK A cmsdk_apb_dualtimer_write(uint64_t offset, uint64_t data, unsigned size) "= CMSDK APB dualtimer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset" =20 +# i8254.c +pit_ioport_read(uint8_t addr, uint32_t value) "[0x%" PRIx8 "] -> 0x%" PRIx= 32 +pit_ioport_write(uint8_t addr, uint32_t value) "[0x%" PRIx8 "] <- 0x%" PRI= x32 + # imx_gpt.c imx_gpt_set_freq(uint32_t clksrc, uint32_t freq) "Setting clksrc %u to %u = Hz" imx_gpt_read(const char *name, uint64_t value) "%s -> 0x%08" PRIx64 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079761; cv=none; d=zohomail.com; s=zohoarc; b=NX5naEKM41Uixgsy0iNyPnJ5qxn4ceHVHPtVDbs/5NFw0GpbEIaDdT4q3UvaXRqIIwXqx3uobw86KWAEatxwBLLBF0WuoTRByp203nYINjWnmbqFoMHadh9WtBhGP8U+5l4SP/OAH2a1ofTgTU9zbrM+RwlZf1iLsHRsZp3dgxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079761; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=bK/IgKwRrJFV3OCY8FzyiKr65tuHFz4ebIlHwo+ale8=; b=Dx8jOVOrt068ENwvLmt4szkVu2HtAckdwA8v0D3mFaaVDJyWD8sl7rZS8a/11yY1VFqlR/oBQ+nLpqjms1qe54oYzEZZg0Wi+hQ/iUrgK+evy+kA8sxWSrbs38xgABuFD+WDtgY8VNtN43OpSZjbDwBriic7cD7ZBHc05MhNA/I= 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 1761079761685632.0413334579315; Tue, 21 Oct 2025 13:49:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIB-0001Ts-2J; Tue, 21 Oct 2025 16:49:15 -0400 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 1vBJI8-0001KN-Tl for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:13 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJHy-0001D1-99 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:12 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-471191ac79dso51280425e9.3 for ; Tue, 21 Oct 2025 13:49:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496d269dbsm22407965e9.11.2025.10.21.13.48.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079739; x=1761684539; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bK/IgKwRrJFV3OCY8FzyiKr65tuHFz4ebIlHwo+ale8=; b=x1NIOTsDlkpT5EDKUSULmLnrN9g82cgW3b/AeyVbAPA9jPX+k+eTskXAvMAXGZtuWJ zqvwnEY3/BdaymhtaS6900ZAbO/Bys1zIsZHw7xD7JjkNPsP6y61rYCxKaXk289J8191 LnL2C3Y1y899YdoZGkpVCdLYWGkEiZj4K9HS65n2fHyzQ7jpL9CJSxeBFoFpAT5TtTMQ QjiOIyFxtRp47USrOub6dqSNNancPWn/XRi3Xf2o6Wb5ehDa1ZG+W3p3+j3A1WdTY+RC 7tOCwsLHbTu+xiuqYc605sTauyYiLc2tRZe3YFAE+UNFd7Y3l2/ceCpogmiHochqbyjF UgLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079739; x=1761684539; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bK/IgKwRrJFV3OCY8FzyiKr65tuHFz4ebIlHwo+ale8=; b=LLYtMwdlK5Z1uK4wXvnrjB3/qhYb92KfwEkpB8nBr/LDifa0uAxzlyGYCtzUoXETcv oapabLydc3+CfkqCzV8qnuz2XdI3sbzoq+khkqUULGQI8Et3lIybbeBXMN4PHzVANREz VdbHeJW0P2ZplgWxk31GDlnLSIyfvC53Qsuu8unj0ADTdjotdhnkgnL/om/mcr4L2v0z EN5aOCICwsX1TQ3aLRoR5wRjJ2n0I7CqV9ZDJ6dVOzQ6UuyEv3GdJJkFAeypTaextMIB mnPsgPPhNsKAIKSlWmaNUpOU3ZMRgqMxDjwnWteKB9DfNZifvyngNNgz7LsdXe4CXLVQ p9NA== X-Gm-Message-State: AOJu0Ywrw4ggR4rrtPcy8jpQbSLswufbO9ZMzXClSKCXVUP2A4PYZVsu dE3sEhzTHbaPku6x6yVADpzQVSbhViOLi/nJUCzqEvuPx8MeNVy9oGtYzyDohippbk+LsLz475/ 2IVSEFWM= X-Gm-Gg: ASbGnctpMmSPK679/xJqs5mdlS7czR7uVP0O2DqtKP7A1Zd43mEtZgGXbcDb4Obsis/ spvlG0BN7Ac6NEgmh6CHw+WUu2rz5elBgDrhEziw55S7Ij9JL8oaTzPO/nWuZDV/Drlbyu8kBKB 1iKlFNtfZV27aBqdzJ0Pw5ZEZE5nv6oXtRQWYHjY2l2+KIJnXPEmXZy4vBbiK4gMbY+bPHUkgt5 eKKxnaeEjuIUOxcgazOL0lNErfZdHathzBwr0xSh/ycZ8TJ++l0kOCSAXEkSmZkr/layKaO7ihC DSNMiVeYN3eLZtH8A/oHlHwvPlTtNkSbfpKHLltGNnuOkkUIprXMJ2rNYSD7kGroOwaeRJIE7/X VQ8b+FxGemlX4uuFcsrS4ogbzpyDdopoPfUGri6njkquYJRD8drgCEyTFH+OI4s0wadPtTM1K4m jY+ZAJVXpSMRpoOkFSq3Ni6MOimf6xrUxkdyl+c221sMhPwVw3Rw== X-Google-Smtp-Source: AGHT+IHHtf7KB79DNuwlumMgH3spVGKBb5YUBUnO2iWD51AIOtvNgOqco4iS6f/r9Ah7VVWM+El6uw== X-Received: by 2002:a05:600c:871a:b0:46e:4882:94c7 with SMTP id 5b1f17b1804b1-471179177camr145140595e9.28.1761079739550; Tue, 21 Oct 2025 13:48:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/45] hw/audio/pcspk: Add I/O trace events Date: Tue, 21 Oct 2025 22:46:39 +0200 Message-ID: <20251021204700.56072-26-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, T_SPF_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761079762425158500 From: Bernhard Beschow Allows to see how the guest interacts with the device. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-3-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/pcspk.c | 10 +++++++++- hw/audio/trace-events | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index a419161b5b1..f8020593b0b 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -34,6 +34,7 @@ #include "hw/audio/pcspk.h" #include "qapi/error.h" #include "qom/object.h" +#include "trace.h" =20 #define PCSPK_BUF_LEN 1792 #define PCSPK_SAMPLE_RATE 32000 @@ -137,13 +138,18 @@ static uint64_t pcspk_io_read(void *opaque, hwaddr ad= dr, { PCSpkState *s =3D opaque; PITChannelInfo ch; + uint8_t val; =20 pit_get_channel_info(s->pit, 2, &ch); =20 s->dummy_refresh_clock ^=3D (1 << 4); =20 - return ch.gate | (s->data_on << 1) | s->dummy_refresh_clock | + val =3D ch.gate | (s->data_on << 1) | s->dummy_refresh_clock | (ch.out << 5); + + trace_pcspk_io_read(s->iobase, val); + + return val; } =20 static void pcspk_io_write(void *opaque, hwaddr addr, uint64_t val, @@ -152,6 +158,8 @@ static void pcspk_io_write(void *opaque, hwaddr addr, u= int64_t val, PCSpkState *s =3D opaque; const int gate =3D val & 1; =20 + trace_pcspk_io_write(s->iobase, val); + s->data_on =3D (val >> 1) & 1; pit_set_gate(s->pit, 2, gate); if (s->voice) { diff --git a/hw/audio/trace-events b/hw/audio/trace-events index b8ef5727678..30f59215453 100644 --- a/hw/audio/trace-events +++ b/hw/audio/trace-events @@ -23,6 +23,10 @@ hda_audio_format(const char *stream, int chan, const cha= r *fmt, int freq) "st %s hda_audio_adjust(const char *stream, int pos) "st %s, pos %d" hda_audio_overrun(const char *stream) "st %s" =20 +# pcspk.c +pcspk_io_read(uint16_t addr, uint8_t val) "[0x%"PRIx16"] -> 0x%"PRIx8 +pcspk_io_write(uint16_t addr, uint8_t val) "[0x%"PRIx16"] <- 0x%"PRIx8 + #via-ac97.c via_ac97_codec_write(uint8_t addr, uint16_t val) "0x%x <- 0x%x" via_ac97_sgd_fetch(uint32_t curr, uint32_t addr, char stop, char eol, char= flag, uint32_t len) "curr=3D0x%x addr=3D0x%x %c%c%c len=3D%d" --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079783; cv=none; d=zohomail.com; s=zohoarc; b=ncCOD58oq4pCji/BvWChKNLgJFnAPygJM8ydWGUKrideiReXt+a6kEz0bWkmfIjbzlJF2B5c5CHlTF84M8kORhUIQHHb4l2Tb8GgZPa7OUkgGZI3lIzXaXa7G4P7YDMmbBPYbtbi6J8Q0XP+yiJ6hY9jc0HsA53Ie/9b4ivfk84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079783; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=qiAzXkxkjYHknkOXo7tQh5/nC6H28Sy+HM9ZBnkuo70=; b=LuvyaUp22HN2xJ8n8AbKelRi5v1bLx19HvRJ4f1dPPIJacw/Rg6wQgT2Wlbao3+F1wkwkvWIOwBOTGYVfehZsMFfRIcma0iRYar/MRtLaWBfDK4yKk0NUmxe+RtzukNQZ9kv5Zc3CynA3F9IOB5LO4hAT1FTrwJjQjEMYXydvxU= 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 1761079783446914.365657628365; Tue, 21 Oct 2025 13:49:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIE-0001hl-3K; Tue, 21 Oct 2025 16:49:18 -0400 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 1vBJIB-0001XF-8E for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:15 -0400 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 1vBJI4-0001DQ-8V for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:14 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so16166425e9.1 for ; Tue, 21 Oct 2025 13:49:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427f685sm10282635e9.2.2025.10.21.13.49.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079744; x=1761684544; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qiAzXkxkjYHknkOXo7tQh5/nC6H28Sy+HM9ZBnkuo70=; b=wKuhvhLSD0wkKRF6vFrnKbIwy7/7T9Qll/BXCRMjragSaqDZrfXeFLWkJ1aPXGWT4E MGibiGj7qjFwnIlRhSCP5r/zI7ZnmEIFij3zAZ3WQxaQrPGcZa7NzhmBc+Y6J+YlhXjP sRPZVl65/ze5fOPn6u/xH2Hwa/BvtLjNlUroxBYpsjfohctHPPPP3F74ia4isdzjc6iG IStqJefkLAKpRUjK6L58XO5Nrlkvfh46Hwyho16/1Zm0/ron+ZJAgIy2u6Srm6rOp4rK 9ywYsr6YBK/wLdLIoChUSG7F7i7sl2TJnt/geiDrfUnz4IwaL0/agPLPl2FdhnpRJLEO pj7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079744; x=1761684544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qiAzXkxkjYHknkOXo7tQh5/nC6H28Sy+HM9ZBnkuo70=; b=UnUhw7UjLTvCAt2cb2ALcDQrFq+8l8G8YQZntqcMiHSaGAGO0cicqaar7BH7Oa3bS8 fAO+eBGoTIGsihsTPAxjkw5Yc3JeBBrGdKEsDs6yn6taY88K0dXLLXMSSqdn/fNqnWJ0 QDFSdwHriPTXmO/F8oK0NyRywJEjrVz3aZwp3wto774jf5Aj0ZcAtQ/a0B6pxBjHjyN5 M2qeyJVr8Em5ArkwmmrcESwKw6xqymnR9t9jZKX4Yi6YThMXk9pM8lKe/HG4w3zjeh6c +9UezLBlEmYYwFDSFwj6RYJj1kzo/UJHj2srhGAx460zUlTxmZplRnhWtzLLuRh5voZ7 M0Nw== X-Gm-Message-State: AOJu0YwSn/J2S6/TV2m4fVsMx/2FHSO6zMIGFenc0pgtT9v6FJcRMEaL rKZDKeMSW1CB/o6eB/LTHI9zPMywfDJwVuizuJ2VTHmZgE3ViUFRwa41z93Hx7hDsKyz0CvTX+b keGmfL+0= X-Gm-Gg: ASbGncudJ8YlzeC3n2Z/YpUE1kWZVF4QdjGCtKrQghLchinXE4Goeh6Uyc6A5jc1UwO r5YjjejcTLfGq7nGpFqHuU6NiKQjGfQtYr0gZSu9lsKxQlpHiVuWbB/gYHOXkXej0fRPxmE6Uyh AawZSPF79HE7xwHkVyf+fzUoXZhH9vCfmF61BhtCy97X6y07iD273pvHmZA2JtLZgM3glr5V1/T M8AyFNV6GS1bZcTJh1FraABLSiKS/WmGKQ3QuHItq8MjZ1JYYM+YsyZ9gKcVbJhl1+oPE1REiYV m7n7L2lvuywoqa/kaNkB2hk1HbC2wxsSVPxrk68fDBbomEUUwMWoqz+NKISN5KfNb/serZeOb/4 S4gJa81lmbgw2wjdyKK/YTTl7ocyan5xR9AGQhj3Xe5Ct1ByS+u5yrqvM6hQPqvcumXiUn7RBWs rFxNdqyez/iPS75SCEwE4hLhcBynm+33ouBuy3kGH9PN1TNniLEqhLehlr/+hc X-Google-Smtp-Source: AGHT+IHET51dflvL2EqO31hezpcfSdXVtgVgR8Ht/8cjxYQpLuuqAgbnIdkZcfXpW3UF9K+yof/6Uw== X-Received: by 2002:a05:600c:5029:b0:45d:cfee:7058 with SMTP id 5b1f17b1804b1-471179035dbmr137360965e9.22.1761079743920; Tue, 21 Oct 2025 13:49:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/45] hw/rtc/mc146818rtc: Convert CMOS_DPRINTF() into trace events Date: Tue, 21 Oct 2025 22:46:40 +0200 Message-ID: <20251021204700.56072-27-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::334; envelope-from=philmd@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 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: 1761079784760158500 From: Bernhard Beschow Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-4-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/mc146818rtc.c | 14 +++----------- hw/rtc/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index f9f5cf396f0..61e9c0bf99f 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -43,16 +43,10 @@ #include "qapi/error.h" #include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" +#include "trace.h" =20 -//#define DEBUG_CMOS //#define DEBUG_COALESCED =20 -#ifdef DEBUG_CMOS -# define CMOS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) -#else -# define CMOS_DPRINTF(format, ...) do { } while (0) -#endif - #ifdef DEBUG_COALESCED # define DPRINTF_C(format, ...) printf(format, ## __VA_ARGS__) #else @@ -439,8 +433,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, if ((addr & 1) =3D=3D 0) { s->cmos_index =3D data & 0x7f; } else { - CMOS_DPRINTF("cmos: write index=3D0x%02x val=3D0x%02" PRIx64 "\n", - s->cmos_index, data); + trace_mc146818_rtc_ioport_write(s->cmos_index, data); switch(s->cmos_index) { case RTC_SECONDS_ALARM: case RTC_MINUTES_ALARM: @@ -726,8 +719,7 @@ static uint64_t cmos_ioport_read(void *opaque, hwaddr a= ddr, ret =3D s->cmos_data[s->cmos_index]; break; } - CMOS_DPRINTF("cmos: read index=3D0x%02x val=3D0x%02x\n", - s->cmos_index, ret); + trace_mc146818_rtc_ioport_read(s->cmos_index, ret); return ret; } } diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events index b9f2852d35f..d2f36217cb8 100644 --- a/hw/rtc/trace-events +++ b/hw/rtc/trace-events @@ -32,6 +32,10 @@ m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io= write addr:0x%04" PRIx6 m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x= value:0x%02x" m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%0= 4x value:0x%02x" =20 +# mc146818rtc.c +mc146818_rtc_ioport_read(uint8_t addr, uint8_t value) "[0x%02" PRIx8 "] ->= 0x%02" PRIx8 +mc146818_rtc_ioport_write(uint8_t addr, uint8_t value) "[0x%02" PRIx8 "] <= - 0x%02" PRIx8 + # goldfish_rtc.c goldfish_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " val= ue 0x%08" PRIx64 goldfish_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " va= lue 0x%08" PRIx64 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079965; cv=none; d=zohomail.com; s=zohoarc; b=fIdj7w0JDmFVMNRHbb4ET5eRVJueI5zNfJaD5TBUtPY+Dk3uZi84tZzpQYlAptH+BpzQN0jQnjuRzmiPHG8okcmTMeMQzhzQu1RKzr/KDIi6PPpGdZhErh9jwXKR5EF0eZzY27KJ0gthIO86a6bkJChnA/0CJ3KXHkjSd1PHbbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079965; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+cOm69gp8RtXa1qAAfK4fawY1gQ+HuTw0UpUvx18adE=; b=bqHu9J70Sn31KzlYRa5FjAgR6Vd8vNw2HYYBiNYP7ozfXgbMA1S7Zq3wmic1vWi2geNBtOAnVeq+4jSrfCV2c0Zn61wyEMsHG7dFDPZzP5mqrUm1rm0/DB/pC4F8l1qFzytKyoHNY7ZnnCaLb5HQ3Kx0Ti/rLtYMSXrTOt97IpI= 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 1761079965334910.8938954356861; Tue, 21 Oct 2025 13:52:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIW-0002GU-56; Tue, 21 Oct 2025 16:49:36 -0400 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 1vBJIF-0001uF-Ka for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:19 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJI7-0001Dq-Sc for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:18 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47118259fd8so37850175e9.3 for ; Tue, 21 Oct 2025 13:49:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c428e9b2sm9706715e9.5.2025.10.21.13.49.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079748; x=1761684548; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+cOm69gp8RtXa1qAAfK4fawY1gQ+HuTw0UpUvx18adE=; b=qAUPiZxihivV6duvZoWkLBmXIqTZvTYtYIAqRxwpTSmAWvVJAUWdiIEKEV1Mv8oDTT jxP9jU37fGmDg2F95F/5ZiJLAVuyJXfxaYAFe/LfiwjvjHYqE4h/N7sB3DV+FcaIq28K eOsq06+CXxG0b2VlsiaFh/32zkpMxWIwD+BJDuwct5Ne4lGNK25JB+z66J0qTA2E/Yj0 xX/sjFVzgRKBz11u62LyKU2ceMdTCM/x9l5AuZ1OqvkvqSEsE9VUnMw1hmTB9oIv6RDD QsSEy1swXqm0ngeYezsO24jzT3fvcCvjrVwKJWEYRapKUxm6xY5IT0s71zd64n/sen4u UmFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079748; x=1761684548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+cOm69gp8RtXa1qAAfK4fawY1gQ+HuTw0UpUvx18adE=; b=p+qxkqzIaaAbPAHIsleFsDonDV4c6dX6Q7ZJToM5suJvMu2jKoc07tmvnumFw+Wm+8 ufZhZcRSitaklLNWvka2vHMHmp7tgcDRGtrl9mrfae5v/zD3Oj5TpkLfXDamM8Ogldsh 78s02yaezIwqw0uj3/Z4PrYnHF9RXNWrv2EZAFwdCikvyevdATyw45WcytPvFjs9Ov14 azg6AEw/7u3WNxELDStW8llKAaN05TEFNw157Mb7hMcMAWoOIrlwZqrkfjju6lh6MFF/ qNOS3k629IvZv8R4FpqzJM8mds/vrCzEywp0iHWV/Va7ldIeuKI89SqtGjyQpUD5J5wD t6lw== X-Gm-Message-State: AOJu0Yzv/4EZuU5aa4VLGvguElnxi+owW91eIH6EuZ9vjpADGMrO66WN ifgSTgK1FYJeY71SLa02FlpAXxVw4u3y4vAMoMs+uXSGF8/m6ugWChfBxb7uJ1VtBmBIU9YWeU5 rK7SHaBU= X-Gm-Gg: ASbGncti1Vrv5+3oXyiO4Tx7E8r2gXoiCCvoIaSb0KY0l8O2kcmb2dasUcVNn/p0C/A rWWzZhZRMUOdDW9PDeGMAYxj+8kuwELcP3H6gQPscpuTQcnWozDGypYrsEkolETrbFLMl4RS3+Q CSgrh6HtBdEPuZZ1ijF8zmsbR+rQ10dpTmZXtyI4oIUO7NL8lyOagahhpaYqZhS5+OnvWRX0049 3TMga7lC+UAcl9Og1t18HwpHLP6yITPB+CdFKyZ+gwTCZdfkdI8+QHOD/gA25iXzPnZsJl5TqtZ 11ntbSabEXIDmUzPoUHnfSYN9vbRooqS+FOSjI00KZmFpRjbboeYlBJv3pXt0OqxY4EvMpPk1pS 4NcrO3gR7CMhRrwH2a3bKxYCf27qNBTw3oP+F3x0wKISvZfAVGCJmwRJmI5E0G/ZbsRnpphGNKk j0wzcWLR/sFfdRjUWPq6meLTVKKHZJGPx2k8pK1MMP83OvEhGsTA== X-Google-Smtp-Source: AGHT+IGH2WH9rt4xT5MElTptAVpFCrxyxM2OAreopV+TB4rOZODCkC697xGnuPcEXQWgilihapYPCQ== X-Received: by 2002:a05:600c:870b:b0:46f:b42e:e366 with SMTP id 5b1f17b1804b1-4711791fa34mr132500195e9.40.1761079748363; Tue, 21 Oct 2025 13:49:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/45] hw/rtc/mc146818rtc: Use ARRAY_SIZE macro Date: Tue, 21 Oct 2025 22:46:41 +0200 Message-ID: <20251021204700.56072-28-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1761079967557154100 From: Bernhard Beschow Avoids the error-prone repetition of the array size. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-5-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/mc146818rtc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 61e9c0bf99f..5a89062b4c5 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -726,13 +726,14 @@ static uint64_t cmos_ioport_read(void *opaque, hwaddr= addr, =20 void mc146818rtc_set_cmos_data(MC146818RtcState *s, int addr, int val) { - if (addr >=3D 0 && addr <=3D 127) + if (addr >=3D 0 && addr < ARRAY_SIZE(s->cmos_data)) { s->cmos_data[addr] =3D val; + } } =20 int mc146818rtc_get_cmos_data(MC146818RtcState *s, int addr) { - assert(addr >=3D 0 && addr <=3D 127); + assert(addr >=3D 0 && addr < ARRAY_SIZE(s->cmos_data)); return s->cmos_data[addr]; } =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079825; cv=none; d=zohomail.com; s=zohoarc; b=gnqznJNo3HI3IzAMJ+QvymeXWeVTNfp3kGIDG5WzBzMo51P9rntmL32vz0I5w+udiCS5uGwY7ivwxjvZnHGk94iMUZzkMCCcj8UioQfEJ9FpRYCVSdeie2JJbvuLKBURkJbJ122wu1E7dgaGHvaozJ2SwlsY7t4ytGDTny/0wIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079825; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9eb7afNyuJzQGK0xtJs1N7yRKtZt0dzwealgk3XAOio=; b=VZEc3lMDlXMyr+zChTbak6poU07TFWWPjHdwgjPSCpjBei1VWY9Xw22o/il6aiynGDwYb30CuX+hyhFVvuTqBoXIeDyWfFi/O/7YfJ2uUn55EcEtploUOOoKVj9YmZIxZRz0iDhamFzJ40l4JY8z4buZamGVCV+S4ScVdUXIfpc= 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 1761079825268429.3084896385135; Tue, 21 Oct 2025 13:50:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIV-0002Fo-Sn; Tue, 21 Oct 2025 16:49:36 -0400 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 1vBJII-00023y-DV for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:24 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIB-0001EH-Rp for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:21 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3ee15b5435bso5888811f8f.0 for ; Tue, 21 Oct 2025 13:49:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427c3casm9707885e9.4.2025.10.21.13.49.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079753; x=1761684553; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9eb7afNyuJzQGK0xtJs1N7yRKtZt0dzwealgk3XAOio=; b=bgGZ3cGlliRuh9YeeqyA8HHNFgz1D5bIeoX7Q+LAMVZMdU8ZEkPAZ/S0WsQFd8owW1 t0ZCvgOcZpkTKHNF5p81h27eZqw/gGKuE2nEGM0Dz1C5aBUJSmbVwotyUiapoYuM4jSj d17vAse3sTh3BUSJCREhF98kPDAaaD+dEw7jP/hwNHCpMe0ULUYoD3TXry8gJyWZb0Il 3ilbWho/SUBDd/NMLPIpTAIVl8IsC5jTiC8Mi2pGkiZ1DHxT3xw8PcJlW0MfqWMEkokl b07OkveZR71wmATBEOY+j33sdr33L9GkB6Q7FqKQU8zDdo2cfr5fx/X1VxRHZCF+SG+o q0Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079753; x=1761684553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9eb7afNyuJzQGK0xtJs1N7yRKtZt0dzwealgk3XAOio=; b=erxFJGEkPoaV1ma/U7vDYvxHeSRrTbJMoLntjnh3BUXJ/sIge/X+m+YnHAwx9yCr0n Ms02lNTmGlxsP6xrnadyKJzpF00gNML0H4Nkk4QDjYVE5vivvX5u1RFWiXDYs8IkIZag go2sysdMq8bgKr8xo5y9R4ztYbYxZ5uyQe3BzEs1UA4OM3SU8/CdUVZJaVNGR1E4VkP6 oS/NW6aSG1s3V1GDDiTV3qd0SkCwvEdImRldF00/g3UNBWay5k4KBS12AQvcK99Uh7sc nIG51aM8p4uYCYGbMtJtwM0KV09+sbEP1G/VKSBpc2MMNVprHM8kHz+lK4YtLZ0HyBMb DCCQ== X-Gm-Message-State: AOJu0YyS9ETI2O2y/IRM5PaluZhMn9UAzFwxg9WYamMUnQsgW0b+V8PP 6UVKr3esDNJmvd4fo4qZnOcUBe+JT7b/4iPWssMQ6Es+ic+FpjbpF19579zvP9gLyjYnRYj8VLP ILMizhMQ= X-Gm-Gg: ASbGnctWSplD9RE0N5PqD/nCGjha5+JPBZtVdZkdvWItzLqtxfvX6NN0qWSzNpDjvYZ XFVsZri2o1a/vtrY6ZbO50mfwm78s0IPCkQB87z7fHTDyR1Ry/TNAvHTKKpWibn5rc9j1YAE7NA 04RcYg2anl87PHF6JqO2CkCCcvB24CZIi6uq0sLx8W2s6ChvCuvYby4rJf8mzEJlyHPgomIllG9 x2O/hOdrl6KxKU80PL5i1Wc6jVCtQthYVTHodYB2+6wAKp6SSfizhrsrK8VKG4h524qBToIwVB3 NW5Qbn9M2gXjSNEvZjJa70CCFuy6bAI7AueoalZplkYAgxByr4Pww3IAXESOQPPiVYZwi1X4uIF QtKt3m0jW4BrEizlDZhBDxVNZHcZKvC4kHAG2yCD0w1mBZVGelBO+qiUs/anTVAfhM4/ltyH1mU E791uSAKwCt2a2IjDLQWVnozo4wB7mjWeSdEm80/wvvxZsAgLSH2dhH7lkic4h X-Google-Smtp-Source: AGHT+IEiiD4CNRQnboBszha4q4uTBLq3eAYVL6NNdSaZgvKx9W9eUGT3SnGpxoDtEs0kRv6s0HRr5Q== X-Received: by 2002:a5d:64c3:0:b0:427:8fe:4359 with SMTP id ffacd0b85a97d-42708fe44f3mr11680360f8f.27.1761079752808; Tue, 21 Oct 2025 13:49:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/45] hw/rtc/mc146818rtc: Assert correct usage of mc146818rtc_set_cmos_data() Date: Tue, 21 Oct 2025 22:46:42 +0200 Message-ID: <20251021204700.56072-29-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 1761079827259158500 From: Bernhard Beschow The offset is never controlled by the guest, so any misuse constitutes a programming error and shouldn't be silently ignored. Fix this by using asse= rt(). Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-6-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/mc146818rtc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 5a89062b4c5..8631386b9f0 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -726,9 +726,8 @@ static uint64_t cmos_ioport_read(void *opaque, hwaddr a= ddr, =20 void mc146818rtc_set_cmos_data(MC146818RtcState *s, int addr, int val) { - if (addr >=3D 0 && addr < ARRAY_SIZE(s->cmos_data)) { - s->cmos_data[addr] =3D val; - } + assert(addr >=3D 0 && addr < ARRAY_SIZE(s->cmos_data)); + s->cmos_data[addr] =3D val; } =20 int mc146818rtc_get_cmos_data(MC146818RtcState *s, int addr) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079881; cv=none; d=zohomail.com; s=zohoarc; b=dcCpm1OMrspHH+4fQ4N84ineR159kPqbM7ZTSwdhPF2Y9eoKyuLW/0Om4UeUVf6dJi3LFo0+JmtuSBQBzxyDe2gDDhnuVxb9z9s1BBpk3sXl5TFNzw25XAggdCkqfdp0xhGB9SiP7p5p85lUGXq8xranvzKmasdJcH7DsybaJ3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079881; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=dEqUJ6VzdguNYBQGctiSO6TrLInk/uHfft6teX8fIpI=; b=F/bsNn/zvx8yXAxmgy68STaIHptgHn9NFXmtyutOKQiZ6QOw3LjtEp54VDqWnpP6CXwT7cF56WcPFk+nDqhXJ3VMFaLRsjHgSz54yVhNe/3j7g4Ne8mmSxo1IrVVoYXNcdbAKq11cTniuMbxEF3NgSYpIGuf/Rzge1RDZUcQp3g= 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 1761079881111136.35138516611835; Tue, 21 Oct 2025 13:51:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIZ-0002V8-KS; Tue, 21 Oct 2025 16:49:40 -0400 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 1vBJIK-00026Z-Pm for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:31 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIG-0001Ee-KI for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:23 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47117e75258so28945865e9.2 for ; Tue, 21 Oct 2025 13:49:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42d9524sm9241145e9.18.2025.10.21.13.49.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079757; x=1761684557; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dEqUJ6VzdguNYBQGctiSO6TrLInk/uHfft6teX8fIpI=; b=WVwmriWhKaxQlrTSyrcs+x2YGp1XNFZ1qrie7OzLGGyCBqlk2RyS8UvQDtMOkjlHT0 GxFitszArlmAjaJuQV/BXVukFUSkjYWQDQZKwY1ti8/nzBfDfXf0DO8R6jDwOtnsqN4w lpQOFAA385x1FqLxsIqqHxlRA44WJPgCKPg+NHxPRrLTNIPFuEWUyBCXDrLbG/oPngju bL+MkzmYhXLgDMe/9EnJeZQ9m0Xru5gJ8QPK7149c7KoJfIWF5D7d5uSrc0L/A4fgm1b dLN3G/Xcv9YJ8DE80zoI+zMXfup+IkepOsASHv8JEYxjH6QniW5CK5or/w5rtIqOqxYO d14w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079757; x=1761684557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dEqUJ6VzdguNYBQGctiSO6TrLInk/uHfft6teX8fIpI=; b=CyxiOitrOmpp7fM8A/6qC9WofELWAtan7cj+jBVBBgu3bBI0Om4TRkX8qBMu7VMIxF GjbGhL0HIjQgJ55hf9+6zmlBw/zVHHzo+Eum6IH/xvEP3h5AeYO1/Yo6aCYXHtENatPj NutLqHwN7RCkz5ssVcsilFA+LjOTQXw8KV2YOa1LxLpzJCguwDLPtqP9uf5EXGJd+21A k7iTMG3IBmYk6TRa4kXiBxSl+Hh4ZS2FhxzlgDL+E9GOcijQTTIVbOSRu1WwjJH9LObO i9GsbcgIPH06J34ixggbAEXXjYypfShu5m5HJBrEcZY7TGz2Cj5/Zgk5yoB20LVrCB4u mpLA== X-Gm-Message-State: AOJu0Ywzg80XQi4xOaJRk9uUzx1zy3NhblBJ1YEjI/S2/eUEgc1VjTCG DiTZbUXMdwE21B6USfJQ+rizBOfhT1DNkioBVXFbTXKuLdsr5jjmDBJFI//PZ+TEPT9iRzITTzq zwpHK8es= X-Gm-Gg: ASbGnctFtVm2ATdyNY68e9eofW3tS8YjDSZsPS+2LulIYjiDNhIoS0zbKJyNbOPCyBy iBpWyoOwmf8DtAC6IG54BKnLSaHEYxlpjXi4ndyygQPOsRh20UXoVIbqjrksbXu7uKis6JYZKuR Kwx0gStTf2/1Gs+GXU4G5ZfkTnBMLTIisGBz0Vi1HFfDXqieKS7WrJQ811cYvdeXoRxKdv+R4lF P5KpplOD73xKK+8jE/HpVSmKBYypiDvbXAMdWl1XP3yb2wk/8juOeBu5lwIR3fgDavPem8hBkRr UQ5ByLQux9oxpvdFmTJ2zN1TMcTDoiJQfQGwRx2Ju7b0xNVRLAmp6AvreVtBA2vQvD+Gz5uzkpj l5n8uIQ1H4ib9yTTa0GdS/wav9z3J6m9D1zUuN7xvS/BUKOh5MkJyVE6Zv7plyVozPHaqD66iN4 MdXLn0ilB/jAqJSXeB2WA7z4a8sHPcC+CzI08LxWHyauQFkL64mQ== X-Google-Smtp-Source: AGHT+IEDldZ9dOy+9juFawfW5DFsoS8TXzInBbT4Yecn1ZTmaKB3zUCSJ7QIcF8kWfCSiEZaEPMtcg== X-Received: by 2002:a05:600c:3492:b0:471:1774:3003 with SMTP id 5b1f17b1804b1-4711791c88bmr135935055e9.29.1761079757172; Tue, 21 Oct 2025 13:49:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/45] hw/ide/ide-internal: Move dma_buf_commit() into ide "namespace" Date: Tue, 21 Oct 2025 22:46:43 +0200 Message-ID: <20251021204700.56072-30-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1761079884636158500 From: Bernhard Beschow The identifier suggests that it is a generic DMA function while it is tied to IDE. Fix this by adding an "ide_" prefix. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-7-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/ide-internal.h | 2 +- hw/ide/ahci.c | 8 ++++---- hw/ide/core.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/ide/ide-internal.h b/hw/ide/ide-internal.h index 0d64805da20..281d07c9d58 100644 --- a/hw/ide/ide-internal.h +++ b/hw/ide/ide-internal.h @@ -398,7 +398,7 @@ int64_t ide_get_sector(IDEState *s); void ide_set_sector(IDEState *s, int64_t sector_num); =20 void ide_start_dma(IDEState *s, BlockCompletionFunc *cb); -void dma_buf_commit(IDEState *s, uint32_t tx_bytes); +void ide_dma_buf_commit(IDEState *s, uint32_t tx_bytes); void ide_dma_error(IDEState *s); void ide_abort_command(IDEState *s); =20 diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 1303c21cb70..14bc66fb7fa 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1417,7 +1417,7 @@ static void ahci_pio_transfer(const IDEDMA *dma) } =20 /* Update number of transferred bytes, destroy sglist */ - dma_buf_commit(s, size); + ide_dma_buf_commit(s, size); =20 out: /* declare that we processed everything */ @@ -1482,8 +1482,8 @@ static int32_t ahci_dma_prepare_buf(const IDEDMA *dma= , int32_t limit) =20 /** * Updates the command header with a bytes-read value. - * Called via dma_buf_commit, for both DMA and PIO paths. - * sglist destruction is handled within dma_buf_commit. + * Called via ide_dma_buf_commit, for both DMA and PIO paths. + * sglist destruction is handled within ide_dma_buf_commit. */ static void ahci_commit_buf(const IDEDMA *dma, uint32_t tx_bytes) { @@ -1511,7 +1511,7 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) } =20 /* free sglist, update byte count */ - dma_buf_commit(s, l); + ide_dma_buf_commit(s, l); s->io_buffer_index +=3D l; =20 trace_ahci_dma_rw_buf(ad->hba, ad->port_no, l); diff --git a/hw/ide/core.c b/hw/ide/core.c index b14983ec54f..8c380abf7c1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -827,7 +827,7 @@ static void ide_sector_read(IDEState *s) ide_sector_read_cb, s); } =20 -void dma_buf_commit(IDEState *s, uint32_t tx_bytes) +void ide_dma_buf_commit(IDEState *s, uint32_t tx_bytes) { if (s->bus->dma->ops->commit_buf) { s->bus->dma->ops->commit_buf(s->bus->dma, tx_bytes); @@ -848,7 +848,7 @@ void ide_set_inactive(IDEState *s, bool more) =20 void ide_dma_error(IDEState *s) { - dma_buf_commit(s, 0); + ide_dma_buf_commit(s, 0); ide_abort_command(s); ide_set_inactive(s, false); ide_bus_set_irq(s->bus); @@ -893,7 +893,7 @@ static void ide_dma_cb(void *opaque, int ret) if (ret < 0) { if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))= ) { s->bus->dma->aiocb =3D NULL; - dma_buf_commit(s, 0); + ide_dma_buf_commit(s, 0); return; } } @@ -912,7 +912,7 @@ static void ide_dma_cb(void *opaque, int ret) sector_num =3D ide_get_sector(s); if (n > 0) { assert(n * 512 =3D=3D s->sg.size); - dma_buf_commit(s, s->sg.size); + ide_dma_buf_commit(s, s->sg.size); sector_num +=3D n; ide_set_sector(s, sector_num); s->nsector -=3D n; @@ -944,7 +944,7 @@ static void ide_dma_cb(void *opaque, int ret) * Reset the Active bit and don't raise the interrupt. */ s->status =3D READY_STAT | SEEK_STAT; - dma_buf_commit(s, 0); + ide_dma_buf_commit(s, 0); goto eot; } =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079863; cv=none; d=zohomail.com; s=zohoarc; b=mT42iJXSYNMmD4uSZwP2xyNBnaAm+91bKXsfBuY7si57FGnnJVKK/3cOvhLbWqtsWuMfzJSwqAtbQbY7N9fvVNPQU3mJCEdYpF2se+Orq4mzsJh7nEjUduQjUz8wNQuZfICU2U8xpp5lRq0ZcC4SfyOX1NByzlHFD53OdZ+SobY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079863; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Gp0SFofvlzLiW3dkCN7ra8y38q/vsb0gHhtDpLv4noc=; b=IONSvNAHrhxRdeGr9pfoHl/032fpTjCAon4xc/3nwjPeuXrO7sdmUOP5ImJr1EWY0hkhcY19NqySQMbSFkJNize8yIZb1HO8HiEa6u0v60egxWTk8KCP5CHeuBYjAvOKLYFJkzisD5B+/n1L8uF2pvvivP8wepTMLcMcmHqKLms= 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 1761079863067125.13679892702908; Tue, 21 Oct 2025 13:51:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIZ-0002RQ-1B; Tue, 21 Oct 2025 16:49:39 -0400 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 1vBJIR-0002AG-CL for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:33 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIN-0001FL-HS for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:31 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so4405531f8f.3 for ; Tue, 21 Oct 2025 13:49:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce3e2sm21843389f8f.47.2025.10.21.13.49.20 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079763; x=1761684563; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Gp0SFofvlzLiW3dkCN7ra8y38q/vsb0gHhtDpLv4noc=; b=Mvyqty+GhRglsIb1FWhJ7jssuelM8I9ZVJw0q6+4sfatwkeVBpdeWR7NS9HDgVBSdk UT7NiSCltAMM+Dtfx/0/psy6gNgSG4k8K6t2Vvtoiinp7CAY3XJ2oX8Uf6NTgVvwuptP /uRZg12hCoq02dR2AggdNPB2gqb2gQ2u9jP2UIn4Ke4+b46WbClpWwhS++qRp3XGESBH EX/oJpGotI4bGt2frgVOkEaiAbS02Li2/ZYK7l+i+qJQIz4E9W3oQwJ9A/mMmhlHTprr CUHFa+Q7br0pUbFb5YitnFsLFd6DU3wp2yHo0HlDOk1jT4zGTDOQ84zpZjTwXT9zjk1o T79g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079763; x=1761684563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gp0SFofvlzLiW3dkCN7ra8y38q/vsb0gHhtDpLv4noc=; b=uGKjy22km5gwyuvOjo5f9qByByIyJAoaw0PlDSZ35VQv2HzGxAGWRymb+m7FzY5Nsx H0/NcBQUqesxj46AWMBcu4zeam68nOQhRyMtgWCQggk6EiqqpfPGqX4vTFyyJ0Rp08D9 vwuvMGSnfZ053fAC+u6FG5NzpbfznWOEqsxrE5q5Q0MwbtGrb2VRB4wbUpZ0xytYjYth YmiejgI2Jf2WdFNYl9Yif3Q2dmia88axl6atetQs3ENkxU4B5R6HiNiiMyRBt2E6KDtm 4EbTT3K7QV7Gw+I3gb7imG4m/Kx8pGRzJZ7Ksqe9qYi0qX0II1mXdiUSK34DC+UqeJDz 1ecg== X-Gm-Message-State: AOJu0YzacyUCnaOMq4/iCM6pNROB8y1a1PCCAdnet8d/8dtWyd9RyCjW Nuf0lR0By+A/rKypoI97emUQ35/aywGeUIe/nnvsRvjaXHbvX9GwHxl/OfSqN5/yhVZQwvL7/la prJPK6AE= X-Gm-Gg: ASbGncukc6t/r4LDir9/5Nz1RYJt5wKijGtgIZuXKcx3//7V3OIdn1qFaH1hfuewvwu sNeFvA8FAGcnqMtUY4wvTixfXdo1A4xDfaCoNorx+hbi3XfvIAqSETklqDhim4c1FwdBi+rzg7E Nzb3D8kHpCcJ+IhGeIC6+YGK9jHIrrc713zNNrw9ze+xyJd/JvW/QchBB4rGl6f/6u/tYv2CrWo 3eo+M2PuW5RDQTOv5wWP/ufNkK5sZTQXZD5N/p3IvV5mhX82riyLi+wOKo44z+MZPazLz1ezkK4 96PmyqQc0zeciJ3RQyDyxTVKey0/okg/6VEw2Wydmcc/Z+24TCZB+bd215Fr+H68PEYo/UUSJB2 //N0PccNxjuGoggVYTlSSYe5t3nxR/lCbAI3XpoSvW0JxbO5+Olf7eZyV0ysrGuSue/WV/n7/xk sIlJC7ZUyULlUiEPtYSoZec71k8ADXE5zGuJ+ictTACoOSsB0O5GHOJXfTKnET X-Google-Smtp-Source: AGHT+IF5LnOj5cOOQSSWYM2xjgH8HwaNF8uXxD7Dhmw+zm8aHZnqUGt5hp/qK3oWs6CtkqYtu+qDnQ== X-Received: by 2002:a05:6000:2209:b0:428:3ef4:9a0d with SMTP id ffacd0b85a97d-4283ef49ed1mr8043771f8f.49.1761079762440; Tue, 21 Oct 2025 13:49:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/45] hw/i386/apic: Prefer APICCommonState over DeviceState Date: Tue, 21 Oct 2025 22:46:44 +0200 Message-ID: <20251021204700.56072-31-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1761079865723158500 From: Bernhard Beschow Makes the APIC API more type-safe by resolving quite a few APIC_COMMON downcasts. Like PICCommonState, the APICCommonState is now a public typedef while stay= ing an abstract datatype. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-8-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/apic.h | 33 +++++------ include/hw/i386/apic_internal.h | 7 +-- target/i386/cpu.h | 5 +- target/i386/kvm/kvm_i386.h | 2 +- target/i386/whpx/whpx-internal.h | 4 +- hw/i386/kvm/apic.c | 3 +- hw/i386/vapic.c | 2 +- hw/i386/x86-cpu.c | 2 +- hw/intc/apic.c | 97 +++++++++++++------------------- hw/intc/apic_common.c | 56 +++++++----------- target/i386/cpu-apic.c | 18 +++--- target/i386/cpu-dump.c | 2 +- target/i386/cpu.c | 2 +- target/i386/kvm/kvm.c | 2 +- target/i386/whpx/whpx-apic.c | 3 +- 15 files changed, 98 insertions(+), 140 deletions(-) diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h index eb606d60760..871f1428885 100644 --- a/include/hw/i386/apic.h +++ b/include/hw/i386/apic.h @@ -1,28 +1,29 @@ #ifndef APIC_H #define APIC_H =20 +typedef struct APICCommonState APICCommonState; =20 /* apic.c */ void apic_set_max_apic_id(uint32_t max_apic_id); -int apic_accept_pic_intr(DeviceState *s); -void apic_deliver_pic_intr(DeviceState *s, int level); -void apic_deliver_nmi(DeviceState *d); -int apic_get_interrupt(DeviceState *s); -int cpu_set_apic_base(DeviceState *s, uint64_t val); -uint64_t cpu_get_apic_base(DeviceState *s); -bool cpu_is_apic_enabled(DeviceState *s); -void cpu_set_apic_tpr(DeviceState *s, uint8_t val); -uint8_t cpu_get_apic_tpr(DeviceState *s); -void apic_init_reset(DeviceState *s); -void apic_sipi(DeviceState *s); -void apic_poll_irq(DeviceState *d); -void apic_designate_bsp(DeviceState *d, bool bsp); -int apic_get_highest_priority_irr(DeviceState *dev); +int apic_accept_pic_intr(APICCommonState *s); +void apic_deliver_pic_intr(APICCommonState *s, int level); +void apic_deliver_nmi(APICCommonState *s); +int apic_get_interrupt(APICCommonState *s); +int cpu_set_apic_base(APICCommonState *s, uint64_t val); +uint64_t cpu_get_apic_base(APICCommonState *s); +bool cpu_is_apic_enabled(APICCommonState *s); +void cpu_set_apic_tpr(APICCommonState *s, uint8_t val); +uint8_t cpu_get_apic_tpr(APICCommonState *s); +void apic_init_reset(APICCommonState *s); +void apic_sipi(APICCommonState *s); +void apic_poll_irq(APICCommonState *s); +void apic_designate_bsp(APICCommonState *s, bool bsp); +int apic_get_highest_priority_irr(APICCommonState *s); int apic_msr_read(int index, uint64_t *val); int apic_msr_write(int index, uint64_t val); -bool is_x2apic_mode(DeviceState *d); +bool is_x2apic_mode(APICCommonState *s); =20 /* pc.c */ -DeviceState *cpu_get_current_apic(void); +APICCommonState *cpu_get_current_apic(void); =20 #endif diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_interna= l.h index 429278da618..4a62fdceb4e 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -22,6 +22,7 @@ #define QEMU_APIC_INTERNAL_H =20 #include "cpu.h" +#include "hw/i386/apic.h" #include "system/memory.h" #include "qemu/timer.h" #include "target/i386/cpu-qom.h" @@ -125,8 +126,6 @@ #define VAPIC_ENABLE_BIT 0 #define VAPIC_ENABLE_MASK (1 << VAPIC_ENABLE_BIT) =20 -typedef struct APICCommonState APICCommonState; - #define TYPE_APIC_COMMON "apic-common" typedef struct APICCommonClass APICCommonClass; DECLARE_OBJ_CHECKERS(APICCommonState, APICCommonClass, @@ -203,8 +202,8 @@ typedef struct VAPICState { extern bool apic_report_tpr_access; =20 bool apic_next_timer(APICCommonState *s, int64_t current_time); -void apic_enable_tpr_access_reporting(DeviceState *d, bool enable); -void apic_enable_vapic(DeviceState *d, hwaddr paddr); +void apic_enable_tpr_access_reporting(APICCommonState *s, bool enable); +void apic_enable_vapic(APICCommonState *s, hwaddr paddr); =20 void vapic_report_tpr_access(DeviceState *dev, CPUState *cpu, target_ulong= ip, TPRAccess access); diff --git a/target/i386/cpu.h b/target/i386/cpu.h index ce948861a76..d0da9bfe58c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -27,6 +27,7 @@ #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/memop.h" +#include "hw/i386/apic.h" #include "hw/i386/topology.h" #include "qapi/qapi-types-common.h" #include "qemu/cpu-float.h" @@ -2349,7 +2350,7 @@ struct ArchCPU { =20 /* in order to simplify APIC support, we leave this pointer to the user */ - struct DeviceState *apic_state; + APICCommonState *apic_state; struct MemoryRegion *cpu_as_root, *cpu_as_mem, *smram; Notifier machine_done; =20 @@ -2830,7 +2831,7 @@ bool cpu_svm_has_intercept(CPUX86State *env, uint32_t= type); =20 /* apic.c */ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); -void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip, +void apic_handle_tpr_access_report(APICCommonState *s, target_ulong ip, TPRAccess access); =20 /* Special values for X86CPUVersion: */ diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h index 5f83e8850a2..5c908fdd6a5 100644 --- a/target/i386/kvm/kvm_i386.h +++ b/target/i386/kvm/kvm_i386.h @@ -56,7 +56,7 @@ bool kvm_has_adjust_clock_stable(void); bool kvm_has_exception_payload(void); void kvm_synchronize_all_tsc(void); =20 -void kvm_get_apic_state(DeviceState *d, struct kvm_lapic_state *kapic); +void kvm_get_apic_state(APICCommonState *s, struct kvm_lapic_state *kapic); void kvm_put_apicbase(X86CPU *cpu, uint64_t value); =20 bool kvm_has_x2apic_api(void); diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-inter= nal.h index 6633e9c4ca3..2dcad1f5650 100644 --- a/target/i386/whpx/whpx-internal.h +++ b/target/i386/whpx/whpx-internal.h @@ -5,6 +5,8 @@ #include #include =20 +#include "hw/i386/apic.h" + typedef enum WhpxBreakpointState { WHPX_BP_CLEARED =3D 0, WHPX_BP_SET_PENDING, @@ -44,7 +46,7 @@ struct whpx_state { }; =20 extern struct whpx_state whpx_global; -void whpx_apic_get(DeviceState *s); +void whpx_apic_get(APICCommonState *s); =20 #define WHV_E_UNKNOWN_CAPABILITY 0x80370300L =20 diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 1be9bfe36e9..82355f04631 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -60,9 +60,8 @@ static void kvm_put_apic_state(APICCommonState *s, struct= kvm_lapic_state *kapic kvm_apic_set_reg(kapic, 0x3e, s->divide_conf); } =20 -void kvm_get_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) +void kvm_get_apic_state(APICCommonState *s, struct kvm_lapic_state *kapic) { - APICCommonState *s =3D APIC_COMMON(dev); int i, v; =20 if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) { diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index 0c1c92c4793..f1089f0a7c8 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -490,7 +490,7 @@ void vapic_report_tpr_access(DeviceState *dev, CPUState= *cs, target_ulong ip, } =20 typedef struct VAPICEnableTPRReporting { - DeviceState *apic; + APICCommonState *apic; bool enable; } VAPICEnableTPRReporting; =20 diff --git a/hw/i386/x86-cpu.c b/hw/i386/x86-cpu.c index c876e6709e0..1a86a853d5f 100644 --- a/hw/i386/x86-cpu.c +++ b/hw/i386/x86-cpu.c @@ -86,7 +86,7 @@ int cpu_get_pic_interrupt(CPUX86State *env) return intno; } =20 -DeviceState *cpu_get_current_apic(void) +APICCommonState *cpu_get_current_apic(void) { if (current_cpu) { X86CPU *cpu =3D X86_CPU(current_cpu); diff --git a/hw/intc/apic.c b/hw/intc/apic.c index c7680338563..cb35c80c75b 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -181,10 +181,8 @@ static void apic_local_deliver(APICCommonState *s, int= vector) } } =20 -void apic_deliver_pic_intr(DeviceState *dev, int level) +void apic_deliver_pic_intr(APICCommonState *s, int level) { - APICCommonState *s =3D APIC(dev); - if (level) { apic_local_deliver(s, APIC_LVT_LINT0); } else { @@ -301,10 +299,8 @@ static void apic_deliver_irq(uint32_t dest, uint8_t de= st_mode, apic_bus_deliver(deliver_bitmask, delivery_mode, vector_num, trigger_m= ode); } =20 -bool is_x2apic_mode(DeviceState *dev) +bool is_x2apic_mode(APICCommonState *s) { - APICCommonState *s =3D APIC(dev); - return s->apicbase & MSR_IA32_APICBASE_EXTD; } =20 @@ -388,15 +384,12 @@ static void apic_set_tpr(APICCommonState *s, uint8_t = val) } } =20 -int apic_get_highest_priority_irr(DeviceState *dev) +int apic_get_highest_priority_irr(APICCommonState *s) { - APICCommonState *s; - - if (!dev) { + if (!s) { /* no interrupts */ return -1; } - s =3D APIC_COMMON(dev); return get_highest_priority_int(s->irr); } =20 @@ -458,22 +451,19 @@ static int apic_irq_pending(APICCommonState *s) static void apic_update_irq(APICCommonState *s) { CPUState *cpu; - DeviceState *dev =3D (DeviceState *)s; =20 cpu =3D CPU(s->cpu); if (!qemu_cpu_is_self(cpu)) { cpu_interrupt(cpu, CPU_INTERRUPT_POLL); } else if (apic_irq_pending(s) > 0) { cpu_interrupt(cpu, CPU_INTERRUPT_HARD); - } else if (!apic_accept_pic_intr(dev) || !pic_get_output(isa_pic)) { + } else if (!apic_accept_pic_intr(s) || !pic_get_output(isa_pic)) { cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD); } } =20 -void apic_poll_irq(DeviceState *dev) +void apic_poll_irq(APICCommonState *s) { - APICCommonState *s =3D APIC(dev); - apic_sync_vapic(s, SYNC_FROM_VAPIC); apic_update_irq(s); } @@ -516,7 +506,7 @@ static void apic_eoi(APICCommonState *s) =20 static bool apic_match_dest(APICCommonState *apic, uint32_t dest) { - if (is_x2apic_mode(&apic->parent_obj)) { + if (is_x2apic_mode(apic)) { return apic->initial_apic_id =3D=3D dest; } else { return apic->id =3D=3D (uint8_t)dest; @@ -550,7 +540,7 @@ static void apic_get_broadcast_bitmask(uint32_t *delive= r_bitmask, for (i =3D 0; i < max_apics; i++) { apic_iter =3D local_apics[i]; if (apic_iter) { - bool apic_in_x2apic =3D is_x2apic_mode(&apic_iter->parent_obj); + bool apic_in_x2apic =3D is_x2apic_mode(apic_iter); =20 if (is_x2apic_broadcast && apic_in_x2apic) { apic_set_bit(deliver_bitmask, i); @@ -642,27 +632,24 @@ static void apic_startup(APICCommonState *s, int vect= or_num) cpu_interrupt(CPU(s->cpu), CPU_INTERRUPT_SIPI); } =20 -void apic_sipi(DeviceState *dev) +void apic_sipi(APICCommonState *s) { - APICCommonState *s =3D APIC(dev); - if (!s->wait_for_sipi) return; cpu_x86_load_seg_cache_sipi(s->cpu, s->sipi_vector); s->wait_for_sipi =3D 0; } =20 -static void apic_deliver(DeviceState *dev, uint32_t dest, uint8_t dest_mod= e, +static void apic_deliver(APICCommonState *s, uint32_t dest, uint8_t dest_m= ode, uint8_t delivery_mode, uint8_t vector_num, uint8_t trigger_mode, uint8_t dest_shorthand) { - APICCommonState *s =3D APIC(dev); APICCommonState *apic_iter; uint32_t deliver_bitmask_size =3D max_apic_words * sizeof(uint32_t); g_autofree uint32_t *deliver_bitmask =3D g_new(uint32_t, max_apic_word= s); uint32_t current_apic_id; =20 - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { current_apic_id =3D s->initial_apic_id; } else { current_apic_id =3D s->id; @@ -709,18 +696,15 @@ static void apic_deliver(DeviceState *dev, uint32_t d= est, uint8_t dest_mode, =20 static bool apic_check_pic(APICCommonState *s) { - DeviceState *dev =3D (DeviceState *)s; - - if (!apic_accept_pic_intr(dev) || !pic_get_output(isa_pic)) { + if (!apic_accept_pic_intr(s) || !pic_get_output(isa_pic)) { return false; } - apic_deliver_pic_intr(dev, 1); + apic_deliver_pic_intr(s, 1); return true; } =20 -int apic_get_interrupt(DeviceState *dev) +int apic_get_interrupt(APICCommonState *s) { - APICCommonState *s =3D APIC(dev); int intno; =20 /* if the APIC is installed or enabled, we let the 8259 handle the @@ -752,9 +736,8 @@ int apic_get_interrupt(DeviceState *dev) return intno; } =20 -int apic_accept_pic_intr(DeviceState *dev) +int apic_accept_pic_intr(APICCommonState *s) { - APICCommonState *s =3D APIC(dev); uint32_t lvt0; =20 if (!s) @@ -788,20 +771,18 @@ static void apic_timer(void *opaque) =20 static int apic_register_read(int index, uint64_t *value) { - DeviceState *dev; APICCommonState *s; uint32_t val; int ret =3D 0; =20 - dev =3D cpu_get_current_apic(); - if (!dev) { + s =3D cpu_get_current_apic(); + if (!s) { return -1; } - s =3D APIC(dev); =20 switch(index) { case 0x02: /* id */ - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { val =3D s->initial_apic_id; } else { val =3D s->id << 24; @@ -828,14 +809,14 @@ static int apic_register_read(int index, uint64_t *va= lue) val =3D 0; break; case 0x0d: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { val =3D s->extended_log_dest; } else { val =3D s->log_dest << 24; } break; case 0x0e: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { val =3D 0; ret =3D -1; } else { @@ -902,14 +883,14 @@ static uint64_t apic_mem_read(void *opaque, hwaddr ad= dr, unsigned size) =20 int apic_msr_read(int index, uint64_t *val) { - DeviceState *dev; + APICCommonState *s; =20 - dev =3D cpu_get_current_apic(); - if (!dev) { + s =3D cpu_get_current_apic(); + if (!s) { return -1; } =20 - if (!is_x2apic_mode(dev)) { + if (!is_x2apic_mode(s)) { return -1; } =20 @@ -943,20 +924,18 @@ static void apic_send_msi(MSIMessage *msi) =20 static int apic_register_write(int index, uint64_t val) { - DeviceState *dev; APICCommonState *s; =20 - dev =3D cpu_get_current_apic(); - if (!dev) { + s =3D cpu_get_current_apic(); + if (!s) { return -1; } - s =3D APIC(dev); =20 trace_apic_register_write(index, val); =20 switch(index) { case 0x02: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { return -1; } =20 @@ -979,14 +958,14 @@ static int apic_register_write(int index, uint64_t va= l) apic_eoi(s); break; case 0x0d: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { return -1; } =20 s->log_dest =3D val >> 24; break; case 0x0e: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { return -1; } =20 @@ -1005,20 +984,20 @@ static int apic_register_write(int index, uint64_t v= al) uint32_t dest; =20 s->icr[0] =3D val; - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { s->icr[1] =3D val >> 32; dest =3D s->icr[1]; } else { dest =3D (s->icr[1] >> 24) & 0xff; } =20 - apic_deliver(dev, dest, (s->icr[0] >> 11) & 1, + apic_deliver(s, dest, (s->icr[0] >> 11) & 1, (s->icr[0] >> 8) & 7, (s->icr[0] & 0xff), (s->icr[0] >> 15) & 1, (s->icr[0] >> 18) & 3); break; } case 0x31: - if (is_x2apic_mode(dev)) { + if (is_x2apic_mode(s)) { return -1; } =20 @@ -1053,7 +1032,7 @@ static int apic_register_write(int index, uint64_t va= l) case 0x3f: { int vector =3D val & 0xff; =20 - if (!is_x2apic_mode(dev)) { + if (!is_x2apic_mode(s)) { return -1; } =20 @@ -1063,7 +1042,7 @@ static int apic_register_write(int index, uint64_t va= l) * - Trigger mode: 0 (Edge) * - Delivery mode: 0 (Fixed) */ - apic_deliver(dev, 0, 0, APIC_DM_FIXED, vector, 0, 1); + apic_deliver(s, 0, 0, APIC_DM_FIXED, vector, 0, 1); =20 break; } @@ -1102,14 +1081,14 @@ static void apic_mem_write(void *opaque, hwaddr add= r, uint64_t val, =20 int apic_msr_write(int index, uint64_t val) { - DeviceState *dev; + APICCommonState *s; =20 - dev =3D cpu_get_current_apic(); - if (!dev) { + s =3D cpu_get_current_apic(); + if (!s) { return -1; } =20 - if (!is_x2apic_mode(dev)) { + if (!is_x2apic_mode(s)) { return -1; } =20 diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 394fe020134..ec9e978b0b4 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -35,12 +35,11 @@ =20 bool apic_report_tpr_access; =20 -int cpu_set_apic_base(DeviceState *dev, uint64_t val) +int cpu_set_apic_base(APICCommonState *s, uint64_t val) { trace_cpu_set_apic_base(val); =20 - if (dev) { - APICCommonState *s =3D APIC_COMMON(dev); + if (s) { APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); /* Reset possibly modified xAPIC ID */ s->id =3D s->initial_apic_id; @@ -50,10 +49,9 @@ int cpu_set_apic_base(DeviceState *dev, uint64_t val) return 0; } =20 -uint64_t cpu_get_apic_base(DeviceState *dev) +uint64_t cpu_get_apic_base(APICCommonState *s) { - if (dev) { - APICCommonState *s =3D APIC_COMMON(dev); + if (s) { trace_cpu_get_apic_base((uint64_t)s->apicbase); return s->apicbase; } else { @@ -62,52 +60,43 @@ uint64_t cpu_get_apic_base(DeviceState *dev) } } =20 -bool cpu_is_apic_enabled(DeviceState *dev) +bool cpu_is_apic_enabled(APICCommonState *s) { - APICCommonState *s; - - if (!dev) { + if (!s) { return false; } =20 - s =3D APIC_COMMON(dev); - return s->apicbase & MSR_IA32_APICBASE_ENABLE; } =20 -void cpu_set_apic_tpr(DeviceState *dev, uint8_t val) +void cpu_set_apic_tpr(APICCommonState *s, uint8_t val) { - APICCommonState *s; APICCommonClass *info; =20 - if (!dev) { + if (!s) { return; } =20 - s =3D APIC_COMMON(dev); info =3D APIC_COMMON_GET_CLASS(s); =20 info->set_tpr(s, val); } =20 -uint8_t cpu_get_apic_tpr(DeviceState *dev) +uint8_t cpu_get_apic_tpr(APICCommonState *s) { - APICCommonState *s; APICCommonClass *info; =20 - if (!dev) { + if (!s) { return 0; } =20 - s =3D APIC_COMMON(dev); info =3D APIC_COMMON_GET_CLASS(s); =20 return info->get_tpr(s); } =20 -void apic_enable_tpr_access_reporting(DeviceState *dev, bool enable) +void apic_enable_tpr_access_reporting(APICCommonState *s, bool enable) { - APICCommonState *s =3D APIC_COMMON(dev); APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); =20 apic_report_tpr_access =3D enable; @@ -116,26 +105,22 @@ void apic_enable_tpr_access_reporting(DeviceState *de= v, bool enable) } } =20 -void apic_enable_vapic(DeviceState *dev, hwaddr paddr) +void apic_enable_vapic(APICCommonState *s, hwaddr paddr) { - APICCommonState *s =3D APIC_COMMON(dev); APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); =20 s->vapic_paddr =3D paddr; info->vapic_base_update(s); } =20 -void apic_handle_tpr_access_report(DeviceState *dev, target_ulong ip, +void apic_handle_tpr_access_report(APICCommonState *s, target_ulong ip, TPRAccess access) { - APICCommonState *s =3D APIC_COMMON(dev); - vapic_report_tpr_access(s->vapic, CPU(s->cpu), ip, access); } =20 -void apic_deliver_nmi(DeviceState *dev) +void apic_deliver_nmi(APICCommonState *s) { - APICCommonState *s =3D APIC_COMMON(dev); APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); =20 info->external_nmi(s); @@ -193,16 +178,14 @@ uint32_t apic_get_current_count(APICCommonState *s) return val; } =20 -void apic_init_reset(DeviceState *dev) +void apic_init_reset(APICCommonState *s) { - APICCommonState *s; APICCommonClass *info; int i; =20 - if (!dev) { + if (!s) { return; } - s =3D APIC_COMMON(dev); s->tpr =3D 0; s->spurious_vec =3D 0xff; s->log_dest =3D 0; @@ -233,13 +216,12 @@ void apic_init_reset(DeviceState *dev) } } =20 -void apic_designate_bsp(DeviceState *dev, bool bsp) +void apic_designate_bsp(APICCommonState *s, bool bsp) { - if (dev =3D=3D NULL) { + if (s =3D=3D NULL) { return; } =20 - APICCommonState *s =3D APIC_COMMON(dev); if (bsp) { s->apicbase |=3D MSR_IA32_APICBASE_BSP; } else { @@ -262,7 +244,7 @@ static void apic_reset_common(DeviceState *dev) s->vapic_paddr =3D 0; info->vapic_base_update(s); =20 - apic_init_reset(dev); + apic_init_reset(s); } =20 static const VMStateDescription vmstate_apic_common; diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index 242a05fdbe9..564c1288e47 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -41,34 +41,31 @@ APICCommonClass *apic_get_class(Error **errp) =20 void x86_cpu_apic_create(X86CPU *cpu, Error **errp) { - APICCommonState *apic; APICCommonClass *apic_class =3D apic_get_class(errp); =20 if (!apic_class) { return; } =20 - cpu->apic_state =3D DEVICE(object_new_with_class(OBJECT_CLASS(apic_cla= ss))); + cpu->apic_state =3D APIC_COMMON(object_new_with_class(OBJECT_CLASS(api= c_class))); object_property_add_child(OBJECT(cpu), "lapic", OBJECT(cpu->apic_state)); object_unref(OBJECT(cpu->apic_state)); =20 /* TODO: convert to link<> */ - apic =3D APIC_COMMON(cpu->apic_state); - apic->cpu =3D cpu; - apic->apicbase =3D APIC_DEFAULT_ADDRESS | MSR_IA32_APICBASE_ENABLE; + cpu->apic_state->cpu =3D cpu; + cpu->apic_state->apicbase =3D APIC_DEFAULT_ADDRESS | MSR_IA32_APICBASE= _ENABLE; =20 /* * apic_common_set_id needs to check if the CPU has x2APIC - * feature in case APIC ID >=3D 255, so we need to set apic->cpu + * feature in case APIC ID >=3D 255, so we need to set cpu->apic_state= ->cpu * before setting APIC ID */ - qdev_prop_set_uint32(cpu->apic_state, "id", cpu->apic_id); + qdev_prop_set_uint32(DEVICE(cpu->apic_state), "id", cpu->apic_id); } =20 void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) { - APICCommonState *apic; static bool apic_mmio_map_once; =20 if (cpu->apic_state =3D=3D NULL) { @@ -77,12 +74,11 @@ void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) qdev_realize(DEVICE(cpu->apic_state), NULL, errp); =20 /* Map APIC MMIO area */ - apic =3D APIC_COMMON(cpu->apic_state); if (!apic_mmio_map_once) { memory_region_add_subregion_overlap(get_system_memory(), - apic->apicbase & + cpu->apic_state->apicbase & MSR_IA32_APICBASE_BASE, - &apic->io_memory, + &cpu->apic_state->io_memory, 0x1000); apic_mmio_map_once =3D true; } diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index a72ed93bd2f..67bf31e0caa 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -291,7 +291,7 @@ static void dump_apic_interrupt(const char *name, uint3= 2_t *ireg_tab, void x86_cpu_dump_local_apic_state(CPUState *cs, int flags) { X86CPU *cpu =3D X86_CPU(cs); - APICCommonState *s =3D APIC_COMMON(cpu->apic_state); + APICCommonState *s =3D cpu->apic_state; if (!s) { qemu_printf("local apic state not available\n"); return; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 455caff6b23..0a66e1fec93 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8789,7 +8789,7 @@ void x86_cpu_after_reset(X86CPU *cpu) } =20 if (cpu->apic_state) { - device_cold_reset(cpu->apic_state); + device_cold_reset(DEVICE(cpu->apic_state)); } #endif } diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 309f043373c..f7a6ef650af 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -5029,7 +5029,7 @@ static int kvm_get_mp_state(X86CPU *cpu) =20 static int kvm_get_apic(X86CPU *cpu) { - DeviceState *apic =3D cpu->apic_state; + APICCommonState *apic =3D cpu->apic_state; struct kvm_lapic_state kapic; int ret; =20 diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index e1ef6d4e6d4..afcb25843b5 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -151,9 +151,8 @@ static void whpx_apic_put(CPUState *cs, run_on_cpu_data= data) } } =20 -void whpx_apic_get(DeviceState *dev) +void whpx_apic_get(APICCommonState *s) { - APICCommonState *s =3D APIC_COMMON(dev); CPUState *cpu =3D CPU(s->cpu); struct whpx_lapic_state kapic; =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761080015373309.6053296838685; Tue, 21 Oct 2025 13:53:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIn-0002m5-Jh; Tue, 21 Oct 2025 16:49:55 -0400 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 1vBJIQ-00029s-Tf for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:33 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIO-0001Fb-SX for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:30 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47117f92e32so40259965e9.1 for ; Tue, 21 Oct 2025 13:49:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496d23237sm22851335e9.10.2025.10.21.13.49.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079767; x=1761684567; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x+PjU2MklfbFewUcVF0ps3xlghKX/9R0SWTbCRF7v2o=; b=vONn6SOLLf31T63h0NQLcJMAF+bvsOJn+o6NJjvOuzEe/tcURPg8EOTUL1brUjaW56 jEFSotg6WB/8xxGywtU1vi9ySrdvIj1N7LDbPKXokS8rEnXts3xyrXP84AS7zX9eIr/Z DoV8MIKcT6SnEcMxspRQ3eqGvChF1gZcvZNkB40udH81/mEeY33mWQPQ31T3gvybJWSv zRyussCRPbaM3s7pNX2pBaho8nKRr0XfPR9WzHOjfXct3+Kw2mRdrvzPQ++Owag/OjUh huvY/U5hUdq/PfNg/n+ypomwrC6z/YBB02K8bWE8Iv4XrgBrILmnYNgziVEfaHxXb4Sh epaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079767; x=1761684567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x+PjU2MklfbFewUcVF0ps3xlghKX/9R0SWTbCRF7v2o=; b=sENpL+JFep2yohyr6gK62yriVVXwOVu3HkXPIcb4MPfkvckeGZPZcuWVecyprX52T5 w35faHx5hKAVRfEtyGUoXCA/FC8WaHf31/uk1JfdiYnIb1hXmL1cWdmk9SFx9dRYRHop qibqEsEZfpdVPTi3dDX8wpxfQT89zYn6JYanApgX/erkIQP9Hnga1TM3POSxTTMIY4ZS GZ0xWxwechrKX9+f6Xy2R8wr7ACDDStpDziFu81XzE4oy5jxhTm/K4HVAVZH8BIThuDq zGolVw1WGA1oBtNejBQp5VrM1TegharfJytciVbiLZcTu7TYFMEPf7nTqzEgSb2VhQ6H tGzg== X-Gm-Message-State: AOJu0YyD1sAR63v8QZdI7i2261fbMJz1k2PIJz6P2Bec+oEfCF1ryeb3 TSsV7Drs+vmu5SyjRgtk00JSAAhOJC4oSBwf+/B7rwYe1OsUu1VBR7BOsENVC1LWbO9L1pCMgnv 5U4rQVYI= X-Gm-Gg: ASbGncu0UEg0vgnwE0PMHinDkFDXp1vuPGX5TB98bGvLFnrIliguSbRIUD6Haf5H+1X EdC176oqmI/tEMyps9YzfFM2+pP7n6GoX4Nr6gw0zes7W+7w6t5ImWbaE5nzP+t5aCN8aNjp/nQ +Ns2iazNT1eQCusM2QZTKBOoYtB6fK4G7GMn127lnywVxp9ZDtIe58NM4fQQO/nzf4N1jMg0tkm HavjmT8X2pWQNnJolFEug1uYSA0hXx/7yDB+0bGAiuBXsSyLgo5pcUU0HxbfovcOuw17G6eR6Fq BstxMAnrcrjEMUJm1XY4c4/OnYXny+E7QxEwUZJ20NnYzwmwD2votVMOhxVAWBGPpuqREmtx6X8 ShwMXQA2NEo2+O+uF/0nnk/HGS2nSx6fWEjyzQhtZ4JYM5REDu0R+rB57WxlmiXytsgl+bHFyen czP26qlpimO+yL1p0+nYQz4kyOGkATfbxfMaRS1KSvCogVCaLJwg== X-Google-Smtp-Source: AGHT+IFW8RvIRYkD9WUJa4fXbIu+drS5wxPOWxUAzNAbpM6odumKt2njizWORZ0bW2YSBx0kE/rGSQ== X-Received: by 2002:a05:600c:4f95:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-471178ac017mr120956265e9.16.1761079766971; Tue, 21 Oct 2025 13:49:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/45] hw/i386/apic: Ensure own APIC use in apic_msr_{read, write} Date: Tue, 21 Oct 2025 22:46:45 +0200 Message-ID: <20251021204700.56072-32-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761080016142158500 From: Bernhard Beschow Avoids the `current_cpu` global and seems more robust by not "forgetting" t= he own APIC and then re-determining it by cpu_get_current_apic() which uses the global. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-9-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/apic.h | 4 ++-- hw/intc/apic.c | 10 ++-------- target/i386/hvf/hvf.c | 4 ++-- target/i386/tcg/system/misc_helper.c | 4 ++-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h index 871f1428885..6a0933f401c 100644 --- a/include/hw/i386/apic.h +++ b/include/hw/i386/apic.h @@ -19,8 +19,8 @@ void apic_sipi(APICCommonState *s); void apic_poll_irq(APICCommonState *s); void apic_designate_bsp(APICCommonState *s, bool bsp); int apic_get_highest_priority_irr(APICCommonState *s); -int apic_msr_read(int index, uint64_t *val); -int apic_msr_write(int index, uint64_t val); +int apic_msr_read(APICCommonState *s, int index, uint64_t *val); +int apic_msr_write(APICCommonState *s, int index, uint64_t val); bool is_x2apic_mode(APICCommonState *s); =20 /* pc.c */ diff --git a/hw/intc/apic.c b/hw/intc/apic.c index cb35c80c75b..ba0eda39217 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -881,11 +881,8 @@ static uint64_t apic_mem_read(void *opaque, hwaddr add= r, unsigned size) return val; } =20 -int apic_msr_read(int index, uint64_t *val) +int apic_msr_read(APICCommonState *s, int index, uint64_t *val) { - APICCommonState *s; - - s =3D cpu_get_current_apic(); if (!s) { return -1; } @@ -1079,11 +1076,8 @@ static void apic_mem_write(void *opaque, hwaddr addr= , uint64_t val, apic_register_write(index, val); } =20 -int apic_msr_write(int index, uint64_t val) +int apic_msr_write(APICCommonState *s, int index, uint64_t val) { - APICCommonState *s; - - s =3D cpu_get_current_apic(); if (!s) { return -1; } diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 8445cadecec..33f723a76a7 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -527,7 +527,7 @@ void hvf_simulate_rdmsr(CPUState *cs) int ret; int index =3D (uint32_t)env->regs[R_ECX] - MSR_APIC_START; =20 - ret =3D apic_msr_read(index, &val); + ret =3D apic_msr_read(cpu->apic_state, index, &val); if (ret < 0) { x86_emul_raise_exception(env, EXCP0D_GPF, 0); } @@ -638,7 +638,7 @@ void hvf_simulate_wrmsr(CPUState *cs) int ret; int index =3D (uint32_t)env->regs[R_ECX] - MSR_APIC_START; =20 - ret =3D apic_msr_write(index, data); + ret =3D apic_msr_write(cpu->apic_state, index, data); if (ret < 0) { x86_emul_raise_exception(env, EXCP0D_GPF, 0); } diff --git a/target/i386/tcg/system/misc_helper.c b/target/i386/tcg/system/= misc_helper.c index 9c3f5cc99b3..0c32424d36a 100644 --- a/target/i386/tcg/system/misc_helper.c +++ b/target/i386/tcg/system/misc_helper.c @@ -299,7 +299,7 @@ void helper_wrmsr(CPUX86State *env) int index =3D (uint32_t)env->regs[R_ECX] - MSR_APIC_START; =20 bql_lock(); - ret =3D apic_msr_write(index, val); + ret =3D apic_msr_write(env_archcpu(env)->apic_state, index, val); bql_unlock(); if (ret < 0) { goto error; @@ -477,7 +477,7 @@ void helper_rdmsr(CPUX86State *env) int index =3D (uint32_t)env->regs[R_ECX] - MSR_APIC_START; =20 bql_lock(); - ret =3D apic_msr_read(index, &val); + ret =3D apic_msr_read(x86_cpu->apic_state, index, &val); bql_unlock(); if (ret < 0) { raise_exception_err_ra(env, EXCP0D_GPF, 0, GETPC()); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761079851222508.985073208681; Tue, 21 Oct 2025 13:50:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJIy-000370-6Q; Tue, 21 Oct 2025 16:50:04 -0400 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 1vBJIW-0002Jx-AA for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:36 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIT-0001GD-Oj for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ee64bc6b90so3876709f8f.0 for ; Tue, 21 Oct 2025 13:49:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c43900e1sm11134085e9.17.2025.10.21.13.49.30 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079771; x=1761684571; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PUpymYOZ5hPQQiiaaJAZks9B5yLzhhqZL128dnY2H3Q=; b=vcAKsn11ETaO+k4mee3Jrsn/VKy1BKz48nPlh5efQDo7KXOMJ4HgXeK4gSnDWIxEyl IStcaGrsCHZQTPTM0K1KNpB5bRSKIEjzXWgwO991oKvPNDoNrxc7ET89PVaECfrhAngJ nfSBjkYKqA7+uE5cSP2QkPFjQO17IjkkQGD9dADVdFEZXsSMBxW2Rv7j4zvspqQswBYr NMZcWvcq7wptDz8PIgXQaSEIo33cgYqY7Eh403lVd2X5dcOs8hwS9KpnaAXNJv/jJplT phA+46be9h6BQOaiD9TCY3QEGdwtZPDNnrND9zHHHg02xvcjblxcgAo+qYtSy9Fmy896 Ar2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079771; x=1761684571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PUpymYOZ5hPQQiiaaJAZks9B5yLzhhqZL128dnY2H3Q=; b=Xn+yerXVwEqeIqo4yKYreagh+WT6rfRKhsXXnyP2FIuQb9W3xiRpIspiAKwpCdNz8k cw28+WuDqHa/Js0TNwI5xDzh4Z9M1YBBl4igVJxKL8wnB24vLHoExa50+cRzlmhvz3iR BTT0qOv/lb3OGVm5zmJvEuOaJgI4YDT/tO0S2NWAGDE0zWFOsNk5meHEVhcIU4RHVFDB JbuJdmywVlVgPJbekYDvkCqaUnxEfe3RRS4TJuNRNyBPgAg16EG80FD0ECLmCIJzdcYW FhCb7IIz222P5UjWIym4xNhKLeAcHa2iv8SDltXZjW3VYYfEh+FfB0X84qP2cuWcW+04 nj9g== X-Gm-Message-State: AOJu0Ywxrli2LNScE4EIcIil56RcV5aT7/5CaaPC5qv7AxCjBW7jmAn2 nHsAnBklHVuTzsb4RDgVhYkKY+n7bgHu5SQFzawvI3DiuVZuASnNG4ODEP7qII7M2VF9n19DqHZ nb+n1Fcw= X-Gm-Gg: ASbGncv0yhM92vxc/eM6/7yTxotzU71skyWwa/GD/eX712STurmCf6HTLfzhwsOroLV I7XU7ad1aroU7KdkqyyqwytdHutvNpgrfNIZfQ/8pL63+3B9GdXTStiW0xs8lQcce/vd4g8zqkl B2AeqZGvOlDqghjnaJfVjhpbLsU1avtDraGn5ToqLUyHHEupSlbQ3PJlTuM1bw3CEITjfGZrLFl b07TJ/BsgACH8CmBfxyGWSGK2v+v074u8PsXuomGP2W2xMkTZJa7gUYWms4Q52/09PNK+OP3m4M 8h0L8kz6SaHVlDg5MN35Ae5tTNvv7EnRxRfioB2YfJNreZvoLUK6wQKyv6isxS8Ysf8OPVbLIwZ H03qnxWlcCUnhVQ7oExJaPDHyLOHSDYW3DJOw+l9+1lFghUbpNVCKpN45UtL0nwipnHc3EnGA/j 7SC4j8pohnw0077AMICdvpGh1zEWHxAzzyMAUpscsOJ8wr048pqA== X-Google-Smtp-Source: AGHT+IHLRHTkkFetm2Y09YcrZ+AhZ1fghtYu9WuZvGU/ZIi66MnupjsZU27Fz8zhvF8nNXwBnqyYxg== X-Received: by 2002:a05:6000:310d:b0:3fb:9950:b9eb with SMTP id ffacd0b85a97d-42704d90129mr10070181f8f.28.1761079771433; Tue, 21 Oct 2025 13:49:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/45] hw/intc/apic: Pass APICCommonState to apic_register_{read, write} Date: Tue, 21 Oct 2025 22:46:46 +0200 Message-ID: <20251021204700.56072-33-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761079853575158500 From: Bernhard Beschow As per the previous patch, the APIC instance is already available in apic_msr_{read,write}, so it can be passed along. It turns out that the call to cpu_get_current_apic() is only required in apic_mem_{read,write}, so it has been moved there. Longer term, cpu_get_current_apic() could be removed entirely if apic_mem_{read,write} is tied to a CPU's local address space. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-10-shentey@gmail.com> [PMD: Move return after apic_send_msi() in apic_mem_write()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/apic.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c index ba0eda39217..aad253af158 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -769,17 +769,11 @@ static void apic_timer(void *opaque) apic_timer_update(s, s->next_time); } =20 -static int apic_register_read(int index, uint64_t *value) +static int apic_register_read(APICCommonState *s, int index, uint64_t *val= ue) { - APICCommonState *s; uint32_t val; int ret =3D 0; =20 - s =3D cpu_get_current_apic(); - if (!s) { - return -1; - } - switch(index) { case 0x02: /* id */ if (is_x2apic_mode(s)) { @@ -868,6 +862,7 @@ static int apic_register_read(int index, uint64_t *valu= e) =20 static uint64_t apic_mem_read(void *opaque, hwaddr addr, unsigned size) { + APICCommonState *s =3D cpu_get_current_apic(); uint64_t val; int index; =20 @@ -875,8 +870,12 @@ static uint64_t apic_mem_read(void *opaque, hwaddr add= r, unsigned size) return 0; } =20 + if (!s) { + return -1; + } + index =3D (addr >> 4) & 0xff; - apic_register_read(index, &val); + apic_register_read(s, index, &val); =20 return val; } @@ -891,7 +890,7 @@ int apic_msr_read(APICCommonState *s, int index, uint64= _t *val) return -1; } =20 - return apic_register_read(index, val); + return apic_register_read(s, index, val); } =20 static void apic_send_msi(MSIMessage *msi) @@ -919,15 +918,8 @@ static void apic_send_msi(MSIMessage *msi) apic_deliver_irq(dest, dest_mode, delivery, vector, trigger_mode); } =20 -static int apic_register_write(int index, uint64_t val) +static int apic_register_write(APICCommonState *s, int index, uint64_t val) { - APICCommonState *s; - - s =3D cpu_get_current_apic(); - if (!s) { - return -1; - } - trace_apic_register_write(index, val); =20 switch(index) { @@ -1054,6 +1046,7 @@ static int apic_register_write(int index, uint64_t va= l) static void apic_mem_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + APICCommonState *s =3D cpu_get_current_apic(); int index =3D (addr >> 4) & 0xff; =20 if (size < 4) { @@ -1073,7 +1066,11 @@ static void apic_mem_write(void *opaque, hwaddr addr= , uint64_t val, return; } =20 - apic_register_write(index, val); + if (!s) { + return; + } + + apic_register_write(s, index, val); } =20 int apic_msr_write(APICCommonState *s, int index, uint64_t val) @@ -1086,7 +1083,7 @@ int apic_msr_write(APICCommonState *s, int index, uin= t64_t val) return -1; } =20 - return apic_register_write(index, val); + return apic_register_write(s, index, val); } =20 static void apic_pre_save(APICCommonState *s) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079862; cv=none; d=zohomail.com; s=zohoarc; b=gB3Rn2l7W9BB+Hzr2PqOfY1FJ7nCATKANqH8BvEbrPs9tk9V/Abhya+oLFBB9Rs/oQyzBgYuKDva6Khcg8pMfMjL1FH2sNQV3O9pti4zYtgMjMdQ65aNQISdUAofjQn53S3NWYsis7FmDB8VtrhyvlwytISORWveilewvnv50FE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079862; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=N7L/lYFt/nDTTsPo3GqiSv7jR/BNA6IJZczYTvOwlC8=; b=jS+n3efZvbCmZjxOZvxiRSpn1xdI74LBLmakGbKt8b7opF1kt+GXGkrKjvPayXbmO0av6bkxb/5aabgfb6LZgxPZoaAsm/IHSsGnUeX4Inv3asA7rEn25YbUyvLHCwGYrWv1uGlMZ+jC3MkLwxsQddM71MKLTvKOB042jTZjk0Y= 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 1761079862631855.2393148333695; Tue, 21 Oct 2025 13:51:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ0-0003Gd-6I; Tue, 21 Oct 2025 16:50:06 -0400 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 1vBJIa-0002e2-QL for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:44 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIY-0001GX-LU for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-471193a9d9eso54889905e9.2 for ; Tue, 21 Oct 2025 13:49:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4342946sm9447795e9.10.2025.10.21.13.49.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079776; x=1761684576; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=N7L/lYFt/nDTTsPo3GqiSv7jR/BNA6IJZczYTvOwlC8=; b=z5wZJoX/tQjsI7QbtODSU5qOqRq5LDHizMct6Xqp/tSu2/uFLQQAmfOJAGwZ0XR2Pu tnsYaV6wOp+6QNTeFmmJZ6OqTK7jY3ZafmtzlZskOZatXjEac5u7tvX/bFP/czDrnPd9 3ya30Mc8qxm8mEe6QHo2vcJHnt2pHhNc4mW+uha+achxRVyfyhoAwyrvNORbt3VMnyML VytFOZnNgW/ANTE55EX9G6rinBT9JEgpHwDeKpankqKcZuGID9rqzFk9qNb9LPmQzwkE cikuzyMxaFBTke+xukPebkw61IFKNs/k8wDXPJsIhhFxxm5zZKoSTXPqQjCsV0EMUJr6 d5ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079776; x=1761684576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N7L/lYFt/nDTTsPo3GqiSv7jR/BNA6IJZczYTvOwlC8=; b=vGeSuE+xxv93nILS0i5sPp/1KkNB9LPrTUq0dTDUHuq/QcRR+BSagprHyly4ZvVV46 2D7z+8KwrF5JGSYtKOLlzPUoxOKYFoJTPSA+7sJWgHiW2DB0dupKdFk0IWE0ivsyDhA3 Dxw8s8bka0bI4lpdntq4guO4Vcr7ZVo2u7/1X0EOxmSDcWzbBBpc9LYK4etLeVGXZ82N vIAPF5Zr/+MS4h3BqU87j3dmIllCjl0jPE6pHUo0iKzwZ2Xc7TFuAkKjjCDEQhqfZzqX 4iGHvREfO1ArUDZ+IUfy0K3RB3MWtf0EbkRYKqklGeCATAzJcSE5Mezi217DtSvJyTOv Y36g== X-Gm-Message-State: AOJu0YzaWsT1L9C8IzWfI62Uptmbyh7JfUHNejW8VRJTlgUN5nYxv7U8 EkKycHFlABtXEjs03y8Ffp/fliQmDUth+yaVvy5FoCAOkHRW17pcg+xXD7vdgNPyofK5i/vYT3o rNwiAR6U= X-Gm-Gg: ASbGncu15GJ5UOLElkMPFsffOqS57aE8M6FYea0ar6CCW52pEAeaTGkC52nTeSQGtmc e01r6PqajRxJAgSXGUzWhKRb9cDbNfEiQytpr91LXO4EOAQC9lLbyW9MPc/ayB0BcUsqqilXcFs cOzcJO6wN3lgm/c18ESOixdRyxIJL0vQkQCIKf0u3YBKX52R7Y8MCtghMCsgLDPJrB2/uvAgABj TLJbMqrwrUDrIK3I3zj221MOFA8PYhxhmvBergqiQGZhJa3dhBtKifzpNTN2XMv/W6we780ZT/K tRr2DEimRIpn/LnQx6Ynk2GrIaL097GK/TaavwzB/6UnArJ0xF55NA7HoHdlyCFMA2hRIPKWVx9 VTKPCwZfrjrR0seGX9rqG99ZIaR3bY2sXbb4mQbHpxEky4uCpB8q420vXYnUylk0l8LysCusrpq A4n4HvU30tiyioKKCRq2NNiIzK1SBrc+eUM0b0BYm9cmSo+UvzYuEjD1sNws0s X-Google-Smtp-Source: AGHT+IEYWu3ktheA4cIGy96ZsX6mSY8SBAFdwT+rcFRy9VhyaEO+tg//KaVCEuz9TMq0nkcaAXf7Hg== X-Received: by 2002:a05:600c:4507:b0:46f:c55a:5a8d with SMTP id 5b1f17b1804b1-4711787276dmr138730615e9.4.1761079775911; Tue, 21 Oct 2025 13:49:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/45] tests/qtest/ds1338-test: Reuse from_bcd() Date: Tue, 21 Oct 2025 22:46:47 +0200 Message-ID: <20251021204700.56072-34-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1761079868412158500 From: Bernhard Beschow from_bcd() is a public API function which can be unit-tested. Reuse it to a= void code duplication. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251019210303.104718-11-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/ds1338-test.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/qtest/ds1338-test.c b/tests/qtest/ds1338-test.c index d12424d27f6..b8d0e65ec44 100644 --- a/tests/qtest/ds1338-test.c +++ b/tests/qtest/ds1338-test.c @@ -18,16 +18,12 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/bcd.h" #include "libqtest.h" #include "libqos/i2c.h" =20 #define DS1338_ADDR 0x68 =20 -static inline uint8_t bcd2bin(uint8_t x) -{ - return ((x) & 0x0f) + ((x) >> 4) * 10; -} - static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc) { QI2CDevice *i2cdev =3D (QI2CDevice *)obj; @@ -39,9 +35,9 @@ static void send_and_receive(void *obj, void *data, QGues= tAllocator *alloc) i2c_read_block(i2cdev, 0, resp, sizeof(resp)); =20 /* check retrieved time against local time */ - g_assert_cmpuint(bcd2bin(resp[4]), =3D=3D , tm_ptr->tm_mday); - g_assert_cmpuint(bcd2bin(resp[5]), =3D=3D , 1 + tm_ptr->tm_mon); - g_assert_cmpuint(2000 + bcd2bin(resp[6]), =3D=3D , 1900 + tm_ptr->tm_y= ear); + g_assert_cmpuint(from_bcd(resp[4]), =3D=3D , tm_ptr->tm_mday); + g_assert_cmpuint(from_bcd(resp[5]), =3D=3D , 1 + tm_ptr->tm_mon); + g_assert_cmpuint(2000 + from_bcd(resp[6]), =3D=3D , 1900 + tm_ptr->tm_= year); } =20 static void ds1338_register_nodes(void) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079997; cv=none; d=zohomail.com; s=zohoarc; b=b0KHrJaz8pXjhkB78qnV5tYTF1Zp83wujS4gI+2/0cHZEN1HzHJOVy/zF919Ki+2tSLm7b4XFVb1fJVlgOXmXtcN02VoPQ0pK9BRAB+hG7d8pDBYijzCEwWCpJ4MJQILmXu6+hLQtAKt9d3fvZNuejHN0lxLgvfQPJYru9GfgLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079997; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=awGc4SjfjjundyymO8QAn2CEIgpzduKbpzVRnBT5Jpc=; b=Y/IrRdIfAg1BHmUxEQ8NfJOqywElHnt1HqOR95a+XdTkCD6FxDYZKgLA68/xnVpwZPcrULa4Ue3/qXkUe7A7hlg8i4IzQGKfLqWXNd10NzrddKSeFl5Je018C59g9+fQFyt5dJvaZnL/IiaVk0Uos1aEJleK6+e+ixhyeBAdIRE= 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 1761079997726951.621204957996; Tue, 21 Oct 2025 13:53:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ3-0003bW-Cs; Tue, 21 Oct 2025 16:50:09 -0400 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 1vBJIk-0002nR-9s for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:54 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJId-0001H4-2o for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:48 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-471075c0a18so63496555e9.1 for ; Tue, 21 Oct 2025 13:49:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4342373sm11132305e9.12.2025.10.21.13.49.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079780; x=1761684580; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=awGc4SjfjjundyymO8QAn2CEIgpzduKbpzVRnBT5Jpc=; b=BK1Ieh48C/8lZzKB70IxL45gOQ1sJJ7noGdz+L7JDCv9MYCDzPH9Ifkyo07cmQPCq1 mmFS379JVO040ZmIQApp4d98AatyFIPV0ii5izjiOYpP8LOHrDrWkIPgFK3SqMQR4ZeF woIwA3TiF4b5CY24dOF1U4cH3IAQv1VqcQiF10Q5+7vs7GZzp43eb9ZKrb1UyM+o6aUv mBOw8k78IZZ8eElgqCa76BRvqQ75+3o7RjR/WsXJ1ZzhuH4uckkdOIMYrtOHZMQOHBfZ 13pdJSpbZ0klx4+ozaCjlSbp7oWB8pG2mlDp5OoO2peudNHxHaIeV2RjPeTHVaBrjwoD a3EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079780; x=1761684580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=awGc4SjfjjundyymO8QAn2CEIgpzduKbpzVRnBT5Jpc=; b=ZdxaTRI+8q2bu1s6na3gBOIewo102KhzKa6TAFBKsDM2jWdm7lG37hW5hSpg73wqfd cxfi526fXa/BkFf9+pNoX4YbQAnqZjBCI//QzRoA5DkecmXlwcnVSyeiwGK02BBPOO+m Hv8+Gr0du1jQCYRpb3UHItL9DKKqNZA8jEMdptkhLGpTQnLVC3Va+XmVzhyJQ9nTS98x 7697Buw77OiamJZfJ+KS/iTzYdHm1bhSMQYPFzvFx8HFt1xxU1upbHYrCVvOCrkdYibQ YlQQqz1wQucaXU07AD14QCylxSE8MYmeo8xJMaZ24FGSJlUiJ4IKjhvYbSkcAHIKLzVq MlDQ== X-Gm-Message-State: AOJu0YzE2q6P9vqZsPr9ybT+UjkaCR9BK3NBeKIvfYiCAqkUc+h6p5qm 5aPlnkZKtHg/vep9W9i1tiT8ykwiCdxzDiI2T8kVQuJmHDuo6INUfwXAnn+JlH4tIzr23KWUUoF WyDHuxB4= X-Gm-Gg: ASbGncuOmhqkx20np5wGASWHmih5XS7Jm8dwONUHsX7BF4LtHspjDmA0CgLwmaZ1OU7 bKicKvgWLv5Nrm/1n87iJmuBZ1LBMOAVoqPJ0j0IiXot0YX4UmQDg/NFHUcu9bcZZMaTDXsk75K QPUEWzKrAXe0ndWkkJR5M/rPlAeCMHPXdqA5iYbjRYBodZdeHOurgdjgdkifg1iKSBJRwvl61IB Z6bA9zaGLbr/oo3N17J2qM78xOjcKfuAsZWdoCH869S54Sn4VqIf1J1OJil5pumfVTw+5snl97D 0q0hhR5N9MJ+y6qHOMum7mksnPUdIMTZnyVVA+TYekWI6PeFxWLcAOW1P4ir0VsQTK3GeQp5oSf haIwtnOjKjh9x7cQVlXPq488ek3Gwc//Gw5NkHD8GkfYoRpo/fIuN8g+4W5eYgSzvd9Pld7CkDc PngwL7fom88/m5r+FstkMkGx6bD8I1JJFlfy8jG3TSITLcF8IImvARfwPNkSJz X-Google-Smtp-Source: AGHT+IEqDr8xACZIzSnF8FRqHqSbklKv46b+byrnXwYGgnqFOvf+Irk/7q9D26wFVVhEf+9DBQ9iMg== X-Received: by 2002:a05:600c:8519:b0:46e:42aa:75b5 with SMTP id 5b1f17b1804b1-471178706a7mr129171065e9.4.1761079780262; Tue, 21 Oct 2025 13:49:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 34/45] hw/audio: improve error reports Date: Tue, 21 Oct 2025 22:46:48 +0200 Message-ID: <20251021204700.56072-35-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1761080004096158501 From: Marc-Andr=C3=A9 Lureau The -audiodev argument is 'model=3D..', use same terminology. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-2-marcandre.lureau@redhat.com> [PMD: Fixed checkpatch.pl issues] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/soundhw.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c index d18fd9fa051..2a41e108c02 100644 --- a/hw/audio/soundhw.c +++ b/hw/audio/soundhw.c @@ -70,13 +70,13 @@ void show_valid_soundhw(void) struct soundhw *c; =20 if (soundhw_count) { - printf("Valid sound card names (comma separated):\n"); - for (c =3D soundhw; c->name; ++c) { - printf ("%-11s %s\n", c->name, c->descr); - } + printf("Valid audio device model names:\n"); + for (c =3D soundhw; c->name; ++c) { + printf("%-11s %s\n", c->name, c->descr); + } } else { - printf("Machine has no user-selectable audio hardware " - "(it may or may not have always-present audio hardware).\n= "); + printf("Machine has no user-selectable audio hardware " + "(it may or may not have always-present audio hardware).\n"= ); } } =20 @@ -88,7 +88,7 @@ void select_soundhw(const char *name, const char *audiode= v) struct soundhw *c; =20 if (selected) { - error_report("only one -soundhw option is allowed"); + error_report("only one -audio option is allowed"); exit(1); } =20 @@ -101,7 +101,7 @@ void select_soundhw(const char *name, const char *audio= dev) } =20 if (!c->name) { - error_report("Unknown sound card name `%s'", name); + error_report("Unknown audio device model `%s'", name); show_valid_soundhw(); exit(1); } @@ -140,4 +140,3 @@ void soundhw_init(void) c->init_pci(pci_bus, audiodev_id); } } - --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079853; cv=none; d=zohomail.com; s=zohoarc; b=Hf0nujsvJZhEi0wYlYZZQs7Fgl2xrkjqZyl20AzcpdlujcJCXGrVz4K7n40qmdX8s7DAP58kNc2MXImLE5ggiJU4+S6hhvG5qJLVz9+fR4Tk5QMsmlrP7rpQVUXSm6HJzgTxPHVKWgimPckzPB7Cit8kG0TznswWcu5g/RY1TfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079853; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=SGb2WMzFlaoi+Qsg+v6ETrYRqrYtH+YhqLXII+0hvwc=; b=fAFfWYohPPAFlBrAATnFsMtl970stiddoIByqMJ2tqVNOL96jucgoTb8euDsFTy9WczVgwcknDSW6e4eNUuzBKWITs3bKCKwcyUs+stHM7526TPvyBrRpSySKtoW23d9mdSB2NdrFHFw4TZP+mKKVB2qZWG8/aj2ZzYhPN0BR20= 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 1761079853765159.4993509286503; Tue, 21 Oct 2025 13:50:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ1-0003IR-3E; Tue, 21 Oct 2025 16:50:07 -0400 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 1vBJIn-0002np-HD for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:54 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIi-0001HO-Rx for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:51 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-471191ac79dso51285695e9.3 for ; Tue, 21 Oct 2025 13:49:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f009a7dasm24086374f8f.25.2025.10.21.13.49.44 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079786; x=1761684586; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SGb2WMzFlaoi+Qsg+v6ETrYRqrYtH+YhqLXII+0hvwc=; b=ZdSE45V1V9TXKHh2s9L4+QKbZDHv60KyNhDS3o/S+LO9NAN8DcbqvswsXyDxLN2q+v ZYJDDRhI7cPeVZMGQi5427dg9KDgtp5ja0OKD0rFXsdRhRlzS/tHNiVGCgwdunye86is XyJAiFnJKVoEhIQW95VQ8L6jyj6kAL+2dr/avgbWIh3Nq+M9IC/BO1YlHtaezjgFBr2X UaSzm8nAQARJdi3+jjmJXsTxXuxQk/wgl9Og409zlommt2Ps/B0B00Y94D9njvygwS6r AYJMZMKPOm6ACMXA7Qe/JvPLiJujsJk12SD2T02PyGE6gYAJT/RiWJ3uVB02AsTC4Vyz h6xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079786; x=1761684586; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SGb2WMzFlaoi+Qsg+v6ETrYRqrYtH+YhqLXII+0hvwc=; b=KO8uiKt+qFk5YNhlHd2+V7tIVPbA445vEggMNqjTdrnYZPYrsBFObrImG3+kDCfvha t57shHrSa1fa8WTSazTbuMAIYDTAb85+9lJlJbf6QQ/lGTWVpfW5k4HWxwqcOpxDMAtI Y5TwvSaH2z9ymENnCFCO3L59UjC1jg7esVmuXRcP9TPJfIZihC5WTwzpGe42zSm8s8hA QoQ+a02rfBWORBGMln94dH0IPzQ03n7ysAqleDGPi+XsvUg03X5vkmHuchupWnslruSN 3AhtTW0qY2tmHSR8Pc8XZfTL7C72AMuOsZdolJWBknXeWk1rO+4A3RR79mCysENfQ8UI GEOg== X-Gm-Message-State: AOJu0YyUSdR7KLw1vz19K+hSLJyIKfPZwF64/ogpEp75ajxYDNuh0QfI KaaEhtTIK6ilbah8zJDP8fB39SeoR9BPvYvDuiWW1SjyNMH4PI2PJ3r+JkjZQ/xehPN3khWH9LJ F61neX+0= X-Gm-Gg: ASbGncsYZko5HbXwMjgilihzTFgG6FPeyUKMNyI1tRJxT0Puiu7KmMcL/CSum0RSLl3 lT0TsADe0zfLilSjg5ZiNS6hM5gqB4+bnwIiyzoV5vJyQsyhb/YyM0jP7OObGcTC5bPxduOB2np iXXKo33uNomZfwFDdY4pxf56DkpMCZ2h0GyVr54iLw0ZBkCNR/ywSquqOcUHmbn4J922KBWgKP4 1S66gtdMwGmzZWg1OGjBz7wRmUBWbupqnt5Rqo9K9hOYZEybMDsntuBM5i4uOSyJD1UlNDz0dcT PeVKyH5s1K2yXdQpF8cUROt90rEhHTLSF4pUNWlgreBVtEmjZ9XhNgdVjTAHNvIXFm9nGPo3XoF 3C6L0J9emOYt7xwS5YITFLwczq931a1LZSTxNPGjVYF9kvkIji/MG4k25jWxwOmY0kt9L5Oz6gu +zSpkqwvLxdpZgnHV62Yguaaww4DcUGweBKaVNVwu2a3hk1skjPQ== X-Google-Smtp-Source: AGHT+IHsISY9p51tLZ+PTeuI5niayxGN8SqmaE7zu1nSveKa5TWQakyv+jCstTY6RvQ258oGBntRWQ== X-Received: by 2002:a05:600c:548d:b0:45f:27fb:8016 with SMTP id 5b1f17b1804b1-471178726a9mr118864715e9.1.1761079786265; Tue, 21 Oct 2025 13:49:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 35/45] hw/audio: rename model list function Date: Tue, 21 Oct 2025 22:46:49 +0200 Message-ID: <20251021204700.56072-36-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1761079856135154100 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-3-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/audio/soundhw.h | 2 +- hw/audio/soundhw.c | 4 ++-- system/vl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/audio/soundhw.h b/include/hw/audio/soundhw.h index 474c5ff94e5..83b30110834 100644 --- a/include/hw/audio/soundhw.h +++ b/include/hw/audio/soundhw.h @@ -7,7 +7,7 @@ void deprecated_register_soundhw(const char *name, const ch= ar *descr, int isa, const char *typename); =20 void soundhw_init(void); -void show_valid_soundhw(void); +void audio_print_available_models(void); void select_soundhw(const char *name, const char *audiodev); =20 #endif diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c index 2a41e108c02..63a68556352 100644 --- a/hw/audio/soundhw.c +++ b/hw/audio/soundhw.c @@ -65,7 +65,7 @@ void deprecated_register_soundhw(const char *name, const = char *descr, soundhw_count++; } =20 -void show_valid_soundhw(void) +void audio_print_available_models(void) { struct soundhw *c; =20 @@ -102,7 +102,7 @@ void select_soundhw(const char *name, const char *audio= dev) =20 if (!c->name) { error_report("Unknown audio device model `%s'", name); - show_valid_soundhw(); + audio_print_available_models(); exit(1); } } diff --git a/system/vl.c b/system/vl.c index fd98ea52d9c..17bbc092c87 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3078,7 +3078,7 @@ void qemu_init(int argc, char **argv) model =3D g_strdup(qdict_get_str(dict, "model")); qdict_del(dict, "model"); if (is_help_option(model)) { - show_valid_soundhw(); + audio_print_available_models(); exit(0); } } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080012; cv=none; d=zohomail.com; s=zohoarc; b=Fqk9RzlW9QtU/BlYrdiIlc6VChfkj32Z07KLWqMSd/d5wDqzFoYjvIHTT3bpA2CdoSARPsXPtmPoZMBAlJpENoudhCFwfjzJAPg722zbgbut/jQobJY6vtH6JO7K1wuksduyW1X1t6Gwb/83XaY7iLWrl/c5/HeqUzSBcxN2wXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080012; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pKK8jXEIKyswNJmUlNwj/PbQlBslE24jFLxpid4Aerk=; b=EHePQfQ9L7a2p7K+/vbA8jtATzAQ47Gu42HJRP2y/mHp3x4KNlpDbxUrEJxg1SkUdQii5JzDxmnbi+7SMkj6kHrT3aYU8cCZhYAt7O8olibrukwqHubfXtmH1g+EIBHJ2PUxvxQrUPSbDVYCs/VsaV59fKV+d1VeR3rQ54BNZ/k= 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 1761080012100376.86271468756377; Tue, 21 Oct 2025 13:53:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ2-0003Yf-Qx; Tue, 21 Oct 2025 16:50:08 -0400 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 1vBJIt-0002w0-J1 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:59 -0400 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 1vBJIo-0001Hm-BZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:49:57 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so1605375e9.1 for ; Tue, 21 Oct 2025 13:49:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9fa8sm22368755f8f.38.2025.10.21.13.49.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079791; x=1761684591; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pKK8jXEIKyswNJmUlNwj/PbQlBslE24jFLxpid4Aerk=; b=wmleXjYjNUH230Bpj6Bw0qlqho8M0nDn4s/4PbPS00R9RVUkmkPsiQCbnDGWHCtjy0 qDk41JFOuUmNZsxf7aBPD1eWvagmRUHgWCeFmnI6Pn5B3LI01KCmy3VtLGKt3wNvEi1t 8U2fYiNI6nvo1HoK8Fgfe8cyPNbVs5xfCx15K00hs4gw0eCoYmIO5a1Y1EwZxLXHIwXX ekyzHxRepCu8DKoFFhsFEpmbixiDJEaASwqSD45m9d9mpdKqvqVXyru8sgh2ugCYB/Ry lqwfgtM6ajsz/k/esIPK0DlUIIQhhtssk1WNhYE0y47wbIoO24ThXMhlY5fOBbXqeeQo vfvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079791; x=1761684591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pKK8jXEIKyswNJmUlNwj/PbQlBslE24jFLxpid4Aerk=; b=FvKIFjqw82ytxEXcu2404lmrzJNDCQ7NOCXTZefa99UMV8O3WoCADO7qxWuIgeBnnB 4cbzZ1sjP5d3K7In/FuVEXN7DQOM8Xw/7/VjjmkNAExn1iq5fhZ3pwyf7B4YKuA4BYBI GR9TjX8H5RGpxQYuugU4jwXdfpX01x4Gsg/zLmoYqAchD26HrG7xah+t5U4PLh/TYh5j 1SWGi30FpOccMBchF+RAgliXc+xtrzbgmqvs1DwZquoyGpuA09Delsh1NKs6UdyFkl9B aKM3Tdad46t4J319NPwILUDdKWQIeioomqFMK0W2WzKaKBa2yusetFDdPj8lgwxxvkyg 80JQ== X-Gm-Message-State: AOJu0Yy/X76jIVOGCBOypnN3d2meeXoqxJ1OBSypNCO2e+jfJ4vqRP9B YClPfg/gF/89yFOWi3wX9Rp84S4kv7Yh6gXp1YlzCBsgeS/f2j3EqMoAFkOj6II+MV+LIjs0Yg0 3c/wgbxQ= X-Gm-Gg: ASbGncu3EyITtzd/BAco8uA/I75wHFNXPlZ8DJ4XuXsOaHZ13A9aj03X3DiQC4DM3Dh 9QKrOj/ljRjVCwlEwei2uRk/zhZWziT7AeVtE/neiK0+IZ+gWf87kzsHWOWQgUAyaP83yGpyAFR zXZDZtK/EBV4I+veA7ndhiSJDDRagMiRgklplCdVinA5vbbx0dd8H165QdO69QUlROuFTiuMgE8 z8z80R7pXcTB0e+4qyitNgrAIy4B6zykmG0d7RS5u69I+wU8sCnGXTtg1ukAC2oGSWjql6sDHKG MCMz+ADgrqTrBbwZhn3oHOEr6+tw8adwbTDg4/2Q3K7CVzWEU4sVk/fxp2FU1B+rNrRpfk7tAZm yo0saXw/Ap+8IObpoW7F9V0mD6H9jdOC4zMYRSvqQUBhF9kgQx8et8+8PYKoSXRb71kNtC8b1Ku 443cZohwWzw2CDq+2CPYYa87h2i3z0w5Tdv3KtiS5pIRluvT5V19pHkd8jw4/x X-Google-Smtp-Source: AGHT+IGwDqW5rHtJuXG1+gIz3Zn2UNyqI9CKQC6yXGdOmT8XslhPz0lz9vmV0WalSqCHlZGmHczsxw== X-Received: by 2002:a05:600c:6992:b0:471:5c0:94fc with SMTP id 5b1f17b1804b1-475c3fa355cmr6999585e9.6.1761079791185; Tue, 21 Oct 2025 13:49:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 36/45] hw/audio: remove global pcspk Date: Tue, 21 Oct 2025 22:46:50 +0200 Message-ID: <20251021204700.56072-37-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::333; envelope-from=philmd@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 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: 1761080014062154100 From: Marc-Andr=C3=A9 Lureau It is no longer used since commit 6033b9ecd4 ("pc: remove -soundhw pcspk") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-4-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/pcspk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index f8020593b0b..610a5b21626 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -61,7 +61,6 @@ struct PCSpkState { }; =20 static const char *s_spk =3D "pcspk"; -static PCSpkState *pcspk_state; =20 static inline void generate_samples(PCSpkState *s) { @@ -200,8 +199,6 @@ static void pcspk_realizefn(DeviceState *dev, Error **e= rrp) if (s->card.state && AUD_register_card(s_spk, &s->card, errp)) { pcspk_audio_init(s); } - - pcspk_state =3D s; } =20 static bool migrate_needed(void *opaque) @@ -237,7 +234,6 @@ static void pcspk_class_initfn(ObjectClass *klass, cons= t void *data) set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->vmsd =3D &vmstate_spk; device_class_set_props(dc, pcspk_properties); - /* Reason: realize sets global pcspk_state */ /* Reason: pit object link */ dc->user_creatable =3D false; } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080053; cv=none; d=zohomail.com; s=zohoarc; b=H6aH9Qqtkze4b/vcNk7eZU5XjWpHrrog7P8IyYw964CDcXOkPP3ngVE6Jy+xee6vH4XFpr8MhpuUS4Lf/j7ryGTyCSWrO7jv3Mhf85y7QuN22FFOo362jARAm/uu4ZOXv/l1jdguC2JZ0hs8Mue/gocE5tlmOJe1/dj2i8EMKpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080053; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=E3RZP+uPdi/u4o2bwW6kEbE3vICc4qLss0EKsxFjnU8=; b=PSf8CCmlO70Ktq0owp+uxrQRuE+CYMu6azxvv+MmWaFIX3Tcm8doY6Ru6EV7/S4cYH1YESbFLqD3S159m7Yf5LJ629iIp1IOxYHK8F8mPAhNl/41rj5Tgks/h1T/wnrpvpJju6cwomVkDlLYisiwNF+LJB5X8WJw+ZIQ9XEJuMw= 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 1761080053048301.5979281876504; Tue, 21 Oct 2025 13:54:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ4-0003oN-UV; Tue, 21 Oct 2025 16:50:11 -0400 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 1vBJIx-00033U-AE for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:03 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIt-0001IQ-CB for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:01 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4710665e7deso23270075e9.1 for ; Tue, 21 Oct 2025 13:49:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce678sm22286950f8f.51.2025.10.21.13.49.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079796; x=1761684596; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E3RZP+uPdi/u4o2bwW6kEbE3vICc4qLss0EKsxFjnU8=; b=SL9lA8/cDXs5s6IaEQxVdz0qIIn0EE+NcgJLRGWMnKTNvPDCCVQBKhTz03Gt4t4lZu omPncDw0ypdwtTi9sYt5smrs+ZY9vFw1YEitOuGRPAtVzumrtgkaW91p1EEODLZ1accj Nnga3Uiosu2zXJ9ol55yL5hNOQYWyB1PDslYznQQvFlr+F7+rpRT6PkzUAuFQGWEdu61 cOKgVE2ztNwcQA9Dn0qbHgJW2WcHt9R7udd/gKJhEMXbJGNm3b0OjhNkirIthYOU+VWq aHe71U2X/5dkZX9xNrBoQJbgK64HhzbgAfmmwEamAI3mBqIj6pvELYzljoBWT8TMdunw Kuug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079796; x=1761684596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E3RZP+uPdi/u4o2bwW6kEbE3vICc4qLss0EKsxFjnU8=; b=hHmNq3pjXTCl9mtSJ2mE3bNUcL3MSHIys02dy3TAvYzzoUHz7Ku4xYH7SX4DHyL7bm jgVpvgS8eM/zULRhhFfx5mKsOshihUo5drfPrpeTw/Tz9eRjJ3Nl5e6D3P1KbwOsRukC sd+3mAXl9grAlJOncvqvbzqZiLABHBdaW5iH/l+siv97SO24KyRdzos8jfoHTro2oc6m BecwZkAzDbCJDcAIw7QZ55f1GTPWnVwSOGMSIBwdOuzGw0MOkgEFxzBGwqdiweM4Wjcn aKydHLmDf6i87p087TGjueJCh0M3NiIl1qoEzxz77YTjB1aTfBRd3mkHwkX7MGXblHpo 5d3w== X-Gm-Message-State: AOJu0YzTdsClPQWHJzVd54brDP4O4JCSfJoFHddr8K40TWcXe+x5UqYN /c+TSrVAuNXFJZgR/QG9Bfj+gxWDBblm1Emq1DT4Pg0NUPkPy4ORPMiJlUCQwRrqvo7UjfKBHVR dLnH0nxY= X-Gm-Gg: ASbGncvFUIGt2AjR3/GQfnFWQ+AGnQZ3loF/Mqeui6sKLMlFS2eoQ4QarAVUqMl2o98 WdeYTbw9SrmoP9ftL4ms+6nDJ5qlM54dkO6lj5AdF2xW3wLgrDtAuIaLonNWEaahXup945pHJYb fkxR2hpaHsZI0Xb0V/Tpl7fl9cqbgLDtC5BhITDXhXigcl1/Loux/ORB3oLQFoot4a6511Z0ZG/ cKs9Tk7s/6eaDEvWf4CuCwKstpPnTFFuXGBTDntD7rFfX2S9Ypc2f4Cx+Laj1yKLP5HRW4IQLr7 RGbeP8VlTXuAqxL9DstiGwiS+81MR59Z7XKl6YSDsY/X2yiw0A4+sUd+4jKC40ZawnzE1vSaIoT UGW+JIMRZFqJs6Cy6qK2wnUmps53gwwUrQlmhPIr9Qdsd02SXfO3wDx/QNB67I5ltGDNZPPCpeF 4L/BYkjJQ77uJVXawc7J2c7BEdFvCKxR/4PROEwCBHQm5+9ZcSPkJ1Sa+/i6xe X-Google-Smtp-Source: AGHT+IHs/8+blCKIUcT171bl2SUi0LuixDfcpAzy8HZtzRCdAy0bihBr8Np6wBz+OV/4DPY5L2Vy8g== X-Received: by 2002:a05:600c:8b0d:b0:46e:39e1:fc27 with SMTP id 5b1f17b1804b1-4711787442amr136670605e9.5.1761079796447; Tue, 21 Oct 2025 13:49:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 37/45] hw/pcspk: use explicitly the required PIT types Date: Tue, 21 Oct 2025 22:46:51 +0200 Message-ID: <20251021204700.56072-38-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1761080054460154100 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-5-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/timer/i8254.h | 4 ++-- hw/audio/pcspk.c | 2 +- hw/timer/i8254_common.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 8402caad307..f7148d92865 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -75,7 +75,7 @@ static inline ISADevice *kvm_pit_init(ISABus *bus, int ba= se) return d; } =20 -void pit_set_gate(ISADevice *dev, int channel, int val); -void pit_get_channel_info(ISADevice *dev, int channel, PITChannelInfo *inf= o); +void pit_set_gate(PITCommonState *pit, int channel, int val); +void pit_get_channel_info(PITCommonState *pit, int channel, PITChannelInfo= *info); =20 #endif /* HW_I8254_H */ diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 610a5b21626..9cf78ff55fa 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -51,7 +51,7 @@ struct PCSpkState { uint8_t sample_buf[PCSPK_BUF_LEN]; QEMUSoundCard card; SWVoiceOut *voice; - void *pit; + PITCommonState *pit; unsigned int pit_count; unsigned int samples; unsigned int play_pos; diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index ad091594cde..419d4cd6e57 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -32,9 +32,8 @@ #include "migration/vmstate.h" =20 /* val must be 0 or 1 */ -void pit_set_gate(ISADevice *dev, int channel, int val) +void pit_set_gate(PITCommonState *pit, int channel, int val) { - PITCommonState *pit =3D PIT_COMMON(dev); PITChannelState *s =3D &pit->channels[channel]; PITCommonClass *c =3D PIT_COMMON_GET_CLASS(pit); =20 @@ -139,9 +138,8 @@ void pit_get_channel_info_common(PITCommonState *s, PIT= ChannelState *sc, info->out =3D pit_get_out(sc, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); } =20 -void pit_get_channel_info(ISADevice *dev, int channel, PITChannelInfo *inf= o) +void pit_get_channel_info(PITCommonState *pit, int channel, PITChannelInfo= *info) { - PITCommonState *pit =3D PIT_COMMON(dev); PITChannelState *s =3D &pit->channels[channel]; PITCommonClass *c =3D PIT_COMMON_GET_CLASS(pit); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080012; cv=none; d=zohomail.com; s=zohoarc; b=n/DxD2uOKK+z63L/tmeysSQIdP4NOBTnGYY33EeD6df2wv0BltHL0hqTqQVRcSYkRharNGP3x3+PZrV6Y3xp9gLPEHija4/9rtjdwmqO0v1mHZUCwXygmI5HxdJceNnnnWvuBjpv36lKbNu0UXj4ngTMU3wqlTQleO2vaa44lNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080012; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=tXHQlfeNsbjB93VOH3deA9mNCchfVoce66tmua/L+g4=; b=HUe1yTiJLQ3DlHs9NkdM3tDyu28YlJ8sA+X5OjJuJLycZUjdY8vPISZHxCcbNlbbE/9Q7FACZpgigTC9p16I5mtGHQ6AZlNrAbfYDttDzYfXsSqSM3UvXZe8KIx81iXWUHZwNY9r2K6/JJHw6SOqArU1tYjCHsndx7z/wsz0ewM= 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 1761080012481187.02122237385424; Tue, 21 Oct 2025 13:53:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJ7-0003qf-3e; Tue, 21 Oct 2025 16:50:13 -0400 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 1vBJJ3-0003fw-E6 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:09 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJIy-0001JA-AN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:09 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4710683a644so2574025e9.0 for ; Tue, 21 Oct 2025 13:50:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b988dsm22360567f8f.35.2025.10.21.13.50.00 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079801; x=1761684601; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tXHQlfeNsbjB93VOH3deA9mNCchfVoce66tmua/L+g4=; b=MZ7afG97XYObp1YySiPtAQvY+1BweNKOJ9wUDt8TqpoOFtxibZbJhXupHS095gLdTN 7Qnm0jIstzUzyd4xB4W6XyT2IEyl2Lvh8H0jvevgOkPCz8OzSzfb+3iDlErpq2ZeFgQn Yw9yUV+mtjltLbwQPRJA+rX6CMNEJFIlGJ0FDDhZ1Vnx51YR6zGBz3jcZ3boLNjmts0U ocNoZXbyiPH0Cvk0iAjBkWx2p6C7vlRF/G6qlHVZwyZhneP+pr478PqKTCilct/Sjs2e BcGOClOCeYwk2Pc7RSMFrx4ROgy5pVXhMvMfPyeRQtHG3soIlKz3y+qdMX9rhGyt1Uef bw7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079801; x=1761684601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tXHQlfeNsbjB93VOH3deA9mNCchfVoce66tmua/L+g4=; b=hADJtA76gSs9tmKGfio7rNzKHZncWnAwbwtIuPL0pe0nBRbCUPbtTHvFm9aIHVAbqy YuJHHAb0IQnzut2PPdmQ1PjxSk4KZ1KVnvVpyD8hNOugjn5Xc+pUESh0W1Fhw5HAI9i4 /RkNyynsLNEbrLhi4sW6I4imnJdQ3+kROTnTzzDceZXFq6k3BqoBC+pnc1K3AP2W7VP/ XdTYoMSBsn2VUdlZkn/37YhzAPrwPEqZZ08nezeo6ir7KJ770fbHL+CBNjb8+HAKvHls U9IYWBHg68B0if4LcBRhgQIKlckDzoHQvCkTSSfpgyDsEqb4ywfloQ/DpJXyOJABldrL 5n2w== X-Gm-Message-State: AOJu0YzCe4IyL+oXPhKslloRmaIhtEHg1DFVDV/Vt3SHq8Y8K2vX/jKl wc41ZxGTZHZL7exURedVAclvtxEGUKF/GkggFgHfOgIgyzlcUILvLvBqBCSAzYqVtp6SebELrUj TSYTdjfo= X-Gm-Gg: ASbGncvHizy1obCWd9H64n/vlCeF5RnChGreQ1+OfY32z1GWOqnEOghF/ed8eulAJMW VpbmAIyxRbg8Lf12p/pk3shcU6PvaS9RUF1+DksAfFfMdgAdJGByvM2+u0e0uY9DI5ASt9fXM+B S3pcgQXnD0dQKtgXu+PABE+r9TC3FZ13HVSoPSXf/ns095FrYuomD0tI3lfqBpQQlwlXn5w9cXK xPZDqZl4n2hGdpzltcO2nZ9I+e8NNojJS3zzTkYYlpaqj74bko/C7JENBX823d+lV2XIF1ZXlsl qjwlGUHN4GuwPaQ912q9IYDJQmnMBjTd0FizvJsUggOWpMBjkWLUVbF2b8RqPzQ884n0TQ42Pat 4qZk80IvFMCAfAIxCTNes0261wH14xbhCwppuPfWe9TDOgOmCEpZwFXB7WPKEFHu1ynmhGOmJG+ 5+1GpXBlwqdPVDjsffB1IMQAhPwWIXa/sb7iULq2LdGyreCZMeUQ== X-Google-Smtp-Source: AGHT+IE0Bho83YAOQgXJp6K824Z6Y59VJ/SsssyB8mbKl813qwDVEGZH1Xjg8zF9m0Q4kOM3LDWeTA== X-Received: by 2002:a05:600c:3e8c:b0:46f:a8fd:c0dc with SMTP id 5b1f17b1804b1-475c3f96944mr9837965e9.3.1761079800882; Tue, 21 Oct 2025 13:50:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 38/45] hw/pcspk: make 'pit' a class property Date: Tue, 21 Oct 2025 22:46:52 +0200 Message-ID: <20251021204700.56072-39-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1761080014012154100 From: Marc-Andr=C3=A9 Lureau This should be functionally equivalent. (for some reason, the device property was convert to an object instance property in commit 873b4d3f0571) Signed-off-by: Marc-Andr=C3=A9 Lureau Message-ID: <20251021090317.425409-6-marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/pcspk.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 9cf78ff55fa..7b716c08efc 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -182,11 +182,6 @@ static void pcspk_initfn(Object *obj) PCSpkState *s =3D PC_SPEAKER(obj); =20 memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "pcspk"= , 1); - - object_property_add_link(obj, "pit", TYPE_PIT_COMMON, - (Object **)&s->pit, - qdev_prop_allow_set_link_before_realize, - 0); } =20 static void pcspk_realizefn(DeviceState *dev, Error **errp) @@ -224,6 +219,7 @@ static const Property pcspk_properties[] =3D { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), + DEFINE_PROP_LINK("pit", PCSpkState, pit, TYPE_PIT_COMMON, PITCommonSta= te *), }; =20 static void pcspk_class_initfn(ObjectClass *klass, const void *data) --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079860; cv=none; d=zohomail.com; s=zohoarc; b=d9KpKiIouM+NPhax3/5oNFmPKgjl4rUxPrtjy+/JCwDJSr+nLHBQhIQdVqn+FhHM+LnuaJVKDE6co/b6cbo5aKbbRl3lplYeVL+dZdKyChdszT4bRSAEVR6MEOCYct1jVMhAGxHBxmH7DoeVVK5mlR2MxZbpos4dIEPEMXBvcCU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079860; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=SwD2kmxbJvpINdRgbF4ogIXx69W3XFLK5H26Co5VqzE=; b=hDuTYUvhHGSrJrowfoiiVkU9q0w1vPWhzI2KqeP0XWE7ud2MhaJWfdo/5rGfoAUNDeit6MGCFT3vkhEI2yjipRhPRCk2QtTTtYuW4IVS6yTij0fVH2jpAOKkeML/BbubSctkMIuUImWJ1RJriA3eXqv4WdqUKiml+IVMk3uILzc= 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 1761079855835943.9962178998278; Tue, 21 Oct 2025 13:50:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJG-0004kL-Hh; Tue, 21 Oct 2025 16:50:25 -0400 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 1vBJJ9-0004B1-8u for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:18 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJ1-0001Vg-Li for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:13 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-471193a9d9eso54893295e9.2 for ; Tue, 21 Oct 2025 13:50:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496c2c9dasm23717925e9.4.2025.10.21.13.50.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079805; x=1761684605; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SwD2kmxbJvpINdRgbF4ogIXx69W3XFLK5H26Co5VqzE=; b=vJfs5PjFZ1D9TNBGjrs4f2gd6FUU3kaphod9FhEIKeNcoDtkcl6ohPG142mmkoVDPb J8jKZwgY62FilnleNLDQWZEi+5i3zygB9kElQDY/7MadfnKox6SbAz2YlE0LUFqsQpD8 5SZh5LZOj8HsSnWKbMAofBlOM7OGjgZRIwmOsZGXq4aEtmn7hYDWR6ViW+yZLrei6jZ2 3LrPqd/A0+yeAys7513BNUj9btK/sqg+pOrVbaGpFtAu0WSyNqmBu47Gji0dLkoNDsJj grQNHdqhN++IbOI5uWxFqwkASl4r+uxZcl4FzRfLHAUfr+nx8kH5LedmKQ2FcXy4E4iN 9UNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079805; x=1761684605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SwD2kmxbJvpINdRgbF4ogIXx69W3XFLK5H26Co5VqzE=; b=qYDNyqC38lua4tb3yqdcuxYxmTcI2BoCXhdRGnEqjWwXnPHrJn56oL/AdDzWKV8kp2 zxnyDBarmZptf7jykMnBs6Xo1BcIidqEcrzMOOzX+tWql+R8+Oq7Nwa/7HZeTOH2C+n1 /YCMZiBlxXhtWYwdAhNSUWQRUsCRQTRSdBN3A6vwPNe/+5Q7bqA12WP+bR4QtI7n/9Sg NbU3Ka5CEa15o+saoTdQrj34xqDerYyOxOxNqrVw2Jux6yhuOVHdTdztSj3jIh0ZcLAk +YM05V4VxTRSkUa6pge4kSFXZ9pa9h8+sbZCm23k3Y8AAY3IytNLz+EeB8IEivZ5JzIF f/FA== X-Gm-Message-State: AOJu0YwvH4XqsPcxwJ2do8t0vc1Pj83i7yv9Wh+R6Hl0WRFO2joaOBDd 1MYXZb+Mempn7lMKQDLgi24VIO1/d/f5280/5racIFd2oASueyv7KuWjHcDH2lqpZLmu0xI8dMC N5L46Peo= X-Gm-Gg: ASbGncuxC4JFAs3k43J/T2eq1YsqueiY2sZ0eyIZ5FR8vhV8veXew9l/GA46aWxhF0n MRE7HBfi94EMCUW4+Ckj3zZiTN4E/CBXch590ZNP9OifXN7Bp5KVWpBv0SciqxPgAFpA+lb7VBV p+IZCG76yicPI0HZRFw2BL2MxSkjD3qfxqOHIS0N6j2k7TPjwGJBIeFDSQsOvDlXqpjulhebSXV x0fgt3Djp0iwZBBOmZLL+04RKz8KtfUWfMmaEC+g8AemIKAuyuNc7zmFyzzJSXeycdJd8jD2/az GaS66U2eQOZ61LaIOpH/EokpjVTzE47orVkOvKalhzYnnPOjfDLsz6uGJHAXMnaF2Ga0e4A8LwT sAjzsUp5jaiTX9CvRJiMSvMywaJj8Eh8CB4+KgZC+GalhMUL66cOSA7Bpm3RBqZCShHtXPy/erU aATKzzbx/M5fQskpaTX5v1JkPNgpCNln7C+CI++QttNAkDp3DYr19B7NzpDCHJ X-Google-Smtp-Source: AGHT+IEN8N6cbZTmZ5+K3NeRYQfV2pXjzXbHHh3gQLJlaF4O8z1hqyW1LZccfvS4pLaT4KDYfeurng== X-Received: by 2002:a05:600c:4507:b0:46f:c55a:5a8d with SMTP id 5b1f17b1804b1-4711787276dmr138738415e9.4.1761079805393; Tue, 21 Oct 2025 13:50:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/45] hw/pcspk: check the "pit" is set Date: Tue, 21 Oct 2025 22:46:53 +0200 Message-ID: <20251021204700.56072-40-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1761079861694158500 From: Marc-Andr=C3=A9 Lureau We don't let the user create a "isa-pcspk" via -device yet (in theory, we could, and fallback on a lookup PIT), but we can add some safety checks that the property was correctly set nonetheless. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-7-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/pcspk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 7b716c08efc..54fcf632e6a 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -189,6 +189,11 @@ static void pcspk_realizefn(DeviceState *dev, Error **= errp) ISADevice *isadev =3D ISA_DEVICE(dev); PCSpkState *s =3D PC_SPEAKER(dev); =20 + if (!s->pit) { + error_setg(errp, "pcspk: No \"pit\" set or available"); + return; + } + isa_register_ioport(isadev, &s->ioport, s->iobase); =20 if (s->card.state && AUD_register_card(s_spk, &s->card, errp)) { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079858; cv=none; d=zohomail.com; s=zohoarc; b=HDIOLaEH93JEGtlVXEc+qq55Cxu0heb8rCMr1l+FaDhEKsowY7fCaoylLXAqbpKdpHoCuCjaomAaKAljND6CwO+jI2PtLk619rbk/HI4HlgbABx66p+ETNE4qTg6JL7IjFjRF46ILa2XpGAoB4Jgp01fFUiA+egpjP1/NVIFGB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079858; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=136/EoT/2Q4J5+IoWSj7My2l2dbFFhNYF5UlktJCftU=; b=Lp+mWvzqn528YQxxga+h4ndrsrPbdoPlZeYzymVUhkEuX00T9DtTWFY8zs4+4YAvxQ+tR1D3eXVL+MEl9yminU+gUOrVdWrVek6uOvxGY6IjeGyussyihREYQCAv91Dfw++/JmGNBAvYlo/12e3k1J9ogShYzDkEQ06F8oYpfxY= 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 1761079858556742.0720598471657; Tue, 21 Oct 2025 13:50:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJZ-0005Ye-3U; Tue, 21 Oct 2025 16:50:41 -0400 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 1vBJJO-00050e-DT for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:30 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJC-0001Wg-NS for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:30 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-47106fc51faso71588185e9.0 for ; Tue, 21 Oct 2025 13:50:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4369b33sm9191795e9.14.2025.10.21.13.50.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079810; x=1761684610; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=136/EoT/2Q4J5+IoWSj7My2l2dbFFhNYF5UlktJCftU=; b=k+FJQ/nvfnADpNBBtzC7Y6C65h8HGmhiQYweFliRoyQsr8kY7DeaA1XoitWYzwdin7 7OpmDH1otRt9OyJddnmre/YOGZHMqeSrzxXGh2s9acufqJrB8thQvZD6AZ8B4EdKyyEK e5LGkGruLHYsAU0oRIx69KdoTieRbIsQ8QxZoIe/fb1XnlVAXPtlgz2/g0Sg0utBczO9 KSfikVKkJJbxrj8Umnq9OA9Q1JtXTU6+HdjQG/MV4E4EdG+VY5+ork47bz2f/aGwQPFr aX9PptBJFre7lh3IlCDUe1hRSY4l7yRtFso9eSDG8mkIQHmU+hUKNUlt5ZPixWnmRdbQ YYaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079810; x=1761684610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=136/EoT/2Q4J5+IoWSj7My2l2dbFFhNYF5UlktJCftU=; b=vzEH/Fj1utDTcZywa9gaexxmXdH5Z6R740M1jBAjczqM4djerZWTIYfRU/dwKoaxQf QwVfFC5u0J62stemnHou9q0Z2HOekMZ6MAsg2OikyQ5WAnHbh6z4hd/gDqwaK7264Gfp 6F4zjPa1WrqqTWPsOq2ZEo5BqFO4y336aoUnNQupTxLCUpLBJhkRtkgyu8f9lW5wsWYp oyLGsT//Ei+22jOF682GHY/DDdfNjDP2r0mLMlyY1pnYSm3SW5lphs/OWcKI6bAC8sVH Nnf3bXrMd8Hb43ncHGIdvGUptqnwwrffekdjBkpnwlqc+HAQTsmIgI8fy9G4RIpSj5Hw oAZw== X-Gm-Message-State: AOJu0YyCOL5yDErCtF22tW9MU9RQVtmO3YGM5Rb2OFCYTPDtONvDGeav LPGAHfke8By1WxUOAvCO1so9tPtHsyzQyCPHGpDo1tIncbUgt+yQe73p7y4EIJtIBOFrsWsTANL FBMLMslg= X-Gm-Gg: ASbGncudql9+Z4JR+59ns2HnDv9eFW3LP+h5i+mC8yxJWCDr9m9/vzgA1Do2xouVjkw tkePzjGFCXyd8m0s0WTlh+t/h3vR+A9WLPLQ979imA1J+dyNU/+PQAowujVYRhhlYqaqHPJwVgd XpiUitmN9WnxVvZWXPb86K73kag/j2cQ6bwcrNKEXwNPkhHVdjEAG/NGz4C3l5Ax0ccfZTqJQpw Hf9MzMHsmU4KvBskOZyu0KdGfBW03NiReiX5lqeFUdI3CGQwQeLz4eH1UavSESSlwWRoPL5VLp3 Y8tjHMMmmWCprkw3zAB0qFGxD+9Q6c1EecQoWgnDDazh7dShIEo0EZk4YpHdoW48+Odr5EpwMvJ LMVyndFFj5QpQV4ribAWPw5EKTLg6faiyvGefIzBlk118SVRHtj20+6PoEgPtYJOh2lfX70iAys K8HE+eaPzCQuu9uMKXq26xLI6S/b6ZBI9Q/Ki6GSAWtvrazFrQ8hHelBNVy08N X-Google-Smtp-Source: AGHT+IHqufNHmMTYr8fZlnRndPaTxdlycXCOXzZdR/IC7vo/hiEA0lU+XoUpmFOFxmG1UDz6C3NKAA== X-Received: by 2002:a05:600c:3492:b0:46e:45d3:82fd with SMTP id 5b1f17b1804b1-47117917267mr133455785e9.31.1761079809977; Tue, 21 Oct 2025 13:50:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 40/45] hw/audio: replace AUD_log() usage Date: Tue, 21 Oct 2025 22:46:54 +0200 Message-ID: <20251021204700.56072-41-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1761079860202154100 From: Marc-Andr=C3=A9 Lureau AUD_log() is just printf(stderr, "prefix: "..), we can use error_report() or warn_report() appropriately instead. Ideally it should be converted to traces, but there are many places to convert, this is left for another day. Avoid bit-rot by using conditionals. The patch could be splitted if necessary. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021090317.425409-32-marcandre.lureau@redhat.com> [PMD: Fixed checkpatch.pl issues] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/ac97.c | 124 +++++++++++++++++++++++---------------------- hw/audio/adlib.c | 24 ++++----- hw/audio/cs4231a.c | 44 ++++++++-------- hw/audio/es1370.c | 24 ++++----- hw/audio/gus.c | 25 ++++----- hw/audio/pcspk.c | 2 +- hw/audio/sb16.c | 115 +++++++++++++++++++++-------------------- 7 files changed, 180 insertions(+), 178 deletions(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index eb7a847080d..828333b66af 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "system/dma.h" #include "qom/object.h" +#include "qemu/error-report.h" #include "ac97.h" =20 #define SOFT_VOLUME @@ -141,11 +142,12 @@ enum { BUP_LAST =3D 2 }; =20 -#ifdef DEBUG_AC97 -#define dolog(...) AUD_log("ac97", __VA_ARGS__) -#else -#define dolog(...) -#endif +#define DEBUG_AC97 0 +#define dolog(fmt, ...) do { \ + if (DEBUG_AC97) { \ + error_report("ac97: " fmt, ##__VA_ARGS__); \ + } \ + } while (0) =20 #define MKREGS(prefix, start) \ enum { \ @@ -190,7 +192,7 @@ static void fetch_bd(AC97LinkState *s, AC97BusMasterReg= s *r) r->bd.addr =3D le32_to_cpu(*(uint32_t *) &b[0]) & ~3; r->bd.ctl_len =3D le32_to_cpu(*(uint32_t *) &b[4]); r->picb =3D r->bd.ctl_len & 0xffff; - dolog("bd %2d addr=3D0x%x ctl=3D0x%06x len=3D0x%x(%d bytes)\n", + dolog("bd %2d addr=3D0x%x ctl=3D0x%06x len=3D0x%x(%d bytes)", r->civ, r->bd.addr, r->bd.ctl_len >> 16, r->bd.ctl_len & 0xffff, (r->bd.ctl_len & 0xffff) << 1); } @@ -222,7 +224,7 @@ static void update_sr(AC97LinkState *s, AC97BusMasterRe= gs *r, uint32_t new_sr) =20 r->sr =3D new_sr; =20 - dolog("IOC%d LVB%d sr=3D0x%x event=3D%d level=3D%d\n", + dolog("IOC%d LVB%d sr=3D0x%x event=3D%d level=3D%d", r->sr & SR_BCIS, r->sr & SR_LVBCI, r->sr, event, level); =20 if (!event) { @@ -231,11 +233,11 @@ static void update_sr(AC97LinkState *s, AC97BusMaster= Regs *r, uint32_t new_sr) =20 if (level) { s->glob_sta |=3D masks[r - s->bm_regs]; - dolog("set irq level=3D1\n"); + dolog("set irq level=3D1"); pci_irq_assert(&s->dev); } else { s->glob_sta &=3D ~masks[r - s->bm_regs]; - dolog("set irq level=3D0\n"); + dolog("set irq level=3D0"); pci_irq_deassert(&s->dev); } } @@ -256,14 +258,14 @@ static void voice_set_active(AC97LinkState *s, int bm= _index, int on) break; =20 default: - AUD_log("ac97", "invalid bm_index(%d) in voice_set_active", bm_ind= ex); + error_report("ac97: invalid bm_index(%d) in voice_set_active", bm_= index); break; } } =20 static void reset_bm_regs(AC97LinkState *s, AC97BusMasterRegs *r) { - dolog("reset_bm_regs\n"); + dolog("reset_bm_regs"); r->bdbar =3D 0; r->civ =3D 0; r->lvi =3D 0; @@ -281,7 +283,7 @@ static void reset_bm_regs(AC97LinkState *s, AC97BusMast= erRegs *r) static void mixer_store(AC97LinkState *s, uint32_t i, uint16_t v) { if (i + 2 > sizeof(s->mixer_data)) { - dolog("mixer_store: index %d out of bounds %zd\n", + dolog("mixer_store: index %d out of bounds %zd", i, sizeof(s->mixer_data)); return; } @@ -295,7 +297,7 @@ static uint16_t mixer_load(AC97LinkState *s, uint32_t i) uint16_t val =3D 0xffff; =20 if (i + 2 > sizeof(s->mixer_data)) { - dolog("mixer_load: index %d out of bounds %zd\n", + dolog("mixer_load: index %d out of bounds %zd", i, sizeof(s->mixer_data)); } else { val =3D s->mixer_data[i + 0] | (s->mixer_data[i + 1] << 8); @@ -460,7 +462,7 @@ static void mixer_reset(AC97LinkState *s) { uint8_t active[LAST_INDEX]; =20 - dolog("mixer_reset\n"); + dolog("mixer_reset"); memset(s->mixer_data, 0, sizeof(s->mixer_data)); memset(active, 0, sizeof(active)); mixer_store(s, AC97_Reset, 0x0000); /* 6940 */ @@ -508,7 +510,7 @@ static void mixer_reset(AC97LinkState *s) static uint32_t nam_readb(void *opaque, uint32_t addr) { AC97LinkState *s =3D opaque; - dolog("U nam readb 0x%x\n", addr); + dolog("U nam readb 0x%x", addr); s->cas =3D 0; return ~0U; } @@ -523,7 +525,7 @@ static uint32_t nam_readw(void *opaque, uint32_t addr) static uint32_t nam_readl(void *opaque, uint32_t addr) { AC97LinkState *s =3D opaque; - dolog("U nam readl 0x%x\n", addr); + dolog("U nam readl 0x%x", addr); s->cas =3D 0; return ~0U; } @@ -535,7 +537,7 @@ static uint32_t nam_readl(void *opaque, uint32_t addr) static void nam_writeb(void *opaque, uint32_t addr, uint32_t val) { AC97LinkState *s =3D opaque; - dolog("U nam writeb 0x%x <- 0x%x\n", addr, val); + dolog("U nam writeb 0x%x <- 0x%x", addr, val); s->cas =3D 0; } =20 @@ -563,10 +565,10 @@ static void nam_writew(void *opaque, uint32_t addr, u= int32_t val) break; case AC97_Vendor_ID1: case AC97_Vendor_ID2: - dolog("Attempt to write vendor ID to 0x%x\n", val); + dolog("Attempt to write vendor ID to 0x%x", val); break; case AC97_Extended_Audio_ID: - dolog("Attempt to write extended audio ID to 0x%x\n", val); + dolog("Attempt to write extended audio ID to 0x%x", val); break; case AC97_Extended_Audio_Ctrl_Stat: if (!(val & EACS_VRA)) { @@ -579,36 +581,36 @@ static void nam_writew(void *opaque, uint32_t addr, u= int32_t val) mixer_store(s, AC97_MIC_ADC_Rate, 0xbb80); open_voice(s, MC_INDEX, 48000); } - dolog("Setting extended audio control to 0x%x\n", val); + dolog("Setting extended audio control to 0x%x", val); mixer_store(s, AC97_Extended_Audio_Ctrl_Stat, val); break; case AC97_PCM_Front_DAC_Rate: if (mixer_load(s, AC97_Extended_Audio_Ctrl_Stat) & EACS_VRA) { mixer_store(s, addr, val); - dolog("Set front DAC rate to %d\n", val); + dolog("Set front DAC rate to %d", val); open_voice(s, PO_INDEX, val); } else { - dolog("Attempt to set front DAC rate to %d, but VRA is not set= \n", + dolog("Attempt to set front DAC rate to %d, but VRA is not set= ", val); } break; case AC97_MIC_ADC_Rate: if (mixer_load(s, AC97_Extended_Audio_Ctrl_Stat) & EACS_VRM) { mixer_store(s, addr, val); - dolog("Set MIC ADC rate to %d\n", val); + dolog("Set MIC ADC rate to %d", val); open_voice(s, MC_INDEX, val); } else { - dolog("Attempt to set MIC ADC rate to %d, but VRM is not set\n= ", + dolog("Attempt to set MIC ADC rate to %d, but VRM is not set", val); } break; case AC97_PCM_LR_ADC_Rate: if (mixer_load(s, AC97_Extended_Audio_Ctrl_Stat) & EACS_VRA) { mixer_store(s, addr, val); - dolog("Set front LR ADC rate to %d\n", val); + dolog("Set front LR ADC rate to %d", val); open_voice(s, PI_INDEX, val); } else { - dolog("Attempt to set LR ADC rate to %d, but VRA is not set\n", + dolog("Attempt to set LR ADC rate to %d, but VRA is not set", val); } break; @@ -630,7 +632,7 @@ static void nam_writew(void *opaque, uint32_t addr, uin= t32_t val) /* None of the features in these regs are emulated, so they are RO= */ break; default: - dolog("U nam writew 0x%x <- 0x%x\n", addr, val); + dolog("U nam writew 0x%x <- 0x%x", addr, val); mixer_store(s, addr, val); break; } @@ -639,7 +641,7 @@ static void nam_writew(void *opaque, uint32_t addr, uin= t32_t val) static void nam_writel(void *opaque, uint32_t addr, uint32_t val) { AC97LinkState *s =3D opaque; - dolog("U nam writel 0x%x <- 0x%x\n", addr, val); + dolog("U nam writel 0x%x <- 0x%x", addr, val); s->cas =3D 0; } =20 @@ -655,7 +657,7 @@ static uint32_t nabm_readb(void *opaque, uint32_t addr) =20 switch (addr) { case CAS: - dolog("CAS %d\n", s->cas); + dolog("CAS %d", s->cas); val =3D s->cas; s->cas =3D 1; break; @@ -664,38 +666,38 @@ static uint32_t nabm_readb(void *opaque, uint32_t add= r) case MC_CIV: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->civ; - dolog("CIV[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("CIV[%d] -> 0x%x", GET_BM(addr), val); break; case PI_LVI: case PO_LVI: case MC_LVI: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->lvi; - dolog("LVI[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("LVI[%d] -> 0x%x", GET_BM(addr), val); break; case PI_PIV: case PO_PIV: case MC_PIV: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->piv; - dolog("PIV[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("PIV[%d] -> 0x%x", GET_BM(addr), val); break; case PI_CR: case PO_CR: case MC_CR: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->cr; - dolog("CR[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("CR[%d] -> 0x%x", GET_BM(addr), val); break; case PI_SR: case PO_SR: case MC_SR: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->sr & 0xff; - dolog("SRb[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("SRb[%d] -> 0x%x", GET_BM(addr), val); break; default: - dolog("U nabm readb 0x%x -> 0x%x\n", addr, val); + dolog("U nabm readb 0x%x -> 0x%x", addr, val); break; } return val; @@ -713,17 +715,17 @@ static uint32_t nabm_readw(void *opaque, uint32_t add= r) case MC_SR: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->sr; - dolog("SR[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("SR[%d] -> 0x%x", GET_BM(addr), val); break; case PI_PICB: case PO_PICB: case MC_PICB: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->picb; - dolog("PICB[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("PICB[%d] -> 0x%x", GET_BM(addr), val); break; default: - dolog("U nabm readw 0x%x -> 0x%x\n", addr, val); + dolog("U nabm readw 0x%x -> 0x%x", addr, val); break; } return val; @@ -741,14 +743,14 @@ static uint32_t nabm_readl(void *opaque, uint32_t add= r) case MC_BDBAR: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->bdbar; - dolog("BMADDR[%d] -> 0x%x\n", GET_BM(addr), val); + dolog("BMADDR[%d] -> 0x%x", GET_BM(addr), val); break; case PI_CIV: case PO_CIV: case MC_CIV: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->civ | (r->lvi << 8) | (r->sr << 16); - dolog("CIV LVI SR[%d] -> 0x%x, 0x%x, 0x%x\n", GET_BM(addr), + dolog("CIV LVI SR[%d] -> 0x%x, 0x%x, 0x%x", GET_BM(addr), r->civ, r->lvi, r->sr); break; case PI_PICB: @@ -756,19 +758,19 @@ static uint32_t nabm_readl(void *opaque, uint32_t add= r) case MC_PICB: r =3D &s->bm_regs[GET_BM(addr)]; val =3D r->picb | (r->piv << 16) | (r->cr << 24); - dolog("PICB PIV CR[%d] -> 0x%x 0x%x 0x%x 0x%x\n", GET_BM(addr), + dolog("PICB PIV CR[%d] -> 0x%x 0x%x 0x%x 0x%x", GET_BM(addr), val, r->picb, r->piv, r->cr); break; case GLOB_CNT: val =3D s->glob_cnt; - dolog("glob_cnt -> 0x%x\n", val); + dolog("glob_cnt -> 0x%x", val); break; case GLOB_STA: val =3D s->glob_sta | GS_S0CR; - dolog("glob_sta -> 0x%x\n", val); + dolog("glob_sta -> 0x%x", val); break; default: - dolog("U nabm readl 0x%x -> 0x%x\n", addr, val); + dolog("U nabm readl 0x%x -> 0x%x", addr, val); break; } return val; @@ -795,7 +797,7 @@ static void nabm_writeb(void *opaque, uint32_t addr, ui= nt32_t val) fetch_bd(s, r); } r->lvi =3D val % 32; - dolog("LVI[%d] <- 0x%x\n", GET_BM(addr), val); + dolog("LVI[%d] <- 0x%x", GET_BM(addr), val); break; case PI_CR: case PO_CR: @@ -816,7 +818,7 @@ static void nabm_writeb(void *opaque, uint32_t addr, ui= nt32_t val) voice_set_active(s, r - s->bm_regs, 1); } } - dolog("CR[%d] <- 0x%x (cr 0x%x)\n", GET_BM(addr), val, r->cr); + dolog("CR[%d] <- 0x%x (cr 0x%x)", GET_BM(addr), val, r->cr); break; case PI_SR: case PO_SR: @@ -824,10 +826,10 @@ static void nabm_writeb(void *opaque, uint32_t addr, = uint32_t val) r =3D &s->bm_regs[GET_BM(addr)]; r->sr |=3D val & ~(SR_RO_MASK | SR_WCLEAR_MASK); update_sr(s, r, r->sr & ~(val & SR_WCLEAR_MASK)); - dolog("SR[%d] <- 0x%x (sr 0x%x)\n", GET_BM(addr), val, r->sr); + dolog("SR[%d] <- 0x%x (sr 0x%x)", GET_BM(addr), val, r->sr); break; default: - dolog("U nabm writeb 0x%x <- 0x%x\n", addr, val); + dolog("U nabm writeb 0x%x <- 0x%x", addr, val); break; } } @@ -844,10 +846,10 @@ static void nabm_writew(void *opaque, uint32_t addr, = uint32_t val) r =3D &s->bm_regs[GET_BM(addr)]; r->sr |=3D val & ~(SR_RO_MASK | SR_WCLEAR_MASK); update_sr(s, r, r->sr & ~(val & SR_WCLEAR_MASK)); - dolog("SR[%d] <- 0x%x (sr 0x%x)\n", GET_BM(addr), val, r->sr); + dolog("SR[%d] <- 0x%x (sr 0x%x)", GET_BM(addr), val, r->sr); break; default: - dolog("U nabm writew 0x%x <- 0x%x\n", addr, val); + dolog("U nabm writew 0x%x <- 0x%x", addr, val); break; } } @@ -863,22 +865,22 @@ static void nabm_writel(void *opaque, uint32_t addr, = uint32_t val) case MC_BDBAR: r =3D &s->bm_regs[GET_BM(addr)]; r->bdbar =3D val & ~3; - dolog("BDBAR[%d] <- 0x%x (bdbar 0x%x)\n", GET_BM(addr), val, r->bd= bar); + dolog("BDBAR[%d] <- 0x%x (bdbar 0x%x)", GET_BM(addr), val, r->bdba= r); break; case GLOB_CNT: /* TODO: Handle WR or CR being set (warm/cold reset requests) */ if (!(val & (GC_WR | GC_CR))) { s->glob_cnt =3D val & GC_VALID_MASK; } - dolog("glob_cnt <- 0x%x (glob_cnt 0x%x)\n", val, s->glob_cnt); + dolog("glob_cnt <- 0x%x (glob_cnt 0x%x)", val, s->glob_cnt); break; case GLOB_STA: s->glob_sta &=3D ~(val & GS_WCLEAR_MASK); s->glob_sta |=3D (val & ~(GS_WCLEAR_MASK | GS_RO_MASK)) & GS_VALID= _MASK; - dolog("glob_sta <- 0x%x (glob_sta 0x%x)\n", val, s->glob_sta); + dolog("glob_sta <- 0x%x (glob_sta 0x%x)", val, s->glob_sta); break; default: - dolog("U nabm writel 0x%x <- 0x%x\n", addr, val); + dolog("U nabm writel 0x%x <- 0x%x", addr, val); break; } } @@ -903,7 +905,7 @@ static int write_audio(AC97LinkState *s, AC97BusMasterR= egs *r, to_copy =3D MIN(temp, sizeof(tmpbuf)); pci_dma_read(&s->dev, addr, tmpbuf, to_copy); copied =3D AUD_write(s->voice_po, tmpbuf, to_copy); - dolog("write_audio max=3D%x to_copy=3D%x copied=3D%x\n", + dolog("write_audio max=3D%x to_copy=3D%x copied=3D%x", max, to_copy, copied); if (!copied) { *stop =3D 1; @@ -916,7 +918,7 @@ static int write_audio(AC97LinkState *s, AC97BusMasterR= egs *r, =20 if (!temp) { if (to_copy < 4) { - dolog("whoops\n"); + dolog("whoops"); s->last_samp =3D 0; } else { s->last_samp =3D *(uint32_t *)&tmpbuf[to_copy - 4]; @@ -929,7 +931,7 @@ static int write_audio(AC97LinkState *s, AC97BusMasterR= egs *r, =20 static void write_bup(AC97LinkState *s, int elapsed) { - dolog("write_bup\n"); + dolog("write_bup"); if (!(s->bup_flag & BUP_SET)) { if (s->bup_flag & BUP_LAST) { int i; @@ -997,7 +999,7 @@ static void transfer_audio(AC97LinkState *s, int index,= int elapsed) int stop =3D 0; =20 if (s->invalid_freq[index]) { - AUD_log("ac97", "attempt to use voice %d with invalid frequency %d= \n", + error_report("ac97: attempt to use voice %d with invalid frequency= %d", index, s->invalid_freq[index]); return; } @@ -1017,12 +1019,12 @@ static void transfer_audio(AC97LinkState *s, int in= dex, int elapsed) int temp; =20 if (!r->bd_valid) { - dolog("invalid bd\n"); + dolog("invalid bd"); fetch_bd(s, r); } =20 if (!r->picb) { - dolog("fresh bd %d is empty 0x%x 0x%x\n", + dolog("fresh bd %d is empty 0x%x 0x%x", r->civ, r->bd.addr, r->bd.ctl_len); if (r->civ =3D=3D r->lvi) { r->sr |=3D SR_DCH; /* CELV? */ @@ -1059,7 +1061,7 @@ static void transfer_audio(AC97LinkState *s, int inde= x, int elapsed) } =20 if (r->civ =3D=3D r->lvi) { - dolog("Underrun civ (%d) =3D=3D lvi (%d)\n", r->civ, r->lv= i); + dolog("Underrun civ (%d) =3D=3D lvi (%d)", r->civ, r->lvi); =20 new_sr |=3D SR_LVBCI | SR_DCH | SR_CELV; stop =3D 1; diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 1f29a7e319d..772435f04cd 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -29,24 +29,24 @@ #include "audio/audio.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" +#include "qemu/error-report.h" #include "qom/object.h" =20 -//#define DEBUG +#define DEBUG 0 =20 #define ADLIB_KILL_TIMERS 1 =20 #define ADLIB_DESC "Yamaha YM3812 (OPL2)" =20 -#ifdef DEBUG +#if DEBUG #include "qemu/timer.h" #endif =20 -#define dolog(...) AUD_log ("adlib", __VA_ARGS__) -#ifdef DEBUG -#define ldebug(...) dolog (__VA_ARGS__) -#else -#define ldebug(...) -#endif +#define ldebug(fmt, ...) do { \ + if (DEBUG) { \ + error_report("adlib: " fmt, ##__VA_ARGS__); \ + } \ + } while (0) =20 #include "fmopl.h" #define SHIFT 1 @@ -64,7 +64,7 @@ struct AdlibState { int enabled; int active; int bufpos; -#ifdef DEBUG +#if DEBUG int64_t exp[2]; #endif int16_t *mixbuf; @@ -92,7 +92,7 @@ static void adlib_kill_timers (AdlibState *s) =20 delta =3D AUD_get_elapsed_usec_out (s->voice, &s->ats); ldebug ( - "delta =3D %f dexp =3D %f expired =3D> %d\n", + "delta =3D %f dexp =3D %f expired =3D> %d", delta / 1000000.0, s->dexp[i] / 1000000.0, delta >=3D s->dexp[i] @@ -131,7 +131,7 @@ static void timer_handler (void *opaque, int c, double = interval_Sec) { AdlibState *s =3D opaque; unsigned n =3D c & 1; -#ifdef DEBUG +#if DEBUG double interval; int64_t exp; #endif @@ -142,7 +142,7 @@ static void timer_handler (void *opaque, int c, double = interval_Sec) } =20 s->ticking[n] =3D 1; -#ifdef DEBUG +#if DEBUG interval =3D NANOSECONDS_PER_SECOND * interval_Sec; exp =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + interval; s->exp[n] =3D exp; diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 6dfff202ff9..7931fcfec81 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -30,7 +30,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "qemu/timer.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qom/object.h" =20 @@ -43,21 +43,21 @@ More... */ =20 -/* #define DEBUG */ +#define DEBUG 0 /* #define DEBUG_XLAW */ =20 static struct { int aci_counter; } conf =3D {1}; =20 -#ifdef DEBUG -#define dolog(...) AUD_log ("cs4231a", __VA_ARGS__) -#else -#define dolog(...) -#endif +#define dolog(fmt, ...) do { \ + if (DEBUG) { \ + error_report("cs4231a: " fmt, ##__VA_ARGS__); \ + } \ + } while (0) =20 -#define lwarn(...) AUD_log ("cs4231a", "warning: " __VA_ARGS__) -#define lerr(...) AUD_log ("cs4231a", "error: " __VA_ARGS__) +#define lwarn(fmt, ...) warn_report("cs4231a: " fmt, ##__VA_ARGS__) +#define lerr(fmt, ...) error_report("cs4231a: " fmt, ##__VA_ARGS__) =20 #define CS_REGS 16 #define CS_DREGS 32 @@ -284,7 +284,7 @@ static void cs_reset_voices (CSState *s, uint32_t val) as.freq =3D freqs[xtal][(val >> 1) & 7]; =20 if (as.freq =3D=3D -1) { - lerr ("unsupported frequency (val=3D%#x)\n", val); + lerr("unsupported frequency (val=3D0x%x)", val); goto error; } =20 @@ -319,11 +319,11 @@ static void cs_reset_voices (CSState *s, uint32_t val) =20 case 7: case 4: - lerr ("attempt to use reserved format value (%#x)\n", val); + lerr("attempt to use reserved format value (0x%x)", val); goto error; =20 case 5: - lerr ("ADPCM 4 bit IMA compatible format is not supported\n"); + lerr("ADPCM 4 bit IMA compatible format is not supported"); goto error; } =20 @@ -393,7 +393,7 @@ static uint64_t cs_read (void *opaque, hwaddr addr, uns= igned size) ret =3D s->regs[saddr]; break; } - dolog ("read %d:%d -> %d\n", saddr, iaddr, ret); + dolog("read %d:%d -> %d", saddr, iaddr, ret); return ret; } =20 @@ -425,7 +425,7 @@ static void cs_write (void *opaque, hwaddr addr, case RESERVED: case RESERVED_2: case RESERVED_3: - lwarn ("attempt to write %#x to reserved indirect register %d\= n", + lwarn("attempt to write 0x%x to reserved indirect register %d", val, iaddr); break; =20 @@ -439,7 +439,7 @@ static void cs_write (void *opaque, hwaddr addr, cs_reset_voices (s, val); } else { - lwarn ("[P]MCE(%#x, %#x) is not set, val=3D%#x\n", + lwarn("[P]MCE(0x%x, 0x%x) is not set, val=3D0x%x", s->regs[Index_Address], s->dregs[Alternate_Feature_Status], val); @@ -453,7 +453,7 @@ static void cs_write (void *opaque, hwaddr addr, val &=3D ~(1 << 5); /* D5 is reserved */ s->dregs[iaddr] =3D val; if (val & PPIO) { - lwarn ("PIO is not supported (%#x)\n", val); + lwarn("PIO is not supported (0x%x)", val); break; } if (val & PEN) { @@ -472,11 +472,11 @@ static void cs_write (void *opaque, hwaddr addr, break; =20 case Error_Status_And_Initialization: - lwarn ("attempt to write to read only register %d\n", iaddr); + lwarn("attempt to write to read only register %d", iaddr); break; =20 case MODE_And_ID: - dolog ("val=3D%#x\n", val); + dolog("val=3D0x%x", val); if (val & MODE2) s->dregs[iaddr] |=3D MODE2; else @@ -485,7 +485,7 @@ static void cs_write (void *opaque, hwaddr addr, =20 case Alternate_Feature_Enable_I: if (val & TE) - lerr ("timer is not yet supported\n"); + lerr("timer is not yet supported"); s->dregs[iaddr] =3D val; break; =20 @@ -499,7 +499,7 @@ static void cs_write (void *opaque, hwaddr addr, break; =20 case Version_Chip_ID: - lwarn ("write to Version_Chip_ID register %#x\n", val); + lwarn("write to Version_Chip_ID register 0x%x", val); s->dregs[iaddr] =3D val; break; =20 @@ -507,7 +507,7 @@ static void cs_write (void *opaque, hwaddr addr, s->dregs[iaddr] =3D val; break; } - dolog ("written value %#x to indirect register %d\n", val, iaddr); + dolog("written value 0x%x to indirect register %d", val, iaddr); break; =20 case Status: @@ -519,7 +519,7 @@ static void cs_write (void *opaque, hwaddr addr, break; =20 case PIO_Data: - lwarn ("attempt to write value %#x to PIO register\n", val); + lwarn("attempt to write value 0x%x to PIO register", val); break; } } diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index a6a32a6348b..6b0da0746ec 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/module.h" -#include "system/dma.h" +#include "qemu/error-report.h" #include "qom/object.h" #include "trace.h" =20 @@ -190,7 +190,7 @@ static void print_ctl(uint32_t val) a(CDC_EN); a(SERR_DIS); #undef a - AUD_log("es1370", "ctl - PCLKDIV %d(DAC2 freq %d), freq %d,%s\n", + error_report("es1370: ctl - PCLKDIV %d(DAC2 freq %d), freq %d,%s", (val & CTRL_PCLKDIV) >> CTRL_SH_PCLKDIV, DAC2_DIVTOSR((val & CTRL_PCLKDIV) >> CTRL_SH_PCLKDIV), dac1_samplerate[(val & CTRL_WTSRSEL) >> CTRL_SH_WTSRSEL], @@ -226,7 +226,7 @@ static void print_sctl(uint32_t val) } #undef b #undef a - AUD_log("es1370", + error_report("es1370: " "%s p2_end_inc %d, p2_st_inc %d," " r1_fmt %s, p2_fmt %s, p1_fmt %s\n", buf, @@ -238,10 +238,10 @@ static void print_sctl(uint32_t val) } } =20 -#define lwarn(...) \ +#define lwarn(fmt, ...) \ do { \ if (VERBOSE_ES1370) { \ - AUD_log("es1370: warning", __VA_ARGS__); \ + error_report("es1370: " fmt, ##__VA_ARGS__); \ } \ } while (0) =20 @@ -502,10 +502,10 @@ static void es1370_write(void *opaque, hwaddr addr, u= int64_t val, unsigned size) break; =20 case ES1370_REG_PHANTOM_FRAMECNT: - lwarn("writing to phantom frame count 0x%" PRIx64 "\n", val); + lwarn("writing to phantom frame count 0x%" PRIx64, val); break; case ES1370_REG_PHANTOM_FRAMEADR: - lwarn("writing to phantom frame address 0x%" PRIx64 "\n", val); + lwarn("writing to phantom frame address 0x%" PRIx64, val); break; =20 case ES1370_REG_ADC_FRAMECNT: @@ -522,7 +522,7 @@ static void es1370_write(void *opaque, hwaddr addr, uin= t64_t val, unsigned size) break; =20 default: - lwarn("writel 0x%" PRIx64 " <- 0x%" PRIx64 "\n", addr, val); + lwarn("writel 0x%" PRIx64 " <- 0x%" PRIx64, addr, val); break; } } @@ -586,16 +586,16 @@ static uint64_t es1370_read(void *opaque, hwaddr addr= , unsigned size) =20 case ES1370_REG_PHANTOM_FRAMECNT: val =3D ~0U; - lwarn("reading from phantom frame count\n"); + lwarn("reading from phantom frame count"); break; case ES1370_REG_PHANTOM_FRAMEADR: val =3D ~0U; - lwarn("reading from phantom frame address\n"); + lwarn("reading from phantom frame address"); break; =20 default: val =3D ~0U; - lwarn("readl 0x%" PRIx64 " -> 0x%x\n", addr, val); + lwarn("readl 0x%" PRIx64 " -> 0x%x", addr, val); break; } return val; @@ -677,7 +677,7 @@ static void es1370_transfer_audio (ES1370State *s, stru= ct chan *d, int loop_sel, * when the sample count reaches zero) or 1 for stop mode (set * interrupt and stop recording). */ - AUD_log ("es1370: warning", "non looping mode\n"); + warn_report("es1370: non looping mode"); } else { d->frame_cnt =3D size; =20 diff --git a/hw/audio/gus.c b/hw/audio/gus.c index c36df0240fe..91d07e0f81c 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -32,15 +32,16 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "gusemu.h" -#include "gustate.h" +#include "qemu/error-report.h" #include "qom/object.h" =20 -#define dolog(...) AUD_log ("audio", __VA_ARGS__) -#ifdef DEBUG -#define ldebug(...) dolog (__VA_ARGS__) -#else -#define ldebug(...) -#endif +#define DEBUG 0 + +#define ldebug(fmt, ...) do { \ + if (DEBUG) { \ + error_report("gus: " fmt, ##__VA_ARGS__); \ + } \ + } while (0) =20 #define TYPE_GUS "gus" OBJECT_DECLARE_SIMPLE_TYPE(GUSState, GUS) @@ -154,14 +155,14 @@ int GUS_irqrequest (GUSEmuState *emu, int hwirq, int = n) /* qemu_irq_lower (s->pic); */ qemu_irq_raise (s->pic); s->irqs +=3D n; - ldebug ("irqrequest %d %d %d\n", hwirq, n, s->irqs); + ldebug("irqrequest %d %d %d", hwirq, n, s->irqs); return n; } =20 void GUS_irqclear (GUSEmuState *emu, int hwirq) { GUSState *s =3D emu->opaque; - ldebug ("irqclear %d %d\n", hwirq, s->irqs); + ldebug("irqclear %d %d", hwirq, s->irqs); qemu_irq_lower (s->pic); s->irqs -=3D 1; #ifdef IRQ_STORM @@ -175,7 +176,7 @@ void GUS_dmarequest (GUSEmuState *emu) { GUSState *s =3D emu->opaque; IsaDmaClass *k =3D ISADMA_GET_CLASS(s->isa_dma); - ldebug ("dma request %d\n", der->gusdma); + ldebug("dma request %d", s->emu.gusdma); k->hold_DREQ(s->isa_dma, s->emu.gusdma); } =20 @@ -186,13 +187,13 @@ static int GUS_read_DMA (void *opaque, int nchan, int= dma_pos, int dma_len) QEMU_UNINITIALIZED char tmpbuf[4096]; int pos =3D dma_pos, mode, left =3D dma_len - dma_pos; =20 - ldebug ("read DMA %#x %d\n", dma_pos, dma_len); + ldebug("read DMA 0x%x %d", dma_pos, dma_len); mode =3D k->has_autoinitialization(s->isa_dma, s->emu.gusdma); while (left) { int to_copy =3D MIN ((size_t) left, sizeof (tmpbuf)); int copied; =20 - ldebug ("left=3D%d to_copy=3D%d pos=3D%d\n", left, to_copy, pos); + ldebug("left=3D%d to_copy=3D%d pos=3D%d", left, to_copy, pos); copied =3D k->read_memory(s->isa_dma, nchan, tmpbuf, pos, to_copy); gus_dma_transferdata (&s->emu, tmpbuf, copied, left =3D=3D copied); left -=3D copied; diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 54fcf632e6a..a719912872a 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -125,7 +125,7 @@ static int pcspk_audio_init(PCSpkState *s) =20 s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); if (!s->voice) { - AUD_log(s_spk, "Could not open voice\n"); + error_report("pcspk: Could not open voice"); return -1; } =20 diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bac64118fef..03c82f2777e 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -30,22 +30,21 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" +#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" #include "qom/object.h" =20 -#define dolog(...) AUD_log ("sb16", __VA_ARGS__) - -/* #define DEBUG */ +#define DEBUG 0 /* #define DEBUG_SB16_MOST */ =20 -#ifdef DEBUG -#define ldebug(...) dolog (__VA_ARGS__) -#else -#define ldebug(...) -#endif +#define ldebug(fmt, ...) do { \ + if (DEBUG) { \ + error_report("sb16: " fmt, ##__VA_ARGS__); \ + } \ + } while (0) =20 static const char e3[] =3D "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992."; =20 @@ -157,7 +156,7 @@ static int irq_of_magic (int magic) #if 0 static void log_dsp (SB16State *dsp) { - ldebug ("%s:%s:%d:%s:dmasize=3D%d:freq=3D%d:const=3D%d:speaker=3D%d\n", + ldebug("%s:%s:%d:%s:dmasize=3D%d:freq=3D%d:const=3D%d:speaker=3D%d", dsp->fmt_stereo ? "Stereo" : "Mono", dsp->fmt_signed ? "Signed" : "Unsigned", dsp->fmt_bits, @@ -182,7 +181,7 @@ static void control (SB16State *s, int hold) IsaDmaClass *k =3D ISADMA_GET_CLASS(isa_dma); s->dma_running =3D hold; =20 - ldebug ("hold %d high %d dma %d\n", hold, s->use_hdma, dma); + ldebug("hold %d high %d dma %d", hold, s->use_hdma, dma); =20 if (hold) { k->hold_DREQ(isa_dma, dma); @@ -289,8 +288,8 @@ static void dma_cmd8 (SB16State *s, int mask, int dma_l= en) " alignment %d\n", s->block_size, s->align + 1); } =20 - ldebug ("freq %d, stereo %d, sign %d, bits %d, " - "dma %d, auto %d, fifo %d, high %d\n", + ldebug("freq %d, stereo %d, sign %d, bits %d, " + "dma %d, auto %d, fifo %d, high %d", s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, s->block_size, s->dma_auto, s->fifo, s->highspeed); =20 @@ -337,8 +336,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t= d0, int dma_len) s->block_size <<=3D s->fmt_stereo; } =20 - ldebug ("freq %d, stereo %d, sign %d, bits %d, " - "dma %d, auto %d, fifo %d, high %d\n", + ldebug("freq %d, stereo %d, sign %d, bits %d, " + "dma %d, auto %d, fifo %d, high %d", s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, s->block_size, s->dma_auto, s->fifo, s->highspeed); =20 @@ -395,7 +394,7 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t= d0, int dma_len) =20 static inline void dsp_out_data (SB16State *s, uint8_t val) { - ldebug ("outdata %#x\n", val); + ldebug("outdata 0x%x", val); if ((size_t) s->out_data_len < sizeof (s->out_data)) { s->out_data[s->out_data_len++] =3D val; } @@ -407,18 +406,18 @@ static inline uint8_t dsp_get_data (SB16State *s) return s->in2_data[--s->in_index]; } else { - dolog ("buffer underflow\n"); + warn_report("sb16: buffer underflow"); return 0; } } =20 static void command (SB16State *s, uint8_t cmd) { - ldebug ("command %#x\n", cmd); + ldebug("command 0x%x", cmd); =20 if (cmd > 0xaf && cmd < 0xd0) { if (cmd & 8) { - qemu_log_mask(LOG_UNIMP, "ADC not yet supported (command %#x)\= n", + qemu_log_mask(LOG_UNIMP, "ADC not yet supported (command 0x%x)= \n", cmd); } =20 @@ -427,7 +426,7 @@ static void command (SB16State *s, uint8_t cmd) case 12: break; default: - qemu_log_mask(LOG_GUEST_ERROR, "%#x wrong bits\n", cmd); + qemu_log_mask(LOG_GUEST_ERROR, "0x%x wrong bits\n", cmd); } s->needed_bytes =3D 3; } @@ -645,13 +644,13 @@ static void command (SB16State *s, uint8_t cmd) goto warn; =20 default: - qemu_log_mask(LOG_UNIMP, "Unrecognized command %#x\n", cmd); + qemu_log_mask(LOG_UNIMP, "Unrecognized command 0x%x\n", cmd); break; } } =20 if (!s->needed_bytes) { - ldebug ("\n"); + ldebug("!needed_bytes"); } =20 exit: @@ -664,7 +663,7 @@ static void command (SB16State *s, uint8_t cmd) return; =20 warn: - qemu_log_mask(LOG_UNIMP, "warning: command %#x,%d is not truly underst= ood" + qemu_log_mask(LOG_UNIMP, "warning: command 0x%x,%d is not truly unders= tood" " yet\n", cmd, s->needed_bytes); goto exit; =20 @@ -687,7 +686,7 @@ static uint16_t dsp_get_hilo (SB16State *s) static void complete (SB16State *s) { int d0, d1, d2; - ldebug ("complete command %#x, in_index %d, needed_bytes %d\n", + ldebug("complete command 0x%x, in_index %d, needed_bytes %d", s->cmd, s->in_index, s->needed_bytes); =20 if (s->cmd > 0xaf && s->cmd < 0xd0) { @@ -696,11 +695,11 @@ static void complete (SB16State *s) d0 =3D dsp_get_data (s); =20 if (s->cmd & 8) { - dolog ("ADC params cmd =3D %#x d0 =3D %d, d1 =3D %d, d2 =3D %d= \n", + warn_report("sb16: ADC params cmd =3D 0x%x d0 =3D %d, d1 =3D %= d, d2 =3D %d", s->cmd, d0, d1, d2); } else { - ldebug ("cmd =3D %#x d0 =3D %d, d1 =3D %d, d2 =3D %d\n", + ldebug("cmd =3D 0x%x d0 =3D %d, d1 =3D %d, d2 =3D %d", s->cmd, d0, d1, d2); dma_cmd (s, s->cmd, d0, d1 + (d2 << 8)); } @@ -711,13 +710,13 @@ static void complete (SB16State *s) s->csp_mode =3D dsp_get_data (s); s->csp_reg83r =3D 0; s->csp_reg83w =3D 0; - ldebug ("CSP command 0x04: mode=3D%#x\n", s->csp_mode); + ldebug("CSP command 0x04: mode=3D0x%x", s->csp_mode); break; =20 case 0x05: s->csp_param =3D dsp_get_data (s); s->csp_value =3D dsp_get_data (s); - ldebug ("CSP command 0x05: param=3D%#x value=3D%#x\n", + ldebug("CSP command 0x05: param=3D0x%x value=3D0x%x", s->csp_param, s->csp_value); break; @@ -725,9 +724,9 @@ static void complete (SB16State *s) case 0x0e: d0 =3D dsp_get_data (s); d1 =3D dsp_get_data (s); - ldebug ("write CSP register %d <- %#x\n", d1, d0); + ldebug("write CSP register %d <- 0x%x", d1, d0); if (d1 =3D=3D 0x83) { - ldebug ("0x83[%d] <- %#x\n", s->csp_reg83r, d0); + ldebug("0x83[%d] <- 0x%x", s->csp_reg83r, d0); s->csp_reg83[s->csp_reg83r % 4] =3D d0; s->csp_reg83r +=3D 1; } @@ -738,10 +737,10 @@ static void complete (SB16State *s) =20 case 0x0f: d0 =3D dsp_get_data (s); - ldebug ("read CSP register %#x -> %#x, mode=3D%#x\n", + ldebug("read CSP register 0x%x -> 0x%x, mode=3D0x%x", d0, s->csp_regs[d0], s->csp_mode); if (d0 =3D=3D 0x83) { - ldebug ("0x83[%d] -> %#x\n", + ldebug("0x83[%d] -> 0x%x", s->csp_reg83w, s->csp_reg83[s->csp_reg83w % 4]); dsp_out_data (s, s->csp_reg83[s->csp_reg83w % 4]); @@ -754,7 +753,7 @@ static void complete (SB16State *s) =20 case 0x10: d0 =3D dsp_get_data (s); - dolog ("cmd 0x10 d0=3D%#x\n", d0); + warn_report("sb16: cmd 0x10 d0=3D0x%x", d0); break; =20 case 0x14: @@ -763,7 +762,7 @@ static void complete (SB16State *s) =20 case 0x40: s->time_const =3D dsp_get_data (s); - ldebug ("set time const %d\n", s->time_const); + ldebug("set time const %d", s->time_const); break; =20 case 0x41: @@ -776,12 +775,12 @@ static void complete (SB16State *s) * http://homepages.cae.wisc.edu/~brodskye/sb16doc/sb16doc.htm= l#SamplingRate */ s->freq =3D restrict_sampling_rate(dsp_get_hilo(s)); - ldebug ("set freq %d\n", s->freq); + ldebug("set freq %d", s->freq); break; =20 case 0x48: s->block_size =3D dsp_get_lohi (s) + 1; - ldebug ("set dma block len %d\n", s->block_size); + ldebug("set dma block len %d", s->block_size); break; =20 case 0x74: @@ -811,21 +810,21 @@ static void complete (SB16State *s) ); } } - ldebug ("mix silence %d %d %" PRId64 "\n", samples, bytes,= ticks); + ldebug("mix silence %d %d %" PRId64, samples, bytes, ticks= ); } break; =20 case 0xe0: d0 =3D dsp_get_data (s); s->out_data_len =3D 0; - ldebug ("E0 data =3D %#x\n", d0); + ldebug("E0 data =3D 0x%x", d0); dsp_out_data (s, ~d0); break; =20 case 0xe2: -#ifdef DEBUG +#if DEBUG d0 =3D dsp_get_data (s); - dolog ("E2 =3D %#x\n", d0); + warn_report("sb16: E2 =3D 0x%x", d0); #endif break; =20 @@ -835,7 +834,7 @@ static void complete (SB16State *s) =20 case 0xf9: d0 =3D dsp_get_data (s); - ldebug ("command 0xf9 with %#x\n", d0); + ldebug("command 0xf9 with 0x%x", d0); switch (d0) { case 0x0e: dsp_out_data (s, 0xff); @@ -856,13 +855,13 @@ static void complete (SB16State *s) break; =20 default: - qemu_log_mask(LOG_UNIMP, "complete: unrecognized command %#x\n= ", + qemu_log_mask(LOG_UNIMP, "complete: unrecognized command 0x%x\= n", s->cmd); return; } } =20 - ldebug ("\n"); + ldebug(""); s->cmd =3D -1; } =20 @@ -926,7 +925,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) =20 iport =3D nport - s->port; =20 - ldebug ("write %#x <- %#x\n", nport, val); + ldebug("write 0x%x <- 0x%x", nport, val); switch (iport) { case 0x06: switch (val) { @@ -976,7 +975,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) } else { if (s->in_index =3D=3D sizeof (s->in2_data)) { - dolog ("in data overrun\n"); + warn_report("sb16: in data overrun"); } else { s->in2_data[s->in_index++] =3D val; @@ -992,7 +991,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) break; =20 default: - ldebug ("(nport=3D%#x, val=3D%#x)\n", nport, val); + ldebug("(nport=3D0x%x, val=3D0x%x)", nport, val); break; } } @@ -1016,7 +1015,7 @@ static uint32_t dsp_read(void *opaque, uint32_t nport) } else { if (s->cmd !=3D -1) { - dolog ("empty output buffer for command %#x\n", + warn_report("sb16: empty output buffer for command 0x%x", s->cmd); } retval =3D s->last_read_byte; @@ -1029,7 +1028,7 @@ static uint32_t dsp_read(void *opaque, uint32_t nport) break; =20 case 0x0d: /* timer interrupt clear */ - /* dolog ("timer interrupt clear\n"); */ + /* warn_report("sb16: timer interrupt clear"); */ retval =3D 0; break; =20 @@ -1056,13 +1055,13 @@ static uint32_t dsp_read(void *opaque, uint32_t npo= rt) } =20 if (!ack) { - ldebug ("read %#x -> %#x\n", nport, retval); + ldebug("read 0x%x -> 0x%x", nport, retval); } =20 return retval; =20 error: - dolog ("warning: dsp_read %#x error\n", nport); + warn_report("sb16: dsp_read 0x%x error", nport); return 0xff; } =20 @@ -1108,7 +1107,7 @@ static void mixer_write_datab(void *opaque, uint32_t = nport, uint32_t val) SB16State *s =3D opaque; =20 (void) nport; - ldebug ("mixer_write [%#x] <- %#x\n", s->mixer_nreg, val); + ldebug("mixer_write [0x%x] <- 0x%x", s->mixer_nreg, val); =20 switch (s->mixer_nreg) { case 0x00: @@ -1118,7 +1117,7 @@ static void mixer_write_datab(void *opaque, uint32_t = nport, uint32_t val) case 0x80: { int irq =3D irq_of_magic (val); - ldebug ("setting irq to %d (val=3D%#x)\n", irq, val); + ldebug("setting irq to %d (val=3D0x%x)", irq, val); if (irq > 0) { s->irq =3D irq; } @@ -1133,7 +1132,7 @@ static void mixer_write_datab(void *opaque, uint32_t = nport, uint32_t val) hdma =3D ctz32 (val & 0xf0); if (dma !=3D s->dma || hdma !=3D s->hdma) { qemu_log_mask(LOG_GUEST_ERROR, "attempt to change DMA 8bit" - " %d(%d), 16bit %d(%d) (val=3D%#x)\n", dma, = s->dma, + " %d(%d), 16bit %d(%d) (val=3D0x%x)\n", dma,= s->dma, hdma, s->hdma, val); } #if 0 @@ -1145,12 +1144,12 @@ static void mixer_write_datab(void *opaque, uint32_= t nport, uint32_t val) =20 case 0x82: qemu_log_mask(LOG_GUEST_ERROR, "attempt to write into IRQ status" - " register (val=3D%#x)\n", val); + " register (val=3D0x%x)\n", val); return; =20 default: if (s->mixer_nreg >=3D 0x80) { - ldebug ("attempt to write mixer[%#x] <- %#x\n", s->mixer_nreg,= val); + ldebug("attempt to write mixer[0x%x] <- 0x%x", s->mixer_nreg, = val); } break; } @@ -1165,11 +1164,11 @@ static uint32_t mixer_read(void *opaque, uint32_t n= port) (void) nport; #ifndef DEBUG_SB16_MOST if (s->mixer_nreg !=3D 0x82) { - ldebug ("mixer_read[%#x] -> %#x\n", + ldebug("mixer_read[0x%x] -> 0x%x", s->mixer_nreg, s->mixer_regs[s->mixer_nreg]); } #else - ldebug ("mixer_read[%#x] -> %#x\n", + ldebug("mixer_read[0x%x] -> 0x%x", s->mixer_nreg, s->mixer_regs[s->mixer_nreg]); #endif return s->mixer_regs[s->mixer_nreg]; @@ -1241,7 +1240,7 @@ static int SB_read_DMA (void *opaque, int nchan, int = dma_pos, int dma_len) till =3D s->left_till_irq; =20 #ifdef DEBUG_SB16_MOST - dolog ("pos:%06d %d till:%d len:%d\n", + warn_report("sb16: pos:%06d %d till:%d len:%d", dma_pos, free, till, dma_len); #endif =20 @@ -1265,7 +1264,7 @@ static int SB_read_DMA (void *opaque, int nchan, int = dma_pos, int dma_len) } =20 #ifdef DEBUG_SB16_MOST - ldebug ("pos %5d free %5d size %5d till % 5d copy %5d written %5d size= %5d\n", + ldebug("pos %5d free %5d size %5d till % 5d copy %5d written %5d size = %5d", dma_pos, free, dma_len, s->left_till_irq, copy, written, s->block_size); #endif --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080006; cv=none; d=zohomail.com; s=zohoarc; b=FxVGoUj/nsViH+D7biWruSU84cBRRILKsxYWQBoxi4SBS4iwzS/XVxh5jb9HalZbvJKceK+Fz6Sj2VpuTW3ZPBpfypuiLyM1z8AZXtvvv1qddG/cahqRxlpkF8kSOhKW/yQxy7kKt1hyW2d/W1vhHT18TMAUOMaYpu82ztIp5fY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080006; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=oo0V2NSC+Um6jMwrxg0bGYRYcKSTrlyh1iPnhHilHTI=; b=BzUj5DgnkSQ1Y2PKvcu5p/Y+eT7n+gHkysZXx7eZ2iqWkbapXbSR1pKuZib+70dKN+K8I16qQycQH2ylibp89I9yK9WN5TKHwai88cv7nGFbcF02oQdw8/ZpPsTp5hrxKXHU6WUe53uK/GV1M3PmFkt2EmFV4i8SikCLsTDG6mo= 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 1761080006896514.8427508927117; Tue, 21 Oct 2025 13:53:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJR-00053U-Ow; Tue, 21 Oct 2025 16:50:33 -0400 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 1vBJJJ-0004wn-8A for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:26 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJD-0001X9-HN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:24 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4711f156326so46984295e9.1 for ; Tue, 21 Oct 2025 13:50:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c4342860sm9313135e9.11.2025.10.21.13.50.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079814; x=1761684614; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oo0V2NSC+Um6jMwrxg0bGYRYcKSTrlyh1iPnhHilHTI=; b=uEN5KHScp8VbtV9T0zn/Q/mAVqNnoHlqdhAcuqWrm1u8uUVmc/wCUsZU76TvhUD41N gWfVnXkvFQXWZCzH5NqBPZukR+Bx2UjzTusH/v/HwLEq4hrgCHBOtLgYXgkuPieF2mvt c5TKCcFwWwYINWjxG9k7PSEVy3x1yjJpG13jzQiWmsvzm7sBewWe3gqtngaOLyly3B3f CLbZPPuwXmuRZiaE+kXbDzdurnrNuX5rk8jVgB1hKI5zps74eG8FumBsPmzM5DyXU9I0 2dncPY0u6kwk2Ez7IoONxP+2ZsCjAZaquDjxgdvNm3NP3hK9poPhohRyWzrzr15M9Afb DJkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079814; x=1761684614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oo0V2NSC+Um6jMwrxg0bGYRYcKSTrlyh1iPnhHilHTI=; b=qJh3IVGS8Pj0nPAL+SHNrklnGBqL6e9x9eWvIPK/xZxG4M47gs8S5w9dosxvB0AC2c YCnnTVg0acTeb42D3ssERKNaFDPu9dLfp2HTE837SOT9idD/nsKri2CU3HYLUWEODbe2 5EpLBlrafj+5mD8c/3Su69NwRwihMGvbb+/2978bp4/YuDslln8B7O/P9FSXWCPg4YOi rcLGM4524ra8588VIkYWYCp292Ohm+VGImMJJKJw7DgijdOAsi/zf6V39IzEEzH0NfWe r9qPJ88tVitaIHnMbuE32JVWKFaJJX52hl06Bb6K9M9APLu7oov6n0pG9hti6xn63ywB v0Ow== X-Gm-Message-State: AOJu0YwkvZVnZhh+FPRtyQJToPPPXYfR0oHd7GNBFLOUGCPWckdBc14c hiay+XG4D63SJmyUmhwU9J/M3gW+nU8a3GaxRgUjit2se8+NOG3E5YJorzN6oXPtjkMZKeRppVI /NOLHTZY= X-Gm-Gg: ASbGncvlFXiW8496zbvKO7UxjArZUt71x0aW6Sz0A4diYA/pGRcGa2xhJ5BMnM0dP4d zTvyXjP7xapMhShbrTCq3E7uqNVEIwksudUXGb51kjyP6BFdNxqDv32GVxNBl2rgaW2646Ri6Ue 3QMkLqJhC1e44U8ki0JGuAl1c1Jde9H6jVQEOR6pTdvGX+DRy8xopKOcKtHn2LHbIkgRdvmhlM5 Pwrfd4RndiVIhZCcRJu9jMLNPM4Qnsp97d7EcDkuKFPjt+q6s0bzhBAhxoyE/LnyMcIu0biXFdB v2KjDxYekUWchzI/FqxJPnDgCqfizspmNS7klVHOWg6WYnBqWnDo6TvXyExJHO+hJQttG7BWAoP iPpTna9FdK3Xgkohc0jMS75lIdC1Vcn/omWCeA/n49TKnipRim5GIyAKWZ/EF2UgudwNtWZJ6nC WGal+gslWQV06Ye6G1c3rg+1fe/9AN5A+YDGShOpx4SYS4WOMcuMWZfELlhjz8q+k+3xPvmqg= X-Google-Smtp-Source: AGHT+IHW9KWXdQ9OX3Lnp+QOQw5xni6Go8DaTVEzBnIrHOe65hDSyauG18ERjCA+0sgirIl14cCE/A== X-Received: by 2002:a05:600c:470d:b0:471:a98:998d with SMTP id 5b1f17b1804b1-471178a4ac3mr123228265e9.12.1761079814429; Tue, 21 Oct 2025 13:50:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 41/45] hw/ppc/spapr: Rename resize_hpt_err to errp Date: Tue, 21 Oct 2025 22:46:55 +0200 Message-ID: <20251021204700.56072-42-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1761080008035158500 From: Vishal Chourasia Rename resize_hpt_err to standard errp naming convention. Signed-off-by: Vishal Chourasia Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251021105442.1474602-9-vishalc@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 97ab6bebd25..e0a2e5a984d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2817,7 +2817,7 @@ static void spapr_machine_init(MachineState *machine) int i; MemoryRegion *sysmem =3D get_system_memory(); long load_limit, fw_size; - Error *resize_hpt_err =3D NULL; + Error *errp =3D NULL; NICInfo *nd; =20 if (!filename) { @@ -2845,7 +2845,7 @@ static void spapr_machine_init(MachineState *machine) /* Determine capabilities to run with */ spapr_caps_init(spapr); =20 - kvmppc_check_papr_resize_hpt(&resize_hpt_err); + kvmppc_check_papr_resize_hpt(&errp); if (spapr->resize_hpt =3D=3D SPAPR_RESIZE_HPT_DEFAULT) { /* * If the user explicitly requested a mode we should either @@ -2853,10 +2853,10 @@ static void spapr_machine_init(MachineState *machin= e) * it's not set explicitly, we reset our mode to something * that works */ - if (resize_hpt_err) { + if (errp) { spapr->resize_hpt =3D SPAPR_RESIZE_HPT_DISABLED; - error_free(resize_hpt_err); - resize_hpt_err =3D NULL; + error_free(errp); + errp =3D NULL; } else { spapr->resize_hpt =3D smc->resize_hpt_default; } @@ -2864,14 +2864,14 @@ static void spapr_machine_init(MachineState *machin= e) =20 assert(spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DEFAULT); =20 - if ((spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DISABLED) && resize_hpt_e= rr) { + if ((spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DISABLED) && errp) { /* * User requested HPT resize, but this host can't supply it. Bail= out */ - error_report_err(resize_hpt_err); + error_report_err(errp); exit(1); } - error_free(resize_hpt_err); + error_free(errp); =20 spapr->rma_size =3D spapr_rma_size(spapr, &error_fatal); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080058; cv=none; d=zohomail.com; s=zohoarc; b=RGpC9sLMR9h8DajJq9kUOap1f3qohLpbU1u1BxVAqcHluaYYwbQiN4vhy7lGajaMjthy8V9nt56ZKF0fbXREwYhbe+FK9Ln57dkmMIO9GtyFbQSqd4FEhZfoZx/LX9WjY0ycSJAeGNcXw/q2PYxDCaD7SMI351bfXgKY2Lfc26E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080058; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8+mIUrwS9misif/yxHTdNYcYKWXudE/3bhL49JVCt/E=; b=WNEk9zbuvuGKYCkupWLZjOA5TNDhRkWHGQ+hllZ9fdkfph4WYzemYCTqF70X4TcDPp6GJ8r4YXBoCNX2pbm2XWtyon/CyPQu3aeYLv2DqI8i7LKzvUp5owbBcJSrPRRADRAlgFcNBy5LMwBVZlZT5PfMO53Px+fsTzMtFhf3kPs= 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 1761080058549451.5600612185008; Tue, 21 Oct 2025 13:54:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJX-0005SE-2y; Tue, 21 Oct 2025 16:50:39 -0400 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 1vBJJN-00050M-28 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:30 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJH-0001Xh-Fv for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:27 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47117f92e32so40263095e9.1 for ; Tue, 21 Oct 2025 13:50:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c42d9524sm9275545e9.18.2025.10.21.13.50.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079819; x=1761684619; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8+mIUrwS9misif/yxHTdNYcYKWXudE/3bhL49JVCt/E=; b=Hyk8dd1Bv3ZNL1UnQH2AMIUN/3Pbfv7SDu4h3oqK/DQsMIUc3lyzcL0bo9ozMv0Uo/ GmA3AZBwFSIq9Q6N1c4foFaEFZ3RUejuFAY12pYP44J94atdJ5KP3GiTWJUP4P1mRI7p FqHv8zpEj+IMFyzW7wo/epyQ6pkke8IbPMTnO8AhwX2NVv1L0/JRiheJ8opb+ZG9sTaK 57uSnwggQaaCPrniMX3WuG/MZCRZqMkMe08bmc7XTrhjfktJ802Nev9jQAFMLM7rNgC2 oQl8Ynuy/EvIPZatt044ZvNXAoWotAYINJdks5f7sG0GVt2TSD72mnOyY2PD3ymEuslO 8A/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079819; x=1761684619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8+mIUrwS9misif/yxHTdNYcYKWXudE/3bhL49JVCt/E=; b=Tpmkl42PzZXdg+WlBMBx36+oozErCNnPs+rlAnOp6BzAHanwk5P7IEZzUfaXMl12hw Ze8jQ2kTke+EADqXiw/bJWPXP92oyUUH12IwoTQkCBfP8z+OjpV35OwLpkrnjgqBPc9G 3r9wxgi9mNEw4DQcDX66YqOyRJe+daAJsMMZBOFDDK8USFiXbNJ9xSnfYXg2Si2liE2d dXjNZ0VyQ4YcQ0y9ugCukqk1LKRgg+CPgw7Xk2MKD67ks7YJiHY2dxrV2A/9sQxNtY0t qpoJ/ae1BR1VbNq5uy/Ye5Sxx77vTJDSMeRbW1OyBTgnaWauuE2G9TS6awR46Y0nd4QW h0gA== X-Gm-Message-State: AOJu0Yz9EcGdd2f+kEjvcMNeCdA7pu917WklCfrln6xNPS3zl+OtW2YZ NpucgBfgEVy3rEuVLNaaSDX1qPoYK3HFhNQ24KOBLRJgd/zTmf5o/0jz6DRXv59XaHNi4heMryc ofYy9++8= X-Gm-Gg: ASbGncuG//p+ageMIYZL1KatDs2J/YPeIghpxeBLeHtAk7em1cafG4eHEgqyDVxPC4X eDt9d7pEfCE68O9zSVf6gB3gWhNl80BryynqNmJFerVyDinDq8V49gNCGx+hw5fHLMuO+wE14E7 TvW+BCklpOVd7lwtHltLfs6Hkjuf9IZl4PfoTBVb/MGW7ZbWoaMyKnpZC+pJVeFEVFcR/btudQd 5TPZXVFlhHmu5DJsP9H4vLr+WFBXcdNDXKs54rGQ8J7RzLVAGfDXchfKxgTnmD0Urfdr2AE3vpj aP55nsngMVw039J+WwA6aP30qxNHpcU3djPGM3+npVXRpt144KfhFOKcJz7Qt6qHNsxzVypMJ/Q jt9VVXdtTUZHbJSjHWjG9FfblSDwtyFCvFCr2wUlDAGmaT5MDf2sUGJWAU0Hsn4/BWJesOpkoWZ WHMp/aJXuejnZBU/Rk8soRLW8vBM5x5CbhMyZwQsYQ5XqI4RuC+8VNgrdv7b1A X-Google-Smtp-Source: AGHT+IH0ckarYdOwYsc7SCvkF/M81GmT8bT9QiINHVfg7YgXaK9BKSGgOX6NFVZ+bu0EXGT7QJtgjg== X-Received: by 2002:a05:600c:4f95:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-471178ac017mr120968615e9.16.1761079818825; Tue, 21 Oct 2025 13:50:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 42/45] qemu/target-info: Include missing 'qapi-types-common.h' header Date: Tue, 21 Oct 2025 22:46:56 +0200 Message-ID: <20251021204700.56072-43-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1761080060628154100 When adding the TargetInfo::@endianness field in commit a37aec2e7d8, we neglected to include the "qapi-types-common.h" header to get the EndianMode enum definition. Fix that. Fixes: a37aec2e7d8 ("qemu/target-info: Add target_endian_mode()") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20251020220941.65269-10-philmd@linaro.org> --- include/qemu/target-info-impl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index 17887f64e26..e446585bf53 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -9,6 +9,7 @@ #ifndef QEMU_TARGET_INFO_IMPL_H #define QEMU_TARGET_INFO_IMPL_H =20 +#include "qapi/qapi-types-common.h" #include "qapi/qapi-types-machine.h" =20 typedef struct TargetInfo { --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079996; cv=none; d=zohomail.com; s=zohoarc; b=UVbzO3+vXwP0dXmEJbOfUHb9qnDVf93LEQnN30qmWkubOhC1p8EEDs2umWSGkvMCGQai4gkge6J2v6UJA3hrFv8GQqenlsmAti8yqDfvhluLEDGwQuuWQ0Iixi5bVrVyVgOYkCCF6ZSOjt9ZdeAvui2lOjfO96B+24LVS6vPVmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079996; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=7pVRvMSa1tuaaAjaeaWzWN+zOC+X4LPSLmio2TfrgMc=; b=iGbXWVtIsne9DswhDxmXj8blsHc0SCfB0yZRN91lbkS7R+NLc1ldHMiwrPbPn/jqriLCaq8mquj3QSDkPwNbYRg7l3JEpf5f4sZE2AQ/1Omr0t7NayD5cVjjJPAswaAo7vqPZgDvxDF6nMLKwY0YjAhWDtNCHHBXuWrPv7QQf5k= 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 1761079996783681.7476440393556; Tue, 21 Oct 2025 13:53:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJV-0005IG-CN; Tue, 21 Oct 2025 16:50:37 -0400 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 1vBJJN-00050L-1e for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:30 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJK-0001YB-To for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:28 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so1608455e9.1 for ; Tue, 21 Oct 2025 13:50:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47494b02475sm24819605e9.4.2025.10.21.13.50.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079823; x=1761684623; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7pVRvMSa1tuaaAjaeaWzWN+zOC+X4LPSLmio2TfrgMc=; b=ipqBQ3kmZQowuKpufkNmaLR1GyOb5l9g8tAIRPbFbFadqqHasfLpLFKGMWwTRJIE2N 4jO6wbfehnW2O6Z+6sdFQVfi2TDx6g/9mhsAJvQbWJja2C39NeowvS3UBVCepzfL5Vte JcKwUbhaWo7kuLsh2rGubr2GnI80mOch3XtBPWnq15e8mRhmJh6BK8ZLiKWqgoDAGQQn 9zsasFAaFOwpD4zura618Gs7d+qM8jqMaeelSwxG+56JrlUPmGCQYzB5Cw6bkYRUAzR/ MM31kCfjPJbjgiAH0ptG8M722cUWNefC5IHtJJrtUhqYXVib8L2vyla/727TTdTG2UAs FuwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079823; x=1761684623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7pVRvMSa1tuaaAjaeaWzWN+zOC+X4LPSLmio2TfrgMc=; b=MlUOpBTP8xdwwfK9n8j1fNQ8vjaI/MWulC3eEuE2QdbmGYwZjMH0O1rN5TJGk3cIKH Mu2saFaZIxRtNwxp4fLWw3AzOzH5dN8KgOpwjmflHUbUX4ZhKbc45RDKfKyCRP3PhdjI 6aW+O+2xLHRm1TI6LB91Lo6l3QvYfcOY9NeaPCPVbS86kzy/U9O9ojdmfTLzaI4IGBwD GagblDRfOYSogu2vAE2Xd2RvoiRI/EmHOE+zE6QngBFK4DC5TpRMVWMA8SrjjnELSiwr mm67PtASveQ1oCikgvqJXesXP7dyZtP9aj+nAMMqU6xSvkmnC0qhAdWD9ntKMrHUNI/l XwZA== X-Gm-Message-State: AOJu0YyRwxRz+YW9wOIECYFKAz2pnm6u3/MaNsT2nwOfieO2/+Y7QoC/ G7hDNZ7GmANTKNp8MDkNLC4bVHq2U8jev3G7BqQd0K0YVSvN0gy0pg73iSTad9mK8TLWPSgLfaK hNm15cbg= X-Gm-Gg: ASbGncvvap4AXtWaALK88AXEyO887s6hEILwXXU0eUzL25VZ2FUx/DG5kV92XOA3oE2 vcoGHlqJlnLCgQYvcLZIS7Eot3Zw7sULFo+gxVXdtAlg7VDJFhFCYkMWmBRPoV7J3gEnfLewU3R FDGtF+PaufwHy8KLy75+4iOemBl6QGU+6iFV+srMsK2Rvu4iMlOzoS6DXJgOS5zx41QLqDM/JfS f+tbWeQlX8kS162bhc1IQ+uUf4mBTIvHyAEQ/WAjIxMYDwTI9YPoMUBoIVwi9arOcw0Kg+Ta8Xd HeKvl2HSqiKd38t05mm1txLw9WwJQlANBz5wy+pcaSldguH+B7m+hIC6MDMsNK5DrGM7B2au/eP rAQClC7Gx3GZ9JPZT85xkbl/dq3XmjdHw1+IVu7ZQbhpZtUxXqI0mXilXlfqKQ+pSH9FddgslQU /7d+J/hay3yROwYndsLwq9Dxdk2CBS+ZONLuaMo+KejULqr68bB91nDcgGdFtd9kGxLpkVlOc= X-Google-Smtp-Source: AGHT+IFd0IRuX6vS1KrZzAvST7/oqk+CE27Cqtt+XJEK1kuXJXXvseHWKqKzwkkqV2mZ01cWzYS3aQ== X-Received: by 2002:a05:600c:3505:b0:46e:59bd:f7e2 with SMTP id 5b1f17b1804b1-475c3fcb2fbmr7419785e9.11.1761079823360; Tue, 21 Oct 2025 13:50:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 43/45] MAINTAINERS: Add missing machine name in the Alpha section Date: Tue, 21 Oct 2025 22:46:57 +0200 Message-ID: <20251021204700.56072-44-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1761079999937154100 From: Thomas Huth Without a machine name here, get_maintainers.pl uses the "-----..." separator for describing what the maintainer is taking care of: $ scripts/get_maintainer.pl -f hw/alpha/dp264.c Richard Henderson (maintainer:-------------= -) qemu-devel@nongnu.org (open list:All patches CC here) Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251020140425.45003-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 667acd933c7..d4e7fd965b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -671,6 +671,7 @@ F: tests/docker/dockerfiles/emsdk-wasm32-cross.docker =20 Alpha Machines -------------- +Clipper M: Richard Henderson S: Maintained F: hw/alpha/ --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761079885; cv=none; d=zohomail.com; s=zohoarc; b=bP91O/XKQTyyD5CVuwXB4ffSmAv8k07fwUFNZ7BG1PKT4kN1IFcWEtcAVuZValV0V6qDwLujTw8L/6w3HwoqcnH1wNf9S9B6fhYA0zVNjm/R5dE4NWmpklHZ8p9iG3/MnyfgzPxY4ytVZM4tsFZ1ttInh6tP4kYCghGwp87SlKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761079885; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XmIazvnMcS62evWaxsTSFabokho2yYFz693QcRgJ7JQ=; b=HzhUDkuR6Z2L+Jld12Ihtt9SDvqDNfZA+5vUyRGy8YeM3rLRyS6+LpCm+jCFSJamVdvTHc2UBBnzJzqcjItthj46DY4kHa+8+iLvjYxD+vvmDGWwUEQpT8IGvyLngk3FLcl4wORH62AnLf99yaGnx90RtfNouxnnfl7ui9oDOfM= 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 1761079885542581.2044033251934; Tue, 21 Oct 2025 13:51:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJZ-0005YZ-1f; Tue, 21 Oct 2025 16:50:41 -0400 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 1vBJJR-00054T-90 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJP-0001YZ-9C for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:32 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-471bde1e8f8so14477055e9.0 for ; Tue, 21 Oct 2025 13:50:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475c427ed3fsm11858105e9.1.2025.10.21.13.50.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079828; x=1761684628; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XmIazvnMcS62evWaxsTSFabokho2yYFz693QcRgJ7JQ=; b=B0nP/4oNgLLbSsyMveFlgJXdsE+jJjhbrDrQvZRJgjcbrRHrbDR8hiNhb7XviD2rGO JjX+r+E1NnOOfWEH9YdEPoij8J4mdXkBk4HIyWrINlNlCO3sWvyrPKh0TPb71nAc2T7h bHDA5143RtqT+PYLeZolPuzaBrAUk+U0zQble9alNJVog4kQZuY8pLB8W/rL0AHMNH5W pNnvBZpBdA4i26pRKBiwIC4zEuNCzDNqMzb9ChhV1huGVogbeoTa7Br8Jeeqj2Bxxumm oHFNoPx9puOopDS4nxYoJGMAzQ2NqTMhe47E+s2FADIGMLMjr8Y3a4S7DeDJI7vEhFe3 NZjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079828; x=1761684628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XmIazvnMcS62evWaxsTSFabokho2yYFz693QcRgJ7JQ=; b=CvuYQy8RAwCBOSkxfS8HsOkhxOFgWzJf1VpoTl5ifW/IEkSPvfVvlHGBYx9O/1Q2z4 AeBMZ/9ttbQSP6BfjUr+AkAGOyxLiwb2J2xFSLDumHY75zloUJpiztPYvH9bP9N8ANvV uRc49+aK19DOVnpzTFa45bIsL+pmRz++D9dJ2Xvsy/ANcVtkmcFXZCpKDgtU5a4L3kMW Dcm2kQt0VboKwcA6sq56Yytcb59Yu0IjfgizoTS9R+iBm8oaZUP2BKtcSPQ3ux7EWdoI gxE6JSvdEUvwKAhMYS2pSRzpQV2GaKWcvuYbwnSZFPs+C5Eny9SVNqN4YJyWhRKAZV7I RJ8g== X-Gm-Message-State: AOJu0Yw8H+i9gLMnUiqWFuQAA342L19RBv8/EiqsZYBJFTtV/MAhYlrp XQdSn6d37RHHeGDOxYM2wLX9MedBwYn4h+4XB6k64GLIl+VL5oqPtX86/R7ftfhDmKoSNexfIU9 1joH94Ww= X-Gm-Gg: ASbGncuVdXRdaV8asLHYAOmdsr6r10Hc/e86NIJ8iVhaxMXJ1KCGgM16tM3ykzIg735 JWlV47liwryHYABS5u+Z0fv9yGScQIzBa3JjSBeCamX7cSqcmH5Gc98RvZXDHlfPxEmdR1yIVXC 39zR2y/8+qMkwbYxXwQN5izs0SYXeC3JqRXZgx6YcWrjTuqUVoI6JLqRkPsq7Xl0WJf3jtv/7cn xTUigUPC6ru45dEpiwXWeAvh/KR9ZQeQjgxrGYaYmqigDkfmZSukzyGuPAS+f5sjOTVwR2d+k4H XwKqQBO17h0h/svoj4JdieeUNnI2rXVQKASWQo2xu1O1skIS2UPpL6m07EDqrA7CiuehQ26s35L 39980cdQN3sX4p/yEXXuU/gxjjPKYO84RIQKdFpPElkk75fw2PgtFEAs/Nfwov80QTHwdGVFAeP lIKLstw7glXgH0hDaLHdhmmZalb2CGnnf1zVfZZd0xxRDevpSIb3b1hadUUssFt3OERxtHodI= X-Google-Smtp-Source: AGHT+IFD2zqidMb3YwCAOpr2QWjvLy+xm/westVdlBAQozpnhsbyCRWRM9DdfVYm+sSDkpgfJp/RZA== X-Received: by 2002:a05:600c:4f89:b0:46e:3edc:2811 with SMTP id 5b1f17b1804b1-4711787750dmr123687955e9.14.1761079827785; Tue, 21 Oct 2025 13:50:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 44/45] docs: update -soundhw -> -device list Date: Tue, 21 Oct 2025 22:46:58 +0200 Message-ID: <20251021204700.56072-45-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1761079888681158500 From: Marc-Andr=C3=A9 Lureau (note: I wonder if pcspk was really an option when -soundhw was available, since it was not user-creatable) Signed-off-by: Marc-Andr=C3=A9 Lureau Message-ID: <20251021090317.425409-8-marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/qdev-device-use.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index c98c86d8280..043ae461140 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -324,8 +324,10 @@ Map from -soundhw sound card name to -device: gus -device gus,iobase=3DIOADDR,irq=3DIRQ,dma=3DDMA,freq=3DF hda -device intel-hda,msi=3DMSI -device hda-duplex sb16 -device sb16,iobase=3DIOADDR,irq=3DIRQ,dma=3DDMA,dma16=3DD= MA16,version=3DV - adlib not yet available with -device - pcspk not yet available with -device + adlib -device adlib,iobase=3DIOADDR,freq=3DF + + pcspk Not available with -device, + but audiodev can be set with -machine pcspk-audiodev=3D =20 For PCI devices, you can add bus=3DPCI-BUS,addr=3DDEVFN to control the PCI device address, as usual. --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=1761080060; cv=none; d=zohomail.com; s=zohoarc; b=gMZIr2rBgdgnntbwMcf2+uR3g94efbPj6De1Vj9PHT7/yEYE1/yLYt+XR97K4xrPLqUxs2tGDVGIhVmfPYGJa5R07KO2djBzyrGmkTq5Ksm6jHAODchkx/cK4EWNcMiqWHaQfk6tj2PpUOaF8U0n6UemNtxGlKwWriZyFfJEeM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761080060; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=5pCkwXJ0ZMdPMUhQ4XQ9aG/lFbpQNR5L7Pb23bpOUK8=; b=noxk3CDoVVdbqNsfc+SAnHXtvZxXN/ZgJ9AwKjnX23z56BDnxdQJrqFuVrPpSXfY3Pk3phVVQVqPLevVuzQf9hQthnEDPw/SwBYWLOP1WsR+cdVlRdcJD5taY6wmnj7cNa2iW92+2f0aWDoDjZTIZHU5VRvEKOAXCOiH0l1g2h8= 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 1761080060239112.98507651135242; Tue, 21 Oct 2025 13:54:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBJJd-0005mK-0d; Tue, 21 Oct 2025 16:50:45 -0400 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 1vBJJV-0005La-HF for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:37 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBJJT-0001ZI-Hg for qemu-devel@nongnu.org; Tue, 21 Oct 2025 16:50:37 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3ee12807d97so5701075f8f.0 for ; Tue, 21 Oct 2025 13:50:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b985esm22665976f8f.34.2025.10.21.13.50.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 13:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761079833; x=1761684633; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5pCkwXJ0ZMdPMUhQ4XQ9aG/lFbpQNR5L7Pb23bpOUK8=; b=p/FmL8PvTjlEdEzy39R1+gDQ7BmyPA4iIwZLYdDRqJYb8SfENwWXbRYrZSe+wWU6LN yhBPVspOu/E+vsydFzxl7cXJTMpvzPDg4+vCtgnxzkzoStJK+m/HPPhCw3hM86nqxgKQ Dv5kB2Yhw8VX4xVrrQcNKHrDlaFlzXGtYhNcfN2lp/pSY16/X4u1UuyWwmdwx5uY6Lw3 d9FYYhJlH1Vi527imsZoI8Ig8k82lf0QcpjduUOw6RxIaMTCQ/RX/wxzurVU+00sh0qm 5p7xxvUPWQ4kZSqaElN8M+SwlJTKJVT0BZNDop7ELyT03N3iwqaw94NJRj0EY63luMkl RAbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761079833; x=1761684633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5pCkwXJ0ZMdPMUhQ4XQ9aG/lFbpQNR5L7Pb23bpOUK8=; b=qRK6fBVaX8u8+tqQ7qNayjQF0m11j3cG6So9kZv9ni7GV7vucO4QDucngtpgIjaxKv YHiGvFOlZQBINImhTZwmV0k4o4I7KJWs7+JDzyAab66tNFZ3ziHywyPC0z1EQc0TcJs7 feZq4sAwRiLzPd+lGW+/QY7sttadymjSH3yCVpYqIlFUWHJrAGqdm7dMxLrpG8++B86k Vc77682L7mLMHp0nH4KUFR9g62OBHMwGJRg7qFPuuYUEa2yNqHtC0MEWS+/GWj/GYkyG a7+TAFZwhnXG+COzZMzVEMAwOHg8Rqk7PvJYgQqrKwxjzrRUF3P4AaA+f8KkY1jU+8lA gcDw== X-Gm-Message-State: AOJu0YxcQ+QlOpC9mdVO+INMXa/GFYDnkRJcZQF1BrdCvAG+0KGpzr4U pt63H7U4Qo/9RRi3eXwjtVtCi9WzctFpWSmNWaFRT8V3J7UxQXzeumevo5mANG8Yx5/t/N96fBm PDCS4WVo= X-Gm-Gg: ASbGncuZ1G4GEwGcdz+iDWl7b0MDBm1VomecVcxa+gR6U2ldY99Ic7U7zAcLYD+YFaO 9Exn867T3boqfp/BqrFy570GmY8NY04eoxd0RBraEH8NbAQ1K2BrGDedDvthSerJYeZVi+wf03z 4tj4TzLMTFen9GTaVy7XqJJFMmACwa109E4kYDNZR0bXBVP2mJlWPiQe4ED0yotEzfJdl1TjAvK aIkAGerCsRDmV8Yd2OwdZEROKijftNZLgPbYJdI6SBoqKr8rUME8YET6e54wheW223lURncUWK9 WUwGua8hVG/BMiK99Sv8A3G03Zt0ZJ/RS90wge3+AqnWpRzvBOWXAPJx0er5gldc6spiUbfD8gC M8E8aViWEKkjucHvaVZX/nAIYDwtaLUyC9Zlb1ET8/vwm72x6YKXU4Uuf16z/PCdEfMtKXJPVmB mRX8YhHBb+mUNW1wTaVry7p0jfCBG1XDgU3WDmxqdl+VyW3eNRaQ== X-Google-Smtp-Source: AGHT+IGs2Z3YSA1x/PxUxi5iw2Iw8Rtin3k+88j0qCKZCdFaNJOWoZWsMHacOKp4FGrMNQ593EYyzA== X-Received: by 2002:a05:6000:22c6:b0:427:23a:c339 with SMTP id ffacd0b85a97d-42704d6c507mr12832022f8f.14.1761079832754; Tue, 21 Oct 2025 13:50:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 45/45] docs: Update mentions of removed '-soundhw' command line option Date: Tue, 21 Oct 2025 22:46:59 +0200 Message-ID: <20251021204700.56072-46-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021204700.56072-1-philmd@linaro.org> References: <20251021204700.56072-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1761080062584154100 The `-soundhw` CLI was removed in commit 039a68373c4 ("introduce -audio as a replacement for -soundhw"). Remove outdated comments and update the document mentioning the old usage. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20251021131825.99390-2-philmd@linaro.org> --- docs/qdev-device-use.txt | 4 ++-- system/qdev-monitor.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 043ae461140..fb420da2a9e 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -311,9 +311,9 @@ constraints. =20 Host and guest part of audio devices have always been separate. =20 -The old way to define guest audio devices is -soundhw C1,... +The old way to define guest audio devices was -soundhw C1,... =20 -The new way is to define each guest audio device separately with +The current way is to define each guest audio device separately with -device. =20 Map from -soundhw sound card name to -device: diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 2ac92d0a076..ec4a2394ceb 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -73,9 +73,9 @@ typedef struct QDevAlias =20 /* Please keep this table sorted by typename. */ static const QDevAlias qdev_alias_table[] =3D { - { "AC97", "ac97" }, /* -soundhw name */ + { "AC97", "ac97" }, { "e1000", "e1000-82540em" }, - { "ES1370", "es1370" }, /* -soundhw name */ + { "ES1370", "es1370" }, { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, { "virtio-9p-device", "virtio-9p", QEMU_ARCH_VIRTIO_MMIO }, --=20 2.51.0