From patchwork Tue Jul 18 21:03:26 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: 1809449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=nGoTsg69; dkim-atps=neutral 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 4R5BMn3Ryvz1yY9 for ; Wed, 19 Jul 2023 07:06:45 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLrrs-0002qO-IS; Tue, 18 Jul 2023 17:04:24 -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 1qLrrU-0002Ze-V2 for qemu-devel@nongnu.org; Tue, 18 Jul 2023 17:04:02 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLrrS-0007Na-Rt for qemu-devel@nongnu.org; Tue, 18 Jul 2023 17:04:00 -0400 Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-6b9ee68396fso116053a34.1 for ; Tue, 18 Jul 2023 14:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1689714237; x=1692306237; 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=HY7pDNszFtan2CM1rV0lkqgjVjDDObnFnQjxCzN5jiM=; b=nGoTsg69IOtq1YBW3HIqHZZ5vpCwwFIFkDU8WR8yp1JUIjv7VVRwtgPjMV5xPF0ilP e+4YKDtsLKM6GaUCXSqncHQmCsk6/sVxpLmD28LGpkZB96bh4f1LcmSCfITMn6tlESTy cIMh1YajCigoNdFiNFRYGDAs2OCpHhUYOtAzMpuY+goVvVcmsF9vzGn/49vOTDP9h4Vf H3IYu9EGLusCSuJ20+tRyhyLt8QHwT4OAZPBgkw8aAuxgmF6/Algh/Sk79MkgjVJXcJ2 8Iybba541EO0wC7waku68paK37geHKwQU4//vC4QOttyjc035Dkwn08ydCyWhgF2dxFV XGOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689714237; x=1692306237; 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=HY7pDNszFtan2CM1rV0lkqgjVjDDObnFnQjxCzN5jiM=; b=RhGBP9GOVtJsuHxazPBnfWZGOGGXvt0tiYQQQjV081EoNYE5fqS9QdoYnezU/JHAIg zt2VmlUQjrEESjEVUOgawefZUE2PihN13ohuNowrUTY2qCWBrjl0jp150QUunBYov84Z pnW8bXmJ8sYCXXzD3FkJgovw1tCPrD5lrgJVbc19IEpE3W0QwcWQDfxSUhiXsNqJDHCt fXT2nzYUH4R14dFBNNZOc0/5PJXBEpWmoVLZbi5yLDHUkmYuRqc8AF4lE6m89xt51Wve VDO1cJ2xOgxCvNoECQTih+LS7KjlxUt0Y0BlgMztlGxS+3u75+M85BHslp6QzntQnHqN CBoQ== X-Gm-Message-State: ABy/qLZMKIazu37lJFrcGr5mepEd5EYvg/sPC2PVDcjykhd9LjJg0XDy pdA2bcRNSDAy0pvCoqGyW3kJGW8ngLHec3tsYfrMow== X-Google-Smtp-Source: APBJJlGCsaubt25oHgImsuPonMAomXFejS2imItNlHVk9s7aDd5bXTKiCj0FzX1w68U4D0qYWTBvXQ== X-Received: by 2002:a05:6870:a2ca:b0:1b7:5ee0:bd50 with SMTP id w10-20020a056870a2ca00b001b75ee0bd50mr17221938oak.1.1689714237385; Tue, 18 Jul 2023 14:03:57 -0700 (PDT) Received: from grind.. (201-69-66-211.dial-up.telesp.net.br. [201.69.66.211]) by smtp.gmail.com with ESMTPSA id v2-20020a056830140200b006b96384ba1csm1160657otp.77.2023.07.18.14.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 14:03:57 -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 for-8.2 v4 08/11] target/riscv/cpu.c: add ADD_UNAVAIL_KVM_PROP_ARRAY() macro Date: Tue, 18 Jul 2023 18:03:26 -0300 Message-ID: <20230718210329.200404-9-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718210329.200404-1-dbarboza@ventanamicro.com> References: <20230718210329.200404-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32e; envelope-from=dbarboza@ventanamicro.com; helo=mail-ot1-x32e.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Use a macro in riscv_cpu_add_kvm_properties() to eliminate some of its code repetition, similar to what we're already doing with ADD_CPU_QDEV_PROPERTIES_ARRAY(). Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 58cbe410e2..7f79585bd1 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1898,6 +1898,13 @@ static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) NULL, (void *)prop_name); } +#define ADD_UNAVAIL_KVM_PROP_ARRAY(_obj, _array) \ + do { \ + for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ + riscv_cpu_add_kvm_unavail_prop(_obj, _array[i].name); \ + } \ + } while (0) + static void riscv_cpu_add_kvm_properties(Object *obj) { DeviceState *dev = DEVICE(obj); @@ -1905,18 +1912,9 @@ static void riscv_cpu_add_kvm_properties(Object *obj) kvm_riscv_init_user_properties(obj); riscv_cpu_add_misa_properties(obj); - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_extensions); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_extensions[i].name); - } - - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_vendor_exts); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_vendor_exts[i].name); - } - - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_experimental_exts); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, - riscv_cpu_experimental_exts[i].name); - } + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_vendor_exts); + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_experimental_exts); for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { /* Check if KVM created the property already */