* [PATCH 01/20] vl: Add missing "hw/boards.h" include
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 02/20] hw/southbridge/ich9: Removed unused headers Philippe Mathieu-Daudé
` (20 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
vl.c calls machine_usb() declared in "hw/boards.h". Include it.
This fixes (when modifying unrelated headers):
vl.c:1283:10: error: implicit declaration of function 'machine_usb' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (!machine_usb(current_machine)) {
^
vl.c:1283:10: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
vl.c:1283:22: error: use of undeclared identifier 'current_machine'
if (!machine_usb(current_machine)) {
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
vl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/vl.c b/vl.c
index 002bf4919e..e85b31df1b 100644
--- a/vl.c
+++ b/vl.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/units.h"
+#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qemu-version.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 02/20] hw/southbridge/ich9: Removed unused headers
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 01/20] vl: Add missing "hw/boards.h" include Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 17:01 ` John Snow
2019-10-14 14:22 ` [PATCH 03/20] hw/input/pckbd: Remove unused "hw/i386/pc.h" header Philippe Mathieu-Daudé
` (19 subsequent siblings)
21 siblings, 1 reply; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The ICH9 chipset is not X86/PC specific.
These files don't use anything declared by the "hw/i386/pc.h"
or "hw/i386/ioapic.h" headers. Remove them.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/ich9.c | 1 -
hw/isa/lpc_ich9.c | 2 --
include/hw/i386/ich9.h | 1 -
3 files changed, 4 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 2034dd749e..fdd0a6c79e 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 17c292e306..61cee2ae3a 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -35,10 +35,8 @@
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "hw/isa/apm.h"
-#include "hw/i386/ioapic.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/i386/ich9.h"
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index 72e803f6e2..a98d10b252 100644
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -5,7 +5,6 @@
#include "hw/sysbus.h"
#include "hw/i386/pc.h"
#include "hw/isa/apm.h"
-#include "hw/i386/ioapic.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
#include "hw/pci/pci_bridge.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 02/20] hw/southbridge/ich9: Removed unused headers
2019-10-14 14:22 ` [PATCH 02/20] hw/southbridge/ich9: Removed unused headers Philippe Mathieu-Daudé
@ 2019-10-14 17:01 ` John Snow
0 siblings, 0 replies; 29+ messages in thread
From: John Snow @ 2019-10-14 17:01 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, Paolo Bonzini,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Igor Mammedov
On 10/14/19 10:22 AM, Philippe Mathieu-Daudé wrote:
> The ICH9 chipset is not X86/PC specific.
>
> These files don't use anything declared by the "hw/i386/pc.h"
> or "hw/i386/ioapic.h" headers. Remove them.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
> ---
> hw/acpi/ich9.c | 1 -
> hw/isa/lpc_ich9.c | 2 --
> include/hw/i386/ich9.h | 1 -
> 3 files changed, 4 deletions(-)
>
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 2034dd749e..fdd0a6c79e 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -27,7 +27,6 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> -#include "hw/i386/pc.h"
> #include "hw/pci/pci.h"
> #include "migration/vmstate.h"
> #include "qemu/timer.h"
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index 17c292e306..61cee2ae3a 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -35,10 +35,8 @@
> #include "hw/isa/isa.h"
> #include "hw/sysbus.h"
> #include "migration/vmstate.h"
> -#include "hw/i386/pc.h"
> #include "hw/irq.h"
> #include "hw/isa/apm.h"
> -#include "hw/i386/ioapic.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_bridge.h"
> #include "hw/i386/ich9.h"
> diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
> index 72e803f6e2..a98d10b252 100644
> --- a/include/hw/i386/ich9.h
> +++ b/include/hw/i386/ich9.h
> @@ -5,7 +5,6 @@
> #include "hw/sysbus.h"
> #include "hw/i386/pc.h"
> #include "hw/isa/apm.h"
> -#include "hw/i386/ioapic.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pcie_host.h"
> #include "hw/pci/pci_bridge.h"
>
--
—js
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 03/20] hw/input/pckbd: Remove unused "hw/i386/pc.h" header
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 01/20] vl: Add missing "hw/boards.h" include Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 02/20] hw/southbridge/ich9: Removed unused headers Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 04/20] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header Philippe Mathieu-Daudé
` (18 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The keyboard controller model don't need anything from
"hw/i386/pc.h". Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/input/pckbd.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index f0acfd86f7..2f09f780ba 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -26,7 +26,6 @@
#include "qemu/log.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
-#include "hw/i386/pc.h"
#include "hw/input/ps2.h"
#include "hw/irq.h"
#include "hw/input/i8042.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 04/20] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 03/20] hw/input/pckbd: Remove unused "hw/i386/pc.h" header Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 05/20] hw/timer: Remove unused "ui/console.h" header Philippe Mathieu-Daudé
` (17 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The "ioapic_internal.h" does not use anything from
"hw/i386/ioapic.h", remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/i386/ioapic_internal.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index d46c87c510..fe06938bda 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -23,7 +23,6 @@
#define QEMU_IOAPIC_INTERNAL_H
#include "exec/memory.h"
-#include "hw/i386/ioapic.h"
#include "hw/sysbus.h"
#include "qemu/notify.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 05/20] hw/timer: Remove unused "ui/console.h" header
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 04/20] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 06/20] hw/usb/dev-storage: " Philippe Mathieu-Daudé
` (16 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The timer models don't need anything from "ui/console.h".
Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/timer/hpet.c | 1 -
hw/timer/twl92230.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1ddae4e7d7..4772cccfe3 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
-#include "ui/console.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index 63bd13d2ca..d0011be89e 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -27,7 +27,6 @@
#include "migration/qemu-file-types.h"
#include "migration/vmstate.h"
#include "sysemu/sysemu.h"
-#include "ui/console.h"
#include "qemu/bcd.h"
#include "qemu/module.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 06/20] hw/usb/dev-storage: Remove unused "ui/console.h" header
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 05/20] hw/timer: Remove unused "ui/console.h" header Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 07/20] hw/i386/intel_iommu: Remove unused includes Philippe Mathieu-Daudé
` (15 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The USB models related to storage don't need anything from
"ui/console.h". Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/usb/dev-storage.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 8545193488..a2ff52d3e5 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -17,7 +17,6 @@
#include "desc.h"
#include "hw/qdev-properties.h"
#include "hw/scsi/scsi.h"
-#include "ui/console.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 07/20] hw/i386/intel_iommu: Remove unused includes
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 06/20] hw/usb/dev-storage: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 08/20] hw/xen/xen_pt_load_rom: " Philippe Mathieu-Daudé
` (14 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
intel_iommu.h does not use any of these includes, remove them.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/i386/intel_iommu.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 66b931e526..a1c4afcda5 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -22,11 +22,7 @@
#ifndef INTEL_IOMMU_H
#define INTEL_IOMMU_H
-#include "sysemu/dma.h"
#include "hw/i386/x86-iommu.h"
-#include "hw/i386/ioapic.h"
-#include "hw/pci/msi.h"
-#include "hw/sysbus.h"
#include "qemu/iova-tree.h"
#define TYPE_INTEL_IOMMU_DEVICE "intel-iommu"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 08/20] hw/xen/xen_pt_load_rom: Remove unused includes
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 07/20] hw/i386/intel_iommu: Remove unused includes Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:29 ` Paul Durrant
2019-10-14 14:22 ` [PATCH 09/20] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header Philippe Mathieu-Daudé
` (13 subsequent siblings)
21 siblings, 1 reply; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
xen_pt_load_rom.c does not use any of these includes, remove them.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/xen/xen_pt_load_rom.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index 307a5c93e2..a50a80837e 100644
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -3,12 +3,8 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/i386/pc.h"
#include "qemu/error-report.h"
-#include "ui/console.h"
#include "hw/loader.h"
-#include "monitor/monitor.h"
-#include "qemu/range.h"
#include "hw/pci/pci.h"
#include "xen_pt.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 08/20] hw/xen/xen_pt_load_rom: Remove unused includes
2019-10-14 14:22 ` [PATCH 08/20] hw/xen/xen_pt_load_rom: " Philippe Mathieu-Daudé
@ 2019-10-14 14:29 ` Paul Durrant
2020-02-27 12:18 ` Anthony PERARD
0 siblings, 1 reply; 29+ messages in thread
From: Paul Durrant @ 2019-10-14 14:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
qemu-devel, Gerd Hoffmann, Stefano Stabellini, qemu-block,
Helge Deller, David Hildenbrand, Markus Armbruster, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
On Mon, 14 Oct 2019 at 15:27, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> xen_pt_load_rom.c does not use any of these includes, remove them.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
> ---
> hw/xen/xen_pt_load_rom.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
> index 307a5c93e2..a50a80837e 100644
> --- a/hw/xen/xen_pt_load_rom.c
> +++ b/hw/xen/xen_pt_load_rom.c
> @@ -3,12 +3,8 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "hw/i386/pc.h"
> #include "qemu/error-report.h"
> -#include "ui/console.h"
> #include "hw/loader.h"
> -#include "monitor/monitor.h"
> -#include "qemu/range.h"
> #include "hw/pci/pci.h"
> #include "xen_pt.h"
>
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 08/20] hw/xen/xen_pt_load_rom: Remove unused includes
2019-10-14 14:29 ` Paul Durrant
@ 2020-02-27 12:18 ` Anthony PERARD
0 siblings, 0 replies; 29+ messages in thread
From: Anthony PERARD @ 2020-02-27 12:18 UTC (permalink / raw)
To: Paul Durrant
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
qemu-devel, Gerd Hoffmann, Max Reitz, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Markus Armbruster,
Halil Pasic, Christian Borntraeger, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Philippe Mathieu-Daudé,
Michael S. Tsirkin, Igor Mammedov
On Mon, Oct 14, 2019 at 03:29:42PM +0100, Paul Durrant wrote:
> On Mon, 14 Oct 2019 at 15:27, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> >
> > xen_pt_load_rom.c does not use any of these includes, remove them.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Reviewed-by: Paul Durrant <paul@xen.org>
Hi,
I've added this patch to a pull requests for the xen.
Cheers,
--
Anthony PERARD
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 09/20] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 08/20] hw/xen/xen_pt_load_rom: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 10/20] hw/alpha/dp264: Include "net/net.h" Philippe Mathieu-Daudé
` (12 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
alpha_sys.h does not use anything from the "hw/ide.h" header.
Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/alpha/alpha_sys.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h
index 4e127a6de8..9991535c0d 100644
--- a/hw/alpha/alpha_sys.h
+++ b/hw/alpha/alpha_sys.h
@@ -6,7 +6,6 @@
#include "target/alpha/cpu-qom.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "hw/ide.h"
#include "hw/i386/pc.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 10/20] hw/alpha/dp264: Include "net/net.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 09/20] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 11/20] hw/hppa/machine: " Philippe Mathieu-Daudé
` (11 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/alpha/dp264.c uses NICInfo variables which are declared in
"net/net.h". Include it.
This fixes (when modifying unrelated headers):
hw/alpha/dp264.c:89:21: error: use of undeclared identifier 'nb_nics'
for (i = 0; i < nb_nics; i++) {
^
hw/alpha/dp264.c:90:30: error: use of undeclared identifier 'nd_table'
pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL);
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/alpha/dp264.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 51feee8558..013a9d3510 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -20,6 +20,7 @@
#include "hw/isa/superio.h"
#include "hw/dma/i8257.h"
#include "qemu/cutils.h"
+#include "net/net.h"
#define MAX_IDE_BUS 2
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/20] hw/hppa/machine: Include "net/net.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (9 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 10/20] hw/alpha/dp264: Include "net/net.h" Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 12/20] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h" Philippe Mathieu-Daudé
` (10 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/hppa/machine.c uses NICInfo variables which are declared in
"net/net.h". Include it.
This fixes (when modifying unrelated headers):
hw/hppa/machine.c:126:21: error: use of undeclared identifier 'nb_nics'
for (i = 0; i < nb_nics; i++) {
^
hw/hppa/machine.c:127:30: error: use of undeclared identifier 'nd_table'
pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL);
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/hppa/machine.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 7e23675429..6c55ed0af1 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -20,6 +20,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/log.h"
+#include "net/net.h"
#define MAX_IDE_BUS 2
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 12/20] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (10 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 11/20] hw/hppa/machine: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 13/20] hw/timer/hpet: Include "exec/address-spaces.h" Philippe Mathieu-Daudé
` (9 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/acpi/cpu_hotplug.c calls pci_address_space_io(). Include
"hw/pci/pci.h" which declares it.
This fixes (when modifying unrelated headers):
hw/acpi/cpu_hotplug.c:103:28: error: implicit declaration of function 'pci_address_space_io' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
MemoryRegion *parent = pci_address_space_io(PCI_DEVICE(gpe_cpu->device));
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/cpu_hotplug.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 6e8293aac9..7fb65d9065 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -14,6 +14,7 @@
#include "qapi/error.h"
#include "hw/core/cpu.h"
#include "hw/i386/pc.h"
+#include "hw/pci/pci.h"
#include "qemu/error-report.h"
#define CPU_EJECT_METHOD "CPEJ"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/20] hw/timer/hpet: Include "exec/address-spaces.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (11 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 12/20] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h" Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 14/20] hw/pci-host/q35: Include "qemu/range.h" Philippe Mathieu-Daudé
` (8 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/timer/hpet.c calls address_space_stl_le() declared in
"exec/address-spaces.h". Include it.
This fixes (when modifying unrelated headers):
hw/timer/hpet.c:210:31: error: use of undeclared identifier 'address_space_memory'
address_space_stl_le(&address_space_memory, timer->fsb >> 32,
^~~~~~~~~~~~~~~~~~~~
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/timer/hpet.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 4772cccfe3..6589d63ebb 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -35,6 +35,7 @@
#include "hw/timer/mc146818rtc.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
+#include "exec/address-spaces.h"
//#define HPET_DEBUG
#ifdef HPET_DEBUG
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 14/20] hw/pci-host/q35: Include "qemu/range.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (12 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 13/20] hw/timer/hpet: Include "exec/address-spaces.h" Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 15/20] hw/i2c/smbus_ich9: " Philippe Mathieu-Daudé
` (7 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
The MCHPCIState structure uses the Range type which is declared in
"qemu/range.h". Include it.
This fixes (when modifying unrelated headers):
In file included from hw/pci-host/q35.c:32:
include/hw/pci-host/q35.h:57:11: error: field has incomplete type 'Range' (aka 'struct Range')
Range pci_hole;
^
include/qemu/typedefs.h:116:16: note: forward declaration of 'struct Range'
typedef struct Range Range;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/pci-host/q35.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index b3bcf2e632..79a88d67b1 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -32,6 +32,7 @@
#include "hw/acpi/ich9.h"
#include "hw/pci-host/pam.h"
#include "hw/i386/intel_iommu.h"
+#include "qemu/range.h"
#define TYPE_Q35_HOST_DEVICE "q35-pcihost"
#define Q35_HOST_DEVICE(obj) \
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 15/20] hw/i2c/smbus_ich9: Include "qemu/range.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (13 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 14/20] hw/pci-host/q35: Include "qemu/range.h" Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 16/20] hw/pci-host/piix: " Philippe Mathieu-Daudé
` (6 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/i2c/smbus_ich9.c calls range_covers_byte(). Include "qemu/range.h"
which declares it.
This fixes (when modifying unrelated headers):
hw/i2c/smbus_ich9.c:66:9: error: implicit declaration of function 'range_covers_byte' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (range_covers_byte(address, len, ICH9_SMB_HOSTC)) {
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/i2c/smbus_ich9.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index fd50fb851a..48f1ff4191 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -21,6 +21,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/range.h"
#include "hw/i2c/pm_smbus.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 16/20] hw/pci-host/piix: Include "qemu/range.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (14 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 15/20] hw/i2c/smbus_ich9: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 17/20] hw/acpi: Include "hw/mem/nvdimm.h" Philippe Mathieu-Daudé
` (5 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
hw/pci-host/piix.c calls various functions from the Range API.
Include "qemu/range.h" which declares them.
This fixes (when modifying unrelated headers):
hw/pci-host/i440fx.c:54:11: error: field has incomplete type 'Range' (aka 'struct Range')
Range pci_hole;
^
include/qemu/typedefs.h:116:16: note: forward declaration of 'struct Range'
typedef struct Range Range;
^
hw/pci-host/i440fx.c:126:9: error: implicit declaration of function 'ranges_overlap' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (ranges_overlap(address, len, I440FX_PAM, I440FX_PAM_SIZE) ||
^
hw/pci-host/i440fx.c:126:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
hw/pci-host/i440fx.c:127:9: error: implicit declaration of function 'range_covers_byte' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
range_covers_byte(address, len, I440FX_SMRAM)) {
^
hw/pci-host/i440fx.c:127:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
hw/pci-host/i440fx.c:189:13: error: implicit declaration of function 'range_is_empty' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
val64 = range_is_empty(&s->pci_hole) ? 0 : range_lob(&s->pci_hole);
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/pci-host/piix.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 135c645535..76ed252a60 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/range.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 17/20] hw/acpi: Include "hw/mem/nvdimm.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (15 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 16/20] hw/pci-host/piix: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 18/20] hw/i386: " Philippe Mathieu-Daudé
` (4 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
Both ich9.c and piix4.c use methods/definitions declared in the
NVDIMM device header. Include it.
This fixes (when modifying unrelated headers):
hw/acpi/ich9.c:507:46: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/acpi/ich9.c:508:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_acpi_plug_cb(hotplug_dev, dev);
^
hw/acpi/piix4.c:403:46: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/acpi/piix4.c:404:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_acpi_plug_cb(hotplug_dev, dev);
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/ich9.c | 1 +
hw/acpi/piix4.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index fdd0a6c79e..4e74284b65 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -39,6 +39,7 @@
#include "hw/i386/ich9.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
//#define DEBUG
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 5742c3df87..11a3e33e5b 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -39,6 +39,7 @@
#include "hw/acpi/cpu.h"
#include "hw/hotplug.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/xen/xen.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 18/20] hw/i386: Include "hw/mem/nvdimm.h"
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (16 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 17/20] hw/acpi: Include "hw/mem/nvdimm.h" Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 19/20] hw/pci-host/q35: Remove unused includes Philippe Mathieu-Daudé
` (3 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
All this files use methods/definitions declared in the NVDIMM
device header. Include it.
This fixes (when modifying unrelated headers):
hw/i386/acpi-build.c:2733:9: error: implicit declaration of function 'nvdimm_build_acpi' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
^
hw/i386/pc.c:1996:61: error: use of undeclared identifier 'TYPE_NVDIMM'
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2032:55: error: use of undeclared identifier 'TYPE_NVDIMM'
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2040:9: error: implicit declaration of function 'nvdimm_plug' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2040:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2065:42: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/i386/pc_i440fx.c:307:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
hw/i386/pc_q35.c:332:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/i386/acpi-build.c | 1 +
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
hw/i386/pc_q35.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4e0f9f425a..ac46936f63 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -48,6 +48,7 @@
#include "hw/timer/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/mem/memory-device.h"
+#include "hw/mem/nvdimm.h"
#include "sysemu/numa.h"
#include "sysemu/reset.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index bcda50efcc..cff330802d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -73,6 +73,7 @@
#include "hw/boards.h"
#include "acpi-build.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-common.h"
#include "qapi/visitor.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 6824b72124..8651b6e2ec 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -58,6 +58,7 @@
#include "migration/misc.h"
#include "kvm_i386.h"
#include "sysemu/numa.h"
+#include "hw/mem/nvdimm.h"
#define MAX_IDE_BUS 2
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 8fad20f314..91ba231ef1 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -53,6 +53,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/numa.h"
+#include "hw/mem/nvdimm.h"
/* ICH9 AHCI has 6 ports */
#define MAX_SATA_PORTS 6
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 19/20] hw/pci-host/q35: Remove unused includes
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (17 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 18/20] hw/i386: " Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 14:22 ` [PATCH 20/20] hw/i386/pc: Clean up includes Philippe Mathieu-Daudé
` (2 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
Only q35.c requires declarations from "hw/i386/pc.h", move it there.
Remove all the includes not used by "q35.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/pci-host/q35.c | 1 +
include/hw/pci-host/q35.h | 7 -------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 158d270b9f..918843d373 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -29,6 +29,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/i386/pc.h"
#include "hw/pci-host/q35.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index 79a88d67b1..534d90dbaf 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -22,16 +22,9 @@
#ifndef HW_Q35_H
#define HW_Q35_H
-#include "hw/isa/isa.h"
-#include "hw/sysbus.h"
-#include "hw/i386/pc.h"
-#include "hw/isa/apm.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
-#include "hw/acpi/acpi.h"
-#include "hw/acpi/ich9.h"
#include "hw/pci-host/pam.h"
-#include "hw/i386/intel_iommu.h"
#include "qemu/range.h"
#define TYPE_Q35_HOST_DEVICE "q35-pcihost"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 20/20] hw/i386/pc: Clean up includes
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (18 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 19/20] hw/pci-host/q35: Remove unused includes Philippe Mathieu-Daudé
@ 2019-10-14 14:22 ` Philippe Mathieu-Daudé
2019-10-14 17:03 ` [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) John Snow
2019-10-26 12:20 ` Philippe Mathieu-Daudé
21 siblings, 0 replies; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-14 14:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Philippe Mathieu-Daudé, Gerd Hoffmann, Stefano Stabellini,
qemu-block, Helge Deller, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Anthony Perard, xen-devel, Eduardo Habkost,
Xie Changlong, qemu-s390x, qemu-arm, Stefan Hajnoczi,
Paolo Bonzini, John Snow, Richard Henderson, Kevin Wolf,
Wen Congyang, Cornelia Huck, Max Reitz, Michael S. Tsirkin,
Igor Mammedov
Various headers are not required by hw/i386/pc.h:
- "qemu/range.h"
- "qemu/bitmap.h"
- "qemu/module.h"
- "exec/memory.h"
- "hw/pci/pci.h"
- "hw/mem/pc-dimm.h"
- "hw/mem/nvdimm.h"
- "net/net.h"
Remove them.
Add 3 headers that were missing:
- "hw/hotplug.h"
PCMachineState::acpi_dev is of type HotplugHandler
- "qemu/notify.h"
PCMachineState::machine_done is of type Notifier
- "qapi/qapi-types-common.h"
PCMachineState::vmport/smm is of type OnOffAuto
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/i386/pc.h | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 6df4f4b6fb..e5c2dc9081 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -1,21 +1,15 @@
#ifndef HW_PC_H
#define HW_PC_H
-#include "exec/memory.h"
+#include "qemu/notify.h"
+#include "qapi/qapi-types-common.h"
#include "hw/boards.h"
#include "hw/isa/isa.h"
#include "hw/block/fdc.h"
#include "hw/block/flash.h"
-#include "net/net.h"
#include "hw/i386/ioapic.h"
-
-#include "qemu/range.h"
-#include "qemu/bitmap.h"
-#include "qemu/module.h"
-#include "hw/pci/pci.h"
-#include "hw/mem/pc-dimm.h"
-#include "hw/mem/nvdimm.h"
#include "hw/acpi/acpi_dev_interface.h"
+#include "hw/hotplug.h"
#define HPET_INTCAP "hpet-intcap"
--
2.21.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa)
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (19 preceding siblings ...)
2019-10-14 14:22 ` [PATCH 20/20] hw/i386/pc: Clean up includes Philippe Mathieu-Daudé
@ 2019-10-14 17:03 ` John Snow
2019-10-26 12:20 ` Philippe Mathieu-Daudé
21 siblings, 0 replies; 29+ messages in thread
From: John Snow @ 2019-10-14 17:03 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Markus Armbruster, qemu-devel
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, Paolo Bonzini,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Igor Mammedov
On 10/14/19 10:22 AM, Philippe Mathieu-Daudé wrote:
> This is a follow-up of Markus's cleanup series:
> Tame a few "touch this, recompile the world"
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
>
> This part is mostly restricted to X86, but since some file from the
> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
> too.
>
> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
> platforms (Quest I started 2 years ago...).
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (20):
> vl: Add missing "hw/boards.h" include
> hw/southbridge/ich9: Removed unused headers
> hw/input/pckbd: Remove unused "hw/i386/pc.h" header
> hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
> hw/timer: Remove unused "ui/console.h" header
> hw/usb/dev-storage: Remove unused "ui/console.h" header
> hw/i386/intel_iommu: Remove unused includes
> hw/xen/xen_pt_load_rom: Remove unused includes
> hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
> hw/alpha/dp264: Include "net/net.h"
> hw/hppa/machine: Include "net/net.h"
> hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
> hw/timer/hpet: Include "exec/address-spaces.h"
> hw/pci-host/q35: Include "qemu/range.h"
> hw/i2c/smbus_ich9: Include "qemu/range.h"
> hw/pci-host/piix: Include "qemu/range.h"
> hw/acpi: Include "hw/mem/nvdimm.h"
> hw/i386: Include "hw/mem/nvdimm.h"
> hw/pci-host/q35: Remove unused includes
> hw/i386/pc: Clean up includes
>
> hw/acpi/cpu_hotplug.c | 1 +
> hw/acpi/ich9.c | 2 +-
> hw/acpi/piix4.c | 1 +
> hw/alpha/alpha_sys.h | 1 -
> hw/alpha/dp264.c | 1 +
> hw/hppa/machine.c | 1 +
> hw/i2c/smbus_ich9.c | 1 +
> hw/i386/acpi-build.c | 1 +
> hw/i386/pc.c | 1 +
> hw/i386/pc_piix.c | 1 +
> hw/i386/pc_q35.c | 1 +
> hw/input/pckbd.c | 1 -
> hw/isa/lpc_ich9.c | 2 --
> hw/pci-host/piix.c | 1 +
> hw/pci-host/q35.c | 1 +
> hw/timer/hpet.c | 2 +-
> hw/timer/twl92230.c | 1 -
> hw/usb/dev-storage.c | 1 -
> hw/xen/xen_pt_load_rom.c | 4 ----
> include/hw/i386/ich9.h | 1 -
> include/hw/i386/intel_iommu.h | 4 ----
> include/hw/i386/ioapic_internal.h | 1 -
> include/hw/i386/pc.h | 12 +++---------
> include/hw/pci-host/q35.h | 8 +-------
> vl.c | 1 +
> 25 files changed, 18 insertions(+), 34 deletions(-)
>
Acked-by: John Snow <jsnow@redhat.com>
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa)
2019-10-14 14:22 [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) Philippe Mathieu-Daudé
` (20 preceding siblings ...)
2019-10-14 17:03 ` [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa) John Snow
@ 2019-10-26 12:20 ` Philippe Mathieu-Daudé
2019-10-26 13:32 ` Laurent Vivier
21 siblings, 1 reply; 29+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-26 12:20 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel, QEMU Trivial
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, Paolo Bonzini, John Snow,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Igor Mammedov
Hi,
On 10/14/19 4:22 PM, Philippe Mathieu-Daudé wrote:
> This is a follow-up of Markus's cleanup series:
> Tame a few "touch this, recompile the world"
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
>
> This part is mostly restricted to X86, but since some file from the
> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
> too.
>
> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
> platforms (Quest I started 2 years ago...).
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (20):
> vl: Add missing "hw/boards.h" include
> hw/southbridge/ich9: Removed unused headers
> hw/input/pckbd: Remove unused "hw/i386/pc.h" header
> hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
> hw/timer: Remove unused "ui/console.h" header
> hw/usb/dev-storage: Remove unused "ui/console.h" header
> hw/i386/intel_iommu: Remove unused includes
> hw/xen/xen_pt_load_rom: Remove unused includes
> hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
> hw/alpha/dp264: Include "net/net.h"
> hw/hppa/machine: Include "net/net.h"
> hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
> hw/timer/hpet: Include "exec/address-spaces.h"
> hw/pci-host/q35: Include "qemu/range.h"
> hw/i2c/smbus_ich9: Include "qemu/range.h"
> hw/pci-host/piix: Include "qemu/range.h"
> hw/acpi: Include "hw/mem/nvdimm.h"
> hw/i386: Include "hw/mem/nvdimm.h"
> hw/pci-host/q35: Remove unused includes
> hw/i386/pc: Clean up includes
Laurent, since this series is fully reviewed, can it go via
your qemu-trivial tree?
Thanks,
Phil.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa)
2019-10-26 12:20 ` Philippe Mathieu-Daudé
@ 2019-10-26 13:32 ` Laurent Vivier
2020-02-27 13:28 ` Paolo Bonzini
0 siblings, 1 reply; 29+ messages in thread
From: Laurent Vivier @ 2019-10-26 13:32 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Markus Armbruster, qemu-devel,
QEMU Trivial
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, Igor Mammedov, John Snow,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Paolo Bonzini
Le 26/10/2019 à 14:20, Philippe Mathieu-Daudé a écrit :
> Hi,
>
> On 10/14/19 4:22 PM, Philippe Mathieu-Daudé wrote:
>> This is a follow-up of Markus's cleanup series:
>> Tame a few "touch this, recompile the world"
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
>>
>> This part is mostly restricted to X86, but since some file from the
>> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
>> too.
>>
>> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
>> platforms (Quest I started 2 years ago...).
>>
>> Regards,
>>
>> Phil.
>>
>> Philippe Mathieu-Daudé (20):
>> vl: Add missing "hw/boards.h" include
>> hw/southbridge/ich9: Removed unused headers
>> hw/input/pckbd: Remove unused "hw/i386/pc.h" header
>> hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
>> hw/timer: Remove unused "ui/console.h" header
>> hw/usb/dev-storage: Remove unused "ui/console.h" header
>> hw/i386/intel_iommu: Remove unused includes
>> hw/xen/xen_pt_load_rom: Remove unused includes
>> hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
>> hw/alpha/dp264: Include "net/net.h"
>> hw/hppa/machine: Include "net/net.h"
>> hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
>> hw/timer/hpet: Include "exec/address-spaces.h"
>> hw/pci-host/q35: Include "qemu/range.h"
>> hw/i2c/smbus_ich9: Include "qemu/range.h"
>> hw/pci-host/piix: Include "qemu/range.h"
>> hw/acpi: Include "hw/mem/nvdimm.h"
>> hw/i386: Include "hw/mem/nvdimm.h"
>> hw/pci-host/q35: Remove unused includes
>> hw/i386/pc: Clean up includes
> Laurent, since this series is fully reviewed, can it go via
> your qemu-trivial tree?
I'll try but I'm not sure to have the time to do that before the softfreeze.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa)
2019-10-26 13:32 ` Laurent Vivier
@ 2020-02-27 13:28 ` Paolo Bonzini
2020-03-09 11:57 ` Laurent Vivier
0 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2020-02-27 13:28 UTC (permalink / raw)
To: Laurent Vivier, Philippe Mathieu-Daudé, Markus Armbruster,
qemu-devel, QEMU Trivial
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, John Snow,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Igor Mammedov
On 26/10/19 15:32, Laurent Vivier wrote:
> Le 26/10/2019 à 14:20, Philippe Mathieu-Daudé a écrit :
>> Hi,
>>
>> On 10/14/19 4:22 PM, Philippe Mathieu-Daudé wrote:
>>> This is a follow-up of Markus's cleanup series:
>>> Tame a few "touch this, recompile the world"
>>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
>>>
>>> This part is mostly restricted to X86, but since some file from the
>>> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
>>> too.
>>>
>>> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
>>> platforms (Quest I started 2 years ago...).
>>>
>>> Regards,
>>>
>>> Phil.
>>>
>>> Philippe Mathieu-Daudé (20):
>>> vl: Add missing "hw/boards.h" include
>>> hw/southbridge/ich9: Removed unused headers
>>> hw/input/pckbd: Remove unused "hw/i386/pc.h" header
>>> hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
>>> hw/timer: Remove unused "ui/console.h" header
>>> hw/usb/dev-storage: Remove unused "ui/console.h" header
>>> hw/i386/intel_iommu: Remove unused includes
>>> hw/xen/xen_pt_load_rom: Remove unused includes
>>> hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
>>> hw/alpha/dp264: Include "net/net.h"
>>> hw/hppa/machine: Include "net/net.h"
>>> hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
>>> hw/timer/hpet: Include "exec/address-spaces.h"
>>> hw/pci-host/q35: Include "qemu/range.h"
>>> hw/i2c/smbus_ich9: Include "qemu/range.h"
>>> hw/pci-host/piix: Include "qemu/range.h"
>>> hw/acpi: Include "hw/mem/nvdimm.h"
>>> hw/i386: Include "hw/mem/nvdimm.h"
>>> hw/pci-host/q35: Remove unused includes
>>> hw/i386/pc: Clean up includes
>> Laurent, since this series is fully reviewed, can it go via
>> your qemu-trivial tree?
>
> I'll try but I'm not sure to have the time to do that before the softfreeze.
Ping :)
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 00/20] hw: Clean up hw/i386 headers (and few alpha/hppa)
2020-02-27 13:28 ` Paolo Bonzini
@ 2020-03-09 11:57 ` Laurent Vivier
0 siblings, 0 replies; 29+ messages in thread
From: Laurent Vivier @ 2020-03-09 11:57 UTC (permalink / raw)
To: Paolo Bonzini, Philippe Mathieu-Daudé, Markus Armbruster,
qemu-devel, QEMU Trivial
Cc: Fam Zheng, Peter Maydell, Matthew Rosato, Paul Durrant,
Gerd Hoffmann, Stefano Stabellini, qemu-block, Helge Deller,
David Hildenbrand, Halil Pasic, Christian Borntraeger,
Anthony Perard, xen-devel, Eduardo Habkost, Xie Changlong,
qemu-s390x, qemu-arm, Stefan Hajnoczi, John Snow,
Richard Henderson, Kevin Wolf, Wen Congyang, Cornelia Huck,
Max Reitz, Michael S. Tsirkin, Igor Mammedov
Le 27/02/2020 à 14:28, Paolo Bonzini a écrit :
> On 26/10/19 15:32, Laurent Vivier wrote:
>> Le 26/10/2019 à 14:20, Philippe Mathieu-Daudé a écrit :
>>> Hi,
>>>
>>> On 10/14/19 4:22 PM, Philippe Mathieu-Daudé wrote:
>>>> This is a follow-up of Markus's cleanup series:
>>>> Tame a few "touch this, recompile the world"
>>>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
>>>>
>>>> This part is mostly restricted to X86, but since some file from the
>>>> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
>>>> too.
>>>>
>>>> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
>>>> platforms (Quest I started 2 years ago...).
>>>>
>>>> Regards,
>>>>
>>>> Phil.
>>>>
>>>> Philippe Mathieu-Daudé (20):
>>>> vl: Add missing "hw/boards.h" include
>>>> hw/southbridge/ich9: Removed unused headers
>>>> hw/input/pckbd: Remove unused "hw/i386/pc.h" header
>>>> hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
>>>> hw/timer: Remove unused "ui/console.h" header
>>>> hw/usb/dev-storage: Remove unused "ui/console.h" header
>>>> hw/i386/intel_iommu: Remove unused includes
>>>> hw/xen/xen_pt_load_rom: Remove unused includes
>>>> hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
>>>> hw/alpha/dp264: Include "net/net.h"
>>>> hw/hppa/machine: Include "net/net.h"
>>>> hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
>>>> hw/timer/hpet: Include "exec/address-spaces.h"
>>>> hw/pci-host/q35: Include "qemu/range.h"
>>>> hw/i2c/smbus_ich9: Include "qemu/range.h"
>>>> hw/pci-host/piix: Include "qemu/range.h"
>>>> hw/acpi: Include "hw/mem/nvdimm.h"
>>>> hw/i386: Include "hw/mem/nvdimm.h"
>>>> hw/pci-host/q35: Remove unused includes
>>>> hw/i386/pc: Clean up includes
>>> Laurent, since this series is fully reviewed, can it go via
>>> your qemu-trivial tree?
>>
>> I'll try but I'm not sure to have the time to do that before the softfreeze.
>
> Ping :)
Applied v2 to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 29+ messages in thread