summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch_init.c4
-rw-r--r--hw/i386/smbios.c10
-rw-r--r--include/hw/i386/smbios.h2
3 files changed, 7 insertions, 9 deletions
diff --git a/arch_init.c b/arch_init.c
index e47e1399bb..6ae8eb6340 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -1137,9 +1137,7 @@ void do_acpitable_option(const QemuOpts *opts)
void do_smbios_option(const char *optarg)
{
#ifdef TARGET_I386
- if (smbios_entry_add(optarg) < 0) {
- exit(1);
- }
+ smbios_entry_add(optarg);
#endif
}
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index e708cb8919..0608aee3db 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -183,7 +183,7 @@ static void smbios_build_type_1_fields(const char *t)
buf, strlen(buf) + 1);
}
-int smbios_entry_add(const char *t)
+void smbios_entry_add(const char *t)
{
char buf[1024];
@@ -222,7 +222,7 @@ int smbios_entry_add(const char *t)
smbios_entries_len += sizeof(*table) + size;
(*(uint16_t *)smbios_entries) =
cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1);
- return 0;
+ return;
}
if (get_param_value(buf, sizeof(buf), "type", t)) {
@@ -230,10 +230,10 @@ int smbios_entry_add(const char *t)
switch (type) {
case 0:
smbios_build_type_0_fields(t);
- return 0;
+ return;
case 1:
smbios_build_type_1_fields(t);
- return 0;
+ return;
default:
error_report("Don't know how to build fields for SMBIOS type %ld",
type);
@@ -242,5 +242,5 @@ int smbios_entry_add(const char *t)
}
error_report("Must specify type= or file=");
- return -1;
+ exit(1);
}
diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h
index 9babeaf270..56c6108848 100644
--- a/include/hw/i386/smbios.h
+++ b/include/hw/i386/smbios.h
@@ -13,7 +13,7 @@
*
*/
-int smbios_entry_add(const char *t);
+void smbios_entry_add(const char *t);
void smbios_add_field(int type, int offset, const void *data, size_t len);
uint8_t *smbios_get_table(size_t *length);