From patchwork Tue Sep 12 13:24:10 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: 1833009 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=IdFpndro; 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 4RlPWm2Fdlz1yh0 for ; Tue, 12 Sep 2023 23:27:16 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg3O9-0002nH-TA; Tue, 12 Sep 2023 09:25: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 1qg3O1-0002gU-5l for qemu-devel@nongnu.org; Tue, 12 Sep 2023 09:25:01 -0400 Received: from mail-ot1-x32b.google.com ([2607:f8b0: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 1qg3Nx-0003Z5-90 for qemu-devel@nongnu.org; Tue, 12 Sep 2023 09:25:00 -0400 Received: by mail-ot1-x32b.google.com with SMTP id 46e09a7af769-6bf038b8f87so3389598a34.1 for ; Tue, 12 Sep 2023 06:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1694525095; x=1695129895; 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=r/+8OhgFIU3gLGWTCwQO/5HwWO22OAQG7y7TH74axdc=; b=IdFpndro+mqWbdAusb/HnBLNtTFLy/MqDMGtr0VW7sX9r9+YvtjhM7DCEUrJad/8A3 fo/1Ed6wv/uzS8HlxrzP3YPYBba8PETS5U8l+YfJBbAukUo1J4c3hb7nVdjygHI1ybRu 1fDQ1Zy0W3i82pd6fw7KukJ34q3kPujKVWxDT1wFLCtxxxJsbDqYZ9VRMh8TLvywcFWp IB0BbSSi8kv0uoWck19jwgioFEYVm08PxASJs4TYIsWmL5rlDaalKGCokHrMoxTO4IRn In+7cF9lHmDYkBYgtGYsmKEaJ0fsgU8VeCVFsvK94S4x4cG3VKs2CV2wTfhAKFKrjHAj iMzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694525095; x=1695129895; 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=r/+8OhgFIU3gLGWTCwQO/5HwWO22OAQG7y7TH74axdc=; b=EMs2d+Q2lG4Dg18a9LajBOCx4XMtNvSKcab/S9d4NVLvxsjz2Z0hLqGgKC+T89XWSF Yz3MMb8LcdwyG75RdZuXvbD4E7b2jIKlE7C0BeQ7+nY2JkcEb50/nspYEwr+R5SHxZ+Q DM/Hj4KHobwp7Z6CSatXhDKQOj4fsme9OmsC0p8DSTJQTLGQq/J585GQiEdBTLsdPHEj PSEQFJaiUOBKmCuoMkvZV7pqetQnkNAEnBYdeyX+vf5/Bmvtv/9kv3y/zarLfyInLVJX NgVSvtcSCe9ZBtnPSXc670cUffkgnebA6oS4QHzhKUjlJXKcxJyR2nMm5yUIhISmw4Ry RZeA== X-Gm-Message-State: AOJu0Yz7PHngjZoJYW42p+pSYHMGRZKfwTXKjWd2Qi5yf7VlFXVuXs82 L3ZwGgzubK+JfWzpxKj1KASTUUIh+TzLT0OV5pA= X-Google-Smtp-Source: AGHT+IHmc92Cip9dZAs/7P14CKt1abxkyGGE1UVpSwwKmDS9FD8tHEh/1t9GsymTXrlMhWo9ptJFjg== X-Received: by 2002:a05:6830:1347:b0:6bc:cde2:3038 with SMTP id r7-20020a056830134700b006bccde23038mr1559259otq.11.1694525094826; Tue, 12 Sep 2023 06:24:54 -0700 (PDT) Received: from grind.. ([177.9.182.82]) by smtp.gmail.com with ESMTPSA id p15-20020a0568301d4f00b006af9d8af435sm3991255oth.50.2023.09.12.06.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 06:24:54 -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, philmd@linaro.org, Daniel Henrique Barboza Subject: [PATCH v10 07/20] target/riscv/cpu.c: add riscv_cpu_add_qdev_prop_array() Date: Tue, 12 Sep 2023 10:24:10 -0300 Message-ID: <20230912132423.268494-8-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912132423.268494-1-dbarboza@ventanamicro.com> References: <20230912132423.268494-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32b; envelope-from=dbarboza@ventanamicro.com; helo=mail-ot1-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+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 9111a83a02..66c2183f20 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1932,6 +1932,15 @@ static Property riscv_cpu_options[] = { DEFINE_PROP_END_OF_LIST(), }; +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); + } +} + #ifdef CONFIG_KVM static void cpu_set_cfg_unavailable(Object *obj, Visitor *v, const char *name, @@ -2005,7 +2014,6 @@ void kvm_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 @@ -2019,21 +2027,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[] = {