From patchwork Wed May 29 22:08:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 247410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1133F2C038E for ; Thu, 30 May 2013 08:13:17 +1000 (EST) Received: from localhost ([::1]:56299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhocM-0001Dy-TG for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 18:13:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYL-0002vY-G3 for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhoYF-0004Wn-64 for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:05 -0400 Received: from vms173023pub.verizon.net ([206.46.173.23]:37477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYF-0004Sz-1M for qemu-devel@nongnu.org; Wed, 29 May 2013 18:08:59 -0400 Received: from wf-rch.minyard.home ([unknown] [173.74.121.95]) by vms173023.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MNK0051YYUBPC10@vms173023.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 29 May 2013 17:08:38 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id EBC121F909; Wed, 29 May 2013 17:08:27 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 9FC757FD97; Wed, 29 May 2013 17:08:29 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 29 May 2013 17:08:15 -0500 Message-id: <1369865296-19584-20-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1369865296-19584-1-git-send-email-minyard@acm.org> References: <1369865296-19584-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.23 Cc: Corey Minyard , openipmi-developer@lists.sourceforge.net Subject: [Qemu-devel] [PATCH 19/20] smbios: Add a function to directly add an entry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Corey Minyard There was no way to directly add a table entry to the SMBIOS table, even though the BIOS supports this. So add a function to do this. This is in preparation for the IPMI handler adding it's SMBIOS table entry. Signed-off-by: Corey Minyard --- hw/i386/smbios.c | 27 +++++++++++++++++++++++++++ include/hw/i386/smbios.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index c00bb2f..c268f2a 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -178,6 +178,33 @@ static void smbios_build_type_1_fields(const char *t) strlen(buf) + 1, buf); } +int smbios_table_entry_add(struct smbios_structure_header *entry) +{ + struct smbios_table *table; + struct smbios_structure_header *header; + unsigned int size = entry->length; + + if (!smbios_entries) { + smbios_entries_len = sizeof(uint16_t); + smbios_entries = g_malloc0(smbios_entries_len); + } + smbios_entries = g_realloc(smbios_entries, smbios_entries_len + + sizeof(*table) + size); + table = (struct smbios_table *)(smbios_entries + smbios_entries_len); + table->header.type = SMBIOS_TABLE_ENTRY; + table->header.length = cpu_to_le16(sizeof(*table) + size); + + header = (struct smbios_structure_header *)(table->data); + memcpy(header, entry, size); + + smbios_check_collision(header->type, SMBIOS_TABLE_ENTRY); + + smbios_entries_len += sizeof(*table) + size; + (*(uint16_t *)smbios_entries) = + cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1); + return 0; +} + int smbios_entry_add(const char *t) { char buf[1024]; diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 94e3641..d92fa88 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -28,6 +28,8 @@ struct smbios_structure_header { uint16_t handle; } QEMU_PACKED; +int smbios_table_entry_add(struct smbios_structure_header *entry); + /* SMBIOS type 0 - BIOS Information */ struct smbios_type_0 { struct smbios_structure_header header;