50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From bae3be01cc25c5532806c3255dbae19393e95686 Mon Sep 17 00:00:00 2001
|
|
From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 4 Apr 2023 20:16:33 +0800
|
|
Subject: [PATCH] migration: fix populate_vfio_info
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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")
|
|
|
|
cheery-pick from fa76c854ae837328187bef41d80af5d1ad36681f
|
|
|
|
Signed-off-by: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
---
|
|
migration/target.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/migration/target.c b/migration/target.c
|
|
index 907ebf0a0a..00ca007f97 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();
|
|
}
|
|
--
|
|
2.27.0
|
|
|