Re: [Qemu-devel] [PATCH v2 30/39] hw/display/vga: remove the old i386/pc dependency

[Thomas Huth <thuth@redhat.com>]

On 17.10.2017 02:12, Philippe Mathieu-Daudé wrote:
> move public API to "hw/display/vga.h" and private registers
> to "hw/display/vga_int_regs.h"
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/display/vga_int.h                 |  3 ++-
>  hw/display/{vga.h => vga_int_regs.h} |  0
>  include/hw/display/vga.h             | 25 +++++++++++++++++++++++++
>  include/hw/i386/pc.h                 | 12 ------------
>  hw/display/vga-isa-mm.c              |  4 +---
>  hw/display/vga-isa.c                 |  2 +-
>  hw/display/vga.c                     |  4 ++--
>  hw/mips/mips_jazz.c                  |  1 +
>  vl.c                                 |  2 +-
>  MAINTAINERS                          |  1 +
>  10 files changed, 34 insertions(+), 20 deletions(-)
>  rename hw/display/{vga.h => vga_int_regs.h} (100%)
>  create mode 100644 include/hw/display/vga.h
> 
> diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
> index ad34a1f048..fe23b81442 100644
> --- a/hw/display/vga_int.h
> +++ b/hw/display/vga_int.h
> @@ -25,8 +25,9 @@
>  #ifndef HW_VGA_INT_H
>  #define HW_VGA_INT_H
>  
> -#include "hw/hw.h"
> +#include "exec/ioport.h"
>  #include "exec/memory.h"
> +#include "ui/console.h"

So vga_int.h now includes console.h (is it really necessary?) ...

[...]
>  static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
>  {
> diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
> index 51ccbccc41..e887b45651 100644
> --- a/hw/display/vga-isa-mm.c
> +++ b/hw/display/vga-isa-mm.c
> @@ -23,11 +23,9 @@
>   */
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
> -#include "ui/console.h"

... and here you also remove it from the .c file - OK ...

> -#include "hw/i386/pc.h"
> +#include "hw/display/vga.h"
>  #include "vga_int.h"
>  #include "ui/pixel_ops.h"
> -#include "qemu/timer.h"
>  
>  #define VGA_RAM_SIZE (8192 * 1024)
>  
> diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
> index 1af95562f2..9af43abee8 100644
> --- a/hw/display/vga-isa.c
> +++ b/hw/display/vga-isa.c
> @@ -26,7 +26,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
>  #include "ui/console.h"

... but here you keep it? I think you should either remove it here, too,
or not add the include in the header (which I'd prefer if the header
itself does not depend on console.h).

> -#include "hw/i386/pc.h"
> +#include "hw/isa/isa.h"
>  #include "vga_int.h"
>  #include "ui/pixel_ops.h"
>  #include "qemu/timer.h"
> diff --git a/hw/display/vga.c b/hw/display/vga.c
> index ed24ef7076..0da4942a09 100644
> --- a/hw/display/vga.c
> +++ b/hw/display/vga.c
> @@ -24,9 +24,9 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/hw.h"
> -#include "vga.h"
> +#include "hw/display/vga.h"
>  #include "ui/console.h"

Here's another one --^

 Thomas