On Sun, Sep 13, 2015 at 04:06:32PM +0100, Leif Lindholm wrote: > The DBG2 table can be considered a "companion" to SPCR - it points out > debug consoles available in the system. > > Also update SPCR comments to reflect DBG2 is now described in this file, > and update the supported SPCR specification revision (no functional > change). > > Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org> > --- > include/hw/acpi/acpi-defs.h | 35 +++++++++++++++++++++++++++++++++-- > 1 file changed, 33 insertions(+), 2 deletions(-) > > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index 2b431e6..a7bd984 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -197,10 +197,41 @@ enum { > }; > > /* > - * Serial Port Console Redirection Table (SPCR), Rev. 1.02 > + * Debug Port Table 2 (DBG2) > * > * For .interface_type see Debug Port Table 2 (DBG2) serial port > - * subtypes in Table 3, Rev. May 22, 2012 > + * subtypes in Table 3, Rev. Aug 10, 2015 > + * > + */ > +struct AcpiDebugPort2Header { > + ACPI_TABLE_HEADER_DEF > + uint32_t devices_offset; > + uint32_t devices_count; > +} QEMU_PACKED; > +typedef struct AcpiDebugPort2Header > + AcpiDebugPort2Header; typedef line could be all on one line
> + > +struct AcpiDebugPort2Device { > + uint8_t revision; > + uint16_t length; > + uint8_t address_count; > + uint16_t namepath_length; > + uint16_t namepath_offset; > + uint16_t oem_data_length; > + uint16_t oem_data_offset; > + uint16_t port_type; > + uint16_t port_subtype; > + uint8_t reserved1[2]; > + uint16_t base_address_offset; > + uint16_t address_size_offset; > +} QEMU_PACKED; > +typedef struct AcpiDebugPort2Device > + AcpiDebugPort2Device; also could be on one line > + > +/* > + * Serial Port Console Redirection Table (SPCR), Rev. 1.03 > + * > + * .interface_type format same as for DBG2. > */ > struct AcpiSerialPortConsoleRedirection { > ACPI_TABLE_HEADER_DEF > -- > 2.1.4 > > Otherwise Reviewed-by: Andrew Jones <drjo...@redhat.com>