9d3ce7cd74
- kvm-ui-clipboard-mark-type-as-not-available-when-there-i.patch [RHEL-19629] - kvm-ui-clipboard-add-asserts-for-update-and-request.patch [RHEL-19629] - kvm-hw-i386-pc-Defer-smbios_set_defaults-to-machine_done.patch [RHEL-21705] - kvm-Implement-base-of-SMBIOS-type-9-descriptor.patch [RHEL-21705] - kvm-Implement-SMBIOS-type-9-v2.6.patch [RHEL-21705] - kvm-smbios-cleanup-smbios_get_tables-from-legacy-handlin.patch [RHEL-21705] - kvm-smbios-get-rid-of-smbios_smp_sockets-global.patch [RHEL-21705] - kvm-smbios-get-rid-of-smbios_legacy-global.patch [RHEL-21705] - kvm-smbios-avoid-mangling-user-provided-tables.patch [RHEL-21705] - kvm-smbios-don-t-check-type4-structures-in-legacy-mode.patch [RHEL-21705] - kvm-smbios-add-smbios_add_usr_blob_size-helper.patch [RHEL-21705] - kvm-smbios-rename-expose-structures-bitmaps-used-by-both.patch [RHEL-21705] - kvm-smbios-build-legacy-mode-code-only-for-pc-machine.patch [RHEL-21705] - kvm-smbios-handle-errors-consistently.patch [RHEL-21705] - kvm-smbios-get-rid-of-global-smbios_ep_type.patch [RHEL-21705] - kvm-smbios-clear-smbios_type4_count-before-building-tabl.patch [RHEL-21705] - kvm-smbios-extend-smbios-entry-point-type-with-auto-valu.patch [RHEL-21705] - kvm-smbios-in-case-of-entry-point-is-auto-try-to-build-v.patch [RHEL-21705] - kvm-smbios-error-out-when-building-type-4-table-is-not-p.patch [RHEL-21705] - kvm-pc-q35-set-SMBIOS-entry-point-type-to-auto-by-defaul.patch [RHEL-21705] - Resolves: RHEL-19629 (CVE-2023-6683 qemu-kvm: QEMU: VNC: NULL pointer dereference in qemu_clipboard_request() [rhel-9]) - Resolves: RHEL-21705 (pc-q35-rhel9.4.0 does not provide proper computer information)
219 lines
7.1 KiB
Diff
219 lines
7.1 KiB
Diff
From 84fc607d678bd72397a41d706e91fa241fd97266 Mon Sep 17 00:00:00 2001
|
|
From: Igor Mammedov <imammedo@redhat.com>
|
|
Date: Wed, 21 Feb 2024 17:00:26 +0000
|
|
Subject: [PATCH 04/20] Implement base of SMBIOS type 9 descriptor.
|
|
|
|
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
|
RH-MergeRequest: 230: Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS
|
|
RH-Jira: RHEL-21705
|
|
RH-Acked-by: MST <mst@redhat.com>
|
|
RH-Acked-by: Ani Sinha <None>
|
|
RH-Commit: [2/18] 2678cc080bfbf3357fa2f94ceaf42fc61b690d32
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-21705
|
|
|
|
commit: 735eee07d1f963635d3c3bf9f5e4bf1bc000870e
|
|
Author: Felix Wu <flwu@google.com>
|
|
|
|
Version 2.1+.
|
|
|
|
Signed-off-by: Felix Wu <flwu@google.com>
|
|
Signed-off-by: Nabih Estefan <nabihestefan@google.com>
|
|
Message-Id: <20240221170027.1027325-2-nabihestefan@google.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
---
|
|
hw/smbios/smbios.c | 99 ++++++++++++++++++++++++++++++++++++
|
|
include/hw/firmware/smbios.h | 13 +++++
|
|
qemu-options.hx | 3 ++
|
|
3 files changed, 115 insertions(+)
|
|
|
|
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
|
|
index 7bde23e59d..4f5637d445 100644
|
|
--- a/hw/smbios/smbios.c
|
|
+++ b/hw/smbios/smbios.c
|
|
@@ -122,6 +122,16 @@ struct type8_instance {
|
|
};
|
|
static QTAILQ_HEAD(, type8_instance) type8 = QTAILQ_HEAD_INITIALIZER(type8);
|
|
|
|
+/* type 9 instance for parsing */
|
|
+struct type9_instance {
|
|
+ const char *slot_designation;
|
|
+ uint8_t slot_type, slot_data_bus_width, current_usage, slot_length,
|
|
+ slot_characteristics1, slot_characteristics2;
|
|
+ uint16_t slot_id;
|
|
+ QTAILQ_ENTRY(type9_instance) next;
|
|
+};
|
|
+static QTAILQ_HEAD(, type9_instance) type9 = QTAILQ_HEAD_INITIALIZER(type9);
|
|
+
|
|
static struct {
|
|
size_t nvalues;
|
|
char **values;
|
|
@@ -371,6 +381,54 @@ static const QemuOptDesc qemu_smbios_type8_opts[] = {
|
|
},
|
|
};
|
|
|
|
+static const QemuOptDesc qemu_smbios_type9_opts[] = {
|
|
+ {
|
|
+ .name = "type",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "SMBIOS element type",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_designation",
|
|
+ .type = QEMU_OPT_STRING,
|
|
+ .help = "string number for reference designation",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_type",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "connector type",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_data_bus_width",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "port type",
|
|
+ },
|
|
+ {
|
|
+ .name = "current_usage",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "current usage",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_length",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "system slot length",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_id",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "system slot id",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_characteristics1",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "slot characteristics1, see the spec",
|
|
+ },
|
|
+ {
|
|
+ .name = "slot_characteristics2",
|
|
+ .type = QEMU_OPT_NUMBER,
|
|
+ .help = "slot characteristics2, see the spec",
|
|
+ },
|
|
+};
|
|
+
|
|
static const QemuOptDesc qemu_smbios_type11_opts[] = {
|
|
{
|
|
.name = "value",
|
|
@@ -594,6 +652,7 @@ bool smbios_skip_table(uint8_t type, bool required_table)
|
|
#define T2_BASE 0x200
|
|
#define T3_BASE 0x300
|
|
#define T4_BASE 0x400
|
|
+#define T9_BASE 0x900
|
|
#define T11_BASE 0xe00
|
|
|
|
#define T16_BASE 0x1000
|
|
@@ -792,6 +851,28 @@ static void smbios_build_type_8_table(void)
|
|
}
|
|
}
|
|
|
|
+static void smbios_build_type_9_table(void)
|
|
+{
|
|
+ unsigned instance = 0;
|
|
+ struct type9_instance *t9;
|
|
+
|
|
+ QTAILQ_FOREACH(t9, &type9, next) {
|
|
+ SMBIOS_BUILD_TABLE_PRE(9, T9_BASE + instance, true);
|
|
+
|
|
+ SMBIOS_TABLE_SET_STR(9, slot_designation, t9->slot_designation);
|
|
+ t->slot_type = t9->slot_type;
|
|
+ t->slot_data_bus_width = t9->slot_data_bus_width;
|
|
+ t->current_usage = t9->current_usage;
|
|
+ t->slot_length = t9->slot_length;
|
|
+ t->slot_id = t9->slot_id;
|
|
+ t->slot_characteristics1 = t9->slot_characteristics1;
|
|
+ t->slot_characteristics2 = t9->slot_characteristics2;
|
|
+
|
|
+ SMBIOS_BUILD_TABLE_POST;
|
|
+ instance++;
|
|
+ }
|
|
+}
|
|
+
|
|
static void smbios_build_type_11_table(void)
|
|
{
|
|
char count_str[128];
|
|
@@ -1141,6 +1222,7 @@ void smbios_get_tables(MachineState *ms,
|
|
}
|
|
|
|
smbios_build_type_8_table();
|
|
+ smbios_build_type_9_table();
|
|
smbios_build_type_11_table();
|
|
|
|
#define MAX_DIMM_SZ (16 * GiB)
|
|
@@ -1472,6 +1554,23 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
|
|
t8_i->port_type = qemu_opt_get_number(opts, "port_type", 0);
|
|
QTAILQ_INSERT_TAIL(&type8, t8_i, next);
|
|
return;
|
|
+ case 9: {
|
|
+ if (!qemu_opts_validate(opts, qemu_smbios_type9_opts, errp)) {
|
|
+ return;
|
|
+ }
|
|
+ struct type9_instance *t;
|
|
+ t = g_new0(struct type9_instance, 1);
|
|
+ save_opt(&t->slot_designation, opts, "slot_designation");
|
|
+ t->slot_type = qemu_opt_get_number(opts, "slot_type", 0);
|
|
+ t->slot_data_bus_width = qemu_opt_get_number(opts, "slot_data_bus_width", 0);
|
|
+ t->current_usage = qemu_opt_get_number(opts, "current_usage", 0);
|
|
+ t->slot_length = qemu_opt_get_number(opts, "slot_length", 0);
|
|
+ t->slot_id = qemu_opt_get_number(opts, "slot_id", 0);
|
|
+ t->slot_characteristics1 = qemu_opt_get_number(opts, "slot_characteristics1", 0);
|
|
+ t->slot_characteristics2 = qemu_opt_get_number(opts, "slot_characteristics2", 0);
|
|
+ QTAILQ_INSERT_TAIL(&type9, t, next);
|
|
+ return;
|
|
+ }
|
|
case 11:
|
|
if (!qemu_opts_validate(opts, qemu_smbios_type11_opts, errp)) {
|
|
return;
|
|
diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h
|
|
index d24b3ccd32..6bbd5a4c20 100644
|
|
--- a/include/hw/firmware/smbios.h
|
|
+++ b/include/hw/firmware/smbios.h
|
|
@@ -211,6 +211,19 @@ struct smbios_type_8 {
|
|
uint8_t port_type;
|
|
} QEMU_PACKED;
|
|
|
|
+/* SMBIOS type 9 - System Slots (v2.1+) */
|
|
+struct smbios_type_9 {
|
|
+ struct smbios_structure_header header;
|
|
+ uint8_t slot_designation;
|
|
+ uint8_t slot_type;
|
|
+ uint8_t slot_data_bus_width;
|
|
+ uint8_t current_usage;
|
|
+ uint8_t slot_length;
|
|
+ uint16_t slot_id;
|
|
+ uint8_t slot_characteristics1;
|
|
+ uint8_t slot_characteristics2;
|
|
+} QEMU_PACKED;
|
|
+
|
|
/* SMBIOS type 11 - OEM strings */
|
|
struct smbios_type_11 {
|
|
struct smbios_structure_header header;
|
|
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
index 0814f43066..94cacc2c63 100644
|
|
--- a/qemu-options.hx
|
|
+++ b/qemu-options.hx
|
|
@@ -2710,6 +2710,9 @@ SRST
|
|
``-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str][,asset=str][,part=str][,processor-id=%d]``
|
|
Specify SMBIOS type 4 fields
|
|
|
|
+``-smbios type=9[,slot_designation=str][,slot_type=%d][,slot_data_bus_width=%d][,current_usage=%d][,slot_length=%d][,slot_id=%d][,slot_characteristics1=%d][,slot_characteristics12=%d]``
|
|
+ Specify SMBIOS type 9 fields
|
|
+
|
|
``-smbios type=11[,value=str][,path=filename]``
|
|
Specify SMBIOS type 11 fields
|
|
|
|
--
|
|
2.39.3
|
|
|