Message ID | 20170518172543.32694-3-quintela@redhat.com |
---|---|
State | New |
Headers | show |
On 18/05/2017 19:25, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/core/qdev.c | 1 - > include/hw/acpi/memory_hotplug.h | 1 - > include/hw/acpi/pcihp.h | 1 - > include/hw/pci/shpc.h | 1 - > include/net/net.h | 1 - > target/alpha/cpu.c | 1 - > target/hppa/cpu.c | 1 - > target/s390x/cpu.c | 1 - > target/tilegx/cpu.c | 1 - > 9 files changed, 9 deletions(-) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 71ff95f..0ce45a2 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -37,7 +37,6 @@ > #include "hw/boards.h" > #include "hw/sysbus.h" > #include "qapi-event.h" > -#include "migration/vmstate.h" > > bool qdev_hotplug = false; > static bool qdev_hot_added = false; This one uses "VMStateDescription", "vmstate_check_only_migratable", "vmstate_register_with_alias_id" and "vmstate_unregister" from migration/savevm.h > diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h > index db8ebc9..77c6576 100644 > --- a/include/hw/acpi/memory_hotplug.h > +++ b/include/hw/acpi/memory_hotplug.h > @@ -3,7 +3,6 @@ > > #include "hw/qdev-core.h" > #include "hw/acpi/acpi.h" > -#include "migration/vmstate.h" > #include "hw/acpi/aml-build.h" > > /** This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h > diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h > index 04528b7..8a65f99 100644 > --- a/include/hw/acpi/pcihp.h > +++ b/include/hw/acpi/pcihp.h > @@ -28,7 +28,6 @@ > #define HW_ACPI_PCIHP_H > > #include "hw/acpi/acpi.h" > -#include "migration/vmstate.h" > #include "hw/hotplug.h" > > #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h > diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h > index b208554..71e836b 100644 > --- a/include/hw/pci/shpc.h > +++ b/include/hw/pci/shpc.h > @@ -3,7 +3,6 @@ > > #include "qemu-common.h" > #include "exec/memory.h" > -#include "migration/vmstate.h" > #include "hw/hotplug.h" > #include "hw/pci/pci.h" This one uses "VMSTATE_BUFFER_UNSAFE_INFO_TEST()" which is defined in migration/vmstate.h. > > diff --git a/include/net/net.h b/include/net/net.h > index 99b28d5..ba663bd 100644 > --- a/include/net/net.h > +++ b/include/net/net.h > @@ -6,7 +6,6 @@ > #include "qapi/qmp/qdict.h" > #include "qemu/option.h" > #include "net/queue.h" > -#include "migration/vmstate.h" > #include "qapi-types.h" > > #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" This one uses "vmstate_offset_array()" which is defined in migration/vmstate.h Perhaps you can explain why you think they are unneeded? Thanks, Laurent
Laurent Vivier <lvivier@redhat.com> wrote: > On 18/05/2017 19:25, Juan Quintela wrote: >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> hw/core/qdev.c | 1 - >> include/hw/acpi/memory_hotplug.h | 1 - >> include/hw/acpi/pcihp.h | 1 - >> include/hw/pci/shpc.h | 1 - >> include/net/net.h | 1 - >> target/alpha/cpu.c | 1 - >> target/hppa/cpu.c | 1 - >> target/s390x/cpu.c | 1 - >> target/tilegx/cpu.c | 1 - >> 9 files changed, 9 deletions(-) >> >> diff --git a/hw/core/qdev.c b/hw/core/qdev.c >> index 71ff95f..0ce45a2 100644 >> --- a/hw/core/qdev.c >> +++ b/hw/core/qdev.c >> @@ -37,7 +37,6 @@ >> #include "hw/boards.h" >> #include "hw/sysbus.h" >> #include "qapi-event.h" >> -#include "migration/vmstate.h" >> >> bool qdev_hotplug = false; >> static bool qdev_hot_added = false; > > This one uses "VMStateDescription", "vmstate_check_only_migratable", > "vmstate_register_with_alias_id" and "vmstate_unregister" from > migration/savevm.h #includes "hw/qdev.h" which 1st include is #include "hw/hw.h" which include "migration/vmstate.h" After this series the only include file that includes migration/vmstate.h is hw/hw.h. Removing it makes no sense (IMHO) because it would mean including it directly in more than half of the tree. > >> diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h >> index db8ebc9..77c6576 100644 >> --- a/include/hw/acpi/memory_hotplug.h >> +++ b/include/hw/acpi/memory_hotplug.h >> @@ -3,7 +3,6 @@ >> >> #include "hw/qdev-core.h" >> #include "hw/acpi/acpi.h" >> -#include "migration/vmstate.h" >> #include "hw/acpi/aml-build.h" >> >> /** > > This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h #include "hw/acpi/acpi.h" which includes: #include "hw/acpi/acpi_dev_interface.h" -> #include "hw/boards.h" -> #include "hw/hw.h" >> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h >> index 04528b7..8a65f99 100644 >> --- a/include/hw/acpi/pcihp.h >> +++ b/include/hw/acpi/pcihp.h >> @@ -28,7 +28,6 @@ >> #define HW_ACPI_PCIHP_H >> >> #include "hw/acpi/acpi.h" >> -#include "migration/vmstate.h" >> #include "hw/hotplug.h" >> >> #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" > > This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h see previous one >> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h >> index b208554..71e836b 100644 >> --- a/include/hw/pci/shpc.h >> +++ b/include/hw/pci/shpc.h >> @@ -3,7 +3,6 @@ >> >> #include "qemu-common.h" >> #include "exec/memory.h" >> -#include "migration/vmstate.h" >> #include "hw/hotplug.h" >> #include "hw/pci/pci.h" > > This one uses "VMSTATE_BUFFER_UNSAFE_INFO_TEST()" which is defined in > migration/vmstate.h. #include "hw/pci/pci.h" -> #include "hw/qedev.h" -> #included "hw/hw.h" >> >> diff --git a/include/net/net.h b/include/net/net.h >> index 99b28d5..ba663bd 100644 >> --- a/include/net/net.h >> +++ b/include/net/net.h >> @@ -6,7 +6,6 @@ >> #include "qapi/qmp/qdict.h" >> #include "qemu/option.h" >> #include "net/queue.h" >> -#include "migration/vmstate.h" >> #include "qapi-types.h" >> >> #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" > > This one uses "vmstate_offset_array()" which is defined in > migration/vmstate.h > > Perhaps you can explain why you think they are unneeded? In all previous ones, they arrive to hw/hw.h for means that are not going to be removed. For this one, I am getting trouble finding a normal chain. #include "qemu/osdep.h" #include "net/net.h" with this change works. But I am not able to find *why*. So, I am dropping this last bit. Is that ok for you? Later, Juan.
On 30/05/2017 17:27, Juan Quintela wrote: > Laurent Vivier <lvivier@redhat.com> wrote: >> On 18/05/2017 19:25, Juan Quintela wrote: >>> Signed-off-by: Juan Quintela <quintela@redhat.com> >>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> --- >>> hw/core/qdev.c | 1 - >>> include/hw/acpi/memory_hotplug.h | 1 - >>> include/hw/acpi/pcihp.h | 1 - >>> include/hw/pci/shpc.h | 1 - >>> include/net/net.h | 1 - >>> target/alpha/cpu.c | 1 - >>> target/hppa/cpu.c | 1 - >>> target/s390x/cpu.c | 1 - >>> target/tilegx/cpu.c | 1 - >>> 9 files changed, 9 deletions(-) >>> >>> diff --git a/hw/core/qdev.c b/hw/core/qdev.c >>> index 71ff95f..0ce45a2 100644 >>> --- a/hw/core/qdev.c >>> +++ b/hw/core/qdev.c >>> @@ -37,7 +37,6 @@ >>> #include "hw/boards.h" >>> #include "hw/sysbus.h" >>> #include "qapi-event.h" >>> -#include "migration/vmstate.h" >>> >>> bool qdev_hotplug = false; >>> static bool qdev_hot_added = false; >> >> This one uses "VMStateDescription", "vmstate_check_only_migratable", >> "vmstate_register_with_alias_id" and "vmstate_unregister" from >> migration/savevm.h > > #includes "hw/qdev.h" > > which 1st include is > > #include "hw/hw.h" > > which include "migration/vmstate.h" > > After this series the only include file that includes > migration/vmstate.h is hw/hw.h. Removing it makes no sense (IMHO) > because it would mean including it directly in more than half of the tree. > >> >>> diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h >>> index db8ebc9..77c6576 100644 >>> --- a/include/hw/acpi/memory_hotplug.h >>> +++ b/include/hw/acpi/memory_hotplug.h >>> @@ -3,7 +3,6 @@ >>> >>> #include "hw/qdev-core.h" >>> #include "hw/acpi/acpi.h" >>> -#include "migration/vmstate.h" >>> #include "hw/acpi/aml-build.h" >>> >>> /** >> >> This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h > > #include "hw/acpi/acpi.h" > > which includes: > > #include "hw/acpi/acpi_dev_interface.h" > > -> > > #include "hw/boards.h" > > -> > > #include "hw/hw.h" > >>> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h >>> index 04528b7..8a65f99 100644 >>> --- a/include/hw/acpi/pcihp.h >>> +++ b/include/hw/acpi/pcihp.h >>> @@ -28,7 +28,6 @@ >>> #define HW_ACPI_PCIHP_H >>> >>> #include "hw/acpi/acpi.h" >>> -#include "migration/vmstate.h" >>> #include "hw/hotplug.h" >>> >>> #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" >> >> This one uses "VMSTATE_STRUCT()" which is defined in migration/vmstate.h > > see previous one > >>> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h >>> index b208554..71e836b 100644 >>> --- a/include/hw/pci/shpc.h >>> +++ b/include/hw/pci/shpc.h >>> @@ -3,7 +3,6 @@ >>> >>> #include "qemu-common.h" >>> #include "exec/memory.h" >>> -#include "migration/vmstate.h" >>> #include "hw/hotplug.h" >>> #include "hw/pci/pci.h" >> >> This one uses "VMSTATE_BUFFER_UNSAFE_INFO_TEST()" which is defined in >> migration/vmstate.h. > > #include "hw/pci/pci.h" > -> > #include "hw/qedev.h" > -> > #included "hw/hw.h" > >>> >>> diff --git a/include/net/net.h b/include/net/net.h >>> index 99b28d5..ba663bd 100644 >>> --- a/include/net/net.h >>> +++ b/include/net/net.h >>> @@ -6,7 +6,6 @@ >>> #include "qapi/qmp/qdict.h" >>> #include "qemu/option.h" >>> #include "net/queue.h" >>> -#include "migration/vmstate.h" >>> #include "qapi-types.h" >>> >>> #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" >> >> This one uses "vmstate_offset_array()" which is defined in >> migration/vmstate.h >> >> Perhaps you can explain why you think they are unneeded? > > In all previous ones, they arrive to hw/hw.h for means that are not > going to be removed. For this one, I am getting trouble finding a > normal chain. > > #include "qemu/osdep.h" > #include "net/net.h" > > with this change works. But I am not able to find *why*. Perhaps you can play with "cc -E"? > > So, I am dropping this last bit. > > Is that ok for you? It makes sense Thanks, Laurent
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 71ff95f..0ce45a2 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -37,7 +37,6 @@ #include "hw/boards.h" #include "hw/sysbus.h" #include "qapi-event.h" -#include "migration/vmstate.h" bool qdev_hotplug = false; static bool qdev_hot_added = false; diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h index db8ebc9..77c6576 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -3,7 +3,6 @@ #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" -#include "migration/vmstate.h" #include "hw/acpi/aml-build.h" /** diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index 04528b7..8a65f99 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -28,7 +28,6 @@ #define HW_ACPI_PCIHP_H #include "hw/acpi/acpi.h" -#include "migration/vmstate.h" #include "hw/hotplug.h" #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index b208554..71e836b 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -3,7 +3,6 @@ #include "qemu-common.h" #include "exec/memory.h" -#include "migration/vmstate.h" #include "hw/hotplug.h" #include "hw/pci/pci.h" diff --git a/include/net/net.h b/include/net/net.h index 99b28d5..ba663bd 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -6,7 +6,6 @@ #include "qapi/qmp/qdict.h" #include "qemu/option.h" #include "net/queue.h" -#include "migration/vmstate.h" #include "qapi-types.h" #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index b4f9798..8186c9d 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -23,7 +23,6 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu-common.h" -#include "migration/vmstate.h" #include "exec/exec-all.h" diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 1d791d0..30299e9 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -22,7 +22,6 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu-common.h" -#include "migration/vmstate.h" #include "exec/exec-all.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index a1bf2ba..e820e63 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -32,7 +32,6 @@ #include "qemu/error-report.h" #include "trace.h" #include "qapi/visitor.h" -#include "migration/vmstate.h" #include "exec/exec-all.h" #ifndef CONFIG_USER_ONLY #include "hw/hw.h" diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c index d90e38e..4532639 100644 --- a/target/tilegx/cpu.c +++ b/target/tilegx/cpu.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "qemu-common.h" #include "hw/qdev-properties.h" -#include "migration/vmstate.h" #include "linux-user/syscall_defs.h" #include "exec/exec-all.h"