From patchwork Thu Aug 24 22:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1825704 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=SKG6b/N+; 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 4RWyCL2qt4z1yfF for ; Fri, 25 Aug 2023 08:18:22 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZIbd-0007lu-RI; Thu, 24 Aug 2023 18:15: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 1qZIbc-0007lg-PY for qemu-devel@nongnu.org; Thu, 24 Aug 2023 18:15:08 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZIba-0006AY-G0 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 18:15:08 -0400 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-571194584e2so239790eaf.3 for ; Thu, 24 Aug 2023 15:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1692915305; x=1693520105; 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=RHTz5czzlTIcDKsj+j2/IKZGfvREvwgfkfyUpTHSbyA=; b=SKG6b/N+AufJjFrxHMmvSMtHKz4ccPoPi3VtziLkHgkTvpITsAXAd+xVMHeuxEVHOf nNLTBk/LsSmY/7RP68S/t+KPdvXmL+uiTca953aFWJWe8coLEtad9h7IboMGczvH/iXT FspMPDEgH372MQMsNPtxkvDe9Ypy/ZeJx0GhrPmdbq1BbIwMMKjjCz/no+8kCjt8uAdh zjUTa7Dz/5yymlweckedmTyMmTktYwPUP5AevmrtJswHQ3Iv1Z7a46/6T3N53ss9BpQs CRQMrabY9WWz93sqy5D0q5ksmjEW0ZmXQthr2Roy7u/FPNitdYaFRagfzEGXdLFhSxV2 Exvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692915305; x=1693520105; 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=RHTz5czzlTIcDKsj+j2/IKZGfvREvwgfkfyUpTHSbyA=; b=DukHi8fVI9Dj3JT13rg5PGAbUK+oXk81d/XShmGTSLfkvWdCBvytUHATYqp3Wn1MBo LOa10EKUQWCYZjsDpEcDglylOOeSVeWUihkvUtTam4dudr8tmAOlRXW2YiVGMsa3mSz4 6+1Gcjm4yZBqUCKCc7lG9tazWHSbCjTOTOOy9FjDTPjDLt6vNVTZnTLN58RZCjKUPZn8 N0e6/0BrRa2UKt6OE0jaHG79RhC0AvSQFah1C6IDrIDnfwU/V5oOy9SFaol37E2ooRKV NifmvmtHrn6um+OU5y5jofpdaOtFXkdFrCyTl2xNnKQ0I2BT4ce1oYydNT5Y0fwYjJm9 HuHQ== X-Gm-Message-State: AOJu0YwjyoqYy0L0f2plBNBS7AiK8rTQM0EF1XxMEWnXEhengUXhISYn exMRk7kfQLCoW9Tz4to2aNVP9ze/lFcyJUg12qE= X-Google-Smtp-Source: AGHT+IHy++RAo8hZM3eji3CqIrCFdIMJtkrGta5isQNyEGgIJg9jZBuDD7bKj9JNk6MYdvtBDVi4Ug== X-Received: by 2002:a4a:ea3b:0:b0:56d:e6:21bf with SMTP id y27-20020a4aea3b000000b0056d00e621bfmr3709783ood.0.1692915305020; Thu, 24 Aug 2023 15:15:05 -0700 (PDT) Received: from grind.. ([179.93.21.19]) by smtp.gmail.com with ESMTPSA id o129-20020a4a4487000000b00565fcfabab8sm256338ooa.21.2023.08.24.15.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 15:15:04 -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 RESEND v8 07/20] target/riscv/cpu.c: add riscv_cpu_add_qdev_prop_array() Date: Thu, 24 Aug 2023 19:14:27 -0300 Message-ID: <20230824221440.484675-8-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230824221440.484675-1-dbarboza@ventanamicro.com> References: <20230824221440.484675-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c36; envelope-from=dbarboza@ventanamicro.com; helo=mail-oo1-xc36.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+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 --- target/riscv/cpu.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 668522db01..4608fa2378 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1946,6 +1946,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v, } #endif +static void riscv_cpu_add_qdev_prop_array(DeviceState *dev, Property *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) { @@ -2002,7 +2009,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 @@ -2016,21 +2022,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[] = {