[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/14] smbios: Improve diagnostics for conflicting en
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/14] smbios: Improve diagnostics for conflicting entries |
Date: |
Sun, 29 Sep 2013 10:00:19 +0300 |
From: Markus Armbruster <address@hidden>
We allow either tables or fields for the same type. Makes sense,
because SeaBIOS uses fields only when no tables are present.
We do this by searching the SMBIOS blob for a previously added table
or field. Error messages look like this:
qemu-system-x86_64: -smbios type=1,serial=42: SMBIOS type 1 table already
defined, cannot add field
User needs to know that "table" is defined by -smbios file=..., and
"field" by -smbios type=...
Instead of searching the blob, record additions of interest, and check
that. Simpler, and makes better error messages possible:
qemu-system-x86_64: -smbios file=smbios_type_1.bin: Can't mix file= and
type= for same type
qemu-system-x86_64: -smbios type=1,serial=42,serial=99: This is the
conflicting setting
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/smbios.c | 43 +++++++++++++++++--------------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index abfd6f7..4263551 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -48,6 +48,12 @@ static uint8_t *smbios_entries;
static size_t smbios_entries_len;
static int smbios_type4_count = 0;
+static struct {
+ bool seen;
+ int headertype;
+ Location loc;
+} first_opt[2];
+
static QemuOptsList qemu_smbios_opts = {
.name = "smbios",
.head = QTAILQ_HEAD_INITIALIZER(qemu_smbios_opts.head),
@@ -159,35 +165,20 @@ uint8_t *smbios_get_table(size_t *length)
*/
static void smbios_check_collision(int type, int entry)
{
- uint16_t *num_entries = (uint16_t *)smbios_entries;
- struct smbios_header *header;
- char *p;
- int i;
-
- if (!num_entries)
- return;
-
- p = (char *)(num_entries + 1);
-
- for (i = 0; i < *num_entries; i++) {
- header = (struct smbios_header *)p;
- if (entry == SMBIOS_TABLE_ENTRY && header->type == SMBIOS_FIELD_ENTRY)
{
- struct smbios_field *field = (void *)header;
- if (type == field->type) {
- error_report("SMBIOS type %d field already defined, "
- "cannot add table", type);
- exit(1);
- }
- } else if (entry == SMBIOS_FIELD_ENTRY &&
- header->type == SMBIOS_TABLE_ENTRY) {
- struct smbios_structure_header *table = (void *)(header + 1);
- if (type == table->type) {
- error_report("SMBIOS type %d table already defined, "
- "cannot add field", type);
+ if (type < ARRAY_SIZE(first_opt)) {
+ if (first_opt[type].seen) {
+ if (first_opt[type].headertype != entry) {
+ error_report("Can't mix file= and type= for same type");
+ loc_push_restore(&first_opt[type].loc);
+ error_report("This is the conflicting setting");
+ loc_pop(&first_opt[type].loc);
exit(1);
}
+ } else {
+ first_opt[type].seen = true;
+ first_opt[type].headertype = entry;
+ loc_save(&first_opt[type].loc);
}
- p += le16_to_cpu(header->length);
}
}
--
MST
- [Qemu-devel] [PULL 02/14] range: add Range to typedefs, (continued)
- [Qemu-devel] [PULL 02/14] range: add Range to typedefs, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 03/14] range: add min/max operations on ranges, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 04/14] pci: add helper to retrieve the 64-bit range, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 05/14] q35: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 07/14] piix4: disable io on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 06/14] piix: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 08/14] pci: remove explicit check to 64K ioport size, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 09/14] virtio-net: fix up HMP NIC info string on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error handling to exit(1), Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 11/14] smbios: Convert to QemuOpts, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 12/14] smbios: Improve diagnostics for conflicting entries,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 13/14] smbios: Make multiple -smbios type= accumulate sanely, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 14/14] smbios: Factor out smbios_maybe_add_str(), Michael S. Tsirkin, 2013/09/29