qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH-for-7.2] hw/display: Declare build_vga_aml() out of "vga_int.

From: Philippe Mathieu-Daudé
Subject: Re: [PATCH-for-7.2] hw/display: Declare build_vga_aml() out of "vga_int.h"
Date: Wed, 9 Nov 2022 23:30:12 +0100
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 
On 9/11/22 23:23, Philippe Mathieu-Daudé wrote:

Commit cfead31326 declared build_vga_aml() in "vga_int.h".
This header happens to include various other things, such
(indirectly) pixman headers.

The freshly introduced acpi-vga.c includes "vga_int.h" to
get build_vga_aml() declaration, but ends including the
'various other things' triggering this build failure (QEMU
configured as '--enable-modules --disable-spice'):

   In file included from /home/fred/qemu-git/src/qemu/include/ui/console.h:4,
                  from ../hw/display/vga_int.h:30,
                  from ../hw/display/acpi-vga.c:4:
   include/ui/qemu-pixman.h:12:10: fatal error: pixman.h: No such file or 
directory
      12 | #include <pixman.h>
         |          ^~~~~~~~~~

Resolve by declaring build_vga_aml() in a ACPI/VGA specific
header named "acpi-vga.h". Adjust MAINTAINERS to avoid
checkpatch warnings.

Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
Reported-by: Frederic Bezies <fredbezies@gmail.com>
Reported-by: Laurent Vivier <lvivier@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1308
Fixes: cfead31326 ("AcpiDevAmlIf interface to build VGA device descs")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
  MAINTAINERS                |  1 +
  hw/display/acpi-vga-stub.c |  2 +-
  hw/display/acpi-vga.c      |  2 +-
  hw/display/acpi-vga.h      | 10 ++++++++++
  hw/display/vga-pci.c       |  1 +
  hw/display/vga_int.h       |  2 --
  6 files changed, 14 insertions(+), 4 deletions(-)
  create mode 100644 hw/display/acpi-vga.h

diff --git a/MAINTAINERS b/MAINTAINERS
index caba73ec41..af4d3bd8fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1844,6 +1844,7 @@ S: Supported
  F: include/hw/acpi/*
  F: include/hw/firmware/smbios.h
  F: hw/acpi/*
+F: hw/display/acpi*
  F: hw/smbios/*
  F: hw/i386/acpi-build.[hc]
  F: hw/arm/virt-acpi-build.c


Please discard in favor of
20221109222112.74519-1-mst@redhat.com/">https://lore.kernel.org/qemu-devel/20221109222112.74519-1-mst@redhat.com/

Note, the MAINTAINERS part is worth salvaging.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]