From patchwork Mon Apr 15 20:47:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 236722 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 249A12C00E5 for ; Tue, 16 Apr 2013 06:46:52 +1000 (EST) Received: from localhost ([::1]:37624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URqIc-0004kR-B5 for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 16:46:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URqHc-0003yy-7C for qemu-devel@nongnu.org; Mon, 15 Apr 2013 16:45:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URqHX-0004d4-DV for qemu-devel@nongnu.org; Mon, 15 Apr 2013 16:45:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URqHX-0004cu-4n for qemu-devel@nongnu.org; Mon, 15 Apr 2013 16:45:43 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3FKjgsd030832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Apr 2013 16:45:42 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn1-4-113.ams2.redhat.com [10.36.4.113]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3FKjb5c030093; Mon, 15 Apr 2013 16:45:41 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, mst@redhat.com Date: Mon, 15 Apr 2013 22:47:48 +0200 Message-Id: <1366058872-11196-4-git-send-email-lersek@redhat.com> In-Reply-To: <1366058872-11196-1-git-send-email-lersek@redhat.com> References: <1366058872-11196-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/7] hw/acpi: extract standard table headers as a standalone structure 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 This enables reuse when preparing per-table fw_cfg blobs later. Signed-off-by: Laszlo Ersek --- include/hw/acpi/acpi.h | 11 +++++++++++ hw/acpi/core.c | 48 +++++++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 635be7b..0e26f63 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -167,4 +167,15 @@ extern size_t acpi_tables_len; void acpi_table_add(const QemuOpts *opts, Error **errp); +typedef struct acpi_table_std_header { + char sig[4]; /* ACPI signature (4 ASCII characters) */ + uint32_t length; /* Length of table, in bytes, including header */ + uint8_t revision; /* ACPI Specification minor version # */ + uint8_t checksum; /* To make sum of entire table == 0 */ + char oem_id[6]; /* OEM identification */ + char oem_table_id[8]; /* OEM table identification */ + uint32_t oem_revision; /* OEM revision number */ + char asl_compiler_id[4]; /* ASL compiler vendor ID */ + uint32_t asl_compiler_revision; /* ASL compiler revision number */ +} QEMU_PACKED AcpiTableStdHdr; #endif /* !QEMU_HW_ACPI_H */ diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 69cadb0..d348f81 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -31,21 +31,13 @@ struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ /* allows easier parsing for fw_cfg clients */ - char sig[4]; /* ACPI signature (4 ASCII characters) */ - uint32_t length; /* Length of table, in bytes, including header */ - uint8_t revision; /* ACPI Specification minor version # */ - uint8_t checksum; /* To make sum of entire table == 0 */ - char oem_id[6]; /* OEM identification */ - char oem_table_id[8]; /* OEM table identification */ - uint32_t oem_revision; /* OEM revision number */ - char asl_compiler_id[4]; /* ASL compiler vendor ID */ - uint32_t asl_compiler_revision; /* ASL compiler revision number */ + AcpiTableStdHdr std; } QEMU_PACKED; -#define ACPI_TABLE_HDR_SIZE sizeof(struct acpi_table_header) -#define ACPI_TABLE_PFX_SIZE sizeof(uint16_t) /* size of the extra prefix */ +/* size of the extra prefix */ +#define ACPI_TABLE_PFX_SIZE offsetof(struct acpi_table_header, std) -static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - ACPI_TABLE_PFX_SIZE] = +static const char unsigned dfl_hdr[sizeof(AcpiTableStdHdr)] = "QEMU\0\0\0\0\1\0" /* sig (4), len(4), revno (1), csum (1) */ "QEMUQEQEMUQEMU\1\0\0\0" /* OEM id (6), table (8), revno (4) */ "QEMU\1\0\0\0" /* ASL compiler ID (4), version (4) */ @@ -105,6 +97,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, size_t body_size, acpi_payload_size; struct acpi_table_header *ext_hdr; unsigned changed_fields; + AcpiTableStdHdr *std; /* Calculate where the ACPI table body starts within the blob, plus where * to copy the ACPI table header from. @@ -177,46 +170,47 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, changed_fields = 0; ext_hdr->_length = cpu_to_le16(acpi_payload_size); + std = &ext_hdr->std; if (hdrs->has_sig) { - strncpy(ext_hdr->sig, hdrs->sig, sizeof ext_hdr->sig); + strncpy(std->sig, hdrs->sig, sizeof std->sig); ++changed_fields; } - if (has_header && le32_to_cpu(ext_hdr->length) != acpi_payload_size) { + if (has_header && le32_to_cpu(std->length) != acpi_payload_size) { fprintf(stderr, "warning: ACPI table has wrong length, header says " "%" PRIu32 ", actual size %zu bytes\n", - le32_to_cpu(ext_hdr->length), acpi_payload_size); + le32_to_cpu(std->length), acpi_payload_size); } - ext_hdr->length = cpu_to_le32(acpi_payload_size); + std->length = cpu_to_le32(acpi_payload_size); if (hdrs->has_rev) { - ext_hdr->revision = hdrs->rev; + std->revision = hdrs->rev; ++changed_fields; } - ext_hdr->checksum = 0; + std->checksum = 0; if (hdrs->has_oem_id) { - strncpy(ext_hdr->oem_id, hdrs->oem_id, sizeof ext_hdr->oem_id); + strncpy(std->oem_id, hdrs->oem_id, sizeof std->oem_id); ++changed_fields; } if (hdrs->has_oem_table_id) { - strncpy(ext_hdr->oem_table_id, hdrs->oem_table_id, - sizeof ext_hdr->oem_table_id); + strncpy(std->oem_table_id, hdrs->oem_table_id, + sizeof std->oem_table_id); ++changed_fields; } if (hdrs->has_oem_rev) { - ext_hdr->oem_revision = cpu_to_le32(hdrs->oem_rev); + std->oem_revision = cpu_to_le32(hdrs->oem_rev); ++changed_fields; } if (hdrs->has_asl_compiler_id) { - strncpy(ext_hdr->asl_compiler_id, hdrs->asl_compiler_id, - sizeof ext_hdr->asl_compiler_id); + strncpy(std->asl_compiler_id, hdrs->asl_compiler_id, + sizeof std->asl_compiler_id); ++changed_fields; } if (hdrs->has_asl_compiler_rev) { - ext_hdr->asl_compiler_revision = cpu_to_le32(hdrs->asl_compiler_rev); + std->asl_compiler_revision = cpu_to_le32(hdrs->asl_compiler_rev); ++changed_fields; } @@ -225,8 +219,8 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, } /* recalculate checksum */ - ext_hdr->checksum = acpi_checksum((const char unsigned *)ext_hdr + - ACPI_TABLE_PFX_SIZE, acpi_payload_size); + std->checksum = acpi_checksum((const char unsigned *)std, + acpi_payload_size); } void acpi_table_add(const QemuOpts *opts, Error **errp)