From patchwork Mon Aug 28 08:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LIU Zhiwei X-Patchwork-Id: 13367705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90188C71153 for ; Mon, 28 Aug 2023 08:49:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaXux-00089V-1l; Mon, 28 Aug 2023 04:48:15 -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 1qaXuw-00088x-70; Mon, 28 Aug 2023 04:48:14 -0400 Received: from out30-98.freemail.mail.aliyun.com ([115.124.30.98]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qaXut-0000NS-BQ; Mon, 28 Aug 2023 04:48:13 -0400 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R211e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045192; MF=zhiwei_liu@linux.alibaba.com; NM=1; PH=DS; RN=16; SR=0; TI=SMTPD_---0VqiOAPO_1693212480; Received: from L-PF1D6DP4-1208.hz.ali.com(mailfrom:zhiwei_liu@linux.alibaba.com fp:SMTPD_---0VqiOAPO_1693212480) by smtp.aliyun-inc.com; Mon, 28 Aug 2023 16:48:01 +0800 From: LIU Zhiwei To: qemu-devel@nongnu.org Cc: eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, pbonzini@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, laurent@vivier.eu, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liweiwei@iscas.ac.cn, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, qemu-riscv@nongnu.org Subject: [RFC PATCH v2 3/6] softmmu/vl: Add qemu_cpu_opts QemuOptsList Date: Mon, 28 Aug 2023 16:45:33 +0800 Message-Id: <20230828084536.231-4-zhiwei_liu@linux.alibaba.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20230828084536.231-1-zhiwei_liu@linux.alibaba.com> References: <20230828084536.231-1-zhiwei_liu@linux.alibaba.com> MIME-Version: 1.0 Received-SPF: pass client-ip=115.124.30.98; envelope-from=zhiwei_liu@linux.alibaba.com; helo=out30-98.freemail.mail.aliyun.com X-Spam_score_int: -98 X-Spam_score: -9.9 X-Spam_bar: --------- X-Spam_report: (-9.9 / 5.0 requ) BAYES_00=-1.9, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_SPF_WL=-7.5 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This make the cpu works the similar way like the -device option. For device option, """ ./qemu-system-riscv64 -device e1000,help e1000 options: acpi-index= - (default: 0) addr= - Slot and optional function number, example: 06.0 or 06 (default: -1) autonegotiation= - on/off (default: true) bootindex= extra_mac_registers= - on/off (default: true) failover_pair_id= """ After this patch, the cpu can output its configurations, """ ./qemu-system-riscv64 -cpu rv64,help Enable extension: rv64imafdch_zicbom_zicboz_zicsr_zifencei_zihintpause_zawrs_zfa_zba_zbb_zbc_zbs_sstc_svadu """ Signed-off-by: LIU Zhiwei --- cpu.c | 2 +- include/hw/core/cpu.h | 11 +++++++++++ softmmu/vl.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/cpu.c b/cpu.c index 03a313cd72..712bd02684 100644 --- a/cpu.c +++ b/cpu.c @@ -257,7 +257,7 @@ void cpu_exec_initfn(CPUState *cpu) #endif } -static const char *cpu_type_by_name(const char *cpu_model) +const char *cpu_type_by_name(const char *cpu_model) { ObjectClass *oc; const char *cpu_type; diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index fdcbe87352..49d41afdfa 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -657,6 +657,17 @@ CPUState *cpu_create(const char *typename); */ const char *parse_cpu_option(const char *cpu_option); +/** + * cpu_type_by_name: + * @cpu_model: The -cpu command line model name. + * + * Looks up type name by the -cpu command line model name + * + * Returns: type name of CPU or prints error and terminates process + * if an error occurred. + */ +const char *cpu_type_by_name(const char *cpu_model); + /** * cpu_has_work: * @cpu: The vCPU to check. diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..bc30f3954d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -218,6 +218,15 @@ static struct { { .driver = "virtio-vga-gl", .flag = &default_vga }, }; +static QemuOptsList qemu_cpu_opts = { + .name = "cpu", + .implied_opt_name = "cpu_model", + .head = QTAILQ_HEAD_INITIALIZER(qemu_cpu_opts.head), + .desc = { + { /* end of list */ } + }, +}; + static QemuOptsList qemu_rtc_opts = { .name = "rtc", .head = QTAILQ_HEAD_INITIALIZER(qemu_rtc_opts.head), @@ -1140,6 +1149,21 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) return 0; } +static int cpu_help_func(void *opaque, QemuOpts *opts, Error **errp) +{ + const char *cpu_model, *cpu_type; + cpu_model = qemu_opt_get(opts, "cpu_model"); + if (!cpu_model) { + return 1; + } + if (!qemu_opt_has_help_opt(opts)) { + return 0; + } + cpu_type = cpu_type_by_name(cpu_model); + list_cpu_props((CPUState *)object_new(cpu_type)); + return 1; +} + static int device_help_func(void *opaque, QemuOpts *opts, Error **errp) { return qdev_device_help(opts); @@ -2467,6 +2491,11 @@ static void qemu_process_help_options(void) exit(0); } + if (qemu_opts_foreach(qemu_find_opts("cpu"), + cpu_help_func, NULL, NULL)) { + exit(0); + } + if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, NULL)) { exit(0); @@ -2680,6 +2709,7 @@ void qemu_init(int argc, char **argv) qemu_add_drive_opts(&bdrv_runtime_opts); qemu_add_opts(&qemu_chardev_opts); qemu_add_opts(&qemu_device_opts); + qemu_add_opts(&qemu_cpu_opts); qemu_add_opts(&qemu_netdev_opts); qemu_add_opts(&qemu_nic_opts); qemu_add_opts(&qemu_net_opts); @@ -2756,6 +2786,11 @@ void qemu_init(int argc, char **argv) case QEMU_OPTION_cpu: /* hw initialization will check this */ cpu_option = optarg; + opts = qemu_opts_parse_noisily(qemu_find_opts("cpu"), + optarg, true); + if (!opts) { + exit(1); + } break; case QEMU_OPTION_hda: case QEMU_OPTION_hdb: