From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <ani@anisinha.ca>,
Peter Maydell <peter.maydell@linaro.org>,
Eric Auger <eric.auger@redhat.com>,
Igor Mammedov <imammedo@redhat.com>
Subject: [PULL 48/57] acpi: remove no longer used build_header()
Date: Tue, 5 Oct 2021 12:04:14 -0400 [thread overview]
Message-ID: <20211005155946.513818-49-mst@redhat.com> (raw)
In-Reply-To: <20211005155946.513818-1-mst@redhat.com>
From: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Message-Id: <20210924122802.1455362-35-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/acpi/acpi-defs.h | 25 -------------------------
include/hw/acpi/aml-build.h | 4 ----
hw/acpi/aml-build.c | 23 -----------------------
3 files changed, 52 deletions(-)
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 1a0774edd6..ee733840aa 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -48,31 +48,6 @@ typedef struct AcpiRsdpData {
unsigned *xsdt_tbl_offset;
} AcpiRsdpData;
-/* Table structure from Linux kernel (the ACPI tables are under the
- BSD license) */
-
-
-#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \
- uint32_t signature; /* 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 */ \
- uint8_t oem_id[6] \
- QEMU_NONSTRING; /* OEM identification */ \
- uint8_t oem_table_id[8] \
- QEMU_NONSTRING; /* OEM table identification */ \
- uint32_t oem_revision; /* OEM revision number */ \
- uint8_t asl_compiler_id[4] \
- QEMU_NONSTRING; /* ASL compiler vendor ID */ \
- uint32_t asl_compiler_revision; /* ASL compiler revision number */
-
-
-/* ACPI common table header */
-struct AcpiTableHeader {
- ACPI_TABLE_HEADER_DEF
-} QEMU_PACKED;
-typedef struct AcpiTableHeader AcpiTableHeader;
-
struct AcpiGenericAddress {
uint8_t space_id; /* Address space where struct or register exists */
uint8_t bit_width; /* Size in bits of given register */
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6e1f42e119..3cf6f2c1b9 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -444,10 +444,6 @@ void acpi_table_begin(AcpiTable *desc, GArray *array);
*/
void acpi_table_end(BIOSLinker *linker, AcpiTable *table);
-void
-build_header(BIOSLinker *linker, GArray *table_data,
- AcpiTableHeader *h, const char *sig, int len, uint8_t rev,
- const char *oem_id, const char *oem_table_id);
void *acpi_data_push(GArray *table_data, unsigned size);
unsigned acpi_data_len(GArray *table);
void acpi_add_table(GArray *table_offsets, GArray *table_data);
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index c0f339847a..76af0ebaf9 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1754,29 +1754,6 @@ void acpi_table_end(BIOSLinker *linker, AcpiTable *desc)
desc->table_offset, table_len, desc->table_offset + checksum_offset);
}
-void
-build_header(BIOSLinker *linker, GArray *table_data,
- AcpiTableHeader *h, const char *sig, int len, uint8_t rev,
- const char *oem_id, const char *oem_table_id)
-{
- unsigned tbl_offset = (char *)h - table_data->data;
- unsigned checksum_offset = (char *)&h->checksum - table_data->data;
- memcpy(&h->signature, sig, 4);
- h->length = cpu_to_le32(len);
- h->revision = rev;
-
- strpadcpy((char *)h->oem_id, sizeof h->oem_id, oem_id, ' ');
- strpadcpy((char *)h->oem_table_id, sizeof h->oem_table_id,
- oem_table_id, ' ');
-
- h->oem_revision = cpu_to_le32(1);
- memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME8, 4);
- h->asl_compiler_revision = cpu_to_le32(1);
- /* Checksum to be filled in by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
- tbl_offset, len, checksum_offset);
-}
-
void *acpi_data_push(GArray *table_data, unsigned size)
{
unsigned off = table_data->len;
--
MST
next prev parent reply other threads:[~2021-10-05 16:49 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 16:00 [PULL 00/57] pc,pci,virtio: features, fixes Michael S. Tsirkin
2021-10-05 16:00 ` [PULL 01/57] hw/virtio: Acquire RCU read lock in virtqueue_packed_drop_all() Michael S. Tsirkin
2021-10-05 16:00 ` [PULL 02/57] hw/virtio: Have virtqueue_get_avail_bytes() pass caches arg to callees Michael S. Tsirkin
2021-10-05 16:00 ` [PULL 03/57] vhost-vdpa: open device fd in net_init_vhost_vdpa() Michael S. Tsirkin
2021-10-05 16:00 ` [PULL 04/57] vhost-vdpa: classify one time request Michael S. Tsirkin
2021-10-05 16:00 ` [PULL 05/57] vhost-vdpa: prepare for the multiqueue support Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 06/57] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 07/57] net: introduce control client Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 08/57] vhost-net: control virtqueue support Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 09/57] virtio-net: use "queue_pairs" instead of "queues" when possible Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 10/57] vhost: record the last virtqueue index for the virtio device Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 11/57] virtio-net: vhost control virtqueue support Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 12/57] vhost-vdpa: multiqueue support Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 13/57] vhost-vsock: fix migration issue when seqpacket is supported Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 14/57] vhost-vsock: handle common features in vhost-vsock-common Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 15/57] acpi: add helper routines to initialize ACPI tables Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 16/57] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header() Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 17/57] acpi: build_xsdt: " Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 18/57] acpi: build_slit: " Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 19/57] acpi: build_fadt: " Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 20/57] acpi: build_tpm2: " Michael S. Tsirkin
2021-10-05 16:01 ` [PULL 21/57] acpi: acpi_build_hest: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 22/57] acpi: build_mcfg: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 23/57] acpi: build_hmat: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 24/57] acpi: nvdimm_build_nfit: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 25/57] acpi: nvdimm_build_ssdt: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 26/57] acpi: vmgenid_build_acpi: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 27/57] acpi: x86: build_dsdt: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 28/57] acpi: build_hpet: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 29/57] acpi: build_tpm_tcpa: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 30/57] acpi: arm/x86: build_srat: " Michael S. Tsirkin
2021-10-05 16:02 ` [PULL 31/57] acpi: use build_append_int_noprefix() API to compose SRAT table Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 32/57] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header() Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 33/57] acpi: build_waet: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 34/57] acpi: build_amd_iommu: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 35/57] acpi: madt: arm/x86: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 36/57] acpi: x86: remove dead code Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 37/57] acpi: x86: set enabled when composing _MAT entries Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 38/57] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 39/57] acpi: arm/virt: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 40/57] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header() Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 41/57] acpi: arm: virt: build_dsdt: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 42/57] acpi: arm: virt: build_iort: " Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 43/57] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Michael S. Tsirkin
2021-10-05 16:03 ` [PULL 44/57] acpi: arm/virt: build_spcr: fix invalid cast Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 45/57] acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header() Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 46/57] acpi: arm/virt: build_gtdt: " Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 47/57] acpi: build_facs: use build_append_int_noprefix() API to compose table Michael S. Tsirkin
2021-10-05 16:04 ` Michael S. Tsirkin [this message]
2021-10-05 16:04 ` [PULL 49/57] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 50/57] bios-tables-test: allow changes in DSDT ACPI tables for q35 Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 51/57] hw/i386/acpi: fix conflicting IO address range for acpi pci hotplug in q35 Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 52/57] bios-tables-test: Update ACPI DSDT table golden blobs for q35 Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 53/57] virtio-balloon: Fix page-poison subsection name Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 54/57] nvdimm: release the correct device list Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 55/57] hw/i386/amd_iommu: Rename amdviPCI TypeInfo Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 56/57] hw/i386/amd_iommu: Rename SysBus specific functions as amdvi_sysbus_X() Michael S. Tsirkin
2021-10-05 16:04 ` [PULL 57/57] hw/i386/amd_iommu: Add description/category to TYPE_AMD_IOMMU_PCI Michael S. Tsirkin
2021-10-05 17:21 ` [PULL 00/57] pc,pci,virtio: features, fixes Richard Henderson
2021-10-05 21:32 ` Michael S. Tsirkin
2021-10-05 23:36 ` Richard Henderson
2021-10-11 3:32 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211005155946.513818-49-mst@redhat.com \
--to=mst@redhat.com \
--cc=ani@anisinha.ca \
--cc=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).