From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Thomas Huth <thuth@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
qemu-devel@nongnu.org, "Cameron Esfahani" <dirty@apple.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Colin Xu" <colin.xu@intel.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Sunil Muthuswamy" <sunilmut@microsoft.com>,
"Wenchao Wang" <wenchao.wang@intel.com>
Subject: Re: [PATCH for-6.1 2/4] migration: Move populate_vfio_info() into a separate file
Date: Wed, 14 Apr 2021 13:22:07 +0100 [thread overview]
Message-ID: <YHbeb5FpYJSoHjui@work-vm> (raw)
In-Reply-To: <20210414112004.943383-3-thuth@redhat.com>
* 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
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2021-04-14 12:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 11:20 [PATCH for-6.1 0/4] Poison more CONFIG switches Thomas Huth
2021-04-14 11:20 ` [PATCH for-6.1 1/4] include/sysemu: Poison all accelerator CONFIG switches in common code Thomas Huth
2021-04-14 16:56 ` Philippe Mathieu-Daudé
2021-04-14 11:20 ` [PATCH for-6.1 2/4] migration: Move populate_vfio_info() into a separate file Thomas Huth
2021-04-14 12:22 ` Dr. David Alan Gilbert [this message]
2021-04-14 12:33 ` Philippe Mathieu-Daudé
2021-05-03 6:04 ` Thomas Huth
2021-04-14 11:20 ` [PATCH for-6.1 3/4] qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code Thomas Huth
2021-04-14 13:55 ` Markus Armbruster
2021-04-15 6:15 ` Thomas Huth
2021-04-15 7:44 ` Markus Armbruster
2021-04-15 8:03 ` Thomas Huth
2021-04-14 11:20 ` [PATCH for-6.1 4/4] configure: Poison all current target-specific #defines Thomas Huth
2021-04-15 8:34 ` Philippe Mathieu-Daudé
2021-04-15 11:21 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YHbeb5FpYJSoHjui@work-vm \
--to=dgilbert@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=colin.xu@intel.com \
--cc=dirty@apple.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=r.bolshakov@yadro.com \
--cc=sunilmut@microsoft.com \
--cc=thuth@redhat.com \
--cc=wenchao.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).