From nobody Fri Nov 6 01:39:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1791921973; cv=none; d=zohomail.com; s=zohoarc; b=MkI1YlO48Zq++9/FAluZE9NBMOyZPrIG0yC9GlSgHleekeVwUYCp5ZlHW2hwVm8kv6AkK48MYPpjbq7flMVKR2yoo8GygEFrvNeSQFrtC+caB9ybyF6Pbj/Zkjogk+1abkrI8qkQ4KNlw6EwmTo74jptnGEONUmqyj+iPmkgtSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1791921973; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9grlkE7NcjVbWKGA44KZGoN8QKYGDpltY5XgCndOBEc=; b=ndFRZv3/yD7c8QxvWZhOM/lqCz0jwhJSssa3tResXvQFqGN/h4x0iJh0LktQPE4OKaT3UxzpZZw/SkW2CRmG43/Vafnh1z6wN1sAU/5NpzA8lFAiI9KHBkl3nZOxQjXKZ8d4UfGKPGPn+JuKG9+3O5ULEdyWzpu8EQ/cY+2wJYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1791921973041986.11595675285; Tue, 13 Oct 2026 13:06:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xGil4-00080t-By; Tue, 13 Oct 2026 16:05:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xGikq-0007xP-5G for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:45 -0400 Received: from mail-dy1-x1332.google.com ([2607:f8b0:4864:20::1332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xGikn-0003Mt-Ba for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:42 -0400 Received: by mail-dy1-x1332.google.com with SMTP id 5a478bee46e88-35834f72d94so6096399eec.0 for ; Tue, 13 Oct 2026 13:05:38 -0700 (PDT) Received: from DESKTOP-Q716RM7 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-35b29c2f861sm25568233eec.11.2026.10.13.13.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791921937; x=1792526737; 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:content-type; bh=9grlkE7NcjVbWKGA44KZGoN8QKYGDpltY5XgCndOBEc=; b=HlCi6khE8AtdDxBX1eiO3PJQJkj02gI5PVMPc0oiR6A1qgQGPiZR9iRXC0VqedYD6f SU9W2jYqFU7KlDGTW5Mdv9uhKG9kZ8IKwBKEg01psdgtgWr9Zg/AxVkqbEd3U5bqUcBD uFVVU+sb4jtu3Chn8bbcnpTCdyJY5q2RF3WbOxvvjMapXVSwpkas1F9MZYzXWuzPvDth zpWsbs8AeOiBOTkKMdgNtKs1ywLcB6aOv4cLh0hpQdbixIQb+uQjCUDcJX5Z+kCREeJH 3FdNMiPDSTflv3BtKbUR6JAQd9j3DbTpuybyb9q2GvenFSNH5sGQkbDqQsSRyPcJzi2e g5yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791921937; x=1792526737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=9grlkE7NcjVbWKGA44KZGoN8QKYGDpltY5XgCndOBEc=; b=oUzUwMfhlZOXDzT6ynA5criBpdVdmhhlI158c8jZ0MvbUHmaFdU7Am42amzom50tfq CvutXlVoXqmPLj8mlezbVNf9N388yrUH5/USt8CGKht3sx47qIOjjLVc6jFdtjGcmTNM 93rTukugOE+EMyzSQg6ygn5y0Ivl4W98TBJ7L3IhxW9NAbx5tN6BQflPnFOHNQ5opK+8 kCUy4Jftz6wlfizUlkzWcqeFgrJ4A0dZZz9521BNsYT7QVvRds6rHQ7j7OwGa5kZXCLm wXSazoNWAB73yuodS2ixRq3vi1+F1qv1lzirQ8VPiJxtYNL99eXzmOBRf+vWc3J+DUmN PEIA== X-Gm-Message-State: AFq9FYJ6G8CShMFFclgA8JjnMLLEY/smlfrcUbAoVXQAbApBN88qkqHs obQ919hcSpikyi0eJorUIz1i5JVVmuNkMs3ROEEIb2XVs1RhFiff2yH0NxckP7W8 X-Gm-Gg: AYBFou3wrY8QgLZT5bRpGDFQOm71/ZfZKJu5mv2FYC/da94eM628c6qQYDF73fROiQA YX7JDeUBx4ITaBTtyoJw1xRSx+m1IxFTMIqSq2wpDLwawisnEdyLB95aR+94fxZp7MtorEECKQS YR7yjDiAKV9ZuIFoC3Gf03WCBdrWJsa3veeYs1Ww1puZMngQqLtzoAwlUtnhQt8voA+1tFbNvXj qoJIOZBiXrQkp8yl/oBLWWPp8CTHSBgCKOQ9nSup0bPv+dV+/bO6c/meV5VdBDqhDV1+Blm85uc p1CECzo4ckO95mLspFodCtALX+0GbtnY89ud2+kKJo3QQllVVCnAe1YbYTlb56iTIx96ppleHDr boLc9vXLtbvqjBRTIQcoIdRbANSZ5n8HAbZiq+TNRBCHGsrXq3NId7zN+GrAFD4eyXzyEI4O41y aZnrGcVq1vFomOZu4uAHnhbR4keDbM5Iz/cFJvhbxBjMES8st1uM9fmt0uUj+FM9j1aKehqCvaK Hqw9jElhfPBxec7v3SFWiekfCId X-Received: by 2002:a05:693c:20c1:10b0:35c:2986:35ab with SMTP id 5a478bee46e88-35c29863f99mr4584533eec.13.1791921936333; Tue, 13 Oct 2026 13:05:36 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: David Hildenbrand , Philippe Mathieu-Daude , Matthew Rosato , Paolo Bonzini , Pierrick Bouvier , Cornelia Huck , Fam Zheng , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Eric Farman Subject: [PATCH 1/3] hw/pci: Avoid guard loadparm with target_s390x() for s390x in class_init Date: Wed, 14 Oct 2026 04:05:22 +0800 Message-ID: <20261013200525.1340-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.55.0.windows.3 In-Reply-To: <20261013200525.1340-1-luoyonggang@gmail.com> References: <20261013200525.1340-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1332; envelope-from=luoyonggang@gmail.com; helo=mail-dy1-x1332.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, FREEMAIL_FROM=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1791921973379158500 Content-Type: text/plain; charset="utf-8" This is for avoid call target_info() in class_init. Now we directly guard in pci_qdev_property_set_loadparm instead. Don't know if its an API break, but the smallest change. Signed-off-by: Yonggang Luo --- hw/pci/pci.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 0efb4eb4bb0..9d3dcd52942 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2878,6 +2878,11 @@ static void pci_qdev_property_set_loadparm(Object *o= bj, const char *value, { void *lp_str; =20 + if (!target_s390x()) { + error_setg(errp, "'loadparm' is only supported on s390x"); + return; + } + if (object_property_get_int(obj, "bootindex", NULL) < 0) { error_setg(errp, "'loadparm' is only valid for boot devices"); return; @@ -2895,14 +2900,11 @@ void pci_qdev_property_add_specifics(DeviceClass *d= c) { ObjectClass *oc =3D OBJECT_CLASS(dc); =20 - /* The loadparm property is only supported on s390x */ - if (target_s390x()) { - object_class_property_add_str(oc, "loadparm", - pci_qdev_property_get_loadparm, - pci_qdev_property_set_loadparm); - object_class_property_set_description(oc, "loadparm", - "load parameter (s390x only)= "); - } + object_class_property_add_str(oc, "loadparm", + pci_qdev_property_get_loadparm, + pci_qdev_property_set_loadparm); + object_class_property_set_description(oc, "loadparm", + "load parameter (s390x only)"); } =20 MemoryRegion *pci_address_space(PCIDevice *dev) --=20 2.55.0.windows.3 From nobody Fri Nov 6 01:39:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1791921963; cv=none; d=zohomail.com; s=zohoarc; b=h+DmLV/mAZOM79oLVQNJTSYgX88pk5HaSjKmBN2NlK9Pevx6nNNM+22qJPzjga4Sx1nFmeysckXQSOTC0CeeqSk0xdBjI2+JtVpPcwPzNuo+vayQxm7lfZQc8GCJtBRYyHQb0rWzv4wWbVvn8X9KuqyTZtMJT6WeH5K3uYH8V/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1791921963; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IAa9EYHeaBZV1We1wS0Pw4Gbkg3A4EQ75sck0EgY0ZI=; b=do64j7nCNHl7eUKwDC7WNl/BA3u6sC7+9//V29bVOBX5k2kP7cF8KFxtCpLnVFfni3ToEZ8d7XGGSMoKrlZsfjkqeaVk5ku1HBGZFBzRtEe0d38vAGzqkUeDxBxR0IW9vyG6h1O45VoD3FiuklVvykd3jLGAc5OJzwIteW5Md4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1791921963617128.61157816765035; Tue, 13 Oct 2026 13:06:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xGil5-000818-DF; Tue, 13 Oct 2026 16:05:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xGiks-0007yE-Dj for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:46 -0400 Received: from mail-dy1-x1331.google.com ([2607:f8b0:4864:20::1331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xGikp-0003N2-NT for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:46 -0400 Received: by mail-dy1-x1331.google.com with SMTP id 5a478bee46e88-35829219da8so322074eec.0 for ; Tue, 13 Oct 2026 13:05:41 -0700 (PDT) Received: from DESKTOP-Q716RM7 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-35b29c2f861sm25568233eec.11.2026.10.13.13.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791921940; x=1792526740; 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:content-type; bh=IAa9EYHeaBZV1We1wS0Pw4Gbkg3A4EQ75sck0EgY0ZI=; b=Dbn2O8tuavLXxzYmgn5hWXNTL5neApEWsUi1UMgJu9MNjs05dDPoEjImdvTynTy/Xw mX81s2hp3cnA9f4lpxMvLARwIpxbBuu0ucqlIxcmLKL1QOUDTbRR7CjLq0iLDjvxZa5y W0rvZ+no7lXw7bWDN0aOOfCB8cf7hKDCQP+q+pIwCJrk5Qvhqcj1RickmG1rQ9a0gnOi u1w1l/H1CKsrls8YdksLshmPRC6jS54Mrm+49zq30/P/WtiGioyP3Qt/ioQnn6J0pe0c /8IA3IVSoy1wzKEuW9R0wTenXLJ5QRmpbuPB7dnIgo8XaUb39+X3X3p4uhbv6f0lcZt3 cmGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791921940; x=1792526740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=IAa9EYHeaBZV1We1wS0Pw4Gbkg3A4EQ75sck0EgY0ZI=; b=sO6+PhY8e9QgUzbQmIS50xd8pbxvm9Pp703kqHSpBrtPfL1MgsjdPcBeH+7215oB2v 22TRmlj+EEuUi6zEmKRLFniKaIM4O/8uz43tq4fejZRof+hzpJG4QYa5IBfRB3UKkNeP +Lf9+Go0YrdHpTEsqZs1Cz8DZ1g9qIhCE54br0t/Ft439oOwsfvvSym+2siMBrGJFrfK UeQxPDC41OriSuQ9UMTdR4JZCL4AaztLOPhk7Eq3Cuj6lZwXItjXNC9oyGyC/HMVfnxU cZFfvQJGDKivpRZuWJdOPiTDS6+Yxb8EekU8V3YbNGon8qrWBpcunU5oBHcWhtFSDugl fuWw== X-Gm-Message-State: AFq9FYJ2UB+Z2GQlOIqQRts2rzTqFqsFPzWzaxpfefwCZSgdcVR8IiPe 96glD2DJcGEh/SZz0peXMbEP23MH/ZpMkHIf2mH2oQNIRY+ndJHIq8psCn8yk56f X-Gm-Gg: AYBFou0dPRNhM6iEePflgEP5tVQ0fQE3mVgzj4v5rR+r4seiPwGscCvzFMtgSNdNjMV d/rSd4QwGsS+M3EM+ZnQ/UXjHtbb1LZO/DlT84NzyCedc9FTl+T+FME5QC6b+M1lHkfXvB+Vg+m ghDII85HsZ5Gdd4kxOEDjJwYXF7arXDeeY91mpi0ZdkpWOffQKPhSuuRbXTKfgfQw1cYS+n7Qdd eKFZ+1ADHiHiM+f7h31xz6OYhGd2OKzv7ytgOyyV31mf3ylapIq33MtlELfZj2f2F6Vj+WwJElX ieaMDKHw6O/PeZNaOweFEC2aXU1Uym7qVNvPx+HReFHnAO93Fk4nNIaLsNQ3GcL8W2mt1DedqsV 0SoMluU9Vvde3SUelLVPJxCqU64U6r6d2iXIOkKV03vnPsdjTFjK5kfyPKNv6ckz/KbusnK0jL1 tzia4ynhHp3hge3YKUIHSxfkaootwAuPbMycGEcTZw8jHbagJi0vAgq572/dj+vfsNDNovjCbvP 2wEi9IJks38iN5IEg== X-Received: by 2002:a05:693c:83da:10b0:353:804a:5e83 with SMTP id 5a478bee46e88-353804a5fe8mr18223942eec.8.1791921940462; Tue, 13 Oct 2026 13:05:40 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: David Hildenbrand , Philippe Mathieu-Daude , Matthew Rosato , Paolo Bonzini , Pierrick Bouvier , Cornelia Huck , Fam Zheng , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Eric Farman Subject: [PATCH 2/3] hw/scsi: Avoid guard loadparm with target_s390x() for s390x in class_init Date: Wed, 14 Oct 2026 04:05:23 +0800 Message-ID: <20261013200525.1340-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.55.0.windows.3 In-Reply-To: <20261013200525.1340-1-luoyonggang@gmail.com> References: <20261013200525.1340-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1331; envelope-from=luoyonggang@gmail.com; helo=mail-dy1-x1331.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, FREEMAIL_FROM=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1791921965231158500 Content-Type: text/plain; charset="utf-8" This is for avoid call target_info() in class_init. Now we directly guard in scsi_property_set_loadparm instead. Don't know if its an API break, but the smallest change. Signed-off-by: Yonggang Luo --- hw/scsi/scsi-disk.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index deb33ac1dda..276941ae537 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -3179,6 +3179,11 @@ static void scsi_property_set_loadparm(Object *obj, = const char *value, { void *lp_str; =20 + if (!target_s390x()) { + error_setg(errp, "'loadparm' is only supported on s390x"); + return; + } + if (object_property_get_int(obj, "bootindex", NULL) < 0) { error_setg(errp, "'loadparm' is only valid for boot devices"); return; @@ -3196,14 +3201,11 @@ static void scsi_property_add_specifics(DeviceClass= *dc) { ObjectClass *oc =3D OBJECT_CLASS(dc); =20 - /* The loadparm property is only supported on s390x */ - if (target_s390x()) { - object_class_property_add_str(oc, "loadparm", - scsi_property_get_loadparm, - scsi_property_set_loadparm); - object_class_property_set_description(oc, "loadparm", - "load parameter (s390x only)= "); - } + object_class_property_add_str(oc, "loadparm", + scsi_property_get_loadparm, + scsi_property_set_loadparm); + object_class_property_set_description(oc, "loadparm", + "load parameter (s390x only)"); } =20 static void scsi_disk_base_class_initfn(ObjectClass *klass, const void *da= ta) --=20 2.55.0.windows.3 From nobody Fri Nov 6 01:39:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1791921978; cv=none; d=zohomail.com; s=zohoarc; b=jrqGujSUr1IWXQwT8EqhsvmkPAMRxnhbVyeq13ILoOgIja646doTnJrEgSx+7eDgjGP8bE+fJsy1BHcr3aB8K0lyXHUYdQCdwE8wM9KO/e3EDLvCW+EIRVhoCO6NYKznhMlq4M1R3W4jocP/WU7l9+rUHX4WCrunthwik6nsCXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1791921978; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1jAQKw6BdaosTvJkg4nCxTm2cQbTjw31PxJAtciPfv0=; b=inlYByO2OSXd2Aans3vcCgsCH6M40TFi2q/B6HmmYp7dW/z/icLrZyGY//1mO3IIebCVdHlmdVjrt1CKP5cCboKI/YWwc4ihdkyJnSUIo31qCYrTNGVtj1o/CbIoV2Wzp/aFo/xsZYqj76M/7UXfKEJFxHcvytDjj3beprcusnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1791921978390294.6134185398114; Tue, 13 Oct 2026 13:06:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xGilG-0008BA-Bl; Tue, 13 Oct 2026 16:06:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xGiku-00080C-1o for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:48 -0400 Received: from mail-dy1-x132f.google.com ([2607:f8b0:4864:20::132f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xGikr-0003NW-Tc for qemu-devel@nongnu.org; Tue, 13 Oct 2026 16:05:47 -0400 Received: by mail-dy1-x132f.google.com with SMTP id 5a478bee46e88-3535bf8b3e0so408536eec.0 for ; Tue, 13 Oct 2026 13:05:45 -0700 (PDT) Received: from DESKTOP-Q716RM7 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-35b29c2f861sm25568233eec.11.2026.10.13.13.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791921944; x=1792526744; 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:content-type; bh=1jAQKw6BdaosTvJkg4nCxTm2cQbTjw31PxJAtciPfv0=; b=X1QptIXnfY0+oPKdnRQH6POjn69jERNt6g1m4Wne/bHouS7ZlBVy+/ZXjdDCcs7mlP WLGJz0KfrRPJruzJYsY6JJkhaEJy16WZSOxlkPhH/lkNljY56kcZYMXtVXz2ugVtqSkr TRdXjP70HLS9MpUtOYWHZ/WP6tYaLC9/JY2q/7paLDRxrid3Gl6z8yFE02fGKPIWibHr aDnONirM4sJ/d+yF62nnXCTCwVzFZuqPj8dH9z5VxiXe8QaPYPeDcakFUZmcjYI3C5yl gl4UqBuC5jzGwtnHrhoq5fvyMmIV/uiKMRc5QqB1m8hYsfrMUzpiHr6/92j2iIQ26SkS qLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791921944; x=1792526744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1jAQKw6BdaosTvJkg4nCxTm2cQbTjw31PxJAtciPfv0=; b=FQ/AmfFy/9/Qhl2Ohxf/tAc3vI4/uwhr6vW2+oAdcthqfSRI5BLxTgPytShRa0+HRC yicg5u4kFBAleW5G1OaY2nAKV2krDY89p+Y8ssUHnnDKg9ctPF+Eut2CHnm7ga55U/WS s07V97+MdVWylq9++xJhBAgzFr446kcpbiK/VkRe8d57p/2sUffRiuniTJDTO54nr7P7 yuVre7TKGUdgeIaPEqEdZXx6Yvm5aQ7OrHGn0PM0vMfM1fMbjMSNeMB7vOE2rfhaDI64 Qxrc8t8BXwHT2n+lyVTQ+o0JfnH9mBpT6CroYTyZLsh0tXdmqCjlUDvLsc50GmgsTc4X 0zqA== X-Gm-Message-State: AFq9FYK3xFCjan4VHJyx9I+CZdEO5jOot1OiFEr1widR7DVCOVhljS4A mo9Htf1j/8j6Q5vA2ISTWMPooJkVe+qsZS2xebaEpfI01VDpR3yW0ewG8GgqRVrI X-Gm-Gg: AYBFou33/KHcUrcN9m940u8uaBRswYKTHzoeeTU/uSF+fjnmq2ZvXqJDUjU1ExXia00 /rujFD3puZiwdwpN/enBgY3gIiFqO8s77CFQX8pGlPwK0ZXZadU6fnB8+sSm9836tac0BlqdzBI U+0dSpqxNeFrwVbkGXvEMBR/LmyOJVYbdLGFN1P+zVPKN0SJGtfMXhEaJ+kvAQPfPvOlZgTgr4m fDJDALD+5pe5KfmO7+lscr0snywsYWPer+MWWGH/WUsQg9OOwxPPgiPPm9iPVzzyGFCAWVsqL/M ON4mBGaxqobJXeV1FGTJudjxng/ZOp/Q1F0ukGs9R0EqXFL3znrAoIk+ci/PbPCvVnDhfemb3+f A8dfSde2cm0ok3i9qzqU0QbPXBgaOkD+irBwk5x/kSZPJD7ksM5aGsfmw+IiktPWoYEqecdohet 3yB63IeTKO/les3mutT9vz4Lo8uCMjm+P7x8C0BL8UnXRhC7C80Zg5KTXiudaFS/l4X13mgXA+u JRFelqoHefC9JoQhA== X-Received: by 2002:a05:7301:70b:b0:356:23dd:3c72 with SMTP id 5a478bee46e88-35623dd574fmr15264117eec.4.1791921944220; Tue, 13 Oct 2026 13:05:44 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: David Hildenbrand , Philippe Mathieu-Daude , Matthew Rosato , Paolo Bonzini , Pierrick Bouvier , Cornelia Huck , Fam Zheng , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Eric Farman Subject: [PATCH 3/3] hw/virtio/virtio-mem: Avoid call to target_info() in class_init Date: Wed, 14 Oct 2026 04:05:24 +0800 Message-ID: <20261013200525.1340-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.55.0.windows.3 In-Reply-To: <20261013200525.1340-1-luoyonggang@gmail.com> References: <20261013200525.1340-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::132f; envelope-from=luoyonggang@gmail.com; helo=mail-dy1-x132f.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1791921979469158500 Content-Type: text/plain; charset="utf-8" Done by merge virtio_mem_legacy_guests_properties into virtio_mem_propertie= s. As we already have vmem->unplugged_inaccessible handle in virtio_mem_device= _realize So we can reject the wrong option in virtio_mem_device_realize, then the ca= ll target_info() in class_init no need anymore. Signed-off-by: Yonggang Luo --- hw/virtio/virtio-mem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7130ed852d9..e528bf2a88b 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -879,7 +879,11 @@ static void virtio_mem_device_realize(DeviceState *dev= , Error **errp) break; } } else { - vmem->unplugged_inaccessible =3D ON_OFF_AUTO_ON; + if (vmem->unplugged_inaccessible !=3D ON_OFF_AUTO_ON) { + error_setg(errp, "'%s' must be 'on' on non-x86 targets", + VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP); + return; + } } =20 if (vmem->dynamic_memslots && @@ -1568,9 +1572,6 @@ static const Property virtio_mem_properties[] =3D { early_migration, true), DEFINE_PROP_BOOL(VIRTIO_MEM_DYNAMIC_MEMSLOTS_PROP, VirtIOMEM, dynamic_memslots, false), -}; - -static const Property virtio_mem_legacy_guests_properties[] =3D { DEFINE_PROP_ON_OFF_AUTO(VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP, VirtIO= MEM, unplugged_inaccessible, ON_OFF_AUTO_ON), }; @@ -1635,9 +1636,6 @@ static void virtio_mem_class_init(ObjectClass *klass,= const void *data) RamDiscardSourceClass *rdsc =3D RAM_DISCARD_SOURCE_CLASS(klass); =20 device_class_set_props(dc, virtio_mem_properties); - if (virtio_mem_has_legacy_guests()) { - device_class_set_props(dc, virtio_mem_legacy_guests_properties); - } dc->vmsd =3D &vmstate_virtio_mem; =20 set_bit(DEVICE_CATEGORY_MISC, dc->categories); --=20 2.55.0.windows.3