Commit 351a6a73 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin

smbios: Normalize smbios_entry_add()'s error handling to exit(1)

It exits on all error conditions but one, where it returns -1.
Normalize, and return void.
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 702d66a8
...@@ -1137,9 +1137,7 @@ void do_acpitable_option(const QemuOpts *opts) ...@@ -1137,9 +1137,7 @@ void do_acpitable_option(const QemuOpts *opts)
void do_smbios_option(const char *optarg) void do_smbios_option(const char *optarg)
{ {
#ifdef TARGET_I386 #ifdef TARGET_I386
if (smbios_entry_add(optarg) < 0) { smbios_entry_add(optarg);
exit(1);
}
#endif #endif
} }
......
...@@ -183,7 +183,7 @@ static void smbios_build_type_1_fields(const char *t) ...@@ -183,7 +183,7 @@ static void smbios_build_type_1_fields(const char *t)
buf, strlen(buf) + 1); buf, strlen(buf) + 1);
} }
int smbios_entry_add(const char *t) void smbios_entry_add(const char *t)
{ {
char buf[1024]; char buf[1024];
...@@ -222,7 +222,7 @@ int smbios_entry_add(const char *t) ...@@ -222,7 +222,7 @@ int smbios_entry_add(const char *t)
smbios_entries_len += sizeof(*table) + size; smbios_entries_len += sizeof(*table) + size;
(*(uint16_t *)smbios_entries) = (*(uint16_t *)smbios_entries) =
cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1); cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1);
return 0; return;
} }
if (get_param_value(buf, sizeof(buf), "type", t)) { if (get_param_value(buf, sizeof(buf), "type", t)) {
...@@ -230,10 +230,10 @@ int smbios_entry_add(const char *t) ...@@ -230,10 +230,10 @@ int smbios_entry_add(const char *t)
switch (type) { switch (type) {
case 0: case 0:
smbios_build_type_0_fields(t); smbios_build_type_0_fields(t);
return 0; return;
case 1: case 1:
smbios_build_type_1_fields(t); smbios_build_type_1_fields(t);
return 0; return;
default: default:
error_report("Don't know how to build fields for SMBIOS type %ld", error_report("Don't know how to build fields for SMBIOS type %ld",
type); type);
...@@ -242,5 +242,5 @@ int smbios_entry_add(const char *t) ...@@ -242,5 +242,5 @@ int smbios_entry_add(const char *t)
} }
error_report("Must specify type= or file="); error_report("Must specify type= or file=");
return -1; exit(1);
} }
...@@ -13,7 +13,7 @@ ...@@ -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); void smbios_add_field(int type, int offset, const void *data, size_t len);
uint8_t *smbios_get_table(size_t *length); uint8_t *smbios_get_table(size_t *length);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment