acpi-defs: clean up open brace usage

patchew has been saying:
ERROR: open brace '{' following struct go on the same line

Fix up acpi-defs.h to follow this rule.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2017-05-09 21:10:05 +03:00
parent 153eba4726
commit 8b12e48950

View file

@ -81,8 +81,8 @@ typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor;
uint32_t asl_compiler_revision; /* ASL compiler revision number */ uint32_t asl_compiler_revision; /* ASL compiler revision number */
struct AcpiTableHeader /* ACPI common table header */ /* ACPI common table header */
{ struct AcpiTableHeader {
ACPI_TABLE_HEADER_DEF ACPI_TABLE_HEADER_DEF
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiTableHeader AcpiTableHeader; typedef struct AcpiTableHeader AcpiTableHeader;
@ -224,8 +224,7 @@ typedef struct AcpiSerialPortConsoleRedirection
/* /*
* ACPI 1.0 Root System Description Table (RSDT) * ACPI 1.0 Root System Description Table (RSDT)
*/ */
struct AcpiRsdtDescriptorRev1 struct AcpiRsdtDescriptorRev1 {
{
ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t table_offset_entry[0]; /* Array of pointers to other */ uint32_t table_offset_entry[0]; /* Array of pointers to other */
/* ACPI tables */ /* ACPI tables */
@ -235,8 +234,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;
/* /*
* ACPI 2.0 eXtended System Description Table (XSDT) * ACPI 2.0 eXtended System Description Table (XSDT)
*/ */
struct AcpiXsdtDescriptorRev2 struct AcpiXsdtDescriptorRev2 {
{
ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint64_t table_offset_entry[0]; /* Array of pointers to other */ uint64_t table_offset_entry[0]; /* Array of pointers to other */
/* ACPI tables */ /* ACPI tables */
@ -246,8 +244,7 @@ typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2;
/* /*
* ACPI 1.0 Firmware ACPI Control Structure (FACS) * ACPI 1.0 Firmware ACPI Control Structure (FACS)
*/ */
struct AcpiFacsDescriptorRev1 struct AcpiFacsDescriptorRev1 {
{
uint32_t signature; /* ACPI Signature */ uint32_t signature; /* ACPI Signature */
uint32_t length; /* Length of structure, in bytes */ uint32_t length; /* Length of structure, in bytes */
uint32_t hardware_signature; /* Hardware configuration signature */ uint32_t hardware_signature; /* Hardware configuration signature */
@ -273,8 +270,7 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;
/* Master MADT */ /* Master MADT */
struct AcpiMultipleApicTable struct AcpiMultipleApicTable {
{
ACPI_TABLE_HEADER_DEF /* ACPI common table header */ ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t local_apic_address; /* Physical address of local APIC */ uint32_t local_apic_address; /* Physical address of local APIC */
uint32_t flags; uint32_t flags;
@ -310,8 +306,7 @@ typedef struct AcpiMultipleApicTable AcpiMultipleApicTable;
/* Sub-structures for MADT */ /* Sub-structures for MADT */
struct AcpiMadtProcessorApic struct AcpiMadtProcessorApic {
{
ACPI_SUB_HEADER_DEF ACPI_SUB_HEADER_DEF
uint8_t processor_id; /* ACPI processor id */ uint8_t processor_id; /* ACPI processor id */
uint8_t local_apic_id; /* Processor's local APIC id */ uint8_t local_apic_id; /* Processor's local APIC id */
@ -319,8 +314,7 @@ struct AcpiMadtProcessorApic
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic; typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic;
struct AcpiMadtIoApic struct AcpiMadtIoApic {
{
ACPI_SUB_HEADER_DEF ACPI_SUB_HEADER_DEF
uint8_t io_apic_id; /* I/O APIC ID */ uint8_t io_apic_id; /* I/O APIC ID */
uint8_t reserved; /* Reserved - must be zero */ uint8_t reserved; /* Reserved - must be zero */
@ -473,8 +467,7 @@ typedef struct Acpi20Hpet Acpi20Hpet;
* SRAT (NUMA topology description) table * SRAT (NUMA topology description) table
*/ */
struct AcpiSystemResourceAffinityTable struct AcpiSystemResourceAffinityTable {
{
ACPI_TABLE_HEADER_DEF ACPI_TABLE_HEADER_DEF
uint32_t reserved1; uint32_t reserved1;
uint32_t reserved2[2]; uint32_t reserved2[2];
@ -486,8 +479,7 @@ typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable;
#define ACPI_SRAT_PROCESSOR_x2APIC 2 #define ACPI_SRAT_PROCESSOR_x2APIC 2
#define ACPI_SRAT_PROCESSOR_GICC 3 #define ACPI_SRAT_PROCESSOR_GICC 3
struct AcpiSratProcessorAffinity struct AcpiSratProcessorAffinity {
{
ACPI_SUB_HEADER_DEF ACPI_SUB_HEADER_DEF
uint8_t proximity_lo; uint8_t proximity_lo;
uint8_t local_apic_id; uint8_t local_apic_id;
@ -509,8 +501,7 @@ struct AcpiSratProcessorX2ApicAffinity {
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiSratProcessorX2ApicAffinity AcpiSratProcessorX2ApicAffinity; typedef struct AcpiSratProcessorX2ApicAffinity AcpiSratProcessorX2ApicAffinity;
struct AcpiSratMemoryAffinity struct AcpiSratMemoryAffinity {
{
ACPI_SUB_HEADER_DEF ACPI_SUB_HEADER_DEF
uint32_t proximity; uint32_t proximity;
uint16_t reserved1; uint16_t reserved1;
@ -522,8 +513,7 @@ struct AcpiSratMemoryAffinity
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity; typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity;
struct AcpiSratProcessorGiccAffinity struct AcpiSratProcessorGiccAffinity {
{
ACPI_SUB_HEADER_DEF ACPI_SUB_HEADER_DEF
uint32_t proximity; uint32_t proximity;
uint32_t acpi_processor_uid; uint32_t acpi_processor_uid;