mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
migration: lower handler priority
Define a vmstate priority that is lower than the default, so its handlers run after all default priority handlers. Since 0 is no longer the default priority, translate an uninitialized priority of 0 to MIG_PRI_DEFAULT. CPR for vfio will use this to install handlers for containers that run after handlers for the devices that they contain. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/qemu-devel/1749569991-25171-3-git-send-email-steven.sistare@oracle.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
f95fd60ac1
commit
081c09dc52
2 changed files with 7 additions and 3 deletions
|
@ -155,7 +155,11 @@ enum VMStateFlags {
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
MIG_PRI_DEFAULT = 0,
|
MIG_PRI_UNINITIALIZED = 0, /* An uninitialized priority field maps to */
|
||||||
|
/* MIG_PRI_DEFAULT in save_state_priority */
|
||||||
|
|
||||||
|
MIG_PRI_LOW, /* Must happen after default */
|
||||||
|
MIG_PRI_DEFAULT,
|
||||||
MIG_PRI_IOMMU, /* Must happen before PCI devices */
|
MIG_PRI_IOMMU, /* Must happen before PCI devices */
|
||||||
MIG_PRI_PCI_BUS, /* Must happen before IOMMU */
|
MIG_PRI_PCI_BUS, /* Must happen before IOMMU */
|
||||||
MIG_PRI_VIRTIO_MEM, /* Must happen before IOMMU */
|
MIG_PRI_VIRTIO_MEM, /* Must happen before IOMMU */
|
||||||
|
|
|
@ -266,7 +266,7 @@ typedef struct SaveState {
|
||||||
|
|
||||||
static SaveState savevm_state = {
|
static SaveState savevm_state = {
|
||||||
.handlers = QTAILQ_HEAD_INITIALIZER(savevm_state.handlers),
|
.handlers = QTAILQ_HEAD_INITIALIZER(savevm_state.handlers),
|
||||||
.handler_pri_head = { [MIG_PRI_DEFAULT ... MIG_PRI_MAX] = NULL },
|
.handler_pri_head = { [0 ... MIG_PRI_MAX] = NULL },
|
||||||
.global_section_id = 0,
|
.global_section_id = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -737,7 +737,7 @@ static int calculate_compat_instance_id(const char *idstr)
|
||||||
|
|
||||||
static inline MigrationPriority save_state_priority(SaveStateEntry *se)
|
static inline MigrationPriority save_state_priority(SaveStateEntry *se)
|
||||||
{
|
{
|
||||||
if (se->vmsd) {
|
if (se->vmsd && se->vmsd->priority) {
|
||||||
return se->vmsd->priority;
|
return se->vmsd->priority;
|
||||||
}
|
}
|
||||||
return MIG_PRI_DEFAULT;
|
return MIG_PRI_DEFAULT;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue