Skip to content

Commit

Permalink
smbios: Normalize smbios_entry_add()'s error handling to exit(1)
Browse files Browse the repository at this point in the history
It exits on all error conditions but one, where it returns -1.
Normalize, and return void.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Markus Armbruster authored and mstsirkin committed Sep 28, 2013
1 parent 702d66a commit 351a6a7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 1 addition & 3 deletions arch_init.c
Expand Up @@ -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
}

Expand Down
10 changes: 5 additions & 5 deletions hw/i386/smbios.c
Expand Up @@ -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];

Expand Down Expand Up @@ -222,18 +222,18 @@ 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)) {
unsigned long type = strtoul(buf, NULL, 0);
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);
Expand All @@ -242,5 +242,5 @@ int smbios_entry_add(const char *t)
}

error_report("Must specify type= or file=");
return -1;
exit(1);
}
2 changes: 1 addition & 1 deletion include/hw/i386/smbios.h
Expand Up @@ -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);

Expand Down

0 comments on commit 351a6a7

Please sign in to comment.