From patchwork Fri Sep 1 19:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1828959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=ccL+n7ph; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RcpV71Wd2z1ygF for ; Sat, 2 Sep 2023 05:47:59 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcA6g-0007sf-CX; Fri, 01 Sep 2023 15:47: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 1qcA6e-0007s4-7E for qemu-devel@nongnu.org; Fri, 01 Sep 2023 15:47:00 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qcA6b-00033n-Vf for qemu-devel@nongnu.org; Fri, 01 Sep 2023 15:46:59 -0400 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-57358a689d2so1473265eaf.2 for ; Fri, 01 Sep 2023 12:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1693597615; x=1694202415; 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=VlbGyX5m6KtgrJVMCPdMtGmiqD1bES604h+IzM7DCvA=; b=ccL+n7phnDi+S5xNAsT0CNaMK5Cr8KqJaxYpDmFtyWg26bnE9nEhPgEh5mEbUnNEbs vCuYkwhrL+Pyyo4zq9GRM9WqtzVq8kw79l1CIi8mrJswLdlnLwQKZFE12jEKix98n95T dLe4wut3gB5BgMjRvEjHTxa781DUncsr/Hl4JbpwH84KL6jq4IiHObuaIpmo151GqM9L Wfl4Og3hgk9BXEJkOCubPCZjVzCZh+pI7vTIR7W7/18L0ZkocG15idtwy3HJSH5ybS03 0BoEn2Qr765aRpcsrbJawZfvKhZLoIj4UQDHAzxx6zkE83nChmbaV7wO0SrypyNco65K JGww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693597615; x=1694202415; 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=VlbGyX5m6KtgrJVMCPdMtGmiqD1bES604h+IzM7DCvA=; b=HdqmafYkdgYdM4Does5O700P57J2uJetRl04UIwO2M3PlpV6dho3Acx8xqdgPTail0 EQU05gVQAifB0WnHqUeRibQj3kUlyE7RpzAVcEbSpRj24zf+lcNZ1JdQvoKYmfC7xwX3 EME3UEeL5ze3A5SYejRKbAbgE5o2W8d3Tz67MjnMqlQWJ8TUdB9rRCzcItwd8Lo3ojv7 WXOgGArHldUUADz43LCVHfKgrC9W49YekoDfERgZsg2eZainv0T3ylnUQ0zUQ0I4qcbG XwMV+jj8TsQchKboRnh/h9J/dsadS6/nGatcwXjREGBvv+CoxWbb1uhKsfri0SmaT8/k wNJg== X-Gm-Message-State: AOJu0YzJYd6n8FXwkR5FrtuMGMRpIbjlmd+eVcRBCkNz6aRXikHXQw6s tY1xteWM5xuZGKJhidv6uVoSzbYvL4B1gM7Yq04= X-Google-Smtp-Source: AGHT+IH44mryeYRuEWy93olBG9vKcgXh44ING2P3GjvKWFcjh8lR352c6056Z6AnRT4cHZfY2n4DPg== X-Received: by 2002:a4a:d1cc:0:b0:571:2b59:d697 with SMTP id a12-20020a4ad1cc000000b005712b59d697mr3387307oos.0.1693597615724; Fri, 01 Sep 2023 12:46:55 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.94.15.194]) by smtp.gmail.com with ESMTPSA id h187-20020a4a5ec4000000b00565d41ba4d0sm2303002oob.35.2023.09.01.12.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 12:46:55 -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, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v9 07/20] target/riscv/cpu.c: add riscv_cpu_add_qdev_prop_array() Date: Fri, 1 Sep 2023 16:46:13 -0300 Message-ID: <20230901194627.1214811-8-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901194627.1214811-1-dbarboza@ventanamicro.com> References: <20230901194627.1214811-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c31; envelope-from=dbarboza@ventanamicro.com; helo=mail-oo1-xc31.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The code inside riscv_cpu_add_user_properties() became quite repetitive after recent changes. Add a helper to hide the repetition away. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- target/riscv/cpu.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 86d536f242..d484d63bcd 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1951,6 +1951,15 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v, } #endif +static void riscv_cpu_add_qdev_prop_array(DeviceState *dev, Property *array) +{ + g_assert(array); + + for (Property *prop = array; prop && prop->name; prop++) { + qdev_property_add_static(dev, prop); + } +} + #ifndef CONFIG_USER_ONLY static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) { @@ -2007,7 +2016,6 @@ static void riscv_cpu_add_kvm_properties(Object *obj) */ static void riscv_cpu_add_user_properties(Object *obj) { - Property *prop; DeviceState *dev = DEVICE(obj); #ifndef CONFIG_USER_ONLY @@ -2021,21 +2029,10 @@ static void riscv_cpu_add_user_properties(Object *obj) riscv_cpu_add_misa_properties(obj); - for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { - qdev_property_add_static(dev, prop); - } - - for (prop = riscv_cpu_options; prop && prop->name; prop++) { - qdev_property_add_static(dev, prop); - } - - for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) { - qdev_property_add_static(dev, prop); - } - - for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) { - qdev_property_add_static(dev, prop); - } + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_extensions); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_options); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_vendor_exts); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_experimental_exts); } static Property riscv_cpu_properties[] = {