[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/24] smbios: add max speed comdline option for type
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 17/24] smbios: add max speed comdline option for type-17 (meory device) structure |
Date: |
Thu, 19 Mar 2015 12:05:35 +0300 |
From: "Gabriel L. Somlo" <address@hidden>
Signed-off-by: Gabriel Somlo <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/i386/smbios.c | 10 ++++++++--
qemu-options.hx | 4 ++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index f2e9ab6..1341e02 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -91,6 +91,7 @@ static struct {
static struct {
const char *loc_pfx, *bank, *manufacturer, *serial, *asset, *part;
+ uint16_t speed;
} type17;
static QemuOptsList qemu_smbios_opts = {
@@ -304,6 +305,10 @@ static const QemuOptDesc qemu_smbios_type17_opts[] = {
.name = "part",
.type = QEMU_OPT_STRING,
.help = "part number",
+ },{
+ .name = "speed",
+ .type = QEMU_OPT_NUMBER,
+ .help = "maximum capable speed",
},
{ /* end of list */ }
};
@@ -697,13 +702,13 @@ static void smbios_build_type_17_table(unsigned instance,
uint64_t size)
SMBIOS_TABLE_SET_STR(17, bank_locator_str, type17.bank);
t->memory_type = 0x07; /* RAM */
t->type_detail = cpu_to_le16(0x02); /* Other */
- t->speed = cpu_to_le16(0); /* Unknown */
+ t->speed = cpu_to_le16(type17.speed);
SMBIOS_TABLE_SET_STR(17, manufacturer_str, type17.manufacturer);
SMBIOS_TABLE_SET_STR(17, serial_number_str, type17.serial);
SMBIOS_TABLE_SET_STR(17, asset_tag_number_str, type17.asset);
SMBIOS_TABLE_SET_STR(17, part_number_str, type17.part);
t->attributes = 0; /* Unknown */
- t->configured_clock_speed = cpu_to_le16(0); /* Unknown */
+ t->configured_clock_speed = t->speed; /* reuse value for max speed */
t->minimum_voltage = cpu_to_le16(0); /* Unknown */
t->maximum_voltage = cpu_to_le16(0); /* Unknown */
t->configured_voltage = cpu_to_le16(0); /* Unknown */
@@ -1083,6 +1088,7 @@ void smbios_entry_add(QemuOpts *opts)
save_opt(&type17.serial, opts, "serial");
save_opt(&type17.asset, opts, "asset");
save_opt(&type17.part, opts, "part");
+ type17.speed = qemu_opt_get_number(opts, "speed", 0);
return;
default:
error_report("Don't know how to build fields for SMBIOS type %ld",
diff --git a/qemu-options.hx b/qemu-options.hx
index c513352..16ff72c 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1403,7 +1403,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
" [,asset=str][,part=str]\n"
" specify SMBIOS type 4 fields\n"
"-smbios
type=17[,loc_pfx=str][,bank=str][,manufacturer=str][,serial=str]\n"
- " [,asset=str][,part=str]\n"
+ " [,asset=str][,part=str][,speed=%d]\n"
" specify SMBIOS type 17 fields\n",
QEMU_ARCH_I386)
STEXI
@@ -1426,7 +1426,7 @@ Specify SMBIOS type 3 fields
@item -smbios
type=4[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
Specify SMBIOS type 4 fields
address@hidden -smbios
type=17[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -smbios
type=17[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
Specify SMBIOS type 17 fields
ETEXI
--
2.1.4
- [Qemu-devel] [PULL 20/24] Fix typos in comments, (continued)
- [Qemu-devel] [PULL 20/24] Fix typos in comments, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 12/24] qmp: Drop unused .user_print from command definitions, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 08/24] Fix remaining warnings from Sparse (void return), Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 06/24] target-mips: Fix warning from Sparse, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 01/24] cris: remove unused cris_cond15 declarations, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 10/24] target-moxie: Fix warnings from Sparse (one-bit signed bitfield), Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 19/24] qtest/ahci: Fix a bit mask expression, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 05/24] arm/nseries: Fix warnings from Sparse, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 22/24] elf-loader: Fix truncation warning from coverity, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 02/24] backends: Fix warning from Sparse, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 17/24] smbios: add max speed comdline option for type-17 (meory device) structure,
Michael Tokarev <=
- [Qemu-devel] [PULL 04/24] omap: Fix warnings from Sparse, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 13/24] arm: fix memory leak, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 23/24] elf-loader: Add missing error handling for call of lseek, Michael Tokarev, 2015/03/19
- [Qemu-devel] [PULL 11/24] hmp: Fix definition of command quit, Michael Tokarev, 2015/03/19
- Re: [Qemu-devel] [PULL 00/24] Trivial patches for 2015-03-19, Peter Maydell, 2015/03/19