| Message ID | 1675795623-234945-1-git-send-email-steven.sistare@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2,01/20] migration: fix populate_vfio_info | expand |
On 07/02/2023 19.47, Steve Sistare wrote: > Include CONFIG_DEVICES so that populate_vfio_info is instantiated for > CONFIG_VFIO. Without it, the 'info migrate' command never returns > info about vfio. > > Fixes: 43bd0bf30f ("migration: Move populate_vfio_info() into a separate file") Oh, weird, I'm pretty sure that I tested my patch back then ... maybe I was on an older branch that did not have have the "#include CONFIG_DEVICES" stuff yet ... :-/ Anyway, this change here looks like the right fix: Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Steve Sistare <steven.sistare@oracle.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > migration/target.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/migration/target.c b/migration/target.c > index 907ebf0..00ca007 100644 > --- a/migration/target.c > +++ b/migration/target.c > @@ -8,6 +8,7 @@ > #include "qemu/osdep.h" > #include "qapi/qapi-types-migration.h" > #include "migration.h" > +#include CONFIG_DEVICES > > #ifdef CONFIG_VFIO > #include "hw/vfio/vfio-common.h" > @@ -17,7 +18,6 @@ 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(); > }
Steve Sistare <steven.sistare@oracle.com> wrote: > Include CONFIG_DEVICES so that populate_vfio_info is instantiated for > CONFIG_VFIO. Without it, the 'info migrate' command never returns > info about vfio. > > Fixes: 43bd0bf30f ("migration: Move populate_vfio_info() into a separate file") > Signed-off-by: Steve Sistare <steven.sistare@oracle.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> queued.
diff --git a/migration/target.c b/migration/target.c index 907ebf0..00ca007 100644 --- a/migration/target.c +++ b/migration/target.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "qapi/qapi-types-migration.h" #include "migration.h" +#include CONFIG_DEVICES #ifdef CONFIG_VFIO #include "hw/vfio/vfio-common.h" @@ -17,7 +18,6 @@ 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(); }
Include CONFIG_DEVICES so that populate_vfio_info is instantiated for CONFIG_VFIO. Without it, the 'info migrate' command never returns info about vfio. Fixes: 43bd0bf30f ("migration: Move populate_vfio_info() into a separate file") Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- migration/target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)