| Message ID | 20170417200041.2451-14-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > include/hw/hw.h | 1 + > include/migration/vmstate.h | 3 --- > migration/block.c | 1 + > migration/channel.c | 1 + > migration/colo.c | 1 + > migration/postcopy-ram.c | 1 + > migration/ram.c | 1 + > 7 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/include/hw/hw.h b/include/hw/hw.h > index e22d4ce..af9eae1 100644 > --- a/include/hw/hw.h > +++ b/include/hw/hw.h > @@ -11,6 +11,7 @@ > #include "exec/memory.h" > #include "hw/irq.h" > #include "migration/vmstate.h" > +#include "migration/qemu-file.h" > #include "qemu/module.h" > #include "sysemu/reset.h" > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index f4c5bed..1e6fcb5 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -27,9 +27,6 @@ > #ifndef QEMU_VMSTATE_H > #define QEMU_VMSTATE_H > > -#ifndef CONFIG_USER_ONLY > -#include "migration/qemu-file.h" > -#endif > #include "migration/qjson.h" > > typedef void SaveStateHandler(QEMUFile *f, void *opaque); > diff --git a/migration/block.c b/migration/block.c > index 0722837..e45a42d 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -19,6 +19,7 @@ > #include "qemu/cutils.h" > #include "migration/block.h" > #include "migration/migration.h" > +#include "migration/qemu-file.h" > #include "sysemu/block-backend.h" > > #define BLOCK_SIZE (1 << 20) > diff --git a/migration/channel.c b/migration/channel.c > index 10416e0..04a26c5 100644 > --- a/migration/channel.c > +++ b/migration/channel.c > @@ -17,6 +17,7 @@ > #include "migration/channel.h" > #include "migration/tls.h" > #include "migration/migration.h" > +#include "migration/qemu-file.h" > #include "trace.h" > #include "qapi/error.h" > #include "io/channel-tls.h" > diff --git a/migration/colo.c b/migration/colo.c > index d455884..e2eaccd 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -13,6 +13,7 @@ > #include "qemu/osdep.h" > #include "sysemu/sysemu.h" > #include "migration/migration.h" > +#include "migration/qemu-file.h" > #include "migration/colo.h" > #include "io/channel-buffer.h" > #include "trace.h" > diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c > index 11b24c6..5aea2ff 100644 > --- a/migration/postcopy-ram.c > +++ b/migration/postcopy-ram.c > @@ -18,6 +18,7 @@ > > #include "qemu/osdep.h" > #include "migration/migration.h" > +#include "migration/qemu-file.h" > #include "migration/postcopy-ram.h" > #include "sysemu/sysemu.h" > #include "sysemu/balloon.h" > diff --git a/migration/ram.c b/migration/ram.c > index 4f49622..b0759ac 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -37,6 +37,7 @@ > #include "migration/xbzrle.h" > #include "migration/init.h" > #include "migration/migration.h" > +#include "migration/qemu-file.h" > #include "migration/postcopy-ram.h" > #include "migration/page_cache.h" > #include "qemu/error-report.h" > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/hw/hw.h b/include/hw/hw.h index e22d4ce..af9eae1 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -11,6 +11,7 @@ #include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" +#include "migration/qemu-file.h" #include "qemu/module.h" #include "sysemu/reset.h" diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f4c5bed..1e6fcb5 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -27,9 +27,6 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H -#ifndef CONFIG_USER_ONLY -#include "migration/qemu-file.h" -#endif #include "migration/qjson.h" typedef void SaveStateHandler(QEMUFile *f, void *opaque); diff --git a/migration/block.c b/migration/block.c index 0722837..e45a42d 100644 --- a/migration/block.c +++ b/migration/block.c @@ -19,6 +19,7 @@ #include "qemu/cutils.h" #include "migration/block.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "sysemu/block-backend.h" #define BLOCK_SIZE (1 << 20) diff --git a/migration/channel.c b/migration/channel.c index 10416e0..04a26c5 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -17,6 +17,7 @@ #include "migration/channel.h" #include "migration/tls.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "trace.h" #include "qapi/error.h" #include "io/channel-tls.h" diff --git a/migration/colo.c b/migration/colo.c index d455884..e2eaccd 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "migration/colo.h" #include "io/channel-buffer.h" #include "trace.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 11b24c6..5aea2ff 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "migration/postcopy-ram.h" #include "sysemu/sysemu.h" #include "sysemu/balloon.h" diff --git a/migration/ram.c b/migration/ram.c index 4f49622..b0759ac 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -37,6 +37,7 @@ #include "migration/xbzrle.h" #include "migration/init.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "migration/postcopy-ram.h" #include "migration/page_cache.h" #include "qemu/error-report.h"
Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/hw/hw.h | 1 + include/migration/vmstate.h | 3 --- migration/block.c | 1 + migration/channel.c | 1 + migration/colo.c | 1 + migration/postcopy-ram.c | 1 + migration/ram.c | 1 + 7 files changed, 6 insertions(+), 3 deletions(-)