From nobody Wed Nov 13 07:10:50 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1692139099; cv=none; d=zohomail.com; s=zohoarc; b=awaC+f9Iqf8Kdw79rhpc1ERJU+IBcRdEiW9IYiypZcZBSkI4aEzXM2tu2BBDwajNptdH88TxpLnLSfMf66rznZNn5JPzVlTgtdNGRavuz1KNJMvG/feLzpB8C6oNqR8gLUV5Gv327kI3KC1dSaUnCXmOrMPsstXBO7/mj5yQto4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692139099; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CV+Q96BqDr+yYM6mYpaiFr+4tsWPyiV37nU28yNXcuM=; b=cCntIDept8BL79LNideYqzvTt8bzrPjJqf81zKeH4DPYb+qtknvYn0vpJM/cWgEM5TAMVG4uq5zVjthcHCw5psmHfUnldmVXEhh80fDQkC1Z0BxkVjJkqzVN6GajV7fWaghro0cA6N4WuFKqshbbUOBpvwn4kklQkJ+XpD7RDTs= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1692139099515634.8726370579136; Tue, 15 Aug 2023 15:38:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qW2fx-0004sA-G0; Tue, 15 Aug 2023 18:38: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 1qW2fv-0004rB-5J for qemu-devel@nongnu.org; Tue, 15 Aug 2023 18:38:07 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qW2fs-00068s-Do for qemu-devel@nongnu.org; Tue, 15 Aug 2023 18:38:06 -0400 Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3a7d4030621so3131396b6e.3 for ; Tue, 15 Aug 2023 15:38:02 -0700 (PDT) Received: from grind.. (189-69-160-189.dial-up.telesp.net.br. [189.69.160.189]) by smtp.gmail.com with ESMTPSA id be15-20020a056808218f00b003a40b3fce01sm5903418oib.10.2023.08.15.15.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 15:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1692139081; x=1692743881; 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=CV+Q96BqDr+yYM6mYpaiFr+4tsWPyiV37nU28yNXcuM=; b=etRYTNo6ZNvTMMyD6TnsjvDlFmqc1imXyRw7ss/EzsStmAJjhAZBLEXio3YZjQQR0u AVbFeW/yZLZpjqfrOQH+5IpWin5abSTAKQrAkjWojI3/MfrxvN7iUOmwZFUUGYF3Rxoy AyMW9hlKNTO8Ume0wICttiwoNJkMwN+s8MAU+j+4PaFYkAUKymk+/9rGKwBBwhEDRtv5 JD+sVqtaxRaozr8ZHgWD2pNGD6sTPQeTU4io1MPFQOlEx6NihH1P6TtUSu76neOvaeAm vGbaJ9mRhWGrPvk51JqBiTC8BsojU/Zaw5CKfZFOtlU4GcMNB64XWXZlefAKx2T7naMS n/vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692139081; x=1692743881; 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=CV+Q96BqDr+yYM6mYpaiFr+4tsWPyiV37nU28yNXcuM=; b=M7f36BecFG+zOKEWPOhrKv0rzEG2484raWPPcHXrDP1g1H16IX7KpCYIxXesufzGOL kQvUc1eLsDz5qPxLdRhs8LMv1FmWwnJoXspMXwiGjHJUOPe2HbdP1nlSrlVEy5VFsYaf ZUtGW74bRfh7yfNgTqnvLuu4OdjQ5lj/dI850bJsKGcNkXzZQLNTo/sWsG/gtjO2744m dDOe03S765ExEnjz3PyQ/lhlyP/PSmgizqaRNmNB8QAlNu12d6AQCIr3vO2Y16c30j6u jie/qeupHYPGtiFFK1zlRSps/Q80cxMkFdD+cEjW8EJ61EEYILq7POeVv3T1dkImCvHv 2kWA== X-Gm-Message-State: AOJu0YzqWBWRqjVrsj1r7pE0h3klm4nZ0lHcFtkfv+hJm4SFlm5FzP5n P1TualjG5CqM+wWyaA4GVuIMybXHtpU1SOoUnUw= X-Google-Smtp-Source: AGHT+IEG8WCGlgqzaxt+CRtAEj5n1az60J0tGeV0JUcWCLVcHeQLjdrIQBrN/HKu+D1Es336D9s7MQ== X-Received: by 2002:aca:6508:0:b0:3a3:4314:8dc0 with SMTP id m8-20020aca6508000000b003a343148dc0mr51347oim.5.1692139080853; Tue, 15 Aug 2023 15:38:00 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH v8 04/12] target/riscv: add DEFINE_PROP_END_OF_LIST() to riscv_cpu_options[] Date: Tue, 15 Aug 2023 19:37:33 -0300 Message-ID: <20230815223741.433763-5-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230815223741.433763-1-dbarboza@ventanamicro.com> References: <20230815223741.433763-1-dbarboza@ventanamicro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=dbarboza@ventanamicro.com; helo=mail-oi1-x236.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=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: 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 @ventanamicro.com) X-ZM-MESSAGEID: 1692139100356100003 Content-Type: text/plain; charset="utf-8" Add DEFINE_PROP_END_OF_LIST() and eliminate the ARRAY_SIZE() usage when iterating in the riscv_cpu_options[] array, making it similar to what we already do when working with riscv_cpu_extensions[]. We also have a more sophisticated motivation behind this change. In the future we might need to export riscv_cpu_options[] to other files, and ARRAY_LIST() doesn't work properly in that case because the array size isn't exposed to the header file. Here's a future sight of what we would deal with: ./target/riscv/kvm.c:1057:5: error: nested extern declaration of 'riscv_cpu= _add_misa_properties' [-Werror=3Dnested-externs] n file included from ../target/riscv/kvm.c:19: home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid applica= tion of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ | ^ ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' 1047 | for (int i =3D 0; i < ARRAY_SIZE(_array); i++) { \ | ^~~~~~~~~~ ./target/riscv/kvm.c:1059:5: note: in expansion of macro 'ADD_UNAVAIL_KVM_P= ROP_ARRAY' 1059 | ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid applica= tion of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ | ^ ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' 1047 | for (int i =3D 0; i < ARRAY_SIZE(_array); i++) { \ Homogenize the present and change the future by using DEFINE_PROP_END_OF_LIST() in riscv_cpu_options[]. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7f0852a14e..854c56b6d0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1853,6 +1853,8 @@ static Property riscv_cpu_options[] =3D { =20 DEFINE_PROP_UINT16("cbom_blocksize", RISCVCPU, cfg.cbom_blocksize, 64), DEFINE_PROP_UINT16("cboz_blocksize", RISCVCPU, cfg.cboz_blocksize, 64), + + DEFINE_PROP_END_OF_LIST(), }; =20 #ifndef CONFIG_USER_ONLY @@ -1904,12 +1906,12 @@ static void riscv_cpu_add_kvm_properties(Object *ob= j) riscv_cpu_add_kvm_unavail_prop(obj, prop->name); } =20 - for (int i =3D 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { + for (prop =3D riscv_cpu_options; prop && prop->name; prop++) { /* Check if KVM created the property already */ - if (object_property_find(obj, riscv_cpu_options[i].name)) { + if (object_property_find(obj, prop->name)) { continue; } - qdev_property_add_static(dev, &riscv_cpu_options[i]); + qdev_property_add_static(dev, prop); } } #endif @@ -1940,8 +1942,8 @@ static void riscv_cpu_add_user_properties(Object *obj) qdev_property_add_static(dev, prop); } =20 - for (int i =3D 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { - qdev_property_add_static(dev, &riscv_cpu_options[i]); + for (prop =3D riscv_cpu_options; prop && prop->name; prop++) { + qdev_property_add_static(dev, prop); } } =20 --=20 2.41.0