| Message ID | 4eedd529e6617f80f3d6a66d7268a0db2bc173fa.1741124640.git.maciej.szmigiero@oracle.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Multifd | expand |
On 3/4/25 23:03, Maciej S. Szmigiero wrote: > From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com> > > Add basic types and flags used by VFIO multifd device state transfer > support. > > Since we'll be introducing a lot of multifd transfer specific code, > add a new file migration-multifd.c to home it, wired into main VFIO > migration code (migration.c) via migration-multifd.h header file. > > Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/meson.build | 1 + > hw/vfio/migration-multifd.c | 33 +++++++++++++++++++++++++++++++++ > hw/vfio/migration-multifd.h | 17 +++++++++++++++++ > hw/vfio/migration.c | 1 + > 4 files changed, 52 insertions(+) > create mode 100644 hw/vfio/migration-multifd.c > create mode 100644 hw/vfio/migration-multifd.h > > diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build > index bba776f75cc7..260d65febd6b 100644 > --- a/hw/vfio/meson.build > +++ b/hw/vfio/meson.build > @@ -5,6 +5,7 @@ vfio_ss.add(files( > 'container-base.c', > 'container.c', > 'migration.c', > + 'migration-multifd.c', > 'cpr.c', > )) > vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) > diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c > new file mode 100644 > index 000000000000..fa594b33fdd1 > --- /dev/null > +++ b/hw/vfio/migration-multifd.c > @@ -0,0 +1,33 @@ > +/* > + * Multifd VFIO migration > + * > + * Copyright (C) 2024,2025 Oracle and/or its affiliates. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + */ > + > +#include "qemu/osdep.h" > +#include "hw/vfio/vfio-common.h" > +#include "migration/misc.h" > +#include "qapi/error.h" > +#include "qemu/error-report.h" > +#include "qemu/lockable.h" > +#include "qemu/main-loop.h" > +#include "qemu/thread.h" > +#include "migration/qemu-file.h" > +#include "migration-multifd.h" > +#include "trace.h" > + > +#define VFIO_DEVICE_STATE_CONFIG_STATE (1) > + > +#define VFIO_DEVICE_STATE_PACKET_VER_CURRENT (0) > + > +typedef struct VFIODeviceStatePacket { > + uint32_t version; > + uint32_t idx; > + uint32_t flags; > + uint8_t data[0]; > +} QEMU_PACKED VFIODeviceStatePacket; > diff --git a/hw/vfio/migration-multifd.h b/hw/vfio/migration-multifd.h > new file mode 100644 > index 000000000000..5b221c6e16b0 > --- /dev/null > +++ b/hw/vfio/migration-multifd.h > @@ -0,0 +1,17 @@ > +/* > + * Multifd VFIO migration > + * > + * Copyright (C) 2024,2025 Oracle and/or its affiliates. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + */ > + > +#ifndef HW_VFIO_MIGRATION_MULTIFD_H > +#define HW_VFIO_MIGRATION_MULTIFD_H > + > +#include "hw/vfio/vfio-common.h" > + > +#endif > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index a9b0970604aa..dc1fe4e717a4 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -23,6 +23,7 @@ > #include "migration/qemu-file.h" > #include "migration/register.h" > #include "migration/blocker.h" > +#include "migration-multifd.h" > #include "qapi/error.h" > #include "qapi/qapi-events-vfio.h" > #include "exec/ramlist.h" >
diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index bba776f75cc7..260d65febd6b 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -5,6 +5,7 @@ vfio_ss.add(files( 'container-base.c', 'container.c', 'migration.c', + 'migration-multifd.c', 'cpr.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c new file mode 100644 index 000000000000..fa594b33fdd1 --- /dev/null +++ b/hw/vfio/migration-multifd.c @@ -0,0 +1,33 @@ +/* + * Multifd VFIO migration + * + * Copyright (C) 2024,2025 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/vfio/vfio-common.h" +#include "migration/misc.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/lockable.h" +#include "qemu/main-loop.h" +#include "qemu/thread.h" +#include "migration/qemu-file.h" +#include "migration-multifd.h" +#include "trace.h" + +#define VFIO_DEVICE_STATE_CONFIG_STATE (1) + +#define VFIO_DEVICE_STATE_PACKET_VER_CURRENT (0) + +typedef struct VFIODeviceStatePacket { + uint32_t version; + uint32_t idx; + uint32_t flags; + uint8_t data[0]; +} QEMU_PACKED VFIODeviceStatePacket; diff --git a/hw/vfio/migration-multifd.h b/hw/vfio/migration-multifd.h new file mode 100644 index 000000000000..5b221c6e16b0 --- /dev/null +++ b/hw/vfio/migration-multifd.h @@ -0,0 +1,17 @@ +/* + * Multifd VFIO migration + * + * Copyright (C) 2024,2025 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_VFIO_MIGRATION_MULTIFD_H +#define HW_VFIO_MIGRATION_MULTIFD_H + +#include "hw/vfio/vfio-common.h" + +#endif diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index a9b0970604aa..dc1fe4e717a4 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -23,6 +23,7 @@ #include "migration/qemu-file.h" #include "migration/register.h" #include "migration/blocker.h" +#include "migration-multifd.h" #include "qapi/error.h" #include "qapi/qapi-events-vfio.h" #include "exec/ramlist.h"