[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if n
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if necessary |
Date: |
Tue, 27 Jan 2015 15:14:10 +0200 |
From: Igor Mammedov <address@hidden>
According to ACPI spec NameSeg shorter than 4 characters
must be padded up to 4 characters with "_" symbol.
ACPI 5.0: 20.2.2 "Name Objects Encoding"
Do it in build_append_nameseg() so that caller shouldn't know
or care about it.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 6a2e9c5..2f1daf7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -305,6 +305,8 @@ static inline void build_append_array(GArray *array, GArray
*val)
g_array_append_vals(array, val->data, val->len);
}
+#define ACPI_NAMESEG_LEN 4
+
static void GCC_FMT_ATTR(2, 3)
build_append_nameseg(GArray *array, const char *format, ...)
{
@@ -317,8 +319,11 @@ build_append_nameseg(GArray *array, const char *format,
...)
len = vsnprintf(s, sizeof s, format, args);
va_end(args);
- assert(len == 4);
+ assert(len <= ACPI_NAMESEG_LEN);
+
g_array_append_vals(array, s, len);
+ /* Pad up to ACPI_NAMESEG_LEN characters if necessary. */
+ g_array_append_vals(array, "____", ACPI_NAMESEG_LEN - len);
}
/* 5.4 Definition Block Encoding */
@@ -859,7 +864,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
if (bus->parent_dev) {
op = 0x82; /* DeviceOp */
- build_append_nameseg(bus_table, "S%.02X_",
+ build_append_nameseg(bus_table, "S%.02X",
bus->parent_dev->devfn);
build_append_byte(bus_table, 0x08); /* NameOp */
build_append_nameseg(bus_table, "_SUN");
@@ -979,7 +984,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
build_append_int(notify, 0x1U << i);
build_append_byte(notify, 0x00); /* NullName */
build_append_byte(notify, 0x86); /* NotifyOp */
- build_append_nameseg(notify, "S%.02X_", PCI_DEVFN(i, 0));
+ build_append_nameseg(notify, "S%.02X", PCI_DEVFN(i, 0));
build_append_byte(notify, 0x69); /* Arg1Op */
/* Pack it up */
@@ -1036,7 +1041,7 @@ static void build_pci_bus_end(PCIBus *bus, void
*bus_state)
if (bus->parent_dev) {
build_append_byte(parent->notify_table, '^'); /* ParentPrefixChar
*/
build_append_byte(parent->notify_table, 0x2E); /* DualNamePrefix */
- build_append_nameseg(parent->notify_table, "S%.02X_",
+ build_append_nameseg(parent->notify_table, "S%.02X",
bus->parent_dev->devfn);
build_append_nameseg(parent->notify_table, "PCNT");
}
@@ -1106,7 +1111,7 @@ build_ssdt(GArray *table_data, GArray *linker,
GArray *sb_scope = build_alloc_array();
uint8_t op = 0x10; /* ScopeOp */
- build_append_nameseg(sb_scope, "_SB_");
+ build_append_nameseg(sb_scope, "_SB");
/* build Processor object for each processor */
for (i = 0; i < acpi_cpus; i++) {
--
MST
- [Qemu-devel] [PULL 04/16] pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled, (continued)
- [Qemu-devel] [PULL 04/16] pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 14/16] pc: Fix DIMMs capacity calculation, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity global, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 16/16] pc-dimm: Add Error argument to pc_existing_dimms_capacity, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 11/16] bios-linker-loader: move source to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is multiple of 16GB, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 09/16] virtio: fix feature bit checks, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 03/16] pci: Split pcie_host_mmcfg_map(), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 13/16] smbios: Don't report unknown CPU speed (fix SVVP regression), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 10/16] bios-linker-loader: move header to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if necessary,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 08/16] bios-tables-test: split piix4 and q35 tests, Michael S. Tsirkin, 2015/01/27
- Re: [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/01/27