[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error h
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error handling to exit(1) |
Date: |
Sun, 29 Sep 2013 10:00:13 +0300 |
From: Markus Armbruster <address@hidden>
It exits on all error conditions but one, where it returns -1.
Normalize, and return void.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/smbios.h | 2 +-
arch_init.c | 4 +---
hw/i386/smbios.c | 10 +++++-----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h
index 9babeaf..56c6108 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);
diff --git a/arch_init.c b/arch_init.c
index e47e139..6ae8eb6 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 e708cb8..0608aee 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);
}
--
MST
- [Qemu-devel] [PULL 00/14] pc,pci,virtio fixes and cleanups, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 01/14] q35: make pci window address/size match guest cfg, Michael S. Tsirkin, 2013/09/29
- [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 <=
- [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, 2013/09/29
- [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