From nobody Thu Nov 13 19:19:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582617226; cv=none; d=zohomail.com; s=zohoarc; b=DC77Uuu6pWWG0cAZ4D/wUpjfsymzaISm4WZJ9GBJD5LnA9o4jalQtk3YLtKlmvLOCCabpFjEPY2W/nIUpq4EnhyEE9cCWUEXNCH4TfTiVadgYPkmyNwCVgaT1MHve9+pJ00FQZiPiVT9Bzl+GJfBk5uucb6Rauxa0zxQlgI/B3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582617226; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9IqXd/LAkiQ4sGPmJjXBJeHmcNvereGafe0fAKCwFGA=; b=neMhiE7pPu84LGlMD+ucvEpLTuoR2b7x5ihmCM5L1vnWrB0lx622srfFr56+fuwGeh6TeUdZZY5uGJ35LOYdF+mOXhsbejaPMXrQaXmoOf2/6M+TorOa8LUbE1UcrjR99/vicuZITkhZ4LiuR/jKYWHj1Thv6LVoYLC3KWkakYA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582617226274700.7188162232335; Mon, 24 Feb 2020 23:53:46 -0800 (PST) Received: from localhost ([::1]:50190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6V2H-0000vd-5m for importer@patchew.org; Tue, 25 Feb 2020 02:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42640) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6V1g-0000Va-8E for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6V1e-0008UP-T2 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:53:08 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3250 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6V1e-0008SM-IA for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:53:06 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id D58136A43795A35D16D8; Tue, 25 Feb 2020 15:52:59 +0800 (CST) Received: from linux-TFkxOR.huawei.com (10.175.104.212) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:52:49 +0800 From: Heyi Guo To: Subject: [PATCH] hw/smbios: add options for type 4 max_speed and current_speed Date: Tue, 25 Feb 2020 15:50:46 +0800 Message-ID: <20200225075046.30151-1-guoheyi@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.212] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.191 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heyi Guo , wanghaibin.wang@huawei.com, Igor Mammedov , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Common VM users sometimes care about CPU speed, so we add two new options to allow VM vendors to present CPU speed to their users. Normally these information can be fetched from host smbios. Strictly speaking, the "max speed" and "current speed" in type 4 are not really for the max speed and current speed of processor, for "max speed" identifies a capability of the system, and "current speed" identifies the processor's speed at boot (see smbios spec), but some applications do not tell the differences. Signed-off-by: Heyi Guo --- Cc: "Michael S. Tsirkin" Cc: Igor Mammedov --- hw/smbios/smbios.c | 22 +++++++++++++++++++--- qemu-options.hx | 3 ++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index ffd98727ee..1d5439643d 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -94,6 +94,8 @@ static struct { =20 static struct { const char *sock_pfx, *manufacturer, *version, *serial, *asset, *part; + uint32_t max_speed; + uint32_t current_speed; } type4; =20 static struct { @@ -272,6 +274,14 @@ static const QemuOptDesc qemu_smbios_type4_opts[] =3D { .name =3D "version", .type =3D QEMU_OPT_STRING, .help =3D "version number", + },{ + .name =3D "max_speed", + .type =3D QEMU_OPT_NUMBER, + .help =3D "max speed in MHz", + },{ + .name =3D "current_speed", + .type =3D QEMU_OPT_NUMBER, + .help =3D "speed at system boot in MHz", },{ .name =3D "serial", .type =3D QEMU_OPT_STRING, @@ -586,9 +596,8 @@ static void smbios_build_type_4_table(MachineState *ms,= unsigned instance) SMBIOS_TABLE_SET_STR(4, processor_version_str, type4.version); t->voltage =3D 0; t->external_clock =3D cpu_to_le16(0); /* Unknown */ - /* SVVP requires max_speed and current_speed to not be unknown. */ - t->max_speed =3D cpu_to_le16(2000); /* 2000 MHz */ - t->current_speed =3D cpu_to_le16(2000); /* 2000 MHz */ + t->max_speed =3D cpu_to_le16(type4.max_speed); + t->current_speed =3D cpu_to_le16(type4.current_speed); t->status =3D 0x41; /* Socket populated, CPU enabled */ t->processor_upgrade =3D 0x01; /* Other */ t->l1_cache_handle =3D cpu_to_le16(0xFFFF); /* N/A */ @@ -1129,6 +1138,13 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) save_opt(&type4.serial, opts, "serial"); save_opt(&type4.asset, opts, "asset"); save_opt(&type4.part, opts, "part"); + /* + * SVVP requires max_speed and current_speed to not be unknown= , and + * we set the default value to 2000MHz as we did before. + */ + type4.max_speed =3D qemu_opt_get_number(opts, "max_speed", 200= 0); + type4.current_speed =3D qemu_opt_get_number(opts, "current_spe= ed", + 2000); return; case 11: qemu_opts_validate(opts, qemu_smbios_type11_opts, &err); diff --git a/qemu-options.hx b/qemu-options.hx index ac315c1ac4..bc9ef0fda8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2233,6 +2233,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, " specify SMBIOS type 3 fields\n" "-smbios type=3D4[,sock_pfx=3Dstr][,manufacturer=3Dstr][,version=3Dstr= ][,serial=3Dstr]\n" " [,asset=3Dstr][,part=3Dstr]\n" + " [,max_speed=3D%d][,current_speed=3D%d]\n" " specify SMBIOS type 4 fields\n" "-smbios type=3D17[,loc_pfx=3Dstr][,bank=3Dstr][,manufacturer=3Dstr][,= serial=3Dstr]\n" " [,asset=3Dstr][,part=3Dstr][,speed=3D%d]\n" @@ -2255,7 +2256,7 @@ Specify SMBIOS type 2 fields @item -smbios type=3D3[,manufacturer=3D@var{str}][,version=3D@var{str}][,s= erial=3D@var{str}][,asset=3D@var{str}][,sku=3D@var{str}] Specify SMBIOS type 3 fields =20 -@item -smbios type=3D4[,sock_pfx=3D@var{str}][,manufacturer=3D@var{str}][,= version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@var{= str}] +@item -smbios type=3D4[,sock_pfx=3D@var{str}][,manufacturer=3D@var{str}][,= version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@var{= str}][,max_speed=3D@var{%d}][,current_speed=3D@var{%d}] Specify SMBIOS type 4 fields =20 @item -smbios type=3D17[,loc_pfx=3D@var{str}][,bank=3D@var{str}][,manufact= urer=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@var{str= }][,speed=3D@var{%d}] --=20 2.19.1