[Qemu-devel] [PATCH] trivial: Don't include isa.h if it is not really necessary

Thomas Huth posted 1 patch 5 years, 2 months ago
Test asan passed
Test checkpatch passed
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test docker-clang@ubuntu passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1546615943-16274-1-git-send-email-thuth@redhat.com
hw/display/ramfb-standalone.c | 1 -
hw/ide/pci.c                  | 1 -
hw/ide/piix.c                 | 1 -
hw/ide/via.c                  | 1 -
hw/misc/macio/mac_dbdma.c     | 1 -
hw/moxie/moxiesim.c           | 1 -
hw/nvram/fw_cfg.c             | 1 -
hw/sparc/sun4m.c              | 1 -
hw/timer/i8254.c              | 1 -
9 files changed, 9 deletions(-)
[Qemu-devel] [PATCH] trivial: Don't include isa.h if it is not really necessary
Posted by Thomas Huth 5 years, 2 months ago
These files don't seem to do anything related to ISA directly, so
there is no need to include isa.h here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/display/ramfb-standalone.c | 1 -
 hw/ide/pci.c                  | 1 -
 hw/ide/piix.c                 | 1 -
 hw/ide/via.c                  | 1 -
 hw/misc/macio/mac_dbdma.c     | 1 -
 hw/moxie/moxiesim.c           | 1 -
 hw/nvram/fw_cfg.c             | 1 -
 hw/sparc/sun4m.c              | 1 -
 hw/timer/i8254.c              | 1 -
 9 files changed, 9 deletions(-)

diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index c0d241b..da3229a 100644
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/loader.h"
-#include "hw/isa/isa.h"
 #include "hw/display/ramfb.h"
 #include "ui/console.h"
 #include "sysemu/sysemu.h"
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index fe1ceeb..b75154f 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "hw/isa/isa.h"
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"
 #include "hw/ide/pci.h"
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index a3afe1f..885c16e 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/blockdev.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 238f038..987d99c 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "hw/isa/isa.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index 87ae246..e5917d8 100644
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -38,7 +38,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/isa/isa.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "qemu/main-loop.h"
 #include "qemu/log.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 4b0ce09..c6b6f72 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -31,7 +31,6 @@
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
-#include "hw/isa/isa.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 3cb726f..62e9464 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -27,7 +27,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "hw/boards.h"
-#include "hw/isa/isa.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/sysbus.h"
 #include "trace.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 639906c..709ee37 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -37,7 +37,6 @@
 #include "net/net.h"
 #include "hw/boards.h"
 #include "hw/scsi/esp.h"
-#include "hw/isa/isa.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/nvram/fw_cfg.h"
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 1057850..20f834e 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/isa/isa.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
 #include "hw/timer/i8254_internal.h"
-- 
1.8.3.1


Re: [Qemu-devel] [Qemu-trivial] [PATCH] trivial: Don't include isa.h if it is not really necessary
Posted by Laurent Vivier 5 years, 2 months ago
On 04/01/2019 16:32, Thomas Huth wrote:
> These files don't seem to do anything related to ISA directly, so
> there is no need to include isa.h here.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/display/ramfb-standalone.c | 1 -
>  hw/ide/pci.c                  | 1 -
>  hw/ide/piix.c                 | 1 -
>  hw/ide/via.c                  | 1 -
>  hw/misc/macio/mac_dbdma.c     | 1 -
>  hw/moxie/moxiesim.c           | 1 -
>  hw/nvram/fw_cfg.c             | 1 -
>  hw/sparc/sun4m.c              | 1 -
>  hw/timer/i8254.c              | 1 -
>  9 files changed, 9 deletions(-)
> 


Applied to my trivial-patches branch.

Thanks,
Laurent