[Qemu-devel] [PULL 0/1] acpi: last minute fix for 2.6

[Qemu-devel] [PULL 0/1] acpi: last minute fix for 2.6

[Michael S. Tsirkin]

The following changes since commit 47dac82d8b013a5c7dd044a797ae6727b553959a:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-04-29 12:12:33 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

for you to fetch changes up to 1dbfd7892b66c757fdf67f346be40233adbad80e:

  acpi: fix bios linker loadder COMMAND_ALLOCATE on bigendian host (2016-05-01 15:42:13 +0300)

----------------------------------------------------------------
acpi: last minute fix for 2.6

Minor, obvious fix only affecting BE hosts.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Igor Mammedov (1):
      acpi: fix bios linker loadder COMMAND_ALLOCATE on bigendian host

 hw/acpi/bios-linker-loader.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/1] acpi: fix bios linker loadder COMMAND_ALLOCATE on bigendian host

[Michael S. Tsirkin]

From: Igor Mammedov <imammedo@redhat.com>

'make check' fails with:

ERROR:tests/bios-tables-test.c:493:load_expected_aml:
   assertion failed: (g_file_test(aml_file, G_FILE_TEST_EXISTS))

since commit:
caf50c7166a6ed96c462ab5db4b495e1234e4cc6
tests: pc: acpi: drop not needed 'expected SSDT' blobs

Assert happens because qemu-system-x86_64 generates
SSDT table and test looks for a corresponding expected
table to compare with.

However there is no expected SSDT blob anymore, since
QEMU souldn't generate one. As it happens BIOS is not
able to read ACPI tables from QEMU and fallbacks to
embeded legacy ACPI codepath, which generates SSDT.
That happens due to wrongly sized endiannes conversion
which makes
 uint8_t BiosLinkerLoaderEntry.alloc.zone
end up with 0 due to truncation of 32 bit integer
which on host is 1 or 2.

Fix it by dropping invalid cpu_to_le32() as uint8_t
doesn't require any conversion.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1330174

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
---
 hw/acpi/bios-linker-loader.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c
index ace9abb..5153ab1 100644
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.c
@@ -135,9 +135,8 @@ void bios_linker_loader_alloc(GArray *linker,
     strncpy(entry.alloc.file, file, sizeof entry.alloc.file - 1);
     entry.command = cpu_to_le32(BIOS_LINKER_LOADER_COMMAND_ALLOCATE);
     entry.alloc.align = cpu_to_le32(alloc_align);
-    entry.alloc.zone = cpu_to_le32(alloc_fseg ?
-                                    BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG :
-                                    BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH);
+    entry.alloc.zone = alloc_fseg ? BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG :
+                                    BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH;
 
     /* Alloc entries must come first, so prepend them */
     g_array_prepend_vals(linker, &entry, sizeof entry);
-- 
MST

Re: [Qemu-devel] [PULL 0/1] acpi: last minute fix for 2.6

[Peter Maydell]

On 1 May 2016 at 13:45, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 47dac82d8b013a5c7dd044a797ae6727b553959a:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-04-29 12:12:33 +0100)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 1dbfd7892b66c757fdf67f346be40233adbad80e:
>
>   acpi: fix bios linker loadder COMMAND_ALLOCATE on bigendian host (2016-05-01 15:42:13 +0300)
>
> ----------------------------------------------------------------
> acpi: last minute fix for 2.6
>
> Minor, obvious fix only affecting BE hosts.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Igor Mammedov (1):
>       acpi: fix bios linker loadder COMMAND_ALLOCATE on bigendian host

Applied, thanks.

-- PMM