|
 |
218e99 |
From d2bfd3e4bb4a6115dc40b56e885a68887df30f94 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Date: Sat, 2 Nov 2013 10:01:20 +0100
|
|
|
218e99 |
Subject: [PATCH 20/29] smbios: Normalize smbios_entry_add()'s error handling to exit(1)
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Message-id: <1383386488-29789-4-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55241
|
|
|
218e99 |
O-Subject: [PATCH 7.0 qemu-kvm 03/11] smbios: Normalize smbios_entry_add()'s error handling to exit(1)
|
|
|
218e99 |
Bugzilla: 994490
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
It exits on all error conditions but one, where it returns -1.
|
|
|
218e99 |
Normalize, and return void.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
(cherry picked from commit 351a6a73ca7a9123f0dfd6c6f85fd01e82fe3741)
|
|
|
218e99 |
---
|
|
|
218e99 |
arch_init.c | 4 +---
|
|
|
218e99 |
hw/i386/smbios.c | 10 +++++-----
|
|
|
218e99 |
include/hw/i386/smbios.h | 2 +-
|
|
|
218e99 |
3 files changed, 7 insertions(+), 9 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
arch_init.c | 4 +---
|
|
|
218e99 |
hw/i386/smbios.c | 10 +++++-----
|
|
|
218e99 |
include/hw/i386/smbios.h | 2 +-
|
|
|
218e99 |
3 files changed, 7 insertions(+), 9 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/arch_init.c b/arch_init.c
|
|
|
218e99 |
index cd2bb5a..7834d36 100644
|
|
|
218e99 |
--- a/arch_init.c
|
|
|
218e99 |
+++ b/arch_init.c
|
|
|
218e99 |
@@ -1080,9 +1080,7 @@ void do_acpitable_option(const QemuOpts *opts)
|
|
|
218e99 |
void do_smbios_option(const char *optarg)
|
|
|
218e99 |
{
|
|
|
218e99 |
#ifdef TARGET_I386
|
|
|
218e99 |
- if (smbios_entry_add(optarg) < 0) {
|
|
|
218e99 |
- exit(1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ smbios_entry_add(optarg);
|
|
|
218e99 |
#endif
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
|
|
|
218e99 |
index e708cb8..0608aee 100644
|
|
|
218e99 |
--- a/hw/i386/smbios.c
|
|
|
218e99 |
+++ b/hw/i386/smbios.c
|
|
|
218e99 |
@@ -183,7 +183,7 @@ static void smbios_build_type_1_fields(const char *t)
|
|
|
218e99 |
buf, strlen(buf) + 1);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
-int smbios_entry_add(const char *t)
|
|
|
218e99 |
+void smbios_entry_add(const char *t)
|
|
|
218e99 |
{
|
|
|
218e99 |
char buf[1024];
|
|
|
218e99 |
|
|
|
218e99 |
@@ -222,7 +222,7 @@ int smbios_entry_add(const char *t)
|
|
|
218e99 |
smbios_entries_len += sizeof(*table) + size;
|
|
|
218e99 |
(*(uint16_t *)smbios_entries) =
|
|
|
218e99 |
cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1);
|
|
|
218e99 |
- return 0;
|
|
|
218e99 |
+ return;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
if (get_param_value(buf, sizeof(buf), "type", t)) {
|
|
|
218e99 |
@@ -230,10 +230,10 @@ int smbios_entry_add(const char *t)
|
|
|
218e99 |
switch (type) {
|
|
|
218e99 |
case 0:
|
|
|
218e99 |
smbios_build_type_0_fields(t);
|
|
|
218e99 |
- return 0;
|
|
|
218e99 |
+ return;
|
|
|
218e99 |
case 1:
|
|
|
218e99 |
smbios_build_type_1_fields(t);
|
|
|
218e99 |
- return 0;
|
|
|
218e99 |
+ return;
|
|
|
218e99 |
default:
|
|
|
218e99 |
error_report("Don't know how to build fields for SMBIOS type %ld",
|
|
|
218e99 |
type);
|
|
|
218e99 |
@@ -242,5 +242,5 @@ int smbios_entry_add(const char *t)
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
error_report("Must specify type= or file=");
|
|
|
218e99 |
- return -1;
|
|
|
218e99 |
+ exit(1);
|
|
|
218e99 |
}
|
|
|
218e99 |
diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h
|
|
|
218e99 |
index 9babeaf..56c6108 100644
|
|
|
218e99 |
--- a/include/hw/i386/smbios.h
|
|
|
218e99 |
+++ b/include/hw/i386/smbios.h
|
|
|
218e99 |
@@ -13,7 +13,7 @@
|
|
|
218e99 |
*
|
|
|
218e99 |
*/
|
|
|
218e99 |
|
|
|
218e99 |
-int smbios_entry_add(const char *t);
|
|
|
218e99 |
+void smbios_entry_add(const char *t);
|
|
|
218e99 |
void smbios_add_field(int type, int offset, const void *data, size_t len);
|
|
|
218e99 |
uint8_t *smbios_get_table(size_t *length);
|
|
|
218e99 |
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|