From patchwork Thu Jul 19 18:53:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 172040 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 3411C2C0331 for ; Fri, 20 Jul 2012 05:28:15 +1000 (EST) Received: from localhost ([::1]:34249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrvsW-0001aO-NQ for incoming@patchwork.ozlabs.org; Thu, 19 Jul 2012 14:55:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrk-0007mS-QY for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Srvrh-0008D6-Vd for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:24 -0400 Received: from vms173003pub.verizon.net ([206.46.173.3]:25847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrh-0008Cm-QN for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:21 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M7F009H38HFFBXA@vms173003.mailsrvcs.net> for qemu-devel@nongnu.org; Thu, 19 Jul 2012 13:53:49 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 2A3C91F945; Thu, 19 Jul 2012 13:53:36 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 5F9EE7FE39; Thu, 19 Jul 2012 13:53:34 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2012 13:53:16 -0500 Message-id: <1342724013-1633-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1342724013-1633-1-git-send-email-minyard@acm.org> References: <1342724013-1633-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.3 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 01/18] 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/smbios.c | 27 +++++++++++++++++++++++++++ hw/smbios.h | 15 ++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/hw/smbios.c b/hw/smbios.c index c57237d..c0c1be1 100644 --- a/hw/smbios.c +++ b/hw/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/hw/smbios.h b/hw/smbios.h index 94e3641..6431a15 100644 --- a/hw/smbios.h +++ b/hw/smbios.h @@ -13,21 +13,22 @@ * */ +/* This goes at the beginning of every SMBIOS structure. */ +struct smbios_structure_header { + uint8_t type; + uint8_t length; + uint16_t handle; +} QEMU_PACKED; + int smbios_entry_add(const char *t); void smbios_add_field(int type, int offset, int len, void *data); uint8_t *smbios_get_table(size_t *length); +int smbios_table_entry_add(struct smbios_structure_header *entry); /* * SMBIOS spec defined tables */ -/* This goes at the beginning of every SMBIOS structure. */ -struct smbios_structure_header { - uint8_t type; - uint8_t length; - uint16_t handle; -} QEMU_PACKED; - /* SMBIOS type 0 - BIOS Information */ struct smbios_type_0 { struct smbios_structure_header header;