From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQAx6-0006LC-Ml for qemu-devel@nongnu.org; Sun, 29 Sep 2013 02:58:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQAx0-0002Vj-O2 for qemu-devel@nongnu.org; Sun, 29 Sep 2013 02:58:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQAx0-0002Vd-EF for qemu-devel@nongnu.org; Sun, 29 Sep 2013 02:57:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8T6vrAu004671 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 29 Sep 2013 02:57:53 -0400 Date: Sun, 29 Sep 2013 10:00:13 +0300 From: "Michael S. Tsirkin" Message-ID: <1380437951-21788-11-git-send-email-mst@redhat.com> References: <1380437951-21788-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1380437951-21788-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error handling to exit(1) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster From: Markus Armbruster It exits on all error conditions but one, where it returns -1. Normalize, and return void. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Michael S. Tsirkin --- 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