From patchwork Tue Jun 10 12:56:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895186 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2247651wrb; Tue, 10 Jun 2025 05:57:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgq80DCL1m/+6IyU31kkKIC6UlHeC5DCuaZD7tJt0TJYJV+OFvQb1f6yquGMPrDyz83H5+FQ==@linaro.org X-Google-Smtp-Source: AGHT+IHYvlvdgA9Yk5ukf5NiOWa4IWCZ3uK8A+NFaO592ZtrxIkyv2rEI2veLSlTeVz2epC0TRXa X-Received: by 2002:a05:620a:1030:b0:7d2:26f3:83de with SMTP id af79cd13be357-7d2298ed2c8mr2447160185a.54.1749560235782; Tue, 10 Jun 2025 05:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560235; cv=none; d=google.com; s=arc-20240605; b=fOkyv3e2heUe5p1C7BmdM/iVDqMiSMZEutfcrYzIbDnJWdSfcu+7wf4xFaCqX62LoJ 2RVrOKmk64tbpZoHMI+FmmWM+3ufHHoCvp4i10k7XYTFG3iLf4J6uHjbgIBPp+RU4tzv ia5YAso+QFHjNc6ZbGpad580EZ8xH7MLiNBQ4uMNGzlWVvH2CvIMK1xxxm7oUGy1owxT vr5LKvveGcxwtCtffXVcO3l4t5koY7Ve2HYMkfZKPDLBN2J4yIa/h3i1duVUMU58ayUB OwXrzZfI0ZAgV5MZaQ4CFfmx8QVvogkS5xvB/blHuOAi/MWze92S2S2xyxpK8iFl421d s0fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zCAoRynAhXP/FtzNeSWR7cVQ7ENbVKgTaL7aafDN9GY=; fh=XWTD8Z9WAMjh+M8BxQj8k30uAZD5B0T9z1nl1AeO1vA=; b=dU52eKH2wFFyLTG4sBHHFdNIeegxeLTtFj40yjYbGsftSj5oLzk7J0P4f6fl9S6XNH yOzd0Ej/2UgRRY69htRCHZD4gOjCG+TfC2ssXKVG8vxg88LxZAMxVBgjTv7ELBOhV4Kr +twtxJDy1CEypaNtdMN0nnwoA1d6/QBwqkQcx9AjxqsdoFrVWc2iTy+bU3CqX0lvThcG Kw4zQHm7V+LrriVy3F9SwtFApc3T1cQuDmteCcg38/P02hKPd9I8T7KYinu2uDfnbcyq 0irSuTWxMgu/eT0KeXdzRGcFZUhVka8PJHAuo0N1rLzKGBx22xO+N2zjb8sCoNXhG8t/ MVSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=grHIlSlp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d25a5f9200si1026315885a.237.2025.06.10.05.57.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:57:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=grHIlSlp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXB-0006ZS-Sj; Tue, 10 Jun 2025 08:56:59 -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 1uOyWy-0006XP-9y for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:44 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyWw-0002Xj-CO for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:44 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a4f71831abso5101855f8f.3 for ; Tue, 10 Jun 2025 05:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560200; x=1750165000; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zCAoRynAhXP/FtzNeSWR7cVQ7ENbVKgTaL7aafDN9GY=; b=grHIlSlp8Hiqfs7X+wMH1usT8PVDnyJQeU7lcgsuI5JD2Kunod/kZIxZPtbxi4F32x MpawQeGoytbxko7b5QnjG+OnF7KWDhMTP2NOy7hxAbRbytpnxObod+2v7aRCtl2O6Xsv M6Gng9sa8tp+QmHKDWL/5wbkvtH0ax3d0lfp4Bp53IOVreex+XC/SiO3+fN73uV6KRo8 QeaPfEGUfsPaTCf1gufDj5Et0nqVHMoRNZqO+Bgn4VgCIkh/2mbuq+92x0H2Hr7lUn0S xcFb1fPcdU9xhMlOf3mKskxtJCUnssJSoweEW+pFrqHJPZAZNOdGVUx7kWW9XEp25Cp1 s5tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560200; x=1750165000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zCAoRynAhXP/FtzNeSWR7cVQ7ENbVKgTaL7aafDN9GY=; b=fee6iKpdKAdpSnEj0f1EoIt9aRPaE7uk8qjMBSRHI4DSyhzzv1s99uf9OTQVLGNHOB TMu+egZhzrQi9JufFsQ6n9ASE3Ug8Ty6pOBQsZyD3aGU/yvL9GTajuEn50QUc9QY6LKP Xk3XU+hpTcPh70zntznUKbKSlJp28y4IC5/s8QnbJmXHHVHPiy1OD/rhuNNmLvFWMITT LPczpVwen7+Tawnp773nFumiw55Gj53UoKcDxJsHRiBAlIZvBbuyaX64tYhx3JsBXk4c AelZyMX6MyrVZ2SqyJ/KHeDbt1I5Pn1yqvLo+YOMZHgJwBhgcWN1o+y6mduqH4dLGC2p E9Ng== X-Gm-Message-State: AOJu0YwjeP3cDzLTwyYLyVT0+iyNJ920AI8JD9E1KtzahVS7Ua0mkyXj i0o7AxqdqUod7A5MacOmUBVk49tx2rdC193WOqEZFwTRosyp5OXeW5hYbmR/K4BTuVp5dsnsLZv 6hFH9cBo= X-Gm-Gg: ASbGncs48MxEML2bVpkHfY4P2uBDjjTQtYzFTUZ6miCNZRmOIA5Ldoatf9V+eu1w8pk 0hdLlCl4JdYAPuhnLJECADFh3llN/U/8+10We+/PLO5fydUQKuKgOxRJ1ssQ7dLpWcIJrvk5M38 8LufUsAv1oECIh/vNsf1NJZ2vRBF495im/fEvedmwSt4EBJiuR+mcXHCbpwbDpkYoHIH5iWJVY7 9Ab4E9y3gmaHp7y+Z6+qi+1ZhOkbjRX6Cc7FcR/WL7SKxEiGPmqm9xnJg0ApvqA3pCPKdl30TIs Wo1VMMRX1NvtsKv5NV2k4zbxzMAN9d9DFW+rP+PTvLMSkuqqhQ3PpOgfL8NIB0DCpUfNN7bx4nC 254WTVevtjpDEUS8MKEPZL8779i0EL09qigc+a31Dyg== X-Received: by 2002:a05:6000:22c4:b0:3a5:2f23:3789 with SMTP id ffacd0b85a97d-3a53188d5cfmr13084855f8f.15.1749560199910; Tue, 10 Jun 2025 05:56: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-3a5323c0819sm12047494f8f.45.2025.06.10.05.56.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PULL 01/24] hw/char/sh_serial: Delete fifo_timeout_timer in DeviceUnrealize Date: Tue, 10 Jun 2025 14:56:10 +0200 Message-ID: <20250610125633.24411-2-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org fifo_timeout_timer is created in the DeviceRealize handler, not in the instance_init one. For parity, delete it in DeviceUnrealize, rather than instance_finalize. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20250124175053.74461-2-philmd@linaro.org> --- hw/char/sh_serial.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 6abd80386fb..cdaeac7b709 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -434,9 +434,9 @@ static void sh_serial_realize(DeviceState *d, Error **errp) s->etu = NANOSECONDS_PER_SECOND / 9600; } -static void sh_serial_finalize(Object *obj) +static void sh_serial_unrealize(DeviceState *dev) { - SHSerialState *s = SH_SERIAL(obj); + SHSerialState *s = SH_SERIAL(dev); timer_del(&s->fifo_timeout_timer); } @@ -445,6 +445,10 @@ static void sh_serial_init(Object *obj) { } +static void sh_serial_finalize(Object *obj) +{ +} + static const Property sh_serial_properties[] = { DEFINE_PROP_CHR("chardev", SHSerialState, chr), DEFINE_PROP_UINT8("features", SHSerialState, feat, 0), @@ -456,6 +460,7 @@ static void sh_serial_class_init(ObjectClass *oc, const void *data) device_class_set_props(dc, sh_serial_properties); dc->realize = sh_serial_realize; + dc->unrealize = sh_serial_unrealize; device_class_set_legacy_reset(dc, sh_serial_reset); /* Reason: part of SuperH CPU/SoC, needs to be wired up */ dc->user_creatable = false; From patchwork Tue Jun 10 12:56:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895201 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2252951wrb; Tue, 10 Jun 2025 06:05:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcxssfv3EFnbHbhL+M/HAtTfZITai09Tqe2AgTMdvZsPCg6S3Vilss5KJm3pP0ss+mYU91zg==@linaro.org X-Google-Smtp-Source: AGHT+IE0R3aqrmkqRnHfl5xeMgQWVmR7/bfSuqJZ9XVyvgE0j4opgGSFQTN3RpSGoNu/BJ4cQOO9 X-Received: by 2002:a05:6102:5813:b0:4e5:9b5f:a7a2 with SMTP id ada2fe7eead31-4e7729266c6mr15341709137.9.1749560747531; Tue, 10 Jun 2025 06:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560747; cv=none; d=google.com; s=arc-20240605; b=V0MT37I+K+Ca8zEw69N8Ys8siTDzkp+BH2WGFtxxU/UNHJii+fHJaFia+mMDh47Q8U aKyh3UGf4GZqS1ue8Q7p6Ub8uXt61coLDqNfqk32Q7knyn2aEpq4WtkvW6WGzvf/qvFY 3tAEt+9ZHVSocoNRj475yevB1CTKvJDb0qYzoLZlp+I4V2G6t13GNO3g8JfyHiexgGqy 9Ci4NnmyDYfnrLTTBzQ8cjVTzdbTEC9xoN4/M31x4WVD/ydbWUROe7qjj0ZTxLfmRn9n vIznV4cs+tmx7TS8mbywdF6V006JmeCs8ak65WTQDh4iud4rDQhdcaiMo1i8RatD+OOP eHeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0Z+F9XmQmU87AVbjZbrQLCllEUIvwWYDtRqjIX6YXKQ=; fh=XWTD8Z9WAMjh+M8BxQj8k30uAZD5B0T9z1nl1AeO1vA=; b=KXjMc2i9L6YTX4qJ9W+oj4hfqzdr8iO/oejtlH63d6wXpi4b1EMBhy3PWIMmx/rASo +uKKkWxhmFZQ/mewHkFU9MLKiB0LM1na5ckpXx249GIgvqQVUzqY76FC/H/pMjchImOF VZ+myoXYTGwQnqyaoxkwhId6UMKRbcWemdAeK4ErGqwLBpThOTVtcQpVT5YyuTnBOzjz wuT4fBcFwJjKfi2ogN05Bn/RMqD4uIKGa7ebmTB+0vCaPjm9wK+tjzLB52mewQZI2NRJ bVkCBQWDne4lRsPgeLML8IzSPY1kfeTM/MVpz1f1HajlEbmblpmkb/qIhd79YuWKACJE /Pxg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lQw5qI2d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4e773992a10si3114791137.182.2025.06.10.06.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lQw5qI2d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXG-0006ac-2m; Tue, 10 Jun 2025 08:57:02 -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 1uOyX3-0006Y9-6d for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:54 -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 1uOyX0-0002YL-Qq for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:48 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-453066fad06so19507525e9.2 for ; Tue, 10 Jun 2025 05:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560204; x=1750165004; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Z+F9XmQmU87AVbjZbrQLCllEUIvwWYDtRqjIX6YXKQ=; b=lQw5qI2dNPRPls8X8mah+MqyRWPR/SsITx7hSvX6AMtYYuwVHwXuin7O/kKSqhJJ6h cFLxFBtWt8s4qaAFmpKvmxPmthqCjnWu919bHHrxNig9fPcgwqtN0er3IPe/tmqlWN21 kL1pl2UohEsnaw3xhoYy4NhxtgAkAQ84GDl/d8WMXRXQGMfSnoG/tY94mNymvIYTQZ2R qKVi04Oo3bygw2wqdKwkWD1Iuq4aE1ujHxpDnCW2+5P4q+gOy/2des3sf/lwCPv2DmBm R7CGBOfTL0OQPURhXuTUVUAZ+QXVuwIWbLX/4C3xvQQ4YkARhGkfLnRJAfZHquR0ybg9 A/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560204; x=1750165004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Z+F9XmQmU87AVbjZbrQLCllEUIvwWYDtRqjIX6YXKQ=; b=Rr4nvub9ocyEOoY5Ub/Cd4fbTjqiTo7aJy5jZ1VWyx+S4szQh8auM88vBTJewbE/64 si8+IbCVdDJFR6ciF+eYn/JzXnkVbPlsrtTbsUX9mWhob+7Q/A+5fFBG6t7fLLN0u56e Fz4DRABiIkOdcKh6mZVLyAyrr+FABI9e3RUpgRf40vb+RDWtXz/Fe0CCN1AwUttyie0m BK5g9Dg4Yj3AR8rdNrKaD+ESODdyoNz3hJPwkN44njT/k14/FJviAbWb7B+sp3PDlbhO QHVGntfWa14A1t5y7blOj5y23A43mCVREU5tzioja4l9tS5wx0NPEuqxwK9R6n/hNFON yN6Q== X-Gm-Message-State: AOJu0YwrVHO/G/XoL0TsQYnObEInKJmXnO/cXX9qA0kd9I4UyYOWngKW deOctlp2Vv+t0XpNmvxVDL89ES9Uh5yxLQatjOMBJUSr24+1T5t2ppBRSZ6djNd4ua1Wr9b+jYo +PlqmRcI= X-Gm-Gg: ASbGncukQ8a7Cl87hxkGuDHNkrDK0W7+ZIxferL5MJjTmCKt1wBvFaPLzZsD461yed9 p+9PMF9rudD12qZwXjSYw++FrxAhcW+NpMqnGFbWpUywzZkwt5YP58Ri7WKlvIpWUakPLK5vIN3 tL9LbF6/mjm8keVPH0TFFOzuVN7vZe28bhzfXYG2tYXb/qYuaTowxaDzaGOGMXKH4rl2udFlGe5 LmdYrszqNVv9pTqHU8RycfHNCSf4MaOgr0E+q3yS7NJ6ZdTp5KrE4HwisNXakNDmSlUAuIZDxZX EUKaaRF8dfKlhaltqKQkG3rgIAokSGmhDDbED0KyUXQoSnmZA9lUWPuDupt/PzA1Cfq/UkU+6bH UHCqczyrVMlsnfyAx9oltA60OgRsPVnEOV0Z/jbhJbw== X-Received: by 2002:a05:600c:4f8a:b0:453:b44:eb71 with SMTP id 5b1f17b1804b1-4530b44efb3mr73427365e9.19.1749560204409; Tue, 10 Jun 2025 05:56:44 -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-3a53244d15asm12581969f8f.66.2025.06.10.05.56.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PULL 02/24] hw/char/sh_serial: Convert to TypeInfo Date: Tue, 10 Jun 2025 14:56:11 +0200 Message-ID: <20250610125633.24411-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org QOM types are now registered using as TypeInfo via DEFINE_TYPES() or type_init(). Update TYPE_SH_SERIAL, removing the empty QOM instance_init/finalize handlers. This was definitely wrong, because OBJECT_DEFINE_TYPE() is only for cases where the class needs its own virtual methods or some other per-class state in its own class struct. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20250124175053.74461-3-philmd@linaro.org> --- hw/char/sh_serial.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index cdaeac7b709..30447fa018a 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -78,10 +78,6 @@ struct SHSerialState { qemu_irq bri; }; -typedef struct {} SHSerialStateClass; - -OBJECT_DEFINE_TYPE(SHSerialState, sh_serial, SH_SERIAL, SYS_BUS_DEVICE) - static void sh_serial_clear_fifo(SHSerialState *s) { memset(s->rx_fifo, 0, SH_RX_FIFO_LENGTH); @@ -441,14 +437,6 @@ static void sh_serial_unrealize(DeviceState *dev) timer_del(&s->fifo_timeout_timer); } -static void sh_serial_init(Object *obj) -{ -} - -static void sh_serial_finalize(Object *obj) -{ -} - static const Property sh_serial_properties[] = { DEFINE_PROP_CHR("chardev", SHSerialState, chr), DEFINE_PROP_UINT8("features", SHSerialState, feat, 0), @@ -465,3 +453,14 @@ static void sh_serial_class_init(ObjectClass *oc, const void *data) /* Reason: part of SuperH CPU/SoC, needs to be wired up */ dc->user_creatable = false; } + +static const TypeInfo sh_serial_types[] = { + { + .name = TYPE_SH_SERIAL, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(SHSerialState), + .class_init = sh_serial_class_init, + }, +}; + +DEFINE_TYPES(sh_serial_types) From patchwork Tue Jun 10 12:56:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895187 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2247778wrb; Tue, 10 Jun 2025 05:57:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgJGMp1A3Hds9VW5A/coQepNppJ/6C5dgOdPV3gKy851DAwvXVdP8FSYQLF580xiKbSeDHJQ==@linaro.org X-Google-Smtp-Source: AGHT+IFJfEh1KMjWNzoz/nMhRMnD9usNFBDN+OEO7jqIvnHCXjVxbmxpTE08oCWwXsNywQPPbedY X-Received: by 2002:a05:6214:2623:b0:6fa:ba15:e7f with SMTP id 6a1803df08f44-6fb24c4f370mr31788756d6.9.1749560259100; Tue, 10 Jun 2025 05:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560259; cv=none; d=google.com; s=arc-20240605; b=gPEF8/lUAyTmG9BVpTTXlePjjc3waY0R3FJ7guR94SQM8ItfiU8RQG1L6Lv7T7kLs8 m09kAYLo2U4/BcbHSHGZF0PmxFJDeWBls19inAcMpxGQoGPOY8CBgH2FZ5ypU8agPW3h dc8VxHcqb1FkoObwcYcNUVO3XI6BTCFAK/WsP4l7DiK7VEbQAXUcsSHP4wC066c/hERy rmc9XtnSEC8xgNDWlKI2z4g2Feoohi4sd8yljPe/W0V8fmioNbDRrIBxavMFaXh7KCnR 6z7OFH7uH9KAKimCOzGdqraYZsz7hfcQiPa34733nlK6keJ9Apws/ZhpOVXAUGz+t9Qv 4qLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; fh=5KYNaH84KuhJkbNfHAKkJotxTHueTtQQGeWlMENxW3A=; b=FIOr8r/o+EVGM7qqpRo45YqHcM2DYMyWNiaJEg/g5BuH1nuaVzJREGpjXw/4dgWCik iT/aNNYnz35xdoIjvmjrd8msq1GBYvQ5xHSxIfZnBrVlZo0aCJrq1NGeWdkYAF3ljM0j UA2zyakLMJjbvuq5Z0+/zMCkfA9VvB1ui8fbAUpyaXzl0gHed6GXSdlDR8fKPHYZxL+5 v530OH1Etv8wLHGjzDayowVAVuxUyCzQ8+emyo+FeBCJFKdLzsNxHjGv7oPW3w39Hj/I st7NwND9HpJC6ImitEEVQGRFRskwGfuwZNbPliLkFlz5VayYjpCxPCrGD1wwGcsxauCD uBdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mGF1KB+X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09b2fc2bsi100052686d6.399.2025.06.10.05.57.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mGF1KB+X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXF-0006Zh-03; Tue, 10 Jun 2025 08:57: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 1uOyX8-0006YQ-R1 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:55 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyX5-0002Z8-43 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:53 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a4ef2c2ef3so4442388f8f.2 for ; Tue, 10 Jun 2025 05:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560209; x=1750165009; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; b=mGF1KB+X14vYj+bUE2xesW4InYkk1PopxIZ0aD5KJr1JIBAMaoXEwQFvK8sc+bY0CU 7kt6MqHaZ7EP26iDS1pkgq2wzR8sNwxPaDRLT27Y3P/EbdNTXIqsBALdOHOlzmvGnpro SOlBviJLvZo/dpZW78Fwzn/vuYnRJ+/1wCd33gXgU4oEjCRkYEBlJFZ3d7d8kT6oGIrW 0JjHufDaHPbqim4cNoSe8TamqmpESoBTNmnEfRSR89OeBvWcYbrmmPnCo8vD40krZpGP NjSVw29aDPhDQeRGwnneksSyKRgd6QoIKagwVt8teWUV/Qqx/0ZWtiFCAdLxoV2P7iG7 lCyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560209; x=1750165009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xYWOMe7KOZYqH5WTkINgsrklm0G/7PrDwav/PmZ5N5o=; b=JCxRURJ6stazjHWPIIgKl/ffhzpBgAU5p6xn46Wwb5gZ3Ed/qcssfxwuszHKiMKYkz 626cjhOYoBGdzALXaOo+wnOsWsGEijz/MznVm1XtP2yogWNZ22IHfZQDj2Dee/4DjJQn G3YEC3HOeVaT2K8J8swT/kElI25ocImYc5ySwlYv/N/cYWVU/MYvriyT/2JWhyoHAdLg kVx3pUvUDDj+MHrooOY1cugUYG8rNDcJNyTrXsINkXssByimOlH9ujAfA71Xfl2DNIut ChDPOwWbwrjL+WMflbg0TSoxQTy0Tz1zWglunRU2sQ6EKAiQu/94UA4EuDtirwaSC0Uj gdNw== X-Gm-Message-State: AOJu0YyZIfIsIMH4qsze4NO0aHnlYGkr3LVN7ntCMJQZ0UmvoJzW1NF7 58+a+CuFVD0wSlP/lK6nDCAgnnM37qM7AYTF+qlUS8pqPN9ko43vq6PLwIyL21B2puvkbkVl+nb jfGLDnT8= X-Gm-Gg: ASbGnct0ZVvBhBF2n1WBgX+zeUJYHjjyB410fyTbqXFYlywtfW4dDTLk3CSg/qsany5 QbhhEm0uMXE+DVfL9l/iHYYKZVeq+4Uv/tXt/uYDaIUCtAU2nfvm2gynTLSeTM950ZeLyllW3fy TvTx0S2NUaer03kqqcko2Yf4CJiF7Oiuaa5fYGfMnLABGpq94jYk2heIfv2CkTop1D2eJuG7zlC YI6MLTugw8/8/CLEGNu+pBViOwuIFFQXksii65L7y3+kh0UvD7tn6bF8Wns9wKKZxtJlxZkcL2C JQE2DuWrbrHpI2iLbSLFCcjOqWvTE27nKkCCog+GDBzrKH7M9t6FLMWO13yTIzBhlrXwVqhnb8t vjf4LtdMt3a1R4DIE78st1XsEsFiKSztLnzHbxpGzvA== X-Received: by 2002:a5d:564d:0:b0:3a5:39e9:7997 with SMTP id ffacd0b85a97d-3a539e979e5mr8554336f8f.34.1749560208877; Tue, 10 Jun 2025 05:56:48 -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-3a532435f95sm7698854f8f.60.2025.06.10.05.56.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 03/24] hw/pci-host/raven: Remove is-legacy-prep property Date: Tue, 10 Jun 2025 14:56:12 +0200 Message-ID: <20250610125633.24411-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan This was a workaround for the prep machine that was removed 5 years ago so this is no longer needed. Fixes: b2ce76a073 (hw/ppc/prep: Remove the deprecated "prep" machine and the OpenHackware BIOS) Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-ID: <0d41c18a8831bd4c8b0948eda3ef8f60f5a311f3.1746374076.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/raven.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 21f7ca65e06..b78a8f32d32 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -75,7 +75,6 @@ struct PRePPCIState { RavenPCIState pci_dev; int contiguous_map; - bool is_legacy_prep; }; #define BIOS_SIZE (1 * MiB) @@ -243,22 +242,18 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; - if (s->is_legacy_prep) { - for (i = 0; i < PCI_NUM_PINS; i++) { - sysbus_init_irq(dev, &s->pci_irqs[i]); - } - } else { - /* According to PReP specification section 6.1.6 "System Interrupt - * Assignments", all PCI interrupts are routed via IRQ 15 */ - s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); - object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, - &error_fatal); - qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); - sysbus_init_irq(dev, &s->or_irq->out_irq); + /* + * According to PReP specification section 6.1.6 "System Interrupt + * Assignments", all PCI interrupts are routed via IRQ 15 + */ + s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); + object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, + &error_fatal); + qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); + sysbus_init_irq(dev, &s->or_irq->out_irq); - for (i = 0; i < PCI_NUM_PINS; i++) { - s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); - } + for (i = 0; i < PCI_NUM_PINS; i++) { + s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); } qdev_init_gpio_in(d, raven_change_gpio, 1); @@ -426,9 +421,6 @@ static const Property raven_pcihost_properties[] = { DEFINE_PROP_UINT32("elf-machine", PREPPCIState, pci_dev.elf_machine, EM_NONE), DEFINE_PROP_STRING("bios-name", PREPPCIState, pci_dev.bios_name), - /* Temporary workaround until legacy prep machine is removed */ - DEFINE_PROP_BOOL("is-legacy-prep", PREPPCIState, is_legacy_prep, - false), }; static void raven_pcihost_class_init(ObjectClass *klass, const void *data) From patchwork Tue Jun 10 12:56:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895206 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253765wrb; Tue, 10 Jun 2025 06:06:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWVlmAPH2bairG4eSrTeIV68YqazIrK9iMDc/wkXnhctTXB6pwVfBRlGCgtjfXZhswrse63g==@linaro.org X-Google-Smtp-Source: AGHT+IH2wCZXLuetsc9G9tbTCYmBbVaPYGfXVj2M4y51HhuER6T0Rs8MDM2otZoMsLP3LQ+T1cX1 X-Received: by 2002:a05:600c:a08d:b0:43d:abd:ad1c with SMTP id 5b1f17b1804b1-45201373d52mr152341255e9.6.1749560815087; Tue, 10 Jun 2025 06:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560815; cv=none; d=google.com; s=arc-20240605; b=jX/8evkiaIVvb73ZiZlyezgeS0tT+tDNiwAB0vBPF41tAyByWP17h2CwpVWNd3kYVs H+gKowcrxyeCWSF7JalCZxi7p0c+iq3zdUjwayTrucLTNZtrRk972IJAJgWabeOVnAfl 5lkYMMCLrOcCCuCm2L6j5LVzyt6tPAKk0GqDtKTnAz8kzfFBNT3TzekAzQ+Cf7BV4DFC X9CGwAnLxCp5HNMofo9POXVwJt5Qcq3N6IWBciDzUpyeQoFT13q9Zr0wTcIkxJGGtlTd 2eGAcOc65QG6rg1dbEdCzC8PMHWZ6A/TSUt6xJBkIsAbMFXJ6Gt6hQYt4nMLcwa9/2b+ K3og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c8bs9uu+7kLf40D2babTGQO+kwfnbkrmCW8mE247ZCQ=; fh=5KYNaH84KuhJkbNfHAKkJotxTHueTtQQGeWlMENxW3A=; b=b/EXoPPWymGGiF1SAxuFem1XV/bu8siq9C9hGIaXFPiBuZbLKXIfVH4t+UzBXbTq/q wY+1LVdGDEecuBeFJSTAN5bFRyJlaPtP3stggeeVq8+QcEOWp8ScvQxS9rf8qtz1Mn8v idWXGO4ZGaU0rKJnqUWQKtaJNc//6LbxBns14YbaKzxGssagnwOnsqvrL1Tcr5bk2P7V qodkB8pxkvUNOZr6kh2N0IXfeQCqVOFxkkMaasI4vVKjBrvM3dT7ALTnjhVH9NjbR1pC tnXMiOm+Zbp/21btJiLgLT2tQZZqk5B412X2T1YIyyAX5pthANteJ7vmnM82wbh7mliO Htow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wcWvOv96; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a5324797a8si7377127f8f.580.2025.06.10.06.06.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:06:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wcWvOv96; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXH-0006as-9x; Tue, 10 Jun 2025 08:57: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 1uOyXC-0006Zd-9b for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56: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 1uOyX9-0002Zs-MO for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:56:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-451ebd3d149so34147035e9.2 for ; Tue, 10 Jun 2025 05:56:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560213; x=1750165013; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c8bs9uu+7kLf40D2babTGQO+kwfnbkrmCW8mE247ZCQ=; b=wcWvOv96w6eeSol8Z91fipI//S2r1YDZWGJ0ZPFSbkTZ2jNIoYG2SNCyLhd1klqp4t 9jQ0MA8g85A2TLbwM7JcWZf4PEJr3iyvxDtf+Zz+5uYJOx4ZH5DSVYNdo4jukrBh4D2R tn5IHVD0F4Xp9II4OWPs0oJ9kUtrdXrqEXeWrlx9ZRdvQLcgw22Z6lhN2QJRgleaoKLQ au7cAQaD2jK1NmIl6l17OM2rbWqjWZNye2TZ0SFTpBEdHs9JsYyizcsL/68aseO6AFlH pZ2Xmy0eABnBgpDbMrasbDf0wHdH3iIJmy6yxoIauCkJuoH81vv8fzVsbw+WdrH63pRb VLjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560213; x=1750165013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c8bs9uu+7kLf40D2babTGQO+kwfnbkrmCW8mE247ZCQ=; b=sxC+4IsPgZ1bJFIkdMnSxYtPU9lvkZb/mY1T4Av5Wd4fyqU1XJ/zhhO2gVi4S3aCN2 g1RkNa0hZOvXoYoxQo4Tump9IhiJnZua48olKg1J62ZjH17UnSt0+isHajX1TIyV04RN AcClAsqeRI+M8gDR2scE3ZSCgItIybsXbKzpSTnB/1/bchBcF7A+AOUYT7zsbs3/Wxky pXUMbA1Cr5Cyx9bstItEMCW/qZoDQRcI3ilJizXeZnPA6khKqdzZw/6rugOj5hhm/JDu fwYNiqEJxHBurJ60y/7IKIGRsY1OdMrA0E4DDTnX5HFZcLzaBiDY7Pir+cB3XqRe6zLZ axew== X-Gm-Message-State: AOJu0YxkVyYT68sOjODeZSmYooYluce5gY72zUcGdLvsVA74m4FII/8u cBEfj05A4h7NmQdoGmNAbnAN63oy5+zBREf/LKN2jeisFwIAp+YMhOrrGC+LGGSIhYpF+d+tq4f wu2IkjaE= X-Gm-Gg: ASbGncvdkVm8YHgmlxJkY3aZp4kXUyAyrnP+vUznDgFThRCvFpht8geNa2Vgl8FkRyz D0ZztPcu5dAFctRzXMLoyyjT6CFIVafUB7j0gMRN4czhJKcwMLn23clBwZhiqHRBahKLIpmm1kx NChF7NV/z97ZVfciCPQ6bjv5Fc+AIYklU9rEXNCBpBS1O0KjdwekygJe35c5iJp2EU6Mvc04OL0 5Qtp0gbzDVzPPp2iMSlMOuh6j5UIjOagS5qey9fAMPlDI6Ix67l+AxNqYSIxkjbqyFmRCLXhAWc GX6iOyfnugj1hVIMIfnSl5rt083oKSDXTlmGpo2CNoNXwcWpX4mSWOKr+NGdoMTO3Q5pWbfnFfF ZlJlDsWCnH4na/YvKEcahBIMXQyjQ3CyLVTVLUT7vpQ== X-Received: by 2002:a05:600c:58d8:b0:43d:17f1:2640 with SMTP id 5b1f17b1804b1-4520151f219mr101712615e9.26.1749560213375; Tue, 10 Jun 2025 05:56:53 -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-3a532462d93sm12494764f8f.91.2025.06.10.05.56.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 04/24] hw/pci-host/raven: Revert "raven: Move BIOS loading from board code to PCI host" Date: Tue, 10 Jun 2025 14:56:13 +0200 Message-ID: <20250610125633.24411-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan This reverts commit d0b25425749d5525b2ba6d9d966d8800a5643b35. Loading firmware from the PCI host is unusual and raven is only used by one board so this does not simplify anything but rather complicates it. Revert to loading firmware from board code as that is the usual way and also because raven has nothing to do with ROM so it is not a good place for this. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-ID: <4ca4f71bf661923d9a91b7e6776a0e40726e2337.1746374076.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/raven.c | 55 --------------------------------------------- hw/ppc/prep.c | 27 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 57 deletions(-) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index b78a8f32d32..f8c0be5d21c 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/log.h" #include "qapi/error.h" @@ -35,9 +34,7 @@ #include "migration/vmstate.h" #include "hw/intc/i8259.h" #include "hw/irq.h" -#include "hw/loader.h" #include "hw/or-irq.h" -#include "elf.h" #include "qom/object.h" #define TYPE_RAVEN_PCI_DEVICE "raven" @@ -47,10 +44,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(RavenPCIState, RAVEN_PCI_DEVICE) struct RavenPCIState { PCIDevice dev; - - uint32_t elf_machine; - char *bios_name; - MemoryRegion bios; }; typedef struct PRePPCIState PREPPCIState; @@ -77,8 +70,6 @@ struct PRePPCIState { int contiguous_map; }; -#define BIOS_SIZE (1 * MiB) - #define PCI_IO_BASE_ADDR 0x80000000 /* Physical address on main bus */ static inline uint32_t raven_pci_io_config(hwaddr addr) @@ -333,48 +324,9 @@ static void raven_pcihost_initfn(Object *obj) static void raven_realize(PCIDevice *d, Error **errp) { - RavenPCIState *s = RAVEN_PCI_DEVICE(d); - char *filename; - int bios_size = -1; - d->config[PCI_CACHE_LINE_SIZE] = 0x08; d->config[PCI_LATENCY_TIMER] = 0x10; d->config[PCI_CAPABILITY_LIST] = 0x00; - - if (!memory_region_init_rom_nomigrate(&s->bios, OBJECT(s), "bios", - BIOS_SIZE, errp)) { - return; - } - memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE), - &s->bios); - if (s->bios_name) { - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, s->bios_name); - if (filename) { - if (s->elf_machine != EM_NONE) { - bios_size = load_elf(filename, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, - ELFDATA2MSB, s->elf_machine, 0, 0); - } - if (bios_size < 0) { - bios_size = get_image_size(filename); - if (bios_size > 0 && bios_size <= BIOS_SIZE) { - hwaddr bios_addr; - bios_size = (bios_size + 0xfff) & ~0xfff; - bios_addr = (uint32_t)(-BIOS_SIZE); - bios_size = load_image_targphys(filename, bios_addr, - bios_size); - } - } - } - g_free(filename); - if (bios_size < 0 || bios_size > BIOS_SIZE) { - memory_region_del_subregion(get_system_memory(), &s->bios); - error_setg(errp, "Could not load bios image '%s'", s->bios_name); - return; - } - } - - vmstate_register_ram_global(&s->bios); } static const VMStateDescription vmstate_raven = { @@ -417,19 +369,12 @@ static const TypeInfo raven_info = { }, }; -static const Property raven_pcihost_properties[] = { - DEFINE_PROP_UINT32("elf-machine", PREPPCIState, pci_dev.elf_machine, - EM_NONE), - DEFINE_PROP_STRING("bios-name", PREPPCIState, pci_dev.bios_name), -}; - static void raven_pcihost_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->realize = raven_pcihost_realizefn; - device_class_set_props(dc, raven_pcihost_properties); dc->fw_name = "pci"; } diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 739526335ca..982e40e53e1 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -35,6 +35,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/datadir.h" #include "hw/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" @@ -55,6 +56,8 @@ #define KERNEL_LOAD_ADDR 0x01000000 #define INITRD_LOAD_ADDR 0x01800000 +#define BIOS_ADDR 0xfff00000 +#define BIOS_SIZE (1 * MiB) #define NVRAM_SIZE 0x2000 static void fw_cfg_boot_set(void *opaque, const char *boot_device, @@ -241,6 +244,9 @@ static void ibm_40p_init(MachineState *machine) ISADevice *isa_dev; ISABus *isa_bus; void *fw_cfg; + MemoryRegion *bios = g_new(MemoryRegion, 1); + char *filename; + ssize_t bios_size = -1; uint32_t kernel_base = 0, initrd_base = 0; long kernel_size = 0, initrd_size = 0; char boot_device; @@ -263,10 +269,27 @@ static void ibm_40p_init(MachineState *machine) cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL); qemu_register_reset(ppc_prep_reset, cpu); + /* allocate and load firmware */ + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!filename) { + error_report("Could not find bios image '%s'", bios_name); + exit(1); + } + memory_region_init_rom(bios, NULL, "bios", BIOS_SIZE, &error_fatal); + memory_region_add_subregion(get_system_memory(), BIOS_ADDR, bios); + bios_size = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0); + if (bios_size < 0) { + bios_size = load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE); + } + if (bios_size < 0 || bios_size > BIOS_SIZE) { + error_report("Could not load bios image '%s'", filename); + return; + } + g_free(filename); + /* PCI host */ dev = qdev_new("raven-pcihost"); - qdev_prop_set_string(dev, "bios-name", bios_name); - qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE); pcihost = SYS_BUS_DEVICE(dev); object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev)); sysbus_realize_and_unref(pcihost, &error_fatal); From patchwork Tue Jun 10 12:56:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895196 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2251908wrb; Tue, 10 Jun 2025 06:04:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkMWWT2zvB0nxPU97B9EfH+I4GizE4QkEj60Fb3OxG9iujR0R/O46cd8nhLsjORDtZif2cbw==@linaro.org X-Google-Smtp-Source: AGHT+IE058IfUDFUGsRSv2/gebPkkanPt5sAiExg84OnukZeCnX+h7/SXsKiD6u/pVfdLzfXXZrV X-Received: by 2002:a05:620a:4713:b0:7d1:fc53:c6b2 with SMTP id af79cd13be357-7d39f62b112mr358872285a.41.1749560647910; Tue, 10 Jun 2025 06:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560647; cv=none; d=google.com; s=arc-20240605; b=lE0KnBt6/t5+Qc+AvUdVzCdvwNKwIFKd9iEyHeFmv+3n4QS11iMezjQKbRPicUWk9U /JbQ4l2a0j5N6YZga5lV8rfYRYPpYv1DnBznA5IfOEpgs5GvMtFXT6xpxUTyhasjIBHq /xVyR95Te2weN1f4w5XxnJzilfwMbidXETb2GtwAYZ42flIQwRp/PB4UDAVP+IbO2Dz9 v3B5WFfESyod/9dXHJxdGwhl1Rr88xbekOVwEqhn/zBnZgbdsjce/LGDXt5x6xpNn1xm f5PongqCQA8WtUFTU7/qXR/gxsybt5IC3UaJKHwgVoVzuVM7Q7QyhR0liTwIGXZxy3/I sTvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2BrH3ucC8SZAZIldmLWTeR9n/b3KT5QterWUvdSwkAc=; fh=u0mpsymjKUb/jBFutCl6w8ZegSbL7IeP6YBgEooPfhQ=; b=MH8Z2AGIACCBLyrH5sx9Ui7xOOLT5goxgEpGg6OfnD1BSMz70A6rRJGvIaO20Wv/Jm 604CuI3RzDepQKQsRsjE2M1v2L1SDM0A8zm1+gjI7AHa1hDrFB9sTHWy0fkmC+K5M7eC s0TyFJ0dgkYZs4odG1L/xfthyokNARkocxU4/qOBbFf1G8hV5zUGS0lm3d8ciRQAe5Kl iGstxPYwbSSmLHmqK+LYgDppwFd1SzSIgWiHFI0Anc/xQn8LxRdVik4tlyeqvS6xRpyq xF7ZgwCxfZoi1kMZCFrfAFNxQXryNNLZav4D2ML+E+hvCoS4Zlp/BD3l5xFbQ2OszlQP vA1g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T0KDyOgJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-53113c29d0csi557792e0c.239.2025.06.10.06.04.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:04:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T0KDyOgJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXM-0006cY-9p; Tue, 10 Jun 2025 08:57: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 1uOyXJ-0006cB-Vh for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:05 -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 1uOyXE-0002ad-AR for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:05 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-450cfb6a794so35100475e9.1 for ; Tue, 10 Jun 2025 05:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560218; x=1750165018; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2BrH3ucC8SZAZIldmLWTeR9n/b3KT5QterWUvdSwkAc=; b=T0KDyOgJNtWTafoN1DcwLYyukKLmZvnVpDzYCLZVIrEKrleBTgnAgultD77P6MEy6A QaubLymUyvfdhAn9duWPMOjFx2hILaNOhmz9xIn4z1FbWRy5dCgtRnizTBdTjr233TVw fVhMUT+FLTht2TOq8lu5cmvSQ5s5Rlf7ScZxWWCjgbsfKPtQOS800in2xuAX/wBX37mE LGuVXRVrfVmJZ0KaAQPM9VqhBGrTFM6z+UIFzkAuTDHitIkIWq3X52MMG7kwPJe5s8fe 5ciiJJ3jvHTm33JrwsEu/itW8NoozyuYuadeBn1BqnrFEXPChMzyAwzcEN46LFbKQbcn OuJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560218; x=1750165018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2BrH3ucC8SZAZIldmLWTeR9n/b3KT5QterWUvdSwkAc=; b=ItVQ309ImmsncLD3FOJDxLd/7HClM9jOFQHIZr4JU1QAH9mkOi5d0LmrSFJFOeWKZE 428QlssVmOViXa6/tiaEYJPB1HXtJhWzv5wMDVZ+kVJhV9LYx0zWqLILRc81VATN326e mw7+5f+prUvbVEaAj81sBuOxpoNl0MPYaQnyJ4lsPxSYuVY4evDnpi5qcSaIFpiV7OKp 0EnHmVXaHJqowCKk42KgZ9I/FpFl3+FtRrdu2HhCvYsxbVbZEn8Z58vpYiv8Z6GYmFLF APK/Itb6g18mePauP8y9OXAcQIcb8SMHDk5NgPLztfORv2TunXgTTQcVfIleMtz/LVgl V2Aw== X-Gm-Message-State: AOJu0Yw7OTFKz6uuzUye3KGUuVdPt8rXMohyxxAKoocwCn8SMny+03cj fTmsW0Np+uY7eObC1yRIEQyJI2fRE+mgirctsnk0wKyn3FHhOiZVnPpzreWDVUqfiR5MpG1BI6N XZjL7yTw= X-Gm-Gg: ASbGncsXAY7FOuyTyIye/QFU803qtebgtrOKUyQSLfk2ADynYq/blkf0iOXhyWMYw6J T2aDW3/Gx8BmndqXa5JnXI01vWmSoFoGRHNXusuXb5PR7ttmgEyi2bQPBegu4v7YwoTQtuu7c08 +Ao84RtaPvtnX/4L/UbnOSIIifMy5kzwGcUmf5wL8OCxzK5a37ZjlIveTW8c8yuViaft1BrYyVI sLE0YS+Flqq01jdEtfU2SbXuoVfkU8dl/Y+H8BHT45fqncbvKkKqIdE08gCiiZzp6WaHxUhF4t6 oYgjxJ5xGi6XRGBE5idZ+MbIqxcO8OgI/jnwlEMpxrOPP1lHPYjpZ9xrlR78nsO3xgW5GFrCmNy iPBJ92WJp+8iYM8m3buJxYlwkRzEV+qeiv1kYHT8kgw== X-Received: by 2002:a05:600c:8b4c:b0:450:cd25:e69c with SMTP id 5b1f17b1804b1-4531de68e18mr24124145e9.21.1749560217869; Tue, 10 Jun 2025 05:56: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 ffacd0b85a97d-3a532464575sm12326362f8f.97.2025.06.10.05.56.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:56:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 05/24] hw/core/resetcontainer: Consolidate OBJECT_DECLARE_SIMPLE_TYPE Date: Tue, 10 Jun 2025 14:56:14 +0200 Message-ID: <20250610125633.24411-6-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhao Liu The QOM type of ResettableContainer is defined by OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES, which means it doesn't need the class! Therefore, use OBJECT_DECLARE_SIMPLE_TYPE to declare the type, then there's no need for class definition. Cc: Peter Maydell Signed-off-by: Zhao Liu Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250514084957.2221975-8-zhao1.liu@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/resetcontainer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/core/resetcontainer.h b/include/hw/core/resetcontainer.h index 23db0c7a880..daeb18c1ea8 100644 --- a/include/hw/core/resetcontainer.h +++ b/include/hw/core/resetcontainer.h @@ -20,7 +20,7 @@ #include "qom/object.h" #define TYPE_RESETTABLE_CONTAINER "resettable-container" -OBJECT_DECLARE_TYPE(ResettableContainer, ResettableContainerClass, RESETTABLE_CONTAINER) +OBJECT_DECLARE_SIMPLE_TYPE(ResettableContainer, RESETTABLE_CONTAINER) /** * resettable_container_add: Add a resettable object to the container From patchwork Tue Jun 10 12:56:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895197 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2252212wrb; Tue, 10 Jun 2025 06:04:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkmKnuRdZnZWxnBx63eDmrXSHrkQsQQ8kaXb05ZPJfFGJmwxxpStTD0jJQ3GU1iU72d2JDjw==@linaro.org X-Google-Smtp-Source: AGHT+IEeDlFP7NI4Gv+Y8KBpQc+gZKBLqphD7za1ESIOtVmbqaKwxavOoWpmVYz5wUD1lheeV5ii X-Received: by 2002:a05:6808:6b8b:b0:406:6a21:524f with SMTP id 5614622812f47-409050d7602mr12164334b6e.19.1749560685742; Tue, 10 Jun 2025 06:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560685; cv=none; d=google.com; s=arc-20240605; b=GCyUENcwTw2pHxWVL8yg1V7OrpE/d6ukGBGJ/iiAJLDGM6s5asTeJB38yQ3SWGtgBr cYfOaxK0d2mz8kSTHM/iwdSs53MKqtb9fX0fXeHkBWU7dLFvYQl4/1ClbuuPM/7ztI6g hs8u12uxmrzVEFlxb/eOvNBS10qsnyqzPzlJET/iL6jM74Qt4wxIWj7+U1fk9j/Ulbjo T2EQKzPEP4yYi4ynX/jQlTjRH+458tA9hiwEJPLoxK4utYSXfjyJTYEKYOJITM6LZpN8 8H/OWCuOi0x0VozsYw/qV/f/kcCtZ60Xr3u+2g5peXZxP346pqeezuwGv7j8GFDk2LnQ xggQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6dp7GpujhzFYh18zm/S+UkI0pyq2WLKkULJ1D7AE954=; fh=0DmwIoWhcxpn5FuM54U9N9gs3dkBxyFUFP/AlAUudaY=; b=B0mNDGE02cCoo6+VAwLqgJfRbaPE0KffxhEFGZK79eFBeelxF5n4ooMBDSK1EjEE6J V7IzVPMBhVcQjxnIQOLodW2aVAAfwQojC7B+8ZyFv6WFxmjIhmZhAgi2y622EecPgQMD hytzTZIlL1lBRDS3RK4rw9zxwtX5ARuIKeOjQsRf9c4ZWK8jKjUeHmkfvPBUVe+sPtyv IsSfmqufrHmYtyENrkmkAlyIcvW/R3O74d9qsXw576ehjgmoakHchluNdlUvKpu5Fhmi Ok5yMVyJi3ML6V4Gs9RGdhpFWub+mZdqx058TbKY/XurufUZV1dls/X/ZbYthnjBRQOU rqAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zc3Zrp+C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-87eeae777cfsi510287241.51.2025.06.10.06.04.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:04:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zc3Zrp+C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXP-0006da-9c; Tue, 10 Jun 2025 08:57: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 1uOyXM-0006cs-Sk for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:08 -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 1uOyXJ-0002bM-Lm for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:08 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-451d54214adso44604735e9.3 for ; Tue, 10 Jun 2025 05:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560222; x=1750165022; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6dp7GpujhzFYh18zm/S+UkI0pyq2WLKkULJ1D7AE954=; b=Zc3Zrp+Cem/Xmt4c0mjt7Ujir2KRu1yqrSWcBErfOChtnJZ7+cx4cOREpn+iMljetO WWtX8c0htIR0GUXy4w2IEyx7VK8XASj0vr9h0k1l4OyGtv7yjWOkesR0sUSaBLicA2o0 +yoWq0flhm9E+J3swE0Etm4AMe3gjui0obD0eKRm81+DMl7HVIwfUOYgt949zfo9hYRf fH7qAziF13JEynSKZj9zyDMeCrZDynnGo3/dDuphl/w81cLy5GfwG0SDmACfIV4CkAfY tOuwUBFQleSAPVZWiYFAe/ZFwdTmYqxGIlTBnfSWbWSWxuNVh/6WWzEeSEQmUow0qT0t Y5/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560222; x=1750165022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6dp7GpujhzFYh18zm/S+UkI0pyq2WLKkULJ1D7AE954=; b=PAiMtHGgVlm5D7SZoNRfr96JnAbECWqhlAnOIQ9s3/tQ+bDaeHCCqW7qqNb1Ab2iOf Jg7CfrUrwBe53smW1vGRpxaJJ/PahIaQsC548df+d07AdvkWFeSjzYY6akbW7HUL0afK zfZZfGmiJLW/pEC2pm2kyANi7Dc2q0lMLLYheNR8+Kw8nSG/I+orZMKFFccui2okySLg on6z5qjEg9eB6rR/qztIndx8qYC8TSNajxwrwSReaqhblnBxvYYqR1U3AGZWaPpdUOkM AfX+mb17p3yMI0YM+zDgKIbZe12dkl9ENbOkW5bjuofq1ne6EMbmT5LFD8dTnAO8ZkIa 0EMw== X-Gm-Message-State: AOJu0Yxj+SqTQwL7mlu3CqhbKMqMMf9+OXAMcpOsdAs/EmWQ8jCl8kPr BUMvTrsRwO/ObUg197s3zhtXQrJjr12g4PxDargV4v5/wnPzM8UzU26lor55XoQ4VcZYPS3tv5I W1PCQr3Y= X-Gm-Gg: ASbGncszz5NAQt3nFHQyrj9KoNQYePzYtebNG0Ez2CLAKEV8cPzlwsxrve/JAPeQLGr aIPj0tAXb7t/KVRAih5+IFdXfOE92urxU3D4kC7mbJE9ei905BCefG6cPZRwoqKyO++ZKvEuY9w p6WxTZn09PG4ZHfsNfHxHVXLnH8bXQLqKxhj4Dfq4C3d/3F+WYqADzFauQnemljhU7Obntrpb9m ea8lFxBVLBdSYFRFtTOViPyt5oK8O25Rgaz3dun/vWM6J1rumTcMhiOlKmGBmfVe/tU6n7HLjiV pzU5ZBvalMh/MH5V3Pk1TlEgilei4KXghNDT2aLF2PYaTOTeiF/o7fVfLlGMutssQoTbLWBMEPh Fxr50ecjFNK6zbvjMlhTwp114g18Nphh9WtFdz+YoTA== X-Received: by 2002:a05:600c:148a:b0:442:d9f2:ded8 with SMTP id 5b1f17b1804b1-45320032194mr16320785e9.15.1749560222334; Tue, 10 Jun 2025 05:57:02 -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-452730d175dsm137297895e9.35.2025.06.10.05.57.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , "Maciej S. Szmigiero" , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 06/24] hw/hyperv/balloon: Consolidate OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES Date: Tue, 10 Jun 2025 14:56:15 +0200 Message-ID: <20250610125633.24411-7-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhao Liu The QOM type of HvBalloon is declared by OBJECT_DECLARE_SIMPLE_TYPE, which means it doesn't need the class! Therefore, use OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES to implement the type, then there's no need for class definition. Cc: "Maciej S. Szmigiero" Signed-off-by: Zhao Liu Acked-by: Maciej S. Szmigiero Message-ID: <20250514084957.2221975-6-zhao1.liu@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/hyperv/hv-balloon.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 94b0abbd683..6dbcb2d9a29 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -67,10 +67,6 @@ * these requests */ -struct HvBalloonClass { - VMBusDeviceClass parent_class; -} HvBalloonClass; - typedef enum State { /* not a real state */ S_NO_CHANGE = 0, @@ -162,8 +158,9 @@ typedef struct HvBalloon { MemoryRegion *mr; } HvBalloon; -OBJECT_DEFINE_TYPE_WITH_INTERFACES(HvBalloon, hv_balloon, HV_BALLOON, VMBUS_DEVICE, \ - { TYPE_MEMORY_DEVICE }, { }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(HvBalloon, hv_balloon, \ + HV_BALLOON, VMBUS_DEVICE, \ + { TYPE_MEMORY_DEVICE }, { }) #define HV_BALLOON_SET_STATE(hvb, news) \ do { \ From patchwork Tue Jun 10 12:56:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895193 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2250831wrb; Tue, 10 Jun 2025 06:02:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3u59vrBXkzcd3cJOdmlTboUMYYqRUc+TjVuAip+bevZrsZIZbxFM1uGjHt1tvKQBTzbJpUg==@linaro.org X-Google-Smtp-Source: AGHT+IELQ7cmKYcQaexuw3NF2zSg3S06ug3Ee3wedNwmtY+dz0b62n+zGpHNECdzaDXrmR+RMB8G X-Received: by 2002:a05:620a:3726:b0:7ca:cd71:2bf8 with SMTP id af79cd13be357-7d2299339d3mr2908084185a.54.1749560575331; Tue, 10 Jun 2025 06:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560575; cv=none; d=google.com; s=arc-20240605; b=EpbASZCOPBgCKXdDRqOxfMTC39nsBipUAXnf8AB+XBdflp7GGRJeDhS+JvKMYU0aZb XOr6f/mIqVzDQgGgAav1Qu5BGRfBXIwD/izHm8eoBTzpWHVlACec/MtMkocdPieG3KrM myNtVm9+T/vuHmviYn7IucsWc4xQ1zGk1ioBGitYBOU17pB2VCKnnVRKLgRGxnCCCEJi OkEwr3fxhCnKzeMG7lSVEtd7HhyLkSW+2m4NMHdI6DLHUz3vSjn4vCWpmSLbQix1EBPN M0hq9mMD7wTOK3b0Mjogrx8TWOYkfBgGEvKSyHT+iXAj6Em1WGXL782ptp/P5VpJfAPT xVzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xJktEGesb57H1K7TS/YxXCRYfzhDd1PRqPB5jPa4EVc=; fh=FIbYwJh3qUo+bGJA3g8Ei87rsDZvyEyMFUHir3PvCEA=; b=cV+QD+Xy4QwyoIClvbQ4HB8XaA3iIWkKE3d0/qN08sy18dxmSTSfqMF01liLkQEgNE d+jL6a+K5jxjboha+kTGbINzPk8w1MWTYtdB25/olrQ1CRe4fTqhVegB3yPDy1NxBXwE qTWIblPTO4R4LSCAe9V18BUoKRPpyg63Fkjy4PJbf5+/h6oBGMImGmpZsNiR7wfgjQzl ABtFobb+yQ4etCPCRyw/yvij5Sym957c3TBKB4LCfYN+Zw7zUZ7eXF9s3q2/uBifNdxu k7r1dXvrNhgCQjMh7O2wBpTtMQD6lynJvVOXPhObVEagrZJiRvZ/hHHdx63mq3Yjf1jd WFgQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qns5WSH1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d25a610aa3si1004904285a.368.2025.06.10.06.02.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qns5WSH1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXR-0006dn-1E; Tue, 10 Jun 2025 08:57: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 1uOyXP-0006dc-KM for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:11 -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 1uOyXN-0002bp-0O for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:11 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so68231575e9.1 for ; Tue, 10 Jun 2025 05:57:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560227; x=1750165027; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJktEGesb57H1K7TS/YxXCRYfzhDd1PRqPB5jPa4EVc=; b=Qns5WSH1Zw1AZauWb0DPt62QIp5BmydrO9Lkz0Zmvnpp1WyBvLRPooRbmPYABv6VCL dzxaoQ3bEJBfP0nqXxaBm/FiDT1IfYbQlrnrSMKVxdfT8l723AoQ4+Yc8YDYSHmGrdPZ TwI/OUyHUPu1O84h1nAEajEJnlb35zD/OAZlASaPTA9zHcUdC7Y6LuL69A8Px6jXdlEt ae49af97tDrIgrtc0Namx9wEKZv8+J77FbNW6oLRFf/jTC23tJdrSj93za2GCTHeEBeK ot/YQLSfdvN6Mu4ynhYU5aRuyWeNEqi4jnz7QpucrwdhUG4x/sH22OiBpqBmwkmyACUc HWrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560227; x=1750165027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xJktEGesb57H1K7TS/YxXCRYfzhDd1PRqPB5jPa4EVc=; b=FyHKfd+3xBVCauCfzdtTx4AyTE9OwU1Ek+/bVRmAsnLS21SGS97RxvlUE0AjKYk2m4 EA1j1xXhVIzMzq9pophhQLyY5KdasfCPidmt7DRgg0Cp0ZUbrTSusbQ5tg/geptuFLyV /7Drgo1ooyrK/h52QU9QArgn+TFPWmlkYbgJ7eOx+qJMZUQQ6haOg2GMF6aIzV/8EFcd 9E5MJOSsKjbZlc+GEIaEWraNY1rNTm4nMPmqNjPI7MgsWS+KxcdhNRevEJlUE6r5NeXG 36+5p5X8/0xWBTz31koj6AWGmZqCKfWH7njc0TCZE5D1907NErWkXDczCkSzbziwfELf fF1Q== X-Gm-Message-State: AOJu0YxoAM/0LHUZwtrNXU7HTbIo3jGRH0N0rW3ESzccnsSS919nqVCp vkiu1vP4IlwH1m/OpCLgdf6Aq86tWmT6Xx8WNLvh8WnazB3+axRtvM8dMNYcXJEukjiMADa/FzD I5DwLDlQ= X-Gm-Gg: ASbGnct2azTEUUwZNBEtlT8H0H65tZpZvseOn9MRvL3mdfkPb1Z1ji6xdRE9KId7xhG 7+DKUD/rbCY2pOMl6wywfa1Csp7u2z9138XnOTEBJ/w7T7/sdTYbMWID5XjhSMgjEWYmQufplrh PlCrprJQoX7z3PSKG2P1vf9rx3N9DUXctJxaEQePEThnrHEzbKzW0anOEkQJrvqnz5OHkTajAf9 bxV6bEA8PESkOZ5xdJCL9z9x9j3Zv2IqK1ZMCSLK69JBlPjtoOoKNqw9POTLPZkZbMW8BlHCXxo rh3KzSjQeuSJKk9Wn0V+l+RQBFyWH10WwIpo/MlIZdCRyea6XpoZbcvapn5U6jA+20X91gkFa5M IN9UW8Fi+2QvJ6hTFB0KiXHJg+vgtyrHHewPYz9XXBA== X-Received: by 2002:a05:600c:8210:b0:44b:eb56:1d45 with SMTP id 5b1f17b1804b1-4531de1a1a6mr28731865e9.15.1749560226831; Tue, 10 Jun 2025 05:57: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-45209ce5045sm140173425e9.16.2025.06.10.05.57.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 07/24] hw/ppc/e500: Move clock and TB frequency to machine class Date: Tue, 10 Jun 2025 14:56:16 +0200 Message-ID: <20250610125633.24411-8-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan Different machines have different frequencies so make this configurable in machine class instead of using a hard coded constant. Signed-off-by: BALATON Zoltan Acked-by: Bernhard Beschow Message-ID: <431166f96ff12ff3dbc670d40544974415f11305.1748012109.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/e500.h | 4 ++++ hw/ppc/e500.c | 18 +++++++++--------- hw/ppc/e500plat.c | 2 ++ hw/ppc/mpc8544ds.c | 2 ++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h index 01db102625f..00f490519c2 100644 --- a/hw/ppc/e500.h +++ b/hw/ppc/e500.h @@ -5,6 +5,8 @@ #include "hw/platform-bus.h" #include "qom/object.h" +#define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000) + struct PPCE500MachineState { /*< private >*/ MachineState parent_obj; @@ -37,6 +39,8 @@ struct PPCE500MachineClass { hwaddr pci_mmio_base; hwaddr pci_mmio_bus_base; hwaddr spin_base; + uint32_t clock_freq; + uint32_t tb_freq; }; void ppce500_init(MachineState *machine); diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 809078a2c3a..dedd96b0574 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -79,8 +79,6 @@ #define MPC85XX_ESDHC_IRQ 72 #define RTC_REGS_OFFSET 0x68 -#define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000) - struct boot_info { uint32_t dt_base; @@ -120,7 +118,7 @@ static uint32_t *pci_map_create(void *fdt, uint32_t mpic, int first_slot, } static void dt_serial_create(void *fdt, unsigned long long offset, - const char *soc, const char *mpic, + const char *soc, uint32_t freq, const char *mpic, const char *alias, int idx, bool defcon) { char *ser; @@ -131,7 +129,7 @@ static void dt_serial_create(void *fdt, unsigned long long offset, qemu_fdt_setprop_string(fdt, ser, "compatible", "ns16550"); qemu_fdt_setprop_cells(fdt, ser, "reg", offset, 0x100); qemu_fdt_setprop_cell(fdt, ser, "cell-index", idx); - qemu_fdt_setprop_cell(fdt, ser, "clock-frequency", PLATFORM_CLK_FREQ_HZ); + qemu_fdt_setprop_cell(fdt, ser, "clock-frequency", freq); qemu_fdt_setprop_cells(fdt, ser, "interrupts", 42, 2); qemu_fdt_setprop_phandle(fdt, ser, "interrupt-parent", mpic); qemu_fdt_setprop_string(fdt, "/aliases", alias, ser); @@ -382,8 +380,7 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, int fdt_size; void *fdt; uint8_t hypercall[16]; - uint32_t clock_freq = PLATFORM_CLK_FREQ_HZ; - uint32_t tb_freq = PLATFORM_CLK_FREQ_HZ; + uint32_t clock_freq, tb_freq; int i; char compatible_sb[] = "fsl,mpc8544-immr\0simple-bus"; char *soc; @@ -484,6 +481,9 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, if (kvmppc_get_hasidle(env)) { qemu_fdt_setprop(fdt, "/hypervisor", "has-idle", NULL, 0); } + } else { + clock_freq = pmc->clock_freq; + tb_freq = pmc->tb_freq; } /* Create CPU nodes */ @@ -564,12 +564,12 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, */ if (serial_hd(1)) { dt_serial_create(fdt, MPC8544_SERIAL1_REGS_OFFSET, - soc, mpic, "serial1", 1, false); + soc, pmc->clock_freq, mpic, "serial1", 1, false); } if (serial_hd(0)) { dt_serial_create(fdt, MPC8544_SERIAL0_REGS_OFFSET, - soc, mpic, "serial0", 0, true); + soc, pmc->clock_freq, mpic, "serial0", 0, true); } /* i2c */ @@ -968,7 +968,7 @@ void ppce500_init(MachineState *machine) env->spr_cb[SPR_BOOKE_PIR].default_value = cs->cpu_index = i; env->mpic_iack = pmc->ccsrbar_base + MPC8544_MPIC_REGS_OFFSET + 0xa0; - ppc_booke_timers_init(cpu, PLATFORM_CLK_FREQ_HZ, PPC_TIMER_E500); + ppc_booke_timers_init(cpu, pmc->tb_freq, PPC_TIMER_E500); /* Register reset handler */ if (!i) { diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 775b9d8da00..4f1d659e723 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -93,6 +93,8 @@ static void e500plat_machine_class_init(ObjectClass *oc, const void *data) pmc->pci_mmio_base = 0xC00000000ULL; pmc->pci_mmio_bus_base = 0xE0000000ULL; pmc->spin_base = 0xFEF000000ULL; + pmc->clock_freq = PLATFORM_CLK_FREQ_HZ; + pmc->tb_freq = PLATFORM_CLK_FREQ_HZ; mc->desc = "generic paravirt e500 platform"; mc->init = e500plat_init; diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 97fb0f35ba9..582698559d2 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -55,6 +55,8 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc, const void *data) pmc->pci_mmio_bus_base = 0xC0000000ULL; pmc->pci_pio_base = 0xE1000000ULL; pmc->spin_base = 0xEF000000ULL; + pmc->clock_freq = PLATFORM_CLK_FREQ_HZ; + pmc->tb_freq = PLATFORM_CLK_FREQ_HZ; mc->desc = "mpc8544ds"; mc->init = mpc8544ds_init; From patchwork Tue Jun 10 12:56:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895188 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2247890wrb; Tue, 10 Jun 2025 05:57:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdM4CluREbjb74BlBg5d/aBukJB2PQQffJzZSuL0Df05+sJuz7X7qf5YD/32AOZJmiJ6TQ/g==@linaro.org X-Google-Smtp-Source: AGHT+IH1rg28JCaCzKR8f3x05hyxGBtx2t8r5agmvilcaC9bIXHPEuxpVh42qtn9SePE9td4+hpW X-Received: by 2002:a05:6214:5085:b0:6fb:44a:3d4c with SMTP id 6a1803df08f44-6fb08f8d3a3mr275963056d6.28.1749560278395; Tue, 10 Jun 2025 05:57:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560278; cv=none; d=google.com; s=arc-20240605; b=N+qj1HGnvMSlpZZAP1kDWYTNPBnQ3KfWxJt7GHWw+5t2KxPPsbxZs95SJd2auJTUqY VbWepvlT73lGmiTS5cAoKhPhHtOp9vSBfgDvKpxCPztE7RT38CtkcZdLe6cEUTgKp8c1 VCnXbulq4yyWhsS9a7mJyc9F5acQ9AszR1fZgYh8sMGdS/gAlhnBEYxAFLbRpPmcH3Rn xV2ny/862O5i9SCrNBcV2FU1CrX/gJ4wDGQA1nUjux+/xGecpAYqCOcgMs2LU5QQmtj3 6pM5jYCO6ZTf/2X4WfuoR+RBck+BXyBiLOTe2vddKUyoI4Hh8aM5V1CWZma8qbDXROVJ H/Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pACGd9aRRNLDY6rAI3jpVfxGD06wCRoRsQs9qD7T4XI=; fh=FIbYwJh3qUo+bGJA3g8Ei87rsDZvyEyMFUHir3PvCEA=; b=lmzpD1a+AfgD9rlhqvRNdjfiVXrDovP9fyr44kSZz76Pb+JIT03Vt3oi7RylyZ2kDq V36WUgoI62Vdv3DLL4Ce5Nzs1lDl5a5PB4UvKnxqWbUw/WOLMfsIZuOQb6dHaShLmmAe oF803CJd+KHrun4JgsXB/9tWWVzMF4rKgiU0mwahOmA7RC2V0vAy4foSo7u7iHtJ6axB yqAjJJe6KW//ihV/Km82J8SRIlWAelBVpfCuMnaWidGJbJtbb964AgVA+ULsYUgiomSh ba3k3zhC9i1XafSSszFV9AMbEuEp1KF0s5q0YirKgZMMLImj5cMoGAa4duR9ka+7rNlq eUCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B3FCq3OV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09ab0a32si97610246d6.13.2025.06.10.05.57.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:57:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B3FCq3OV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXY-0006np-0g; Tue, 10 Jun 2025 08:57:20 -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 1uOyXX-0006nY-6R for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:19 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyXU-0002cM-Rr for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a375e72473so2757534f8f.0 for ; Tue, 10 Jun 2025 05:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560231; x=1750165031; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pACGd9aRRNLDY6rAI3jpVfxGD06wCRoRsQs9qD7T4XI=; b=B3FCq3OVioCshWL3BsMS3hEzeaEC3pMYbjFhMJKxLUIJS+MmIVxWN2oTyJFCVC06jA 6m7S5szdwVxK+XvUQPtcQ04c5OfAXelRoaRcfOgH/tm5bUjV4jgVB1aJE6bH1d8d90BH mfLdWvUDy5TGHaBop5hPTPg5zLoyjy3C/bgIU3uvLwCF4wAZXIL7uv5PvsyxhlP0+8cn SvTOt9mu3kxSHLm6t8WypoeB4uzCPsGteZ1yFnQ+eZoEtU6FdtHRK0Y2ISM1t7Ff4k+8 ZAViZjysk8r8GTEycALU2X5X75b3563nv7vSbnKHliqhlX6WNpC6sLr+dgGMqPNMYG+f oruQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560231; x=1750165031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pACGd9aRRNLDY6rAI3jpVfxGD06wCRoRsQs9qD7T4XI=; b=VGeE1//f/HG6z1dVBXkHZDKNfj7dFhW/oZ7b7FhagFaFQ3/S8jol4fXvvWf1DjKZ+2 3kw1Rid3S0WJ47dGTaQ4/4hl9kRqk2bTJ0ouRQh+dJtz3P2V5QgwXgdm+m6ACwxkosmb 3hli01N1mHFIwtibJNfAnZzVSO0987vyCT4ZC3MH7bVKY0Vjfb5nZEAQYCwE+6/4JZHn 2yI1E4q0wXaLWoWvoeqraerRzBnNXa4kaYhuEwieXXboOV/+YbTTZUwemGoJO1tr+bg0 9eWovdWuTeiF01qcRcJ3Die9Nzdw1EmdITRoFNHVuxgwUqh+fPErp6pPbZB6xW2RxXW3 Xo7A== X-Gm-Message-State: AOJu0YyngUQvPVzEZr2eGMFZ0GIbHc0gmWiW53isNrWhVTeDpXlCdgVk ubK+7e78wvNpqVid1klBa/X/tBXXfziIUxnarLyogW6OPY+VHbswHL4pPRy6erv5VuOvTVW8IiF /ITuCDWg= X-Gm-Gg: ASbGncvlj1z48YhsT7KzYMyShWdRzF1yW342q9jd2VUIoYRix7J7ioVf+1CNbSEn8PR mRkMNyI6LQ/2gHbVziuQwCIbA2Q+iELfCML4eV2rcs6PBTzlY2hIRSVW1DKBNTD5ECsQ22QMTiF q+XlcGXnLwGGeMdUGkDBWqBh/xd03l9SIYQ9w1+XLVMWdrSAutTqE+y4Z+CyS3R43T2+DUS4qn1 0PiYKEeOd5FWSPCgOJU+ZBVKH+086ye5t2iz3zPAfZ79sS08FdKzm0AhTJ984v+BkQPsrzhH3eW wUbYuuFRJofpB9vAsgf/q9cf+74uJTFTugQzHtSvouke3tvdAJuHpIfEaC9BljsjX0KO5CSGNOm MPlcWL/Zgp8YgTTzo/vsxh+wlm9mj1j2PRMtHe+TbsA== X-Received: by 2002:a05:6000:290c:b0:3a4:d8b6:ca3f with SMTP id ffacd0b85a97d-3a5318a7c04mr11661952f8f.30.1749560231443; Tue, 10 Jun 2025 05:57:11 -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-3a5323bee86sm11989585f8f.43.2025.06.10.05.57.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 08/24] hw/net/fsl_etsec: Set default MAC address Date: Tue, 10 Jun 2025 14:56:17 +0200 Message-ID: <20250610125633.24411-9-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan Use default MAC address if none is specified by property as done by most other network interface models. Signed-off-by: BALATON Zoltan Reviewed-by: Bernhard Beschow Acked-by: Bernhard Beschow Message-ID: <8bd7ca691bd502b5fd761615d9af805e783fba36.1748012109.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/net/fsl_etsec/etsec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index d14cb2a1015..846f6cbc5d9 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -389,6 +389,7 @@ static void etsec_realize(DeviceState *dev, Error **errp) { eTSEC *etsec = ETSEC_COMMON(dev); + qemu_macaddr_default_if_unset(&etsec->conf.macaddr); etsec->nic = qemu_new_nic(&net_etsec_info, &etsec->conf, object_get_typename(OBJECT(dev)), dev->id, &dev->mem_reentrancy_guard, etsec); From patchwork Tue Jun 10 12:56:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895203 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253080wrb; Tue, 10 Jun 2025 06:05:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPpSbHyJk6nNXTbJenB+j5fIjeeTj8Uklo8C5dJ1aeoJ3KkX5EqFCtELuDOG0jPdWXXtUACQ==@linaro.org X-Google-Smtp-Source: AGHT+IEOV8HErB07QgpHvjWIQ5wAVvME4uZ+OwJrSbQl1MSsKgvac20lmmK53kdvScqDRcj3QpdK X-Received: by 2002:ad4:5dcb:0:b0:6fa:bedb:f61d with SMTP id 6a1803df08f44-6fb24c526c0mr37481716d6.14.1749560758244; Tue, 10 Jun 2025 06:05:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560758; cv=none; d=google.com; s=arc-20240605; b=F26LS8pWvDvQattHYp4tQPEiRAe++7eCUuMbDVkcWGnmpbAt/gcrFT+0nl7B1PG2Kt MjQd4CUodvcmLSLaFEDX4DNFCfm8y+MoI91AOvVlrHUp7HX9EsPlaNJiW5TwBqTdkqQy Dla2C8ryZj4BEAZ9t0KofkHICN80sdxtzwGnKR6vRnGXpFThiUggsntil/bW98hRbXIC fXqi7u6aX3B1Y1coPRlrsB4fhb5+xuH6AXc9MufVPZ8WB/ZGTmzPVmyYe5CPRUzhg9HY r25G5F3CV8c84qTrMCps1zFERpSukv52CkfxFMSdWuxrUM2hL/G0k5X+GiAA96Ot62uc IbUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; fh=Tr7NIUtXAhmtWFkJJjP6G2+mN+Bis7DT7Z3/vsFybJ4=; b=XeErvMLIK4nHkZFL9I/v2vHc6lyNMGfja9OG3eeJkCBZZvLcMpTsVZcO1JQ+0qGUwD /DSOf1qZkv83G6jqZ7ugo5uPaBfg3SIyTJsTdV1bA8MeEOrUqIb0xPcBlkwJZAq31DFj TBAGrvVvf3b1MF9RXwyYNnwhCoOmv1U9DXRTchVdhPHDRV20MeDFoFwMouhMoI5PLsXx pi2ZGqMSe8dS6TkIxWlrukRon/rz+4j8DHglnC3ynEn69b1LiXmKe0P2ejJ3TvQ9KA+K MUALrutfrIahwEP1+O83XZUn68H4qmVentfhFwOg6IQ7rUC4aRsM0eVnF+CbMmmfO78p hyZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QX4bsIph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09ab05cfsi100886156d6.74.2025.06.10.06.05.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QX4bsIph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXb-0006oi-2A; Tue, 10 Jun 2025 08:57:23 -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 1uOyXZ-0006o2-28 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:21 -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 1uOyXX-0002ci-2v for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so45288345e9.0 for ; Tue, 10 Jun 2025 05:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560237; x=1750165037; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; b=QX4bsIphaAKsqsp7k9txKCymPghZciGLyUCojTj0FavSgaQNfIu2mUvh7SjWLfFEnO 72ZkSV4caUKktKOPWGhMA6XtSJnSoB0uXeq9xyEiwJLfE5qRXy8JXybUcwQLR0br9KJE mj5tfB+6IhQfhncd2EZCPph8QQZ9t0bAn5gkD3+9Rv2UzXBZZTyY14KqrvTlDGrVJ1ku ebmKw7/vC53ZC2zSaXBVfSvMteA5hs2aDhoVYgk3qm6XdqT+kXuWrTHOcSq0F3VSC8Yv GdZcDkk1yIfSYAGF6fndP1mPJagQlEAFkJJK6qlnksZ8HPsw04MCjTCzESSqk6WWXqbU Dmrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560237; x=1750165037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; b=LXTbcZsbZNwBWOQk3t1ZaeSa5PuwCCKCC8qOXs6wKj4B/MncfD8Reui8qc4NnzYdqZ LHq9YVbfGvK5WZxGviQ+Z5iHKDOCYD1Mf9LPS5Us7pftvqCGVrHOuEYDRBvJpDUEqBIE vNfhlGVK5QI9alyokvVrKyH1nUb0Bf9LaZxJQ0xh3YPOl9rIWAHQ+0M5LeTZhs6j32Zw CRwweSJxxWyuLj+JiG0VD/XBybwwdprqa7OyQ9l/mRwlO58knwQ5j5VtxiNA0WjEtT6P xyCPIqJY3s+bGTUlZxqSxPRtT5k86h38HDWbuWss2CxQPmWMM8QZ5lIO2SWBuAnzeRSO hmrg== X-Gm-Message-State: AOJu0YyRqjZuL0LbIg87+7W9oo5zq9ikfOOprIG4AKDUyTQ3NgRskswI D6paAuwEiNkoaZ7sLRoqjRFyBKsRsRJGh4/U7cqvi5p9dBCC2/oSXdgEyMi07yGH5BPmipRq7gq jbl0PIfM= X-Gm-Gg: ASbGncuoG9B0lHMbFRhWNBp3kY+GSwMtydSkaLY+0laTHpBtYtHaJ0fZ26+fMjSJOEQ 0T15TIKJdLL1i2KZKAPj3VzCnJYBuNzOhFuPHADQP7Hh0i7qaRCLDTuFdESfGaB9as03vUTxguO UttSOpbHo5FdUMyB0Vlu2sbX+4jo8IVs6pzIRtAKtYlnXPb2yuH6Z1cT9Y6nQaAd+TrsvseCYHB vaU0KyKmqB7Fh0R8oNt93QOfbsBhFWJJN75GQ0x+W6+Ev+ICR0PJp8R06+vKqNPbCiTGVKNAVBV CWHt+wK951cFM2b4YvDGoy3HT7qQ+DcvbXR/+qEKoEIHPEVgQ2KR2TkemMkOcZB1YUA4QisgbB7 jYul5U3msPA2ipzxiEHNX8pss+Y1hkqTK/5iVg+n7Cw== X-Received: by 2002:a05:600c:c119:b0:453:78f:faa8 with SMTP id 5b1f17b1804b1-453078ffbbamr70192195e9.6.1749560236668; Tue, 10 Jun 2025 05:57:16 -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-4526e0563cesm144357165e9.1.2025.06.10.05.57.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 09/24] hw/ppc/e500: Use SysBusDevice API to access TYPE_CCSR's internal resources Date: Tue, 10 Jun 2025 14:56:18 +0200 Message-ID: <20250610125633.24411-10-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow Rather than accessing the attributes of TYPE_CCSR directly, use the SysBusDevice API which exists exactly for that purpose. Furthermore, registering the memory region with the SysBusDevice API makes it show up in QMP's `info qom-tree` command. Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan [balaton: rebased] Signed-off-by: BALATON Zoltan Acked-by: Bernhard Beschow Message-ID: <619a58d1f83d2aad5b4feec930d46c64abff0977.1748012109.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/ppce500.c | 8 ++++---- hw/ppc/e500.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index e97a515d5fe..52269b05bb1 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" -#include "hw/ppc/e500-ccsr.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" @@ -418,11 +417,12 @@ static const VMStateDescription vmstate_ppce500_pci = { static void e500_pcihost_bridge_realize(PCIDevice *d, Error **errp) { PPCE500PCIBridgeState *b = PPC_E500_PCI_BRIDGE(d); - PPCE500CCSRState *ccsr = CCSR( + SysBusDevice *ccsr = SYS_BUS_DEVICE( object_resolve_path_component(qdev_get_machine(), "e500-ccsr")); + MemoryRegion *ccsr_space = sysbus_mmio_get_region(ccsr, 0); - memory_region_init_alias(&b->bar0, OBJECT(ccsr), "e500-pci-bar0", &ccsr->ccsr_space, - 0, int128_get64(ccsr->ccsr_space.size)); + memory_region_init_alias(&b->bar0, OBJECT(ccsr), "e500-pci-bar0", + ccsr_space, 0, int128_get64(ccsr_space->size)); pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &b->bar0); } diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index dedd96b0574..6899802bedd 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -931,7 +931,6 @@ void ppce500_init(MachineState *machine) CPUPPCState *firstenv = NULL; MemoryRegion *ccsr_addr_space; SysBusDevice *s; - PPCE500CCSRState *ccsr; I2CBus *i2c; irqs = g_new0(IrqLines, smp_cpus); @@ -993,10 +992,10 @@ void ppce500_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, machine->ram); dev = qdev_new("e500-ccsr"); + s = SYS_BUS_DEVICE(dev); object_property_add_child(OBJECT(machine), "e500-ccsr", OBJECT(dev)); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - ccsr = CCSR(dev); - ccsr_addr_space = &ccsr->ccsr_space; + sysbus_realize_and_unref(s, &error_fatal); + ccsr_addr_space = sysbus_mmio_get_region(s, 0); memory_region_add_subregion(address_space_mem, pmc->ccsrbar_base, ccsr_addr_space); @@ -1284,6 +1283,7 @@ static void e500_ccsr_initfn(Object *obj) PPCE500CCSRState *ccsr = CCSR(obj); memory_region_init(&ccsr->ccsr_space, obj, "e500-ccsr", MPC8544_CCSRBAR_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(ccsr), &ccsr->ccsr_space); } static const TypeInfo e500_ccsr_info = { From patchwork Tue Jun 10 12:56:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895189 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2247976wrb; Tue, 10 Jun 2025 05:58:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXn57+gnwSXzDBCxOXn+Po7xAcmc3SzRZ71DwMCv6sVM41WqFEx6J06bWGAqcLgxJinfFrTSQ==@linaro.org X-Google-Smtp-Source: AGHT+IFvq1GBgrgTYw65B/lcNsDoPdr9oPpcIz7qQOF+Un232dq6NK8ARBiQ+PDxC56AswMlj7dn X-Received: by 2002:a05:620a:1030:b0:7d2:26f3:83de with SMTP id af79cd13be357-7d2298ed2c8mr2447619885a.54.1749560280070; Tue, 10 Jun 2025 05:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560280; cv=none; d=google.com; s=arc-20240605; b=TDXRdkx1FrNQ7Ksi46FkM3Nzc0X6Mn4+/gh02jNKlCsQHFbOfkey+GWvJMXXniNQJn h2nNkjgswL/duULbYeObmZYxQ4EVy+1n3wgA0VIc2H6HqUmsBKmwPFI4jNRc7CebA1cV hTQlZcmtUelifh5OzYZI66DDwNsQDsNTDMB+6qcI6PWZk0Hx/dNuHrA6DWF0qJK1bVze xmbJ4Ll6Vn458rdgunONgggJMnlZQh3axQPyWfOdI6AKP7qfmNtbCVlWGKR/6Ku976V8 eaBZ8f1gjVMXbSlqzC0EbU3qgCDH010VwZvFxrCzczUWotJBRakA9r6AiqQ29aHV18Lp 2a2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nPmJc92lIzdWkVRDqUj3SpAKD/Q77Fm/aYA6SSL5Z8Q=; fh=A+psVfaAYVTlu1aNTKJwpkdf61NsFUPDxUJxilErp1A=; b=KX8JjTeONqrUlNwDq7nSWn6OGxzStFSE5Q/Ll8V5W0rD0hPHZccpeRngPONhkpZUtw xvCfbY1vM+nKq56XJ0FyBMdA3JXGvjzJy14zPCmcwwYKeVU6V1uhVO6JqrNX/5wyfoAN +iUvEph/sI9d/w4MCHyn9qATqnWGNDtUy0eZltkSRI6D67WacMQ56klpMt8aVw/gnKps hV1V2AnKcSkvnz/lczmC6NXygR15FLIW5kYlTxrmmCJnbnoKGTHIUcaeJ67Kuqgcdp+c g6YqIJy9+Vrki0UmmWY1nNepwxGRAL7wwANS6f+/43EVY86I9HLlQ93XcRBeYS0IM+sU DhIQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NSRWm/vK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d24b3d0e8asi980002585a.35.2025.06.10.05.57.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:58:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NSRWm/vK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXs-0006qL-7b; Tue, 10 Jun 2025 08:57:42 -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 1uOyXg-0006pU-Iu for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:30 -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 1uOyXb-0002dJ-O9 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:28 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a3798794d3so4649078f8f.1 for ; Tue, 10 Jun 2025 05:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560241; x=1750165041; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nPmJc92lIzdWkVRDqUj3SpAKD/Q77Fm/aYA6SSL5Z8Q=; b=NSRWm/vKXhTfMeGAjSHfoj7Qe2mej7L0pyhAEXbb0Pz/51c+Eurox45fAJZ+8ps6m+ ECKlneZxYxv9Z0WJbEMizUC4pxAIyqsBqdXLcMR02iLlY1qX62L7u/N5EuxO1kXDitye q/CY+lrT8zFagl3Afi5dsL6tvkKiSzxntueF0VvvEV8YhO3HehppsUd6gAi5gmAMSaKJ wNicg+l+8aTX05h/DmaF4+tbXDYya2Y84LU4pTwarbNdGMHH4JYYLKS2gaUkcc/1bMyI Km9KlqLVndeY07oXNbeBaPGaThWfmJWWOJKaptAAGckN6Cv46BDm5IkQZ4KNbA7FR96u 7PpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560241; x=1750165041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nPmJc92lIzdWkVRDqUj3SpAKD/Q77Fm/aYA6SSL5Z8Q=; b=W1RRLXrcIzsu65YxrGDc2xB401Pw0+26+wrcl8uAHhATnd9fKfMvUlVa6JpwK9J6Ld baMfcQcp+1eAofa0yxana8cWPMXfoW1VV4Yd1090PSodqsYPCLFYIovE4RMBA3hb6/ob Qmqx1zfzYcnurNqAJohbQhpArHPbHLsivrzLtNRCLgBTpeEIy5Vwxv6WbABZQjjKbKqa Y9d7n6MiuFrqtT5tfkJiOaNLp+Dhp0FaEbukQw4bDaZXo8zodoxCNFrvMP47fGbTPKfv 3avjoYy5utn33QBvFGMgo/tbrosrFU5C+b2x2a4V40X9laBjMlSB74X9r3w+9/Bsxrl+ n5Pw== X-Gm-Message-State: AOJu0Yy+hcLA9iesD+JwTJR06PLlJl7cl5n6kkwdjK/JiUPFln1t/v+j AEFAER4rllE4sOvnu3Uy6I3Hhr3tGbXGx2XgfEMbM7RetvixJ19rOuhxBgPaPNI08nHved6kCn/ JuupmHQg= X-Gm-Gg: ASbGncuCj4pPIibUJ0aoVQnShFU2F44/SoyHGjMWwAI1oESABB1pzMC2Jc0DWF1tbIv LV+Jt8rlebZpUgtuWGiU07nmgOZxlZMZ47xmc+39m/yKrarm+IOQlvkDvbRd19wBNcK6tz8ozs8 gqtR3xwH25KYWE35RH/hEAQ+otgxnKDGzVNG0SFF7IXfXKIs9PJMZU7DJZo/ONTtuXXJ023U8D1 SlBwhENE4+Waygnw35EVMzKPjE8L1rlyjGv2ShkEJ4WmKdsLIXwBvrvwi+gJr4uV7d03aHIxtrS SUyAoZiWRYr2Sa04C85DYVOOLEqbcRGryP8OrtakhGSbKJc/9R65PzVj7Kos2YklSWvB/QzIRl8 PHbpCFJL0n8pgTDZwk6eVu7xcAizKMfikjMNymQsqag== X-Received: by 2002:a05:6000:4313:b0:3a5:25e4:264f with SMTP id ffacd0b85a97d-3a531cb01acmr14319771f8f.31.1749560241380; Tue, 10 Jun 2025 05:57:21 -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-3a53229ddf6sm12079422f8f.2.2025.06.10.05.57.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Helge Deller , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 10/24] pc-bios: ensure installed ROMs don't have execute permissions Date: Tue, 10 Jun 2025 14:56:19 +0200 Message-ID: <20250610125633.24411-11-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé We have been inconsistent about whether ROMS stored in git have execute permission set, and by default meson will preserve source file permissions when installing files. This has caused periodic problems in RPM packaging as executable binary files get analysed by various tools/linters, which can trip up on the ROMs. Tell meson explicitly that all the ROMs should be without execute permission when installed. Signed-off-by: Daniel P. Berrangé Reviewed-by: Helge Deller Tested-by: Helge Deller Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250530152118.65030-1-berrange@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- pc-bios/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 79bb2e18008..3c41620044a 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -88,7 +88,7 @@ blobs = [ ] if get_option('install_blobs') - install_data(blobs, install_dir: qemu_datadir) + install_data(blobs, install_dir: qemu_datadir, install_mode: 'rw-r--r--') endif subdir('descriptors') From patchwork Tue Jun 10 12:56:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895207 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253791wrb; Tue, 10 Jun 2025 06:06:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUj/VNQAnOO0tzOOewiPC1mbsLWphXaUFH5WyvA84iW/MPqcx5UW8NoZikI5TkctlaJoMkKg==@linaro.org X-Google-Smtp-Source: AGHT+IE7SZ/0uG3ervZ7EwEOOY8dOqbmBr8Zi/0c57tT6cM6RLb2FkBsd3g9PNv/LMZVuOuzwYE6 X-Received: by 2002:a05:600c:530d:b0:43c:efed:732c with SMTP id 5b1f17b1804b1-452014b384cmr113779285e9.28.1749560817073; Tue, 10 Jun 2025 06:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560817; cv=none; d=google.com; s=arc-20240605; b=dd/ckIlz2FU8e7KZG6D9/poVpS3GNmBEKRrjkJGMbwSTXUz+A6csytGOAh0ZJBMh5W AzY0svdYeztjeTym+LwGjOvG6apuGM0ifiozeI2bO+GEilOKESiUPNTzuw9gGQCVdeET 4nOALLkwXwK1ozbbBfFT0kNWfZw1ZxPHso9KtIHg92NBz/GtFVWAyxuI59lLgXZb0aF9 HL711HGvRqwoqnsdOCRhm6SplE9AN/zT6U3jL0iUrRg/pnzQ7veFcjnA3fwJKa5KU9Qh tKmqQfIfOxk1SKxxTw8rWGcAtdXUDKSNr8Qrx6rmhTz2adEB3rnx1EDmHZ31hkTKJjNi e8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZH/UENSCofucK9PKqyMnu0tIqL91/9aKt2x9DQ47tTs=; fh=IFq0Sy7Uzv0jbGB3Fn/r2TqdAVaXSY8MTWubzVrdYL8=; b=kvePrPuYwAy+jwXoxYSgmc2L6a4RJRHZRMzoZLC2xzkOmt4EcGZ3uo6ELeKdodFdTI Y8denTimWbBfmAN/PUVekp0GGfMs3r2nUxa4Xum8tWUl8BRufilOy+yKC60ji0mktgnV gOnkuOKZA79IWiMhDlJZJt8Q20QpJZel8YR1iL/VFl6/taN43pKr7Te0b4kwFx6/BOQk YEzGh2Lmfi2G60jWJCRkkyhUfO0ZS6dPOo/IpHj79vYaRoz1LQ0pMlz7SGE+lIEyqedH LnD2UM/IRgh+GCpzs7D7Jl1ftrlS5cjYoDvfyUwftZecuG+GCa5L5IRRy6Y+cufNcvTo FMPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LCtbcZyS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4531dd99af9si12469895e9.86.2025.06.10.06.06.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:06:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LCtbcZyS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyY4-0007EY-OY; Tue, 10 Jun 2025 08:57:53 -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 1uOyXm-0006q8-Ut for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:36 -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 1uOyXg-0002dh-Gs for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:34 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-450cfb79177so26431465e9.0 for ; Tue, 10 Jun 2025 05:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560246; x=1750165046; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZH/UENSCofucK9PKqyMnu0tIqL91/9aKt2x9DQ47tTs=; b=LCtbcZyS7gPnY0eirB0f7BWtZ3z3UBPNYqWv9QO1RjcOZmEtZifmOBZrHcR/+17FfS /UX1VEmO1fdXgQD7T0ojNRbMELBVcMW+zww07jQ9fSjp4F8Tt1bGuAEAOtqlEOBwvfbO mW3VcN47AsmPaKwxarehqUSKElN7YxKqw2kT9EFjtUxoq71zkDDou50LEqwxJYIY6kn0 6DLEHLyWhF3TSA+001nYN9o0RDyfRvOm+V1ciDiQTMa6WwSYdYk92UpdUYN8Mx/s01Zg Kg5S6hPk7My1mZplCMvqx7wLrAENAf8YJERAEThzu4DIF61PLclurRNlWvp2MtnhRy/2 CL5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560246; x=1750165046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZH/UENSCofucK9PKqyMnu0tIqL91/9aKt2x9DQ47tTs=; b=OfK88xze9hZiBkpYoQxkj4dZf9jdbxwPlFRzv7dOXPYqWe25acYPt4b9hFRIPHbPor MIzAqZRQPiEIPkICLnmv8XEPYvYWTFoVRqzyYC4WO8E+UQY/g85A8Q+hsQvW9GMSzkn6 4un7gr15leSCNFukLgO9B6FZuvw72ZgWl4ca8WajC0yqXEIxXdniPOiMKhqueoP3kCof RfBnXd1C7SIS1Ujgyak4CaXuUrtxHfLLGyUJvn3s+1DJ0HMqLsBVhs2dV2CKmK6Ekgv/ EkFcEHVWUPlJdJ+X9lSPFcq6sFDVMgx3++tUnk5zMN8O41lzNQMJe3EJiWNT6Yxukf7U pJ5Q== X-Gm-Message-State: AOJu0Yx22V3wjYOiH5IfgBXqSAM7hb3xPcPgdYCnpnzTqUOAd21ydPgs xVrpZ0ukGDzvWzh2FieSr8OBAsIdPSuNcRE4UYOYBsP3/DtrsL85MmK7H8ZGEpIg6PbHSrXx8F+ InzBkH6g= X-Gm-Gg: ASbGncs6oEgtrjEDXAz72vqSleEyND2jOqBWXbsDuNtZ73NeuorZC5nHdFp6eXmp6nz lK8wW+k6Ef8qsS2WCJKS3UuBkzq9Pfh3HQZggGj05TSX0N6yhreV33lvDzdhXhPIypq0L1NIE64 TLL3zMctIBg7D3Rc13zmdQaQwzvY1T6xtGvRlN8Gs/XfASNESe5AMy+W2JaNToVvwlxngKONAJ5 3EKIcMyfCx6rup7Y8OGt4G8HMsjHkdaI+88e9A34/eqGjqHwuDpNLxdWtRBqOj3LHCOm98kJwBG a7oIQgPhWhcnejUEgkIvuB2BpF6c6MugzIlGPMaxNHwmASxyP/IaDA5gULUAsXK0jSxLcSjWDEX r2H38Ff7oa5GcEQEXqz6m7HV3JkvmoOBncXe8qNw6ch9OjqGaH3O/ X-Received: by 2002:a05:600c:4e4f:b0:450:d4a6:799e with SMTP id 5b1f17b1804b1-4520149770fmr131012605e9.20.1749560245896; Tue, 10 Jun 2025 05:57: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 5b1f17b1804b1-45213709729sm139681725e9.19.2025.06.10.05.57.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= Subject: [PULL 11/24] MAINTAINERS: Update Akihiko Odaki's affiliation Date: Tue, 10 Jun 2025 14:56:20 +0200 Message-ID: <20250610125633.24411-12-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki My contract with Daynix Computing Ltd. will expire by the end of May, 2025. As I may contribute to QEMU for my research, use my email address at the lab. As I'm the only maintainer of igb and no longer financially supported to maintain it, change its status to Odd Fixes until someone steps up. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250531-rsg-v1-1-e0bae1e1d90e@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 16 ++++++++-------- .mailmap | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index aa6763077ea..76399ad1e0e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2519,7 +2519,7 @@ F: tests/qtest/fuzz-megasas-test.c Network packet abstractions M: Dmitry Fleytman -R: Akihiko Odaki +R: Akihiko Odaki S: Maintained F: include/net/eth.h F: net/eth.c @@ -2549,13 +2549,13 @@ F: docs/specs/rocker.rst e1000x M: Dmitry Fleytman -R: Akihiko Odaki +R: Akihiko Odaki S: Maintained F: hw/net/e1000x* e1000e M: Dmitry Fleytman -R: Akihiko Odaki +R: Akihiko Odaki S: Maintained F: hw/net/e1000e* F: tests/qtest/fuzz-e1000e-test.c @@ -2563,9 +2563,9 @@ F: tests/qtest/e1000e-test.c F: tests/qtest/libqos/e1000e.* igb -M: Akihiko Odaki +M: Akihiko Odaki R: Sriram Yagnaraman -S: Maintained +S: Odd Fixes F: docs/system/devices/igb.rst F: hw/net/igb* F: tests/functional/test_netdev_ethtool.py @@ -2910,7 +2910,7 @@ Core Audio framework backend M: Gerd Hoffmann M: Philippe Mathieu-Daudé R: Christian Schoenebeck -R: Akihiko Odaki +R: Akihiko Odaki S: Odd Fixes F: audio/coreaudio.m @@ -3211,7 +3211,7 @@ F: tests/functional/test_vnc.py Cocoa graphics M: Peter Maydell M: Philippe Mathieu-Daudé -R: Akihiko Odaki +R: Akihiko Odaki S: Odd Fixes F: ui/cocoa.m @@ -3738,7 +3738,7 @@ F: util/iova-tree.c elf2dmp M: Viktor Prutyanov -R: Akihiko Odaki +R: Akihiko Odaki S: Maintained F: contrib/elf2dmp/ diff --git a/.mailmap b/.mailmap index 33fe75400fe..e7271852dc6 100644 --- a/.mailmap +++ b/.mailmap @@ -67,7 +67,8 @@ Andrey Drobyshev Andrey Drobyshev via BALATON Zoltan via # Next, replace old addresses by a more recent one. -Akihiko Odaki +Akihiko Odaki +Akihiko Odaki Aleksandar Markovic Aleksandar Markovic Aleksandar Markovic From patchwork Tue Jun 10 12:56:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895208 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2254204wrb; Tue, 10 Jun 2025 06:07:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJjcCMSGbvko59kXPUcK2q7g1h4X8fN0ImqrcXD1UgRtSPXqOqRlRxm4nvw6r1jczMgCrf0A==@linaro.org X-Google-Smtp-Source: AGHT+IFRninYb7A+qP8Bh19z5bgjycxIO57eSrN20+uzuBk9VHBZtnj5nzpBx7N4IwSKXBt9JpSI X-Received: by 2002:a05:600c:6995:b0:43b:c6a7:ac60 with SMTP id 5b1f17b1804b1-4531cfebb25mr32379105e9.10.1749560845460; Tue, 10 Jun 2025 06:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560845; cv=none; d=google.com; s=arc-20240605; b=Qs+C3/9SMSpgNcUMyiAOnogC4UhWhzcQnLYzn3eOUubHWQB9sRMimkh6yNnbvPwxmL 2JhMUqXnnPuwEORJeE0U4UifUJRalgnwvM+jBr6m2Z+fYyZpFO8TIzCjxVsWO03S3MC+ E3/IN8Rk0ciJjbqXTQNWlPpJZHorqftSln/o59OtuaAuM8OUTn7X7yyyxoJol3jT/5G0 +b0SzaWL+9AXn++qdNQnMKMO+pSRfXYru7sgz4QvNKVBUgHqgZiHSNNB+Uf9KKxe4kAl gS5WHbFnRgIVCLkRjIvChaHjvbXptzdVLtojQ8Ocj/xf8gBdBbDoKgSxZhXKqJZO1O04 XM5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MnthyjpLQDqIlW5Rsj/+WcVAlzOijs/T5Gp1lZVZxOc=; fh=9ZxJW+G2ygeNSkqka7L8Nm8+fzOgYTDqwM9I09+d3OY=; b=SJz7bCE+QcCCe4OQzakOCH0Ekc7Pdc50fvNtujbR1LZZykj2tildQaRMqIoYeWl69d Kzs1IdqHOoY659AITQmtuggZGOIrJw7Am2V4GCCyL5jLONzWMKjJpZLA00pMf1jPCrCu olkVqrAMEOoZtIshY3keBumbq4CHJ3EDyx3OA92jZYOWjGdllMSslwO1f/oi+LTd9x0b e8af/ovYZ2TEAgGuHGw1uJB2cTtc7updcbTi7Qbce0MMOOSACfvkqqdviKPgw7etu7kH OJDMlcCO9Fyt4vzQ9cpHjTKbOre3s/EEQ7xMCjK8Hwlxu5g05gsuY0B3WHVVEk9xmECz kNlA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q0wkKOuM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a5324b1f4fsi6989021f8f.894.2025.06.10.06.07.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:07:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q0wkKOuM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyYM-0007Wf-FZ; Tue, 10 Jun 2025 08:58:12 -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 1uOyXn-0006qA-Au for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:36 -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 1uOyXk-0002e5-TR for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:34 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a4e742dc97so4142225f8f.0 for ; Tue, 10 Jun 2025 05:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560250; x=1750165050; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MnthyjpLQDqIlW5Rsj/+WcVAlzOijs/T5Gp1lZVZxOc=; b=q0wkKOuMsO76pEcIzDuIdzeHZcQkY4Jf+JNGYpTtIjnLamEXlORzH1cIcnivb5ezLh UagSe46Xo58CFLwqRPYao1kp3Jh2c7zDGJJxRxR5O6hCOGiCPBnkVaKWl/2Bg1cL0w/o sevh2qkRgZT7W4nFQfhf8xhkKlGsuwqihGY2n4lNsMiHO6K1NqnDlhu1yXXpZXTkZ4BD qoqlgSUzofNO/bhlopLQ/3Yznq26YVs6rPOMwf6juzqAy1L7NqnEfWbMTCjKsnkIceru JHgD66kMOHOae8fPbOB4gXA6/MfeP3juDtJXy6y7tgTDRCOHdYwNYYw4miSj7Uo4kobg OH4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560250; x=1750165050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MnthyjpLQDqIlW5Rsj/+WcVAlzOijs/T5Gp1lZVZxOc=; b=uMlusNvyxxjSewgeSw0WrnHY40amWmq1B61bcrJPLneAEgoGu3m8gqgQesziNimICS niF5Z4TspUpGKTHXXppJLtn3Q+bTIaM6xhRWyHVp/pTgzkYXfcUUEyYSqrAnDB6KSu+H NNZZQTBOEt8usWROc0Jvbf/WyhccM7QmhVlyMhIOCqGmYPrdiTk44wAEZB0RAu/jJzcT uQ7yOoc4jyAVxPsVPB80o6MRrCMr7q4y+9VuGD7I4kcOaSjV3TszT3i6jm+y2yxVYbvl iptBat4Qc0oKak74Et0zB05VS5hmosVENvTMtUM/5wQIy9W1I9oOGi1O23Y+UZyjFOzs OTWA== X-Gm-Message-State: AOJu0YxSU4bIX51FGqXYiZOzd4V9WCgs8AY75ntP0CmekJ2r2aPxYK/3 oqzkytjhLgL2/osoKJU1XflKtH+3+3Z1+O65+mlTQSPpKi2rOadKcc4cMuUaHHO+s/CWgdnbJmV P7Cg62Zo= X-Gm-Gg: ASbGncvU9mmgzdki4h61xvrEaMmxbWyD+hnmD8wT4Bw/YeQpliiBOUF7ibdw5Ozs9WT ATYlMXN+EQS7sEREfovEV+Oi5NZUvzGkJDwZPY9lbqv9WS3nQcCjFHSwnOH0wIgiSdck4XG4F4B uYI+iSb+3hkYY4aCbUPNW4fXqHumRXAJ/Xstv8nez7TvKfg3fnr38aUI0L/2SgDpsfxvjNqk+yy VSd+Lkgbzg7Esqnmu/WuDzlbrl+N3tsAZx4zBSkVr0u8o4ha2iHU/cd0zqzHF8UryOQ0l89h39g +GKF1V2AnE8L0DjYYnT9g381l8ZMJ+u6SWGpx1+Acik8Zu6TVB9urcAFy5j67GSBBVNUkxbGZHX hzrY/1e7NfF8dZ5PH3VNUB6Xyh+Q3eo+0SLtXUa7gWA== X-Received: by 2002:a05:6000:178f:b0:3a4:f73e:abb1 with SMTP id ffacd0b85a97d-3a5513e3554mr3592555f8f.4.1749560250456; Tue, 10 Jun 2025 05:57: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 ffacd0b85a97d-3a5323b59d0sm12374996f8f.38.2025.06.10.05.57.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PULL 12/24] tests/functional: Add a test for the Arduino UNO machine Date: Tue, 10 Jun 2025 14:56:21 +0200 Message-ID: <20250610125633.24411-13-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth Check whether we can run a kernel that prints something to the serial console. Signed-off-by: Thomas Huth Reviewed-by: Mark Cave-Ayland Message-ID: <20250603184007.24521-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 3 ++- tests/functional/meson.build | 1 + tests/functional/test_avr_uno.py | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100755 tests/functional/test_avr_uno.py diff --git a/MAINTAINERS b/MAINTAINERS index 76399ad1e0e..a6f210dba5a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -219,7 +219,7 @@ S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml F: target/avr/ -F: tests/functional/test_avr_mega2560.py +F: tests/functional/test_avr_*.py Hexagon TCG CPUs M: Brian Cain @@ -1236,6 +1236,7 @@ Arduino M: Philippe Mathieu-Daudé S: Maintained F: hw/avr/arduino.c +F: tests/functional/test_avr_uno.py HP-PARISC Machines ------------------ diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 557d59ddf4d..e406451cd3c 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -150,6 +150,7 @@ tests_arm_linuxuser_thorough = [ tests_avr_system_thorough = [ 'avr_mega2560', + 'avr_uno', ] tests_hppa_system_quick = [ diff --git a/tests/functional/test_avr_uno.py b/tests/functional/test_avr_uno.py new file mode 100755 index 00000000000..adb3b73da4f --- /dev/null +++ b/tests/functional/test_avr_uno.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +# +# QEMU AVR Arduino UNO functional test +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern + + +class UnoMachine(QemuSystemTest): + + ASSET_UNO = Asset( + ('https://github.com/RahulRNandan/LED_Blink_AVR/raw/' + 'c6d602cbb974a193/build/main.elf'), + '3009a4e2cf5c5b65142f538abdf66d4dc6bc6beab7e552fff9ae314583761b72') + + def test_uno(self): + """ + The binary constantly prints out 'LED Blink' + """ + self.set_machine('arduino-uno') + rom_path = self.ASSET_UNO.fetch() + + self.vm.add_args('-bios', rom_path) + self.vm.set_console() + self.vm.launch() + + wait_for_console_pattern(self, 'LED Blink') + + +if __name__ == '__main__': + QemuSystemTest.main() From patchwork Tue Jun 10 12:56:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895204 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253713wrb; Tue, 10 Jun 2025 06:06:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUA2ClZaxHE/YLPoM12BGQvU/Qkg8HgHYgmP50I/Fi5RnYc4v29shX8YS0ym/+WdajR+hgiaQ==@linaro.org X-Google-Smtp-Source: AGHT+IHylWhHN6KuSYn8OY8DytuORtQ/X2Sw9KmUjl434zzH2F7+XOZf9ot+3Rh3RrmD2Agzb1ky X-Received: by 2002:a05:6000:bc1:b0:3a5:34ea:851e with SMTP id ffacd0b85a97d-3a534ea8556mr10103102f8f.25.1749560811550; Tue, 10 Jun 2025 06:06:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560811; cv=none; d=google.com; s=arc-20240605; b=BGNJQI3DjmcIpP64bYZwGg3xbcXtq5c5bSzw5hK9lL51hM2tPw3etWOh2cKzApdzI4 RhWOvPyAFM2XIq3/UFEH/omwqivDZuPcQz1vAkW95UwV1dANcqBzninTXCdqp5vE5KVT 16WLv20SdN3hNKO0RXh01IcK4ZTOx4PsYwXvO76stzV+uIaVUmXMR2BtejYU1tlKJx80 x5/vl3byFjmvS+8ylQq3Ua6ZhZrHO8+xluPtbzu9y/x3ZrIerQfXrUwuQ/DYKTiIcDZ9 ySe/iN/tZFM6WkDNZWuCuWYeFSu3STFX5gXb7txLlRylHgLuUDvqjsaj0JEZK0NZTzXr J4tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8T1V36v8wKP/BAz1gGD+Xad///zXpxrmTwUCr9UV/II=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=VGIkZTE8EZIN+tk1UZriM3Hz/lp/TyVruCnd1FMn9x2vnNDGf+JBQSh/QIEl8A2+oc SJuDX9h2GA7FuqeLCAeWzyHoTZaA4bqb4Nz+0npqXfudXb2/ErgMuZTeUVf2miGGrYkR Z40GeUsqRC8H6ri7YLC9zjys8KU4UmrsJCwf5nlr7nfCjpWa55axUXpiSgPIOGiYST7K qko1MdjGmljFTYNbj0NKPosdRLttvwNzq1uRG++hkZJ9VEkbUzx2JrmWCs8vA2nsw83b tc5b7X6KH7JsDdueeB412faU2FaC9YjXkqB2cru8YrL2kaXqyUpZW9kERHVoFoaGVW7P /kbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XBu8lyyb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a53247d81asi7214400f8f.605.2025.06.10.06.06.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:06:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XBu8lyyb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyZM-0008Ld-9n; Tue, 10 Jun 2025 08:59: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 1uOyXs-0006s9-6Z for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:40 -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 1uOyXq-0002eX-9j for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:39 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-45305c280a3so9663725e9.3 for ; Tue, 10 Jun 2025 05:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560255; x=1750165055; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8T1V36v8wKP/BAz1gGD+Xad///zXpxrmTwUCr9UV/II=; b=XBu8lyybs2/KKFcY5nEYlnij/fKrOspIPrY+P2TsN+/J24SlhE6mIVAARma9F5wIgf Gtgnc8+ESsY0Iz7QdKA8pZoVAu7TDgFP/CQRMCH6Ip1xtv7MYYy2sUVpRl9MOrBT7ifD Ox+Dz8WgChRP2HDHdLnBidBLrV72b3TmZzWMYRfW1uRM3ht6dSI8H7Cng9OM6NebNCGm r5pE7q9Wfp4P+mE2cztmzaYZr7qsJD8BNvn53e+HZNHOrh4/aZFFQ+5UKnks1rGByysh EuZQZXCFuzcxizwLCkf3DuGqxBZdm60lK/QuK6R8GBvgT4J0HfAZ6xd4jHx5ha+kr2Ou K0yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560255; x=1750165055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8T1V36v8wKP/BAz1gGD+Xad///zXpxrmTwUCr9UV/II=; b=vdkqJFCLXY2od7QnT2j5m9t8PIls+Pc/V8Yw91qVxPnzb4GYvkRBH+oPtwjeSPRsJo L5XG3RRQAf5WDYk29vOhOSJwn+6rmeA6oPwOb3Ow3slu/E9DBNumK+nywYF4j0EWJs+2 yKnFTpaUNb82anWMLVM/+Ieu2E4/svL30ZDdPcR5BqcWXGPg6Oh1ASOCEgM7KD1EorTp LwviZbEi/UWDYPL2Pzt6EAqX+miu+GM96+caVmvUMqr9++bUoBN4qQD34EaaU6SKuEX2 R/zpcPqRi3kPJ9FNsubmJLhCoDF4DMC5Q2Gk/rsg7Zm3xRBikPxmLitEk/llwcFYjBtL GoTA== X-Gm-Message-State: AOJu0YyNX/h1H0evYBhpo2Ey3AJ+Phke4y6OKkt0qtxn4PPhpUMlu5FF aLqTv/vFCRtOMiDHJLgbeYqai0Z3CQMssK1Jqd6c3aNaXjE20u40kI76UQwaaronNTh20SMhK/8 FF8RAsbI= X-Gm-Gg: ASbGncuNMHyoWmuCL8/MLCEA963lprZ5QPko/+aW9WlAnLKJrBjEyoTvAGXvU6fqg/m aZYaSxguxKs91jmD04Mh8Tn9W6+8bshq+jl5CetHXd99uHScKqnuJ1rdRaOGH31xD3Nm5AL6xUg bnIB4FaL7UaqusQuMswvJ+G4dVbTrgEGPmexxlHFdro0OwgADKByLTCIuFMoaZWIXkPz8mLoEUn yKaDc6BrSSAWQb4devITgBvK7iurEzRJLLNcTrO0XalWNucdI5iGl7Ox/h+aYEIdPJWKuuY2TpF OQqoZubCddDYijbMEAGgb/7pDg8UccRS9PFyPh3WSP4t29yv5eRa3fQdhMpGRnyyQdK1hNwmdZ+ 6J4tE8Fn+UmN9xlcWcDux55XhKafN8pt6fW3QobvAzg== X-Received: by 2002:a05:600c:1d86:b0:443:48:66d2 with SMTP id 5b1f17b1804b1-452013ab8e3mr191485635e9.16.1749560254978; Tue, 10 Jun 2025 05:57: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 ffacd0b85a97d-3a53229e009sm12603364f8f.16.2025.06.10.05.57.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 13/24] accel/hvf: Fix TYPE_HVF_ACCEL instance size Date: Tue, 10 Jun 2025 14:56:22 +0200 Message-ID: <20250610125633.24411-14-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixes: c97d6d2cdf9 ("i386: hvf: add code base from Google repo") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20250606164418.98655-7-philmd@linaro.org> --- include/system/hvf_int.h | 1 + accel/hvf/hvf-accel-ops.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index 8c8b84012d9..d774e58df91 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -44,6 +44,7 @@ typedef struct hvf_vcpu_caps { struct HVFState { AccelState parent; + hvf_slot slots[32]; int num_slots; diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index b8b6116bc84..d60446b85b8 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -366,6 +366,7 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data) static const TypeInfo hvf_accel_type = { .name = TYPE_HVF_ACCEL, .parent = TYPE_ACCEL, + .instance_size = sizeof(HVFState), .class_init = hvf_accel_class_init, }; From patchwork Tue Jun 10 12:56:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895192 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2250380wrb; Tue, 10 Jun 2025 06:02:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRESRGDIy9VS3vr52hXAongEMqnvlRTaZiptFmTOJI0aGnK1KHgvIkB/600UiXX+zyeh7r+A==@linaro.org X-Google-Smtp-Source: AGHT+IFoLxk1l16Lit84lhSDL931GaDnCWVT6lMZ7tHycd3hJSTt2oUFcuZqw3GmpjvNnPxAE3Sw X-Received: by 2002:a05:622a:2292:b0:494:7043:8a2 with SMTP id d75a77b69052e-4a708d64b8cmr55409931cf.16.1749560536332; Tue, 10 Jun 2025 06:02:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560536; cv=none; d=google.com; s=arc-20240605; b=fnEoLCBY1gwD5yG12x1dmn/eNZxvJup/QMvLhrO6e+yc1ks4mpcL0y9mWFhWVCSIpt F8nb5Ez7MtgyNnvlWrDm4tCwMC56nynwp3AdpOPiRrJ2aMcJDwq1D4FitYJzxE9LSWCl buvgMJzYj6IqzzffW7UrtB7qeOXzIkGDZhBNzS+VB+dGYDQ+2dO7PkOe5Q7jDBhljP6e OKp806BcWqlaWo4MrF+WpQ/s7si55LdnckoaxJpZtdZ64poV4QXVZPBGhuEpy33GiU1/ j0r97v90hLzyEeqM9zcAuQcL9Z1jhtt7ceLuKUABKCC1Baj6iXMvpR5er1AHUzUlQnvX rZIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f1SDtp+PzmoXDCdOjc+70YYb7XPFBDbAy3avwI/RQMs=; fh=efpaI7RtYZZdSEGSooIx65KcEI+WJUnZIjl5QKaULOQ=; b=P+PbGgACCnbup9po2e6K+lCzgqTtgZH2lgiGhPzTI760eBLcpStSq3RGbJR4GyuzdO EMOIzdh5w9535ef7MtqilWQXBqkwzPvWh5naThkVBCHZn8xfl+a6ywsatvvOLyhuDzbb zx5UKuZJwoeHonTYaQWxShSB9CBCONtL/9yXO/rMMPmCibULJkoMz/xxNJf1xEz6olr4 Hbt89pFAtoeF3oisL81Mmhhi9ttupy6UbgiyEjjL+jDpFf3TGx0gZthKcAylVMIPVOxe IBNHfXjQ74zJx8MGIlyKGMye12Cc9euhcLJGDQOUtmeslQi5YboQVy7eCHikRxzfb6ax Pt4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PaW8DMKv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a61985d503si97102671cf.214.2025.06.10.06.02.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:02:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PaW8DMKv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyYE-0007Nn-4g; Tue, 10 Jun 2025 08:58:02 -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 1uOyXw-00072T-NB for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:48 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyXu-0002eu-5d for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:44 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-441ab63a415so56528375e9.3 for ; Tue, 10 Jun 2025 05:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560259; x=1750165059; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f1SDtp+PzmoXDCdOjc+70YYb7XPFBDbAy3avwI/RQMs=; b=PaW8DMKvjuHnaErdBdY4YTNo2BbOvjOexHigHLkS8Jd1awdelFPfBLUzp/vjdVyFR+ MGwLLJ6xr5V2crnG+U9LIg40ltagzuaoRxHxxmRXYptXCxRCbWyp5rh9Rz1VbvRI//fA wZ4SU33bcmxuBHIdJorCy9DXYVMXEJ3gTe7ixsaWqvyhDxwfQ2Ps85hH9FOu0BG1500E oQ9BiC72DkUlxKtItczjO95SW+gzn02AVXemvYbsqegySZDHiSlqmJfvchYswVY/8gIN xdk4Hh8RMOyD7jpaQF7hylGrwLFAQFcfNNFljWRY9UGBIVZ1xFMc5Nt7xiLPPgvxuw53 xU7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560259; x=1750165059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f1SDtp+PzmoXDCdOjc+70YYb7XPFBDbAy3avwI/RQMs=; b=mGAAJxP3eO8Yvyqb8FNNFrmOSJNaFgvk25Tu4YcspS5A0+5FCMP4kiNHQgmWal7OlK K1fuUloEiCjtohwdIMcUk/oLCEgFQRTt/a6KQa+h0EYdWnM5TEkt9dIl1YNBU7ATDBWr snJ0jhFhVnHTVzF6lihkA5suRz52j2eKBaPW/8nEOWPY+3G1iy9OJZ9QSBc2bhHW0B9w J7MRFEehtDpE6OYDEOWxAoACpVLW7DVetm52YIJJ/nUhB6bNXVFd00nKwck5Wbb3I38D AlHc6A/vVSFyIsbdndAeqj+gVH/ziKJ6a0rZ5iVfUQBQbH3wngR8CV4NfoVFB/kgfCbl 0X0Q== X-Gm-Message-State: AOJu0Yzma41FFv4Fj5BRIqFfrilDzcgsd0UUSm6/OQzb90zOCzSeVzdB qXUjXWTEftZq3mZ0xB/jGbCTCPX//cGwMcmFhAZ7xJqA5uuuF3akwoq09IEHpz6PII7cDXERbED FGenpudc= X-Gm-Gg: ASbGnctX1C53OQbwyYcaXryDCVNDEL5ZMkZeHcGwXI2R1QXaT2ItzatHPltYQwCivHN lGldWn2QD5HlBmLf6oGmSKoR+u7Swt2PgoDT6L0PWSVWdPwwlXyIIRZqC6fMGO6xUYGojJ0jiwo EMe5Iiv/JinewyBBlYY4JRbi3W8ZcBjvjP3xKdN7oICRBwpapOapLuhBuMoegMy0hsaMd1aRhmr yYQmFWaJWVRa0KjOhwz3nXCpaFzQv7z/chEuRAtfjtNwAVOzlVR8Co6XKlbhI/RDPerC9jQhyoH YTHm8pGalpU3LXGBWCsLWOJk6BJKNwy7u3v0vexDoCZ6usHseD4ZM89MBrhmStUed05MN6txUDH nYOffkiu4rTW1neHxAnOw2zD0eyfmKv9UbTzk1iEUe0v3aZw9NQFS X-Received: by 2002:a05:6000:220d:b0:3a1:fe77:9e1d with SMTP id ffacd0b85a97d-3a552274ab9mr2414992f8f.16.1749560259447; Tue, 10 Jun 2025 05:57: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-3a532463ed4sm12316003f8f.94.2025.06.10.05.57.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Alireza Sanaee , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 14/24] hw/core/cpu: Move CacheType to general cpu.h Date: Tue, 10 Jun 2025 14:56:23 +0200 Message-ID: <20250610125633.24411-15-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhao Liu I386 has already defined cache types in target/i386/cpu.h. Move CacheType to hw/core/cpu.h, so that ARM and other architectures could use it. Cc: Alireza Sanaee Signed-off-by: Zhao Liu Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250605132722.3597593-1-zhao1.liu@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/cpu.h | 6 ++++++ target/i386/cpu.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 1e87f7d393e..33296a1c080 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -1126,4 +1126,10 @@ extern const VMStateDescription vmstate_cpu_common; #define UNASSIGNED_CPU_INDEX -1 #define UNASSIGNED_CLUSTER_INDEX -1 +enum CacheType { + DATA_CACHE, + INSTRUCTION_CACHE, + UNIFIED_CACHE +}; + #endif diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 545851cbde1..5910dcf74d4 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1773,12 +1773,6 @@ typedef enum TPRAccess { /* Cache information data structures: */ -enum CacheType { - DATA_CACHE, - INSTRUCTION_CACHE, - UNIFIED_CACHE -}; - typedef struct CPUCacheInfo { enum CacheType type; uint8_t level; From patchwork Tue Jun 10 12:56:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895198 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2252396wrb; Tue, 10 Jun 2025 06:05:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4cqx2AycSbVwBLc+JHdRlp7vdxpnpWXBJilCZsETbzC138EkxFmCwXeK35i6EcCGLYjQJ7Q==@linaro.org X-Google-Smtp-Source: AGHT+IGMLdYb2du6frmPZ9DOZavLIM2iaeEnm/fuf1+5WVL1u/uD+uRKCmXTWMgTkG3k8WZ8GJFX X-Received: by 2002:a05:620a:1199:b0:7d3:8dea:b0ca with SMTP id af79cd13be357-7d38deab5b0mr1400649785a.9.1749560703025; Tue, 10 Jun 2025 06:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560703; cv=none; d=google.com; s=arc-20240605; b=P4er7nBtZrFCaL8IvVelhdM+j2QILHSHYqnECArJnHpXhX37B5Ghut7apd5BZomxjc bCmloMQ+X3oDTyvj8xtp5gBULIvCu9jVc7diHi6jf/pIRHNi2ktIzrqUHbNUjlTNSpcu uc1HN7YUaoR58d9/YwW/3p1HXWm2unvRx9R6+kTfhw/eOYLCv9JWvZSsFiTFXTT3NMgN a4gwvYJ73t5KR8CuYMiCfvv9nd/7QMQVV9fJffI/rMXKa8Do4UOS0SD4/adpIWCGHzq1 BI+xxGkPLrOq9qES8j1KE6x39CgpDlJBUm4b+ixKB0r+nW++R4smY/WqwA/bfaTt4OeG qj+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DoWnKErT6L5M/XOHBo7kM8xkl21t85uZpmhKzYCdWBM=; fh=Z3yIkEGKOu/YQanE7qfjSzZqZ7rIvM2aUJb2IOnrnoQ=; b=SBYIMrWHLW8014qavz8GnDFJd/DnHQg7C+5nlj3Q8CDpLIybddYTRbJ5Av8aUcs8ge NVFwZK+X9XPjq4W4SX4Qgg4CNY3LhVFD69vEuyUVm6k+VTq8RqFIuImC6S60rXZQeuvG DPbbSV0Op/0FuDNGQK9BBjgfGYJ7+rjGEHkCguQZsDyJ99kTE8ii8z+q4fmW4tAGMnvU rO9pKy50Vdkf8UMQgPz3ZBiE+vtniTCv0I2aby9aue3QTHM0XlUsOGG/GOytNQ7O0E/I Ue+B62HCB98Zy5LeQs/CyNYJKn60H5mA3YCagXGRGkZGm76NuLDk0Of3R7TiqNeEaPA3 f2Cw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LkDQRj9W; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d25a627502si999150785a.464.2025.06.10.06.05.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LkDQRj9W; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyZ0-00084p-IR; Tue, 10 Jun 2025 08:58:53 -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 1uOyY0-00075d-0J for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:48 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyXy-0002fM-79 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:47 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a503d9ef59so4539480f8f.3 for ; Tue, 10 Jun 2025 05:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560264; x=1750165064; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DoWnKErT6L5M/XOHBo7kM8xkl21t85uZpmhKzYCdWBM=; b=LkDQRj9WyLDWzUf0/H1x+b6tGRESsXKqeBzM6mcCYO6bc/aB8AYnT9KhtXL0Za1idO 8HawYPbL7w7at+gnZhMg/EoNd1zyLWyA/CPKrpmU+kFRH3lSbKlH71sERpS5Nq7JX0fd bMvwmhfFCIJS9KiFProkz7ya+hCpFRvQDO0a6DEMOkS9Gj7fBaBSuvUKCHz7AXEpEYzd +mjuTNuvMJ/OMKKWVLmRbwgXtA5XlaX2x8YEjpzjyPHd4t51wd1THnL1CH91MYTwErut LPS5PIgUfE2vDo2wY+PNXWgfAnViTFaKS8/Wecc0QmQNPJg9oVwle5RGxvtaykDg9yoX CH3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560264; x=1750165064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DoWnKErT6L5M/XOHBo7kM8xkl21t85uZpmhKzYCdWBM=; b=qtTaLMPHJApbotHE4++SGsxY6orXF+8yN2nbFX9MUl9ilKB1wbtJQ4XmzT+7D7FsET LkSnY9n4b/9Jap2VqMmpJhredRdfeSN1iuL5p0ENDJODNJCMB6LF/ISwjnzqFT63XUcS hac7USZhnQ36furFm4g2Jr2EKMTVqx0M3oLqqJkhU0VawM2CLpE7tjwpTDBscjSWXeXr I5DaZEmR/oJvwVcKuQUuO5kqkNMOlwrz4Nh/ipq7Ogf1awnXo5+OSMPtoVvPxWD5SZJ2 f2IHOYwzk63R9TgHfeEOMyOYHAiTbI+r+g113B3VABDvJYV+kzpuI61d4IPdUulCOXNr uIAg== X-Gm-Message-State: AOJu0YxkGOYUJ6rFQ2FYdXtlueilmXb0gBfPOHk3jOC9DVt+cotD388g xS98jiqJUtoRh2D5cCcyUS3vag9pfv+lTx7z7OisncWH9IKoqVKW5/+e+o2PfTHVJyzRGUNwNKs GDvL17KY= X-Gm-Gg: ASbGncs1CS01XaqHnFbKKXDkiQTqRufEBhgKU9+Ob01hCxYF++Op52waIsslEtbIe0I vWE6WHteNu1d3wqIg/Cwaienu+Ag5N15PwdXwzQ2Ct7Z3WCKzU3+8TVq56zP0Ue8ZTFjexwV2t/ +LbJbqco75Q3wQk4so7LAGfBlZbX25NNqDxuFUL5YmN3ZPN2nG+FbzeKlYOYoJLnelII5FAyXnW jl4TBcM/nDRwoyPJOVr8znc/0IOStxGn060nSMTF/46CTnXDJOBRE8+/rU200eljel27ogZe95/ l34F+6+0V3LgTD6nSo4LSUnuHzWFsEQ0/w9Klh1YqgIWnE3mOoS3ZlxXHcjYVP/GSqWeTP89dCv liILJ6aI6LZFY5EnYpfzYTGey2YJnpK1CA0ON6DKWCA== X-Received: by 2002:a05:6000:4313:b0:3a5:25e4:264f with SMTP id ffacd0b85a97d-3a531cb01acmr14320750f8f.31.1749560264048; Tue, 10 Jun 2025 05:57:44 -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-3a532436863sm12477526f8f.52.2025.06.10.05.57.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Glenn Miles , Stefan Hajnoczi Subject: [PULL 15/24] hw/gpio/pca9552: Avoid using g_newa() Date: Tue, 10 Jun 2025 14:56:24 +0200 Message-ID: <20250610125633.24411-16-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We have pin_count <= PCA955X_PIN_COUNT_MAX. Having PCA955X_PIN_COUNT_MAX = 16, it is safe to explicitly allocate the char buffer on the stack, without g_newa(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Glenn Miles Reviewed-by: Stefan Hajnoczi Message-Id: <20250605193540.59874-2-philmd@linaro.org> --- hw/gpio/pca9552.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c index d65c0a2e90f..1e10238b2e0 100644 --- a/hw/gpio/pca9552.c +++ b/hw/gpio/pca9552.c @@ -76,7 +76,7 @@ static void pca955x_display_pins_status(PCA955xState *s, return; } if (trace_event_get_state_backends(TRACE_PCA955X_GPIO_STATUS)) { - char *buf = g_newa(char, k->pin_count + 1); + char buf[PCA955X_PIN_COUNT_MAX + 1]; for (i = 0; i < k->pin_count; i++) { if (extract32(pins_status, i, 1)) { From patchwork Tue Jun 10 12:56:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895195 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2251807wrb; Tue, 10 Jun 2025 06:04:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVaSrmGYaAHZU3Shxv/0nmRkqcLtokZdUnhKnLt2O8UPjeX1Odx2mT/JzSvNC+P8n79OZ9y8A==@linaro.org X-Google-Smtp-Source: AGHT+IFMMEaAoLv24j3uaTSPPhiuhQ6S+4XV9SxLH/eDlno2dk6V/hHj6XuIBPBlHkIa/VjMJBN2 X-Received: by 2002:a05:6102:c12:b0:4e5:59ce:4717 with SMTP id ada2fe7eead31-4e7728badaamr12932477137.9.1749560651302; Tue, 10 Jun 2025 06:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560651; cv=none; d=google.com; s=arc-20240605; b=YGBUaKM3ZY+P4Xh4dbmVtKeCsR8l3p6eRKfFNNoGuzEpmxO90E+D0Ko4R49OZIT9T9 G1OJHNvXTkgms9RxCZnHwWezeZCTtY78eCnkMV+OBHSno8dQgIu38vHq0hIU3dK0dJxa bGRyLyribNx7OCvHGylZfusvpLda1u97kMRKcB7fbxRRfYzkiuP0n3IhtW2TcwfTHasM ZAH6deD0xUtDBABloMxKtLXieUZLvfEp7EyLGM2Afy9w7yDycnNUIoJPTjsJBqb1+SkG CUtF0CLD6pvIXCZILVVw9MVEFrracoLeSR1Xc8MUJ5y/bOM4tpw1vL0y6NMaiaX5Q9+Z K7vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/2mSDVhtmA7a1w6bXLskGx4/lyl+bFQibV5Plr1VjhU=; fh=quEws7m90emvDdcjKojJFV47qc7yx5QC5P4DIOkZc38=; b=MQwMzkCn2PpIi4u5WX2BXmFeGyqmoyLyojnj2I07sQoNucEr/9uVcv4UnPnDbj3cn8 V+1eXDsW+4aB/5NXbrhDE4MS7YB2020F3zfofo1qB5wLmc4Rt9UPqNbAoaX1FkwSQ4h6 XrtaV7+AoR5bwJLKN5aWM75KZiUc9B7C/qeEyp+sf1bvFsupmgct7tw3hi0L0Yv+9cGL 9hMJLTEVkQZzlTaxtX+LuzVFjWpbTKtEXwlhcA/S+YeE5e6F2Xy+Pkd3Pckxy1XTfDZw fWo6PQf1Wb2FZ/7raTYAHyCmNERHsLj4Q9CWjQ0oXpFhSfQ0gBEF5j1XL6wOaxcpCirf ZlQA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tVJptq4f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4e7b493387asi195647137.381.2025.06.10.06.04.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:04:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tVJptq4f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyYh-0007qI-VM; Tue, 10 Jun 2025 08:58: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 1uOyY4-0007K1-NK for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:53 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyY2-0002fk-Qa for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:52 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3a54700a463so1431947f8f.1 for ; Tue, 10 Jun 2025 05:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560269; x=1750165069; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/2mSDVhtmA7a1w6bXLskGx4/lyl+bFQibV5Plr1VjhU=; b=tVJptq4f8M8HSJwdqxbvIo1jXZRAY3k5DmRIxQ3voLKszt/8GDHs5pVKw55Cyn6qzm 9TwyCg8ZoRuu0vkbwkKArkIG/1AtrVhHkhXgPQiN795ls6lp9I9kz4KCuFUJsth0f6VO YYOSBTGdotTNhjgaGg8adD9GbY5OZY4Gg8ecbIceljH03ChDbu4RPyjRw3yoeDO3t+5r QiQCkibxouimE5z+8njl+xWZp/TjqkwKrSB6R0xgAPum9n9LxWKj9EvB7vDBzVxNfykm 6N8GMW7U/5PaH7xALI1oWURbP4QNy0GU0GWIhu5S+sa7MMZWo9jYGzN6uq+feTs2yI8W 70kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560269; x=1750165069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/2mSDVhtmA7a1w6bXLskGx4/lyl+bFQibV5Plr1VjhU=; b=chUm3E3j6BkIZgXLNbg8mRBmFwIiYNIHOX96yNMuD84qcmj3OJDaioxamZnuc13DTO CTBr3/KcmBF7ziJzxoOjYaKXciiX9vUIlZ+AvQkOghvKR0XOELena0autAArqiU3yFQq zZPgtclxPeIrIjNrmfRY7yJJyZR2sVfprWODSYt4fPOr/2+U6YkJO1T7v6jgVHDXXGEf 368/pP+omOnlAu6TsrzOdIYkMULNB06Qb9DkMdpswbPg0jYCkZJx0LmcL3NkgbWDkWMB QFHZtxOsjvSA8tMJEV7HLjdUIgU9CVxDJud5rwRPYb/5sR3Krmk2StRXi7fIrwVtBm21 WeEw== X-Gm-Message-State: AOJu0YyT2qgJMQQ692jFb1WB7zGu5w7PykvWLaX/QIJtdV/REUrzkHAo 1rpOTQKNeDl4TBuX5wjf7yJZ5fGP1fiNdwuZ9InqIIaQm87K/Ak4D0UalNXcZJz7Qiti8S6arZx 2Aik15Ek= X-Gm-Gg: ASbGnct3ymruG6T3RPxbYEqUWKptZizBlsNwXrc+EerlRLio7UVlwT7YMmcx2CLVEKQ 0En5zNjS2/jefO3wOxh79knkOgUslVxD9ngERTmxlWC5ejkYGm5F0QKv8oClevQ7NUb4Vcnwv5D GkbM2i4VMqQp4Db9JhENEGvvNfRUkU27/xkj9MJ9voSjtWwt3Jcr4BnGdcsyKHVt/0BMG8xzAPl dn59DPY8ojQh/GJsu3bYqKTeyfwNR40a7+JmCRq48VOhB5LwUTcv5BNqk80S3KTTFsInEpitAsS 2So3arW6GV4k1EvxwgrMaZumQTbUB8m3XgAo3kljl1mT3Ilj0hO0DAI530aoT+6KHZucdVQPsO3 bToTWB9NjbKOpKNq9Bq0E/vvXfRiusMcshSulSf/dfg== X-Received: by 2002:adf:cb13:0:b0:3a3:76d8:67a7 with SMTP id ffacd0b85a97d-3a55140272emr2374750f8f.20.1749560268675; Tue, 10 Jun 2025 05:57:48 -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-3a53244f516sm12187491f8f.74.2025.06.10.05.57.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Thomas Huth , Stefan Berger , Stefan Hajnoczi Subject: [PULL 16/24] backends/tpm: Avoid using g_alloca() Date: Tue, 10 Jun 2025 14:56:25 +0200 Message-ID: <20250610125633.24411-17-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org tpm_emulator_ctrlcmd() is not in hot path. Use the heap instead of the stack, removing the g_alloca() call. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth Reviewed-by: Stefan Berger Reviewed-by: Stefan Hajnoczi Message-Id: <20250605193540.59874-3-philmd@linaro.org> --- backends/tpm/tpm_emulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 43d350e895d..4a234ab2c0b 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -129,11 +129,11 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg, CharBackend *dev = &tpm->ctrl_chr; uint32_t cmd_no = cpu_to_be32(cmd); ssize_t n = sizeof(uint32_t) + msg_len_in; - uint8_t *buf = NULL; ptm_res res; WITH_QEMU_LOCK_GUARD(&tpm->mutex) { - buf = g_alloca(n); + g_autofree uint8_t *buf = g_malloc(n); + memcpy(buf, &cmd_no, sizeof(cmd_no)); memcpy(buf + sizeof(cmd_no), msg, msg_len_in); From patchwork Tue Jun 10 12:56:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895190 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2248640wrb; Tue, 10 Jun 2025 05:59:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXy/5j74jbklak6QrbXJb+bN4iZgvhlSEzs3AtpJMyObN9QPO90dIuju44eqhqL++fVFfMxBA==@linaro.org X-Google-Smtp-Source: AGHT+IHRrfGqQnvtwmwv1wWTJrsUXs4RQU+GsqsW/sZCi3MSeX3LTM/PjaMbwg/VgBZAT//JnLd5 X-Received: by 2002:a05:6214:cc5:b0:6fa:ce21:cad with SMTP id 6a1803df08f44-6fb08ff4381mr266517086d6.18.1749560375519; Tue, 10 Jun 2025 05:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560375; cv=none; d=google.com; s=arc-20240605; b=j5iZVJ7Wof9OGtE1FZT2qc7yM0+zxZRfDS7ap57dnO61te8tZKuUvBddHcdHuByVx+ esXbGDS8Z73XbAaIs4P/zefRtquKk2kBVAGCus7yb1CAIVxy21h72JL21Q3po17Pbfya XtmuHSMQCcts5aHCMguZZYtGBbwcnSgNSemA6Oidd6qgcFJPrmwQARHzFag6yOu54LVm 9YGYxIBFvvuJwIGGNTbwT5yZj+5dt8DOZEnKNuYH6xXUuHWYWH86VhRiAtoAXbZGhIXJ o6LrZlY2oZrl66AldQnVYkRLp9uoLroJi0K528xwsNPA70CD0c1hgoxuYrxFqYi7/WfA amJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WMlQwQj0IvSUVJlRfBARrapHZdCXw03PUrHdqVvfzZo=; fh=9nTsHeUr74/rzVbS/PZjWghOpgmWy9CWFnlDtkx6Y94=; b=Ug5Tt8ErcVSrey6mYkC8ACzrH+/5Maz3jGv4WzEpTlMlOnGn6CmrD5Cusu+fAWMn8N QcqMBER1FqhGApqqtf5+ARPk4QJiG+OOGuCmzAJNDq+9TzvcIuX67TUklEGr/xgrGrJr KrzrwyOabutVJBE7Sj1YrMduspJu71KpiRwFIuNKvnNtmdp/fW2W57kKBrT2CjWg9DTe Wq/uczxIuKEibJ4X/b9e1Gp5pvIfuGqbrPePDxmWFG88xeCxRgfol+SRjCkJa14pIL0Y N99Yp0QeUGUrHP4YX81pfOZ3RqC56U9vtTdwLr9ChrmTUpAFESuijFHZqmiQnDHs3hlw z2tQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="BcwND4g/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09ac3f60si98568036d6.137.2025.06.10.05.59.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 05:59:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="BcwND4g/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyYd-0007o5-0a; Tue, 10 Jun 2025 08:58: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 1uOyYB-0007OV-45 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:01 -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 1uOyY8-0002gG-3c for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so64914925e9.1 for ; Tue, 10 Jun 2025 05:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560273; x=1750165073; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WMlQwQj0IvSUVJlRfBARrapHZdCXw03PUrHdqVvfzZo=; b=BcwND4g/xEvykPd3NCGJH4e6BakUVkneAUcV9yk390DoyMG4J9Uj119trJOkbdrOt7 jGy8O9cO2T5omKN3EyZGr/EHcWZpTSvXYQfhUgczSaNMQ71t1t5M+AtH/YoDJ9EFyhpn rJm/YqpMDRUfQ30HRESZF7iolPtZhEvQNDufJPrtNf8riJZNmfzf5U4nCQb9D7dUYsoE 8h58qAufTBRhENxIzn3TyYaCBbHg/u0B/0NgxYPUButtrsQB6Q4JJFW85LJBlQJyxYl0 avCB+07NgxsSTxE4Ap7jJsbaU0MlLf6T2W+TlfesgJ/9gZAFrI/O7WYH2ebJTJndzqdP xDLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560273; x=1750165073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WMlQwQj0IvSUVJlRfBARrapHZdCXw03PUrHdqVvfzZo=; b=szOsCXOaOHAgrWbIcyuHuryxjhbf1allchgcVzo+PEjx5ilincPIAGQqmuBk5tE+ER YeOnVgT98zpBtInvAnmSPS1I4+r7BWrDtUx52ol/QUGSSY4MilNA5aROHVM+VnCaHusW n0yow41VYHwPtPFivPNRO2pUu1IFspDLnljQHvj6hmHH18PFfrBpsvNjQuPSYRMo3rtl QE94ePGeDlwZ2ZHS2Sfu596NI0kiT/YR7D07m5gL7C1ovIX4+CVrJ/5pBfyS6I7SGju5 ejbng9va9W4TNxGgDN3ngO4NJhydoTMSdPjnBZegLi2w5GM3gmHY93e9xpBzUpvCXvJw PZlg== X-Gm-Message-State: AOJu0YzDH+jU5eoudIy6wXlZ/KUb2ATCkjBlNb+/T64GbxdHU/sJwQBU BDIO/csLWr0sPWEYcUDslX03FiPZVpvWcqrFhE8WbhVtlecRDvkzyLiHHsSF1zfR2ZJZ56Jy6oo yV/cJWrg= X-Gm-Gg: ASbGnctE9sIhJ/3Snl6ZRt65jPKAK+SFpXRhxSrs4cGIRxIvSCVf2+23gmikkcMnWog IhwwniuCVDS/O1XpbqeEUUSnXkrtn0ido83gp5I6ND77SmP66Eidwd/WNlNUMSpURrsZWGB1xwa 0eYcB5bTibWfFFzjEXMO+Rsvk4AJFW0xiPyzdSd8elUFtlt3Whe5XMm8v1dNgPHhMNBs/qAYyO+ a7qB+H1V2ab0VOicPhNPi6qb++0i/nuykxFKxbjkJ/Bxw7HfIdq6ofvs4c71zRVqgO2RTqlOe1y xS4NYWZD2ABfd8ogmyEweBjb/mTcZIiYLk/uOIv0ABSK3cjbW1xqWULGSgREZO6ruXyJ1LrbSgj J0FmRzbLVlvzmZ9QiaZF7E687TTLThPFO7F9yvSs0ZB3ZyQEMwAP2 X-Received: by 2002:a05:6000:ecf:b0:3a5:5149:ed1a with SMTP id ffacd0b85a97d-3a55149ed48mr2303295f8f.59.1749560273211; Tue, 10 Jun 2025 05:57:53 -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-3a53229de48sm12458281f8f.10.2025.06.10.05.57.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Stefan Hajnoczi Subject: [PULL 17/24] tests/unit/test-char: Avoid using g_alloca() Date: Tue, 10 Jun 2025 14:56:26 +0200 Message-ID: <20250610125633.24411-18-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Do not use g_alloca(), simply allocate the CharBackend structure on the stack. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Stefan Hajnoczi Message-Id: <20250605193540.59874-4-philmd@linaro.org> --- tests/unit/test-char.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit/test-char.c b/tests/unit/test-char.c index 60a843b79d9..f30a39f61ff 100644 --- a/tests/unit/test-char.c +++ b/tests/unit/test-char.c @@ -993,7 +993,7 @@ static void char_udp_test_internal(Chardev *reuse_chr, int sock) struct sockaddr_in other; SocketIdleData d = { 0, }; Chardev *chr; - CharBackend *be; + CharBackend stack_be, *be = &stack_be; socklen_t alen = sizeof(other); int ret; char buf[10]; @@ -1009,7 +1009,6 @@ static void char_udp_test_internal(Chardev *reuse_chr, int sock) chr = qemu_chr_new("client", tmp, NULL); g_assert_nonnull(chr); - be = g_alloca(sizeof(CharBackend)); qemu_chr_fe_init(be, chr, &error_abort); } From patchwork Tue Jun 10 12:56:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895194 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2250847wrb; Tue, 10 Jun 2025 06:02:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3edSpL60AcgORUAmoZgsZ+rkhtGFWjOfuvtWZRcgeZr/jhZQussEH6hMmMZDuCtZhE+4utQ==@linaro.org X-Google-Smtp-Source: AGHT+IHbC29kAW8M40BBwZSIhoscBYzBi6WrANe3e0RmfNfOeNZBde7FgxBkf5tFzBAAeqkksec9 X-Received: by 2002:a05:620a:1b97:b0:7c9:55b2:c3a with SMTP id af79cd13be357-7d39f5639e6mr338977685a.11.1749560576392; Tue, 10 Jun 2025 06:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560576; cv=none; d=google.com; s=arc-20240605; b=llaTVkZO2SEgp+IpM8KWSvEekONa+3QL+9rQ5MxZ84hymTp8GiyYkYtx0D9fuscCQq EUkTedRtl/ujdC2Gn6NSfouQCwsvCzPzIef5fcBg112msxY9iF1N9kBlfZE8brFoyHBm hWe+553RwaBk9J/eGUVXkO0gGHv0iR/N0nFb3u3BoQlAwwxrckk3XgsVMClZPX4mq/o6 9/OvfFsJ0lfMliI1IzVfC0eIpFMBWIGl9DuL777xb95cTHdYiDnuJvYta5CO9OqMWcwT gHaUkYF5ovmxXQqz+fEdmrPQ71z6MCMY4w0v8x7W2S1M10ziHNclmy2eVTvBfC9jCrVO 369w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=flrTTu+SitP359j+Z3lRJJJYIo5FewvRFSPrNcv9gRQ=; fh=6zhT1PaZKSQED2IvARRw5duuPD+XCGjqLDGlhPJdBws=; b=An2TD01QNiAf3AFfHo5T6lqTLEbBiCHhSktvZ9R6iqmcAMTDmfs2lMhpnenYl4froX 2jFpoZ2rCFFvN9GYdkf7t5NIlrRwxD2i0jGmEhUJW8buxS4J5eQ0jLer6IsLLVVoAQSr j/S8df4hAJhcGCp98zwU/2VH19gxd6LQ1E/31jGATgln0vf6j0C1yZojN2sHQrTTrJLK NIIZNrmsFDadeWwKW/w9QEH4KAPPS09w8ggL0zjngqlNzKTjdcUaTdZihCxWTHSLio2a uKMgvC0wBuUBeAIufkCnsSrm7f3ljWCM2sKGaTJ6EuSPoTrkZDljDCmt/uW7lkxNQVbR JcTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lrn572OT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d25a624f4asi1027706085a.439.2025.06.10.06.02.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:02:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lrn572OT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyaw-0000vY-WA; Tue, 10 Jun 2025 09:00: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 1uOyYE-0007S4-9E for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:03 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyYB-0002gk-OW for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:01 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a3798794d3so4649584f8f.1 for ; Tue, 10 Jun 2025 05:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560278; x=1750165078; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=flrTTu+SitP359j+Z3lRJJJYIo5FewvRFSPrNcv9gRQ=; b=lrn572OTRP8vwh8B+EPFn2e/kZ+hTTmbCaTD1wIsu8B/GUKxwG/TZpaVfp9qpFYnza xFDmYcEufJqNFD36/qB5N+Ly6BRItZCaCBFr1kGgYagooBJubKWMG353JMPHVPtuNMNF nSDwFC9rKzpLQDicnNVNG6i5/E3QFjzIiTidxWLXIkzP8SRbRAzhDbFKNZLtrzhYXgTP CpvlmwWJDy2kDeFf7PwQTqxz+Md3iAuTBKgLKebaxiOap7uSR1Oehu9Y5VggHWAqSz1a 0a0UlSj95xg1iDljCwfv6di2E0TBiM7VU9gK6JR5S2DMcv8+YHAO0ozstp/oIfyBvwjN wfRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560278; x=1750165078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=flrTTu+SitP359j+Z3lRJJJYIo5FewvRFSPrNcv9gRQ=; b=k7vcwjQoWFq2muj4E8aS6IcBGIGLK4TeQCOjEduWGMBoeb/d6Ri+MIPbT3AYNR7Lfw xdgp8yUlNw1f2tMstC0T1umc5Lg+Ei/y9rD7wdhFjjpgdYyDbcp42LU/ViRCrAvlCGjx 0P7KA2hOZaZedLPokQ4TxLjTOH6CHbyG3BbtwcPgYd9zAZRkaxV78fM3Y91p6HJ9M8i0 XgEeVGLMHjmyCB/JAJtTBR9wsE3VcFfeyufLLeDCgey86tnHNQpEYEd8VLcV/TlKU7bJ KTXMYVLHcXy5igMYhIDVL9WL4xYrr9a3mCrZCaTQLH+pFsoQ+3uehk3+2iuplI366fUU ZFZQ== X-Gm-Message-State: AOJu0YyjFU0imWM6XjwCKqiIi+80Lty6kGbrb6SRl+ToxIeHFDhgseoU fe4nMKuzgryCvezlJnunyg6T+g0ho9RA+Tixz7d/Ez6sD4hARnCH+IHDKiC7oAAaH4KWzWnurfq 1nobPR8U= X-Gm-Gg: ASbGncuS6myHl+rE/aPSDE+obYNZ5YlQp5PXVBPe+2vZgPtqC687SIjl6oqeGcB21AQ QZwa6GQtlcsV2+USlvn+RqOCv6N2iQAJMhdQz8cUjP9zDCm2CiHBW/7ZGEHc2fa/CCtzE07RlWq rPZQJ3ynt1WjMDZbQiVCt2y5cFTVXwod0U70ThHKFPPKoePgmrwJx+T4tMFdKA9cJcIGYs8Manb 2Q7F2vm4wzRlyrlXt+2Tpjog30pVqNUgjVNZq3C7AadtB2wf4NipU8of2KgFQofOe2Mrjigraww K28+EvuJ5tLHktJsGONKT+7rrrripvyRGcU1KLO91fFL6LvFLd+z6LQ4AuTC/CxcqMYGySRgVp4 HynbWGI7TUP3285Nom1ZtVltadQ8Hn7uh2rXMqu3M/A== X-Received: by 2002:a5d:4b47:0:b0:3a5:34db:4cfd with SMTP id ffacd0b85a97d-3a534db4d97mr10239966f8f.7.1749560277723; Tue, 10 Jun 2025 05:57: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 ffacd0b85a97d-3a53244fceasm12039698f8f.82.2025.06.10.05.57.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhenzhong Duan , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 18/24] hw/virtio/virtio-mem: Fix definition of VirtIOMEMClass Date: Tue, 10 Jun 2025 14:56:27 +0200 Message-ID: <20250610125633.24411-19-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhenzhong Duan Parent of VirtIOMEMClass is VirtioDeviceClass rather than VirtIODevice. This isn't catastrophic only because sizeof(VirtIODevice) > sizeof(VirtioDeviceClass). Fixes: 910b25766b33 ("virtio-mem: Paravirtualized memory hot(un)plug") Signed-off-by: Zhenzhong Duan Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250606092406.229833-2-zhenzhong.duan@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio-mem.h b/include/hw/virtio/virtio-mem.h index bc4f787772a..e0ab31b45a4 100644 --- a/include/hw/virtio/virtio-mem.h +++ b/include/hw/virtio/virtio-mem.h @@ -134,7 +134,7 @@ struct VirtioMemSystemReset { struct VirtIOMEMClass { /* private */ - VirtIODevice parent; + VirtioDeviceClass parent_class; /* public */ void (*fill_device_info)(const VirtIOMEM *vmen, VirtioMEMDeviceInfo *vi); From patchwork Tue Jun 10 12:56:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895200 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2252730wrb; Tue, 10 Jun 2025 06:05:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQgoaCTFbKGoAsKMW3EHjcc62rAjo66mpBokZUBF4qXl7ZpfoN568kzbBCJ0xKstx08xXB9Q==@linaro.org X-Google-Smtp-Source: AGHT+IF5+iUg8nE76ookGOnL8Vl2SF3ldeGXqHlr+Rz5LR3esLZKYMOHrpdCsq7dCitfEBt8beKD X-Received: by 2002:a05:620a:294a:b0:7c3:d5a4:3df3 with SMTP id af79cd13be357-7d2298968a2mr2207797285a.34.1749560718759; Tue, 10 Jun 2025 06:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560718; cv=none; d=google.com; s=arc-20240605; b=ZeaJyjbiN+V6lTu7BtfM7JU8cCIngf1Il/26K2WcsbvJGLysWCRh+jGL+6MYm8zSkz 7OV22pm+JfgjdZmDQqJNS0rHDC8+MIEa/DagVvYhflPeLokLKQsYM+68yUo7eXNhc/7W iNllKwcte7NcMRkjy5j6m7raoYtuD0AuBRaSt8RmgktSUtNhqkdPPivr8kMPP8V5fpr6 uLb7V5gYwJawYEfhmufYzCEzMh3cMDJFyCzb4cQ289AzTmA9nGAdQcN7sblHB4ubVZ0+ iPHc1fnyheWIBFvi8gALPlUw9/e9s6TiIeS3RXW+vVdfMzf/xwjcBowiShytWxDbLwkh LsWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zK8JfL+K6DY+H6D8BIWrVhPNwjGTBASRCCeC9mTbJFE=; fh=6zhT1PaZKSQED2IvARRw5duuPD+XCGjqLDGlhPJdBws=; b=PuWEV+cCCSrpUFNRnFTveTqZawIGJhHCeIOwNQt2+6rdju1bXvKcjMcInYLUvF6jQW jybDt1Cl/W1X4TBTe4GZm44blQ2o+OeAWhsRe1/wqcv0jMhLAkbUdGKVO/GyRrTR0Wr2 yAHaTDwd6giJczR52/6QyZ+AHGdCvtyLLe1lM1IImY2gO5HU8+3+MQQaCdHH+2JuoC6c z+cEp0cZrO1kDBgkdlCf56X5iInunorBJz870XB/l6CW6mAGcZFirV9t4nAJchS1FEWC lD8ymwQeMAVKYOa/NqDa3J1/PQ0j8IeAIivRswSl5QVc9/W9jv4kP+waxjJrkc60teEF HuMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P1axd9lT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d24b3cb236si1012252985a.98.2025.06.10.06.05.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P1axd9lT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOybE-00013V-N4; Tue, 10 Jun 2025 09:01: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 1uOyYJ-0007b8-6C for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:07 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyYG-0002hG-L3 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a54690d369so1971432f8f.3 for ; Tue, 10 Jun 2025 05:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560282; x=1750165082; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zK8JfL+K6DY+H6D8BIWrVhPNwjGTBASRCCeC9mTbJFE=; b=P1axd9lTd0vsAdExoflX61GxsfOaJ2C6Vp1JFEWrwQxYRkyFnvTaRT5p9fXON2helA gYcHuz92l+UFNXQmLLQQSDa2PcoBFQjdwro9acI6GlS2oU/Q2K7kjDO/U2MlCG3Z0BRk s2CbAdyKzWGZ5/ucj23gfb8gSTFy74U5vYvFVcbIgKz2DphrLf6OVzkqDa7LyPqBVw3F ZX43E0v+jcaHs5CyxQskKvAHAru/h+c2o2vvPvtjeB7km3PH8pE3/5hswSHhS8LYcorb VLO4aVLdan4GpPN8PvaBJ9WKrRv+EEUhO4QUyanyzxZDjYfht1VC4KNVT1+dNcex8ixh sW5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560282; x=1750165082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zK8JfL+K6DY+H6D8BIWrVhPNwjGTBASRCCeC9mTbJFE=; b=He250CQr4XgqHPCYpPjxiYlX5scekS7pERMoLKpcWJjwUuhYbS45AccYgyDZi7Gd6m duiaL+4G1wPvUFDdujwC+tJWZOxQr0tHcSxI2oKwesP0gWC6EA8A6DJldifzatyzZYM+ rLORM/vLF91gtI3smRSheFEQq04ISaQB4okdTTUsyj1wKnqfWKiTQxr8f7x0b2jQQDo4 EC9eMxaqz2aHN3zwjmrvXX2jLBC2ajPP6CzBbo6QUqksS/I97awAr/Blmq9e87xwC66w fsGsTztDuz+yJt3onk/2nxsj/d7jlnCVH547ckux6FWdU3aHFjcmAtK/NBNixCT4HN23 2BTg== X-Gm-Message-State: AOJu0YzK438RxBkSjEfbuxZBvta5y8xzqFPQj4D3qicHIzF+D94mccJB foxCvhqbPQqib2Ph8WmcWp9bG+nC+ks0KvbFbtbrxi4Q1Pc9Ff7EaTCcEHn5zuQXHAOWesld84A QwU492p0= X-Gm-Gg: ASbGncvgYc+R3jy4K/KdPVqum/Rv0PqNeUuxUZJJn3o85KnJTWlCcidEMEDoRg5HHBY hM+USI8YmxW6kDw8mciavr3L50A70uOS55E6Zd/ptgk0UG6dKj52HUa1WCqLOP80c9CKRCWJog/ 2flCXUXWTBEQRrg11JM4OuNsM6DejGSoXNSpe4bNvO/LiTkoEZp1Ek5UEAKbprBP3SENQtvSLKF WZJN8JFZW0nTrmWC3mELviFcVxbLxEQ1CSxTIvrFQgBBhpI/J3KB5GB178Gd4RKXfq9hEzGzFh1 cSAxedn4ItAPXUVwVrSVPSJ0A9P6czzTfvI26/vtCQ51TpTQlB38GDY/fXlzaumbWmzRNb7Qo8M KLCZirHuCxlsNP1PhZdUQ8Gcvx/Y/YTE+pRnXDJaMlg== X-Received: by 2002:a05:6000:1a8d:b0:3a4:f7ae:77ca with SMTP id ffacd0b85a97d-3a5319b6a1cmr14665298f8f.3.1749560282240; Tue, 10 Jun 2025 05:58:02 -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-3a532435f95sm7701475f8f.60.2025.06.10.05.58.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhenzhong Duan , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 19/24] hw/virtio/virtio-pmem: Fix definition of VirtIOPMEMClass Date: Tue, 10 Jun 2025 14:56:28 +0200 Message-ID: <20250610125633.24411-20-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhenzhong Duan VirtIOPMEMClass's parent is VirtioDeviceClass rather than VirtIODevice. This isn't catastrophic only because sizeof(VirtIODevice) > sizeof(VirtioDeviceClass). Fixes: 5f503cd9f388 ("virtio-pmem: add virtio device") Closes: https://lists.gnu.org/archive/html/qemu-devel/2025-06/msg00586.html Reported-by: David Hildenbrand Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Zhenzhong Duan Message-ID: <20250606092406.229833-3-zhenzhong.duan@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h index fc4fd1f7fe8..9cce600d0b2 100644 --- a/include/hw/virtio/virtio-pmem.h +++ b/include/hw/virtio/virtio-pmem.h @@ -36,7 +36,7 @@ struct VirtIOPMEM { struct VirtIOPMEMClass { /* private */ - VirtIODevice parent; + VirtioDeviceClass parent_class; /* public */ void (*fill_device_info)(const VirtIOPMEM *pmem, VirtioPMEMDeviceInfo *vi); From patchwork Tue Jun 10 12:56:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895191 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2250267wrb; Tue, 10 Jun 2025 06:02:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGBPj1r+zjklYECu9t3Hg0ds7xY1fUungJAATojpWzKGHU9xduB/15ezcjNEF8AxggS+QD7Q==@linaro.org X-Google-Smtp-Source: AGHT+IHQ4D+ppmRJd7RYqUgLpVKKuvX0KESpahkOsZDjIqM+rJ0AoskB08TdiTJ8TgGYi4A4aaG2 X-Received: by 2002:a05:620a:4723:b0:7ca:dac1:a2b9 with SMTP id af79cd13be357-7d39f64536bmr401321185a.50.1749560528484; Tue, 10 Jun 2025 06:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560528; cv=none; d=google.com; s=arc-20240605; b=j8oz6xrbc/hQDypuYCM0tRd/nf/NxVhY2z59aN2wHdNaMiBmIac3escyR65YjQqPjR Q+SiBACWgMdY3nVCaQGFGMhcmf2jArjAjaWu+2Nv7HCVckUD8q+vfFhr9/gGYyUo192U UGc6pR+/EhbPlXe1/XCvRtf9yd7qXb6gxBlmCDx2gt5eDowN2Tb9ADV99RPRBX5208KL cz7eefPipGMM+j9/RQicgJpr2iPRDl9l97Mrk1cJw0X266doBhhKB7cS16BhbCmz1N38 UyTCgqiMSiqWzzbHVShwvwJdG06Fdb8qvf1oMog+PRuruhIX7bSzsB3aarwUBgr39ihk WbzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=taQBYKGiataMrkl3P46PoMWshwDonRVg+ORcNAH8umE=; fh=2MRiJ5taMKN8hDjv0X8dBZXf3XiWcmBvCVUU3pG/XmU=; b=bU4bFEvGv3OZHbMR1cm2ytDBgqi68JhDtpoMzXMgYvbzPZO9zqNijYsszJO4mQfoel QDLSWI1e8joY/Onta0KTia+1KmihimzOOgEsxmgnyds0U7yX6RcroA3j6RI08CQC/yiH iw27EQP1vDipyO5ABf4oqUthzlUmpWu55/6kbpg0D2ZGjk5lVJBf7k/fW+W8sdZg4ASa kSbqHhwGaMGNtyvWSLJRQT+eO3gBxjQdwHY4Ct0NHLaFzN05x8XXnOrfGpZ+H2bXAmXm tjPJjREPLvfSZTQGwR/aeKUo7Z9ljnsIgrUtSCteRIH7zzwP/XpBhaDFAV+YsQvDNjIW 4FwA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDsvVSsv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d25a5f8845si1005457785a.209.2025.06.10.06.02.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:02:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDsvVSsv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyas-0000ro-02; Tue, 10 Jun 2025 09:00: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 1uOyYN-0007hZ-Gx for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:14 -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 1uOyYK-0002hb-UB for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:11 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-451d3f72391so70528405e9.3 for ; Tue, 10 Jun 2025 05:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560287; x=1750165087; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=taQBYKGiataMrkl3P46PoMWshwDonRVg+ORcNAH8umE=; b=fDsvVSsvE7OzFVbX4PNzyQyeSYNxq7yLhO/0e9AF6aJS7S+xgQDbupBBKl8JzCLUPf GE6fl2PAqGW4HKDpTlfugGzf9Dy9v3BIMMl+1NzEv+oP6/H+5BZgoKCghHVtx8iItv46 ZkGz055HVxQyU3DKxYDt3M5o64fHidL0tvhp4nzFhyqpEyKyGbqN2f7pSoKrldW0UlYw QnAY2IvKiczwkz+bmJo2Y7Wni+TIqTcbtGuEN27GHWVqgmBt/DiOgNtZnb9ozZZYu2MX 5I4SRcwzvEjNpceAB+IrDVMEAZ7uEwCbhAhjkft+LMzmrpuEenaDZaa8dMu09adVT2S/ zCzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560287; x=1750165087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=taQBYKGiataMrkl3P46PoMWshwDonRVg+ORcNAH8umE=; b=ihmTbxE1DPdKS4yW/m9TEdsT+hc5ua1IbcC8ZxZEgY8wk3rAA08sW/5c6rCaM9c5di M8krERZE+Y7nTatT8RuryMBwVVlUjRbP/ltxeFJnM+2UTJBY/NZssYIcaVaMkWSckR/T crDe9p88D+C8XsJUsTlF8KQx/OBh+xvcrkh3ZOpoxnzGnolxllVc7hpY4YXa6boMlFMy lP4boNxeVtcc1jboyY/Juc9C+HAyUCjeVnvcxSWUdOWuBnbMnsKPldGTkRslatos+b9c bCkWk1orcDIEyW4oVaFIcK+Ji5NeFAm7lJw1GuHSsqKJzHW2PbdHVePdOnhg3HFONdSU zEhg== X-Gm-Message-State: AOJu0Yzg/g4ALruM+9dCZt9X4cf+JL1ahji+16bSCKNU+sIy5P6j0Yx0 ZOIOy3klGfWah0pM6vlVkfWCMSohd3S3R1nmN5J9ZWb6d5GS8tEI/dnNJMJTYywfqus1aNEr2LG 2jxV8vQE= X-Gm-Gg: ASbGncs4U2MjZOiHHWBhqrMCCsgOXw0K8o0NQMM1eKMelw9yzWvyogCbdEW2L36CwvS eO7FwvLjPRrcsr4fFvt3I9nXIoJtnkVntCAGHrQUNuX2BFmVi7XMfE57gZTtGM/zQEwAThTsU0H E8jrS578NbRzpo4xj5dXXFzSclqxAAfoKdQcO2uGCxSNuCANJOdrN2wddgb/i+RZ81gE/bCDjAr Dpk3LUx7/p7QdTQjlUVEqevc0djHy0EqIz6BhyzJxpLdnquccjCrtwf3W4jt9tw6flsNABcXWY2 0XrcH0PZ+cB9bmE5NxOM+brTI8dgfb8yIyx9bWBn0SRwlFOzX1lzcV/qdGQhkqY1ig3jqTnJSCs Ls45IFw2tILWgMKX40GNXIcuJuVUABea4aAKDN4mNU/dDEPNMlYJA X-Received: by 2002:a05:6000:430c:b0:3a5:1240:6802 with SMTP id ffacd0b85a97d-3a531cb2a63mr13700643f8f.57.1749560286854; Tue, 10 Jun 2025 05:58: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 ffacd0b85a97d-3a53244f07dsm12432763f8f.79.2025.06.10.05.58.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhenzhong Duan , David Hildenbrand , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= Subject: [PULL 20/24] hw/gpio/aspeed: Fix definition of AspeedGPIOClass Date: Tue, 10 Jun 2025 14:56:29 +0200 Message-ID: <20250610125633.24411-21-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhenzhong Duan AspeedGPIOClass's parent is SysBusDeviceClass rather than SysBusDevice. This isn't catastrophic only because sizeof(SysBusDevice) > sizeof(SysBusDeviceClass). Fixes: 4b7f956862dc ("hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500") Closes: https://lists.gnu.org/archive/html/qemu-devel/2025-06/msg00586.html Suggested-by: David Hildenbrand Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Zhenzhong Duan Message-ID: <20250606092406.229833-4-zhenzhong.duan@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/gpio/aspeed_gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/gpio/aspeed_gpio.h b/include/hw/gpio/aspeed_gpio.h index e1e6c543339..e6b2fe71b50 100644 --- a/include/hw/gpio/aspeed_gpio.h +++ b/include/hw/gpio/aspeed_gpio.h @@ -70,7 +70,7 @@ typedef struct AspeedGPIOReg { } AspeedGPIOReg; struct AspeedGPIOClass { - SysBusDevice parent_obj; + SysBusDeviceClass parent_class; const GPIOSetProperties *props; uint32_t nr_gpio_pins; uint32_t nr_gpio_sets; From patchwork Tue Jun 10 12:56:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895199 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2252408wrb; Tue, 10 Jun 2025 06:05:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX/l/Idj/k+7DA2TOqYMEwwHDaLyLDMOaFZPJx+iLRYX3W/LYdCI2ATl2SbcbZPcESKwnZpgQ==@linaro.org X-Google-Smtp-Source: AGHT+IE6p982JlpaWv2np5zS5Yh7x6V/Gp2HVzK6LpJJbQ+yJyWWMoRzfuvxKv3nkJ7vUWcYcdvu X-Received: by 2002:a05:6102:dd0:b0:4df:e510:242e with SMTP id ada2fe7eead31-4e7a5d0d23cmr2941386137.5.1749560703943; Tue, 10 Jun 2025 06:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560703; cv=none; d=google.com; s=arc-20240605; b=EIccmwgIdAy+FgefIhCoH/T+3CENtuV2UvFFcdFg4ITekGrnT4ULNAQQ5hfP6KWG9M VYCnhIkGIfQqLkOsnEOBYVhKKRVihsUBjHj/OX63JWeiCn0CXfKO3/tfSp4FqS62a37z boDORAA5NwRoRcwE9d23xF5eSXBuBg9bTvsLWd3Pa55LSPUr9msSCrxLDIhb9ytESR15 XDH1DgQpSUBDw2z07C8eUcNIaFT6bbkyvlMxOzMzq1mvZipyhUdFNIEYV2pqdciE4hi+ l1rcER0/kWy4PsNL/GbO4/bA/68FIG1jTHjOm/vm/rd2jAPdLs+zE9BUxAjrLmYQOp1m oqiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NsM3LWHZll8CDgTMYcVvtFIDSa02yxNPgaUuG9wfk94=; fh=CppLwqpZUhohWozcCuYw0GuEyH6BJhip3/WYVgS6zc0=; b=Fui+a8D1IveLaLM/pVk79u2zyVl+LjdFqQO1N+R6pxkEeA3SdQBozI0ZZmZTkAiCdX cGzk2M7kmwA4UQu/sNBKgcO0C572TLMMl+5Ka8KUtZ7VhYaV8a3Mcl7KfFu7lzSYtxzG ofgnFR5Q1wYCojnM4/nSomtzxHlyo/QyNyioeZx0962dtqUm9QTzb9KSeV64rIgaL8nK LaRJEiLqJCIGUfPa+pDAht+n+MFdG9122fGD6m3bDIVHkIT6p0amWfZJW8Ub3H1nRwfr oT+OkPZd+7p+6Olh0Z86pueTC05tL832rIwlEhNRCnZY3POjWWctuQOGUi/xuM6W6vWS ZtZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J3dDY8TC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4e7739957desi3087236137.277.2025.06.10.06.05.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J3dDY8TC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyZg-0000Vi-Up; Tue, 10 Jun 2025 08:59: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 1uOyYT-0007ni-Rq for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:18 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyYQ-0002i3-Bz for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:16 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a525eee2e3so4085359f8f.2 for ; Tue, 10 Jun 2025 05:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560291; x=1750165091; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NsM3LWHZll8CDgTMYcVvtFIDSa02yxNPgaUuG9wfk94=; b=J3dDY8TCUToHo/4IP1KtufwoVdkgFiMjLxClqKBsteLRly0iZfwCDmMyKvJP++LGF1 N8YAL9e9FuhSganHRtZacxgsLudXxzc8d4opgBtah9XjKE7Vx209JgqV77AtKnr8cMfK JYrwng5nKEbEvKZdkWEYdg91XmDesYcVMiZxvverLGgdzY3uToJneFvh+mZ+8aupXPET ZRcwgobDyKiITCm1Fp5lkvbg0Iqqmxi25NmxDpHF6Ki0i09ANg4I2LhYjXFuz//V2xz9 edIff1LYalDR9pljJt+yAhOBq4m1kaqihaK3kYFCsWqgAC71nxW4QqT3UTMDfbYxFhzT KckQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560291; x=1750165091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NsM3LWHZll8CDgTMYcVvtFIDSa02yxNPgaUuG9wfk94=; b=NdGGsQJvMq9guexyQzSdRMcF1WiNZnERwIFBbXosXv0khnNeMdtBVlkNrZb6cwLK63 LbTKNsUjKKBTnw5Wcuqi9iu0uMMQfRgD2QkG/RScCjpIc0uKAUIzLA/SJHBlA+Vp5bY5 CfDjwro2q//JvkgGk0vBSINYBTlpvoVz0ySTiY8Ue3uYLjRTRQc2iEn6x0+77Rzx4SRm txv2ZghwiCkurXZCMPVDdyzhO0qzgJY5uQOmxp86IKZuKhCN48eWauELjgWvlJ5ZmB5j xIwMyykj0UPZ1oEWJg2zzHH/2h00QHwRJVFJD6lLhLi4VVFKz5thV4rdrgwO+JultwWG yFfQ== X-Gm-Message-State: AOJu0YwTDoJwxFouP4j8FspdqsSh02Tl1tWoOeyt6xvAVVg1yWWFbWwT rWda8ncZezBGEOlwAmwaRhq2ZUijWi3dkwODXN+AqEIhchF3DvtZwS/69xreh23TGIyoqTXYMiT LhaEGrCY= X-Gm-Gg: ASbGncsfWy6yirp/tZeGNzNA2AgY4oq3EOc6v/zCh+1T9KOqaKCh7ftNWgJLNnT08Eo wpZZAhw6CqGJO3MyW6wVHYyB++vNxdJh6GumxyN3Sc0EDCB59ap76CrUJbuLteyRoOwlrTTqjKL zsPAnSBTLxVie/M5TsoZJA9HqRALdXCHDs2bJebxpXDSM6Aezk+zLRhabC8K8r7NKSKgMnNRZAz GofpVYyZjnSnCFzcooN01+8lSyWPOajkA9HWOIOq3Ees5I3Xhigzvegw2E48p4jjzaOiDQei5wm zKraTUzbegg1hQ5ipvXNjjZW8R0X8xywjYYyyJHv1fwNZqAH15FQ98buVaxuMs4PAVHwMy9U5P/ 5g1EHEtQUbl5k7KLmMBFVthTyDEM89Ax3W7mgLAmHDw== X-Received: by 2002:a5d:5f49:0:b0:3a5:2fe2:c9e1 with SMTP id ffacd0b85a97d-3a53188e42bmr11600920f8f.30.1749560291354; Tue, 10 Jun 2025 05:58:11 -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-3a53229d96fsm12174152f8f.7.2025.06.10.05.58.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhenzhong Duan , Daniel Henrique Barboza , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PULL 21/24] hw/riscv/riscv-iommu: Remove definition of RISCVIOMMU[Pci|Sys]Class Date: Tue, 10 Jun 2025 14:56:30 +0200 Message-ID: <20250610125633.24411-22-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhenzhong Duan RISCVIOMMUPciClass and RISCVIOMMUSysClass are defined with missed parent class, class_init on them may corrupt their parent class fields. It's lucky that parent_realize and parent_phases are not initialized or used until now, so just remove the definitions. They can be added back when really necessary. Signed-off-by: Zhenzhong Duan Reviewed-by: Daniel Henrique Barboza Acked-by: Alistair Francis Message-ID: <20250606092406.229833-6-zhenzhong.duan@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/riscv/iommu.h | 6 ++---- hw/riscv/riscv-iommu-pci.c | 6 ------ hw/riscv/riscv-iommu-sys.c | 6 ------ 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/include/hw/riscv/iommu.h b/include/hw/riscv/iommu.h index b03339d75ce..8a8acfc3f07 100644 --- a/include/hw/riscv/iommu.h +++ b/include/hw/riscv/iommu.h @@ -30,14 +30,12 @@ typedef struct RISCVIOMMUState RISCVIOMMUState; typedef struct RISCVIOMMUSpace RISCVIOMMUSpace; #define TYPE_RISCV_IOMMU_PCI "riscv-iommu-pci" -OBJECT_DECLARE_TYPE(RISCVIOMMUStatePci, RISCVIOMMUPciClass, RISCV_IOMMU_PCI) +OBJECT_DECLARE_SIMPLE_TYPE(RISCVIOMMUStatePci, RISCV_IOMMU_PCI) typedef struct RISCVIOMMUStatePci RISCVIOMMUStatePci; -typedef struct RISCVIOMMUPciClass RISCVIOMMUPciClass; #define TYPE_RISCV_IOMMU_SYS "riscv-iommu-device" -OBJECT_DECLARE_TYPE(RISCVIOMMUStateSys, RISCVIOMMUSysClass, RISCV_IOMMU_SYS) +OBJECT_DECLARE_SIMPLE_TYPE(RISCVIOMMUStateSys, RISCV_IOMMU_SYS) typedef struct RISCVIOMMUStateSys RISCVIOMMUStateSys; -typedef struct RISCVIOMMUSysClass RISCVIOMMUSysClass; #define FDT_IRQ_TYPE_EDGE_LOW 1 diff --git a/hw/riscv/riscv-iommu-pci.c b/hw/riscv/riscv-iommu-pci.c index 1f44eef74ea..cdb4a7a8f03 100644 --- a/hw/riscv/riscv-iommu-pci.c +++ b/hw/riscv/riscv-iommu-pci.c @@ -68,12 +68,6 @@ typedef struct RISCVIOMMUStatePci { RISCVIOMMUState iommu; /* common IOMMU state */ } RISCVIOMMUStatePci; -struct RISCVIOMMUPciClass { - /*< public >*/ - DeviceRealize parent_realize; - ResettablePhases parent_phases; -}; - /* interrupt delivery callback */ static void riscv_iommu_pci_notify(RISCVIOMMUState *iommu, unsigned vector) { diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 74e76b94a5c..e34d00aef64 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -53,12 +53,6 @@ struct RISCVIOMMUStateSys { uint8_t *msix_pba; }; -struct RISCVIOMMUSysClass { - /*< public >*/ - DeviceRealize parent_realize; - ResettablePhases parent_phases; -}; - static uint64_t msix_table_mmio_read(void *opaque, hwaddr addr, unsigned size) { From patchwork Tue Jun 10 12:56:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895210 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2368786wrb; Tue, 10 Jun 2025 09:46:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgFWQcoTXXwVkLkyY+g1YqzLj0FK0WhqAcYLGYtyMki7GPYHxlZciBUU3YgKPSjZgOyz+cFw==@linaro.org X-Google-Smtp-Source: AGHT+IH8mEcF5RwCt0vX39jip96AeJPtIEJlpPN3u32OH5EP3w6mlK4NNVynL2KKxfJJ934TFAOZ X-Received: by 2002:a05:622a:558d:b0:4a4:40b7:9cc with SMTP id d75a77b69052e-4a713bb0d0cmr2084461cf.12.1749573991789; Tue, 10 Jun 2025 09:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749573991; cv=none; d=google.com; s=arc-20240605; b=jGMtzLLMvGn7X0VBMfzeZWUcQS7MoXRVvMSalqdKG2MpV0aho+63imN2RGoo1OTRZn 5ARBkzfBevpmdhnPVHGKsJeJ272QuYAA7hylziyOgDuqiAFcK+i3I3NWpeUQp9Ed50Ls xy9mv/nFaxsdmsKWLgENDOI8QjclKH2Jm4bLRKG03yJXf2JhARXUBmCSvLagkZb+Bhqq pgZ4qy/SeWZP8pd/XfgC92misH314q5NaWF4vFwGXwrH8MFyztusjugGrCcMdEMGI/yZ 2ODDGr8nE1jWzNyo+WyJ7HoqZ9K/4wb5Wh9BZ2s3ZNrt3Qw2wXvWBIxvpidj7sjFTofd tzNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A3Oij2wAJHxFSCwJ/UgKqeI+OINtKkC72w/X63N9vJw=; fh=3s0HvfwuM7X7Qj8OFDigzwfND5/m4W0+O19F8ZwxsMc=; b=MURD7r2anSivM2dWMV8Q4P/3IQAZ/HNGe9YIH7dYJa3ooKqh5IHJB8qk1HNFSAKhCv uKlfc6nw4oGOhLcGABgNoweiHVyWM84rdVgcpxUv2qj7oMvZjtdZHC8xQliOYDH4iQXg u7dJ6VVgFMp8aYUDWxPeKCyszbqbHQdUfibbhIYnKRBAM4S5n/TiDDc4LiiRIQ/MrFqa IgtcQkfhS7aEAZoRsX8KunYtVLz8LIdiInUHvNHGjXjIs7z2D8+K5hspzEgGjQy3HIcd IrzXcmKGxGBV/NSY+zcu/0jOzsgXK8VcJsTTCvLZGsAR6+zEWxXOO9+7PxX833OzEeG2 vczQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eu+4GTOt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a619893878si111515511cf.392.2025.06.10.09.46.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 09:46:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eu+4GTOt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uP26k-0001oM-0k; Tue, 10 Jun 2025 12:45:54 -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 1uOyYV-0007q9-Mm for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:24 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyYT-0002iQ-Su for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:19 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3a5257748e1so3661082f8f.2 for ; Tue, 10 Jun 2025 05:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560296; x=1750165096; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A3Oij2wAJHxFSCwJ/UgKqeI+OINtKkC72w/X63N9vJw=; b=eu+4GTOtHQndnee6G9Yq9tJ6iolOFHTQfp9OI9PwwFaPXmAojmjjpeP+EZt6kYalBu L4eBSu7cEWQs5VrWRYRbUkQRpbIdQab4HWQW3mPtHXpjxpHZ5v0gwZJGHrMYbDdpCCc4 lpPHtLSxTpHNKoX4Jn/WygVPMgRyER3TFu7TO+mT82yHi1ZthSlkeaZN8Ek3QuW67Kdu 4ewzZoFagmWNbivDhjdihlIRRgicMgsEGALGZNyKTF9lPUJBWOWAFIxJEgIcdk46Np3b D3/10RJFPbzQBaUhh7zdZmACnb5Hn35W6t485hhhfsOa4ahxiS7TwoLj9TBTqYsBc6tP 7MhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560296; x=1750165096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A3Oij2wAJHxFSCwJ/UgKqeI+OINtKkC72w/X63N9vJw=; b=IYuZm6YJ7JH+BfG4TQbD+UKH24Le+wwJ9mEspFDF6apvK6td9NaEd4qIt6/6mLQtP6 hA/Hs4FcnMRoNECN+6XHB1zh58wB3XXSJEB3Uszgw9UFWzCxqDU9Of3IKgcqf3xGLGEk g36xbLQ9LNsOJGGDW1G2/xJSWYONx5eh5l/ViTW4RsIuFkZ93zKiusYMI96tnp70kKPb vDlWlixyUewBuazDsDZNfpbYKHnX4etDT/WL4vxTD90EkYoCH86ALMR8IgqECV7STXrF 9ioeRPECV18uVM0EteK8yV2f/fik3jmqUvi8g8uXSY/2g/FKhfdmyjVGI1YtKjSdqiE+ CghA== X-Gm-Message-State: AOJu0YwWpf22xRHZIoblAqs529F1PkBKU4LhoP6tlOgLe3PFWElQ78/h 9CG/R4HiHYiMOlP/7HsOKAgj6NtrH6yN3LD/rvByxz9I7bFCyWxvSvK5a1ByzJQt/JFgaDpQ2Fr yJxbnRqw= X-Gm-Gg: ASbGncvOfvuaxh256Q4K4xJ49UYR3Jx5mHtoaGutF8EF9TO8fzGThfG1qvQsXlbTtWC V6vDoyy1nJaGKNzvcubN42xLGR/oJ9n+MiM8DxREnZ174A4pf8Vs7GOwYLCWvtsoqb3imQ0cd+l KgNVRupzx08q0SFoaiNy7CTcmGkfQQTAZud0gQqDUjACBjMiY0R7Fm6COWZtVq9dtjH33kesDJU E4L/wkT0jVm9e80Wuxpq5VUe6KJS1zj12ODel5OpepPtrJYWI0lLYXecx4DnYMCyuCsnBFeAN7M 1cuV3zZDaUqY/RF1oPoiKrAUsf03g/q9FmGh2QE6Nxt1ce7BMaz7po5062d1IADGo0xMhMICyMc f3GvRuTTyhMSfkCS68NJRksjjl+vbg4QGxBA9Thh/fg== X-Received: by 2002:a05:6000:40c7:b0:3a4:f70d:8673 with SMTP id ffacd0b85a97d-3a5318855efmr14340134f8f.25.1749560295834; Tue, 10 Jun 2025 05:58: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 ffacd0b85a97d-3a53229de7csm12417949f8f.14.2025.06.10.05.58.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Philippe Michaud-Boudreault , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 22/24] hw/misc/stm32_rcc: Fix stm32_rcc_write() arguments order Date: Tue, 10 Jun 2025 14:56:31 +0200 Message-ID: <20250610125633.24411-23-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Michaud-Boudreault The tracing function for the write case incorrectly has parameters switched around. So order them in the correct way. Signed-off-by: Philippe Michaud-Boudreault Reviewed-by: Philippe Mathieu-Daudé Message-Id: Signed-off-by: Philippe Mathieu-Daudé --- hw/misc/stm32_rcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/stm32_rcc.c b/hw/misc/stm32_rcc.c index 94e8dae441c..5815b3efa54 100644 --- a/hw/misc/stm32_rcc.c +++ b/hw/misc/stm32_rcc.c @@ -60,7 +60,7 @@ static void stm32_rcc_write(void *opaque, hwaddr addr, uint32_t value = val64; uint32_t prev_value, new_value, irq_offset; - trace_stm32_rcc_write(value, addr); + trace_stm32_rcc_write(addr, value); if (addr > STM32_RCC_DCKCFGR2) { qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%"HWADDR_PRIx"\n", From patchwork Tue Jun 10 12:56:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895202 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253026wrb; Tue, 10 Jun 2025 06:05:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7dDAJJ35PQUFWnsk5wFgjMCS+VoYNQ3/zJAP9dyDll3+kOjXdx5k52wTwjAxlht2IzQcuvA==@linaro.org X-Google-Smtp-Source: AGHT+IEQHNNYzD4Kesy/phGt/hpQOYaatk2Tw2Oz8WvZUcviN4JCm+wSCLBw96YH7MmtjQyh/IAz X-Received: by 2002:a05:6830:7010:b0:735:27:2703 with SMTP id 46e09a7af769-73888f0eb5bmr13517992a34.26.1749560743528; Tue, 10 Jun 2025 06:05:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560743; cv=none; d=google.com; s=arc-20240605; b=GMFj/DWCYaAFDtJbLsFIBmK/RuArsOOl8ADXWVmUocXufPge94zyY7Er5+EjZ6EzQe rFvcaFK/ZvKaq3hfUBHPb8XMN4DhujTYVloqXHDm9LUaGyii0WkqfR6I2UgXA9wnzZDZ 1X7/qdV9FzKHG7TqDwXs/aytG/8AoxhBr9mpOd5UpJql9KW7Sp444gUo8o83Fps5PORX 9eW91mP7RAEUyrLhAsM/4H1FBD+wz/ErDn2ZPYqdTmdDIIhdVQrlN6W7csVDs//rusxT dekfkP7iE9Jc1hcL/esH64rkwo/WeIM1622FotPwuQa8nEtlrbtxFAYK8aMUIKhK4Psk Eftw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P1V3w/IS64oeqhhB6d9B4sJVJcOGGWYHRK87tYEg+og=; fh=6GqFupl0RojCw2SOqocjA3ZhL1fUl+SzV/QA+5dypwY=; b=KwvgvpeHZaRDHTrRFmzzttycBEmSKyj7DwGWOqBWO29K05BcubovHkW4jqEY+dRAQN 32uaz9OgFLuIoTgBtiBXB5c8AtK+EF3i92Rvxezykb7XBdi4IArfILGebJl2sgQLTm1w LDGmbiNh43Ff7SJjw51755yqR85b+9dFiX+7lk2yXrQtZRHZbKKqkdWOruT7VyoDCaQ2 oQLxfXzwT/AKchvOur37dPDQcWH2N+0UeF63SAut6fQe5AyrsfLi5aQR1ZTDfgiYRipf rdZpKxAQEmpCJ4BCj2hMOqu6fzx7Iw8Cov9T1YvCZgeGgnPkzcbhNTcOPeWSrwLOOjUe eTUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gAShiRFx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-87eeaf6d05csi509568241.135.2025.06.10.06.05.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gAShiRFx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOybN-0001al-Aw; Tue, 10 Jun 2025 09:01: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 1uOyYe-0007yH-U0 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:32 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyYY-0002j4-Of for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:25 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a51481a598so3144655f8f.3 for ; Tue, 10 Jun 2025 05:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560300; x=1750165100; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P1V3w/IS64oeqhhB6d9B4sJVJcOGGWYHRK87tYEg+og=; b=gAShiRFxDYHLbRgcO0vcBHyYb8XyHMjdoVZl6n0fuF+O4E7/CyM5hZyJ9JJeLYnXw2 PDeeQoOsj9TO/9FndbRbdWrb5XiXvIimB66BX5RGmSTd3H/SQSs2bpH3VfJnNRzHy1po 6dYhbx/DnhhQhC+WIbNVxOBhO2kSy5v1i3Hz+e4HceDROKsgAexFO9eUaeZv8RF3IS/U p6RZIuIEuLn7QmyOKfDrPjif6xeAsHEO7GjtGkpoHXks8XwNH5k715gzJH2udcHzZR0k FXKFylNJwzl2KrA0XoJF4aStNeP7Vm5S9Fz51Wp02ZJ9uXjkYx1QvvFbZx4RDB2tefkC n/4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560300; x=1750165100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P1V3w/IS64oeqhhB6d9B4sJVJcOGGWYHRK87tYEg+og=; b=wgZpl+Hw2cvba4kcbJbe5NSTslx0apdhjK8EMLt8L497DdMKGTvSBZiFwq+YNzGp7T qwC8zb6LuS4gxQUfb6PUzJSWadM+/6HkFZ+uij4yjEmKeo52taSql1/t7EtGnVyoQ42w eObZcdZqyiu4JH/MgC65WvcoAZEwt1LfikXUHpNB+PijMtVJMPNgofd7axbWbsDCQ37v tlJBby44ja9ArNIM1e742LjyzzKx/E4kvsLi1Kpq7FtZqreEwHLI7OuL1eszKorxMaD6 /McwzXVUNT/hrML9ZSXak/WIxndS9jQU7GgfxgVi8NovcjV4pLksa/7fbBNtYnE38gXh 5BoQ== X-Gm-Message-State: AOJu0Ywpx5B1vaSifEwwXPfPg84MoY4yJoSe0AZ7Hh8puYGefBKviYWV WN4XMoagAU8M6yplIxHUvJkLHJFaalVR89eJvqaSU+evHrYgH3HT8+GiTz1bTgS5NL8esCVG1xR f8VUOCN0= X-Gm-Gg: ASbGncv/Y4DT4QvOz7MEPb9ZXzckZWwJb34TrTbu5JZZ75c9g16lUMXFuz8t714w7GQ 6OIyRDPP9kuhniTum1ZKJTvF/tNv9bgobQBc1wZtyAGFuQwvSVxnEh1Qu0R4qxPEoMZ/saFOeKk rIhFmHxsDW4GgVIxC+Om+p3/IUP2ZNFQhaTXuB1TBgu0C8+QHO3vMZt5j6aR9t114dwnT/ZiErk BVyL+3mijIiTLqI56RPenzOHJfM7sBGPkStpz/cRA9mj+buGXu9qtFtgBDRQFgmwMSy/6VHXnEM inmxCujyRF0cIyUZQYhPaXauwhmjLkGkx7yP+ZhqDZqwEAOFZRD8BRAeQMcvL2arcqIbJELH3Lo 972Is0XaXsNIow3a01YDZGKOhpb7KSSutjhMHiKLZRQ== X-Received: by 2002:a05:6000:2f88:b0:3a4:c8c1:aed8 with SMTP id ffacd0b85a97d-3a5319a6fa1mr14453238f8f.39.1749560300385; Tue, 10 Jun 2025 05:58:20 -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-3a53229d9e9sm12425447f8f.13.2025.06.10.05.58.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Soumyajyotii_Ssarkar , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= Subject: [PULL 23/24] hw/net/i82596: Update datasheet URL Date: Tue, 10 Jun 2025 14:56:32 +0200 Message-ID: <20250610125633.24411-24-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Soumyajyotii_Ssarkar Change the asset link to one which is working from the PARISC website. Signed-off-by: Soumyajyotii Ssarkar Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250607152711.108914-2-soumyajyotisarkar23@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/net/i82596.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 64ed3c83905..fc33a00d498 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -5,7 +5,7 @@ * This work is licensed under the GNU GPL license version 2 or later. * * This software was written to be compatible with the specification: - * https://www.intel.com/assets/pdf/general/82596ca.pdf + * https://parisc.docs.kernel.org/en/latest/_downloads/96672be0650d9fc046bbcea40b92482f/82596CA.pdf */ #include "qemu/osdep.h" From patchwork Tue Jun 10 12:56:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895205 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253732wrb; Tue, 10 Jun 2025 06:06:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAxwKBv+UBAZvBh85ScZdZSY/GsnZvzhM9PMUm9F7uegHWW3wNV978XC6phexYsShYizrEUg==@linaro.org X-Google-Smtp-Source: AGHT+IEnM8Beq7fuwO5IYTvreISWLOu3I2LLDWLJtW21cGCI/5jeaQYPa716JQqT31mKygflnY1Q X-Received: by 2002:a05:600c:1c08:b0:43d:42b:e186 with SMTP id 5b1f17b1804b1-4531ddffc27mr22616405e9.8.1749560812686; Tue, 10 Jun 2025 06:06:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560812; cv=none; d=google.com; s=arc-20240605; b=BLckXEjh+Mpm5de0i+gzy2JTMSI/ND479DD+vWKmE2OCGC9IEDIx+MJTcCnvWV4eZP dd9MyVP3CHd8I1SzXUBsoM8tjoFoIIbFjxa6lA8j4fVTKXqV8HQhfI0gJbX3GuqWV99S lGgsekROYusOv8u55MBYz0/ijYARSWWhc+1VzZySfFUWZRLARCTHrEyg0Uyb0vVxHWxW xs2rlToXavcRP5VAZS92+BsSTEqAi4bD//77SJ2SyklXRG4rpHZyC0AWpkXxf0M+ImoG 3FwxUXqCs+7rEexVJiX9opebv4AW4TVUULR2Ldlq03qGplpSVj3Se/UrvhfOhq/JDTzR 5QWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=39EvlkRXXlcumPLuzzHWwFXfargkkijcg5vOQOsW2Dc=; fh=6GqFupl0RojCw2SOqocjA3ZhL1fUl+SzV/QA+5dypwY=; b=dI7Kgk448KMXKPa2M3r9xOG8GnEt0mTkC2WDws9CprlNHRNkuZ+Fj3O4WpAyMP6ETw 2Q+qc+0J/QAU3dtcx/oebjXVne7D7TwkhpwgFCNtj6Rggdr7roRwlp80llYmWchz4c/a UrlGaadzFVcr2ZnD6KsHP77vtYbf7lxnoYlEIa5el7ueCIaV4iR7VGMT1fNnuVq0nJri 9rt4PrSSWA7Vr4D+OsJsqCgtzbOCL+Pck4Z+jibyNkYGG0Mq5kgR8XTR5PiwaUJqhAAz /uBh/AM3f8LdggwLyw707N6HWGc6mP09h61C083a9BPdlMPUrDoMVwwM0XIn5tRS9g7c QD0A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uNYVrdpN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-45320664aafsi7749455e9.99.2025.06.10.06.06.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:06:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uNYVrdpN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyb6-0000yw-Cm; Tue, 10 Jun 2025 09:01: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 1uOyYj-000826-4k for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58: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 1uOyYf-0002jb-9u for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:58:32 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a365a6804eso3410812f8f.3 for ; Tue, 10 Jun 2025 05:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560306; x=1750165106; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=39EvlkRXXlcumPLuzzHWwFXfargkkijcg5vOQOsW2Dc=; b=uNYVrdpNbvP6T0MoLAIfRRYbjNKnfJ51qe5sbacAkVIE+cvyzQF5IzXNJWErby9L3l vxH1dzzO9H44O9bujYMmhkN716U0drq0NWeinEVxnWWjF0J+ChrtXM9JPN0tZZfBK3Mv y1zXYkm3hre2UcwlqCthsczEi0VA4xMdQH2wv/nGzkpAWaWxp1tNfWp32n/YUV+x7RDw km71I2kc7bZuAPUYR2ymrQwl2gM73yxwdK/NL6Hig3T3gsztC/BasqmmimQ07WOCt8iG Y6BBMekTsmHoq6dKHbJTzhrr4fyE3dUCL0dspcGPG50ziZxexvEvd6MiwwISAiddrRVQ UWwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560306; x=1750165106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=39EvlkRXXlcumPLuzzHWwFXfargkkijcg5vOQOsW2Dc=; b=i97LZAZ0qUaiXK2dliQE+ryYk8Q5aFn3Gdquy2NF/BFtxwe2CgPgkJEw7V00PvBgu8 c7Cv1vTM6eaAoT/GYuCIhDtj0gPu9TjRvt8QUAEhBS/GAXoo9vXcfgNN2QmWEmeKno85 kB6yWIb4SMrQQmapPRe7bpgzidj9bA1KPZnWqwl/kou/1R0DkHIptSbZPGhs7l5+pvx3 x2bjzsJ9amnsQQdwabZm1ZGEy8Hl5+LOoiuJEbD+2sAkYI89ASoUjEJzz/MegSf/09uw /n3Jhl+p+NWJLNjEXfM+r+XYR/wtIhLY/934f9BtXnRtu4sUj9QHpjlvOO6DY1OcpmSU RUdw== X-Gm-Message-State: AOJu0YxFZD9u5FrHsUxX4D/SavGN+btk8UKdzheMQL82n/VGeF8GTTAP ruzFWWQ+LOAyHl1XUumNAshA0i2mCFH/AahkDj6JpgLS0V44VXd8uda83S36VLsp1N6gu1Ls4Wj BYAapDvw= X-Gm-Gg: ASbGncvH0/Upc60UsLMKpHFhFtRr1Gg0tjfcd2MGuNfR6R0lEzO/K0Tu7dAj0u8yOCn clVcAcoeypVpKWFTP8GGiHtxO5sSBNh1fzYE2u1FuuS0mhlLg53cFuFpfcuoWJmb8xJJghyiN+E +tSupoByvwKlXokLbp9rTz1j/TaTSCX5FVNKRvqSOLPpxZosurpeavqKUL71F7SAIHXI+uphcf2 g2sFQ6Gvze+n7KQe2WSxDVhhu3acsLNCNuRW8cQ1d/s3jWvjjDeknNeDK/xLZZdpIcriQEeFyrz HooXxyGOOMkwBt4yHyoh5CUOh1uyChb/Lea5BRjJYYMvtTuY+xFYSQVuND1xox4lLV+x+1SisKc hA1MtSk2/OSxyixfakFWX5hIyRbRJzio7nfkZ20FuIA== X-Received: by 2002:a05:6000:4027:b0:3a4:d6ed:8df8 with SMTP id ffacd0b85a97d-3a5522bdeeamr2019374f8f.39.1749560305674; Tue, 10 Jun 2025 05:58: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 5b1f17b1804b1-452730c7756sm138986805e9.33.2025.06.10.05.58.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:58:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Soumyajyotii_Ssarkar , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= Subject: [PULL 24/24] hw/net/i82596: Factor configure function out Date: Tue, 10 Jun 2025 14:56:33 +0200 Message-ID: <20250610125633.24411-25-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Soumyajyotii_Ssarkar Abstract the configure function. Signed-off-by: Soumyajyotii Ssarkar Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250607152711.108914-2-soumyajyotisarkar23@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/net/i82596.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/hw/net/i82596.c b/hw/net/i82596.c index fc33a00d498..c1ff3e6c564 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -177,6 +177,26 @@ static void set_individual_address(I82596State *s, uint32_t addr) trace_i82596_new_mac(nc->info_str); } +static void i82596_configure(I82596State *s, uint32_t addr) +{ + uint8_t byte_cnt; + byte_cnt = get_byte(addr + 8) & 0x0f; + + byte_cnt = MAX(byte_cnt, 4); + byte_cnt = MIN(byte_cnt, sizeof(s->config)); + /* copy byte_cnt max. */ + address_space_read(&address_space_memory, addr + 8, + MEMTXATTRS_UNSPECIFIED, s->config, byte_cnt); + /* config byte according to page 35ff */ + s->config[2] &= 0x82; /* mask valid bits */ + s->config[2] |= 0x40; + s->config[7] &= 0xf7; /* clear zero bit */ + assert(I596_NOCRC_INS == 0); /* do CRC insertion */ + s->config[10] = MAX(s->config[10], 5); /* min frame length */ + s->config[12] &= 0x40; /* only full duplex field valid */ + s->config[13] |= 0x3f; /* set ones in byte 13 */ +} + static void set_multicast_list(I82596State *s, uint32_t addr) { uint16_t mc_count, i; @@ -234,7 +254,6 @@ static void command_loop(I82596State *s) { uint16_t cmd; uint16_t status; - uint8_t byte_cnt; DBG(printf("STARTING COMMAND LOOP cmd_p=%08x\n", s->cmd_p)); @@ -254,20 +273,7 @@ static void command_loop(I82596State *s) set_individual_address(s, s->cmd_p); break; case CmdConfigure: - byte_cnt = get_byte(s->cmd_p + 8) & 0x0f; - byte_cnt = MAX(byte_cnt, 4); - byte_cnt = MIN(byte_cnt, sizeof(s->config)); - /* copy byte_cnt max. */ - address_space_read(&address_space_memory, s->cmd_p + 8, - MEMTXATTRS_UNSPECIFIED, s->config, byte_cnt); - /* config byte according to page 35ff */ - s->config[2] &= 0x82; /* mask valid bits */ - s->config[2] |= 0x40; - s->config[7] &= 0xf7; /* clear zero bit */ - assert(I596_NOCRC_INS == 0); /* do CRC insertion */ - s->config[10] = MAX(s->config[10], 5); /* min frame length */ - s->config[12] &= 0x40; /* only full duplex field valid */ - s->config[13] |= 0x3f; /* set ones in byte 13 */ + i82596_configure(s, s->cmd_p); break; case CmdTDR: /* get signal LINK */