Message ID | 20210414112004.943383-3-thuth@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Poison more CONFIG switches | expand |
* Thomas Huth (thuth@redhat.com) wrote: > The CONFIG_VFIO switch only works in target specific code. Since > migration/migration.c is common code, the #ifdef does not have > the intended behavior here. Move the related code to a separate > file now which gets compiled via specific_ss instead. > > Fixes: 3710586caa ("qapi: Add VFIO devices migration stats in Migration stats") > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> althoguh I wonder if it would be easier to put the populate_vfio_info into hw/vfio and add a stub function? Dave > --- > migration/meson.build | 3 ++- > migration/migration.c | 15 --------------- > migration/migration.h | 2 ++ > migration/target.c | 25 +++++++++++++++++++++++++ > 4 files changed, 29 insertions(+), 16 deletions(-) > create mode 100644 migration/target.c > > diff --git a/migration/meson.build b/migration/meson.build > index 3ecedce94d..f8714dcb15 100644 > --- a/migration/meson.build > +++ b/migration/meson.build > @@ -31,4 +31,5 @@ softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) > softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) > softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) > > -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c', 'ram.c')) > +specific_ss.add(when: 'CONFIG_SOFTMMU', > + if_true: files('dirtyrate.c', 'ram.c', 'target.c')) > diff --git a/migration/migration.c b/migration/migration.c > index 8ca034136b..db8c378079 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -60,10 +60,6 @@ > #include "qemu/yank.h" > #include "sysemu/cpus.h" > > -#ifdef CONFIG_VFIO > -#include "hw/vfio/vfio-common.h" > -#endif > - > #define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */ > > /* Amount of time to allocate to each "chunk" of bandwidth-throttled > @@ -1059,17 +1055,6 @@ static void populate_disk_info(MigrationInfo *info) > } > } > > -static void populate_vfio_info(MigrationInfo *info) > -{ > -#ifdef CONFIG_VFIO > - if (vfio_mig_active()) { > - info->has_vfio = true; > - info->vfio = g_malloc0(sizeof(*info->vfio)); > - info->vfio->transferred = vfio_mig_bytes_transferred(); > - } > -#endif > -} > - > static void fill_source_migration_info(MigrationInfo *info) > { > MigrationState *s = migrate_get_current(); > diff --git a/migration/migration.h b/migration/migration.h > index db6708326b..2730fa05c0 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -376,4 +376,6 @@ void migration_make_urgent_request(void); > void migration_consume_urgent_request(void); > bool migration_rate_limit(void); > > +void populate_vfio_info(MigrationInfo *info); > + > #endif > diff --git a/migration/target.c b/migration/target.c > new file mode 100644 > index 0000000000..907ebf0a0a > --- /dev/null > +++ b/migration/target.c > @@ -0,0 +1,25 @@ > +/* > + * QEMU live migration - functions that need to be compiled target-specific > + * > + * This work is licensed under the terms of the GNU GPL, version 2 > + * or (at your option) any later version. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/qapi-types-migration.h" > +#include "migration.h" > + > +#ifdef CONFIG_VFIO > +#include "hw/vfio/vfio-common.h" > +#endif > + > +void populate_vfio_info(MigrationInfo *info) > +{ > +#ifdef CONFIG_VFIO > + if (vfio_mig_active()) { > + info->has_vfio = true; > + info->vfio = g_malloc0(sizeof(*info->vfio)); > + info->vfio->transferred = vfio_mig_bytes_transferred(); > + } > +#endif > +} > -- > 2.27.0 >
On 4/14/21 1:20 PM, Thomas Huth wrote: > The CONFIG_VFIO switch only works in target specific code. Since > migration/migration.c is common code, the #ifdef does not have > the intended behavior here. Move the related code to a separate > file now which gets compiled via specific_ss instead. > > Fixes: 3710586caa ("qapi: Add VFIO devices migration stats in Migration stats") > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > migration/meson.build | 3 ++- > migration/migration.c | 15 --------------- > migration/migration.h | 2 ++ > migration/target.c | 25 +++++++++++++++++++++++++ > 4 files changed, 29 insertions(+), 16 deletions(-) > create mode 100644 migration/target.c Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 14/04/2021 13.20, Thomas Huth wrote: > The CONFIG_VFIO switch only works in target specific code. Since > migration/migration.c is common code, the #ifdef does not have > the intended behavior here. Move the related code to a separate > file now which gets compiled via specific_ss instead. > > Fixes: 3710586caa ("qapi: Add VFIO devices migration stats in Migration stats") > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > migration/meson.build | 3 ++- > migration/migration.c | 15 --------------- > migration/migration.h | 2 ++ > migration/target.c | 25 +++++++++++++++++++++++++ > 4 files changed, 29 insertions(+), 16 deletions(-) > create mode 100644 migration/target.c > > diff --git a/migration/meson.build b/migration/meson.build > index 3ecedce94d..f8714dcb15 100644 > --- a/migration/meson.build > +++ b/migration/meson.build > @@ -31,4 +31,5 @@ softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) > softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) > softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) > > -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c', 'ram.c')) > +specific_ss.add(when: 'CONFIG_SOFTMMU', > + if_true: files('dirtyrate.c', 'ram.c', 'target.c')) > diff --git a/migration/migration.c b/migration/migration.c > index 8ca034136b..db8c378079 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -60,10 +60,6 @@ > #include "qemu/yank.h" > #include "sysemu/cpus.h" > > -#ifdef CONFIG_VFIO > -#include "hw/vfio/vfio-common.h" > -#endif > - > #define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */ > > /* Amount of time to allocate to each "chunk" of bandwidth-throttled > @@ -1059,17 +1055,6 @@ static void populate_disk_info(MigrationInfo *info) > } > } > > -static void populate_vfio_info(MigrationInfo *info) > -{ > -#ifdef CONFIG_VFIO > - if (vfio_mig_active()) { > - info->has_vfio = true; > - info->vfio = g_malloc0(sizeof(*info->vfio)); > - info->vfio->transferred = vfio_mig_bytes_transferred(); > - } > -#endif > -} > - > static void fill_source_migration_info(MigrationInfo *info) > { > MigrationState *s = migrate_get_current(); > diff --git a/migration/migration.h b/migration/migration.h > index db6708326b..2730fa05c0 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -376,4 +376,6 @@ void migration_make_urgent_request(void); > void migration_consume_urgent_request(void); > bool migration_rate_limit(void); > > +void populate_vfio_info(MigrationInfo *info); > + > #endif > diff --git a/migration/target.c b/migration/target.c > new file mode 100644 > index 0000000000..907ebf0a0a > --- /dev/null > +++ b/migration/target.c > @@ -0,0 +1,25 @@ > +/* > + * QEMU live migration - functions that need to be compiled target-specific > + * > + * This work is licensed under the terms of the GNU GPL, version 2 > + * or (at your option) any later version. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/qapi-types-migration.h" > +#include "migration.h" > + > +#ifdef CONFIG_VFIO > +#include "hw/vfio/vfio-common.h" > +#endif > + > +void populate_vfio_info(MigrationInfo *info) > +{ > +#ifdef CONFIG_VFIO > + if (vfio_mig_active()) { > + info->has_vfio = true; > + info->vfio = g_malloc0(sizeof(*info->vfio)); > + info->vfio->transferred = vfio_mig_bytes_transferred(); > + } > +#endif > +} > Ping! David, Juan, any comments on this one? Thomas
diff --git a/migration/meson.build b/migration/meson.build index 3ecedce94d..f8714dcb15 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -31,4 +31,5 @@ softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c', 'ram.c')) +specific_ss.add(when: 'CONFIG_SOFTMMU', + if_true: files('dirtyrate.c', 'ram.c', 'target.c')) diff --git a/migration/migration.c b/migration/migration.c index 8ca034136b..db8c378079 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -60,10 +60,6 @@ #include "qemu/yank.h" #include "sysemu/cpus.h" -#ifdef CONFIG_VFIO -#include "hw/vfio/vfio-common.h" -#endif - #define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */ /* Amount of time to allocate to each "chunk" of bandwidth-throttled @@ -1059,17 +1055,6 @@ static void populate_disk_info(MigrationInfo *info) } } -static void populate_vfio_info(MigrationInfo *info) -{ -#ifdef CONFIG_VFIO - if (vfio_mig_active()) { - info->has_vfio = true; - info->vfio = g_malloc0(sizeof(*info->vfio)); - info->vfio->transferred = vfio_mig_bytes_transferred(); - } -#endif -} - static void fill_source_migration_info(MigrationInfo *info) { MigrationState *s = migrate_get_current(); diff --git a/migration/migration.h b/migration/migration.h index db6708326b..2730fa05c0 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -376,4 +376,6 @@ void migration_make_urgent_request(void); void migration_consume_urgent_request(void); bool migration_rate_limit(void); +void populate_vfio_info(MigrationInfo *info); + #endif diff --git a/migration/target.c b/migration/target.c new file mode 100644 index 0000000000..907ebf0a0a --- /dev/null +++ b/migration/target.c @@ -0,0 +1,25 @@ +/* + * QEMU live migration - functions that need to be compiled target-specific + * + * This work is licensed under the terms of the GNU GPL, version 2 + * or (at your option) any later version. + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-types-migration.h" +#include "migration.h" + +#ifdef CONFIG_VFIO +#include "hw/vfio/vfio-common.h" +#endif + +void populate_vfio_info(MigrationInfo *info) +{ +#ifdef CONFIG_VFIO + if (vfio_mig_active()) { + info->has_vfio = true; + info->vfio = g_malloc0(sizeof(*info->vfio)); + info->vfio->transferred = vfio_mig_bytes_transferred(); + } +#endif +}
The CONFIG_VFIO switch only works in target specific code. Since migration/migration.c is common code, the #ifdef does not have the intended behavior here. Move the related code to a separate file now which gets compiled via specific_ss instead. Fixes: 3710586caa ("qapi: Add VFIO devices migration stats in Migration stats") Signed-off-by: Thomas Huth <thuth@redhat.com> --- migration/meson.build | 3 ++- migration/migration.c | 15 --------------- migration/migration.h | 2 ++ migration/target.c | 25 +++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 migration/target.c