falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm_gic_kvm: Disable live migration if not supported 

Currently, if the kernel does not have live migration API, the migration
will still be attempted, but vGIC save/restore functions will just not do
anything. This will result in a broken machine state.

This patch fixes the problem by adding migration blocker if kernel API is
not supported.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Pavel Fedin 2015-10-27 12:00:50 +00:00 committed by Peter Maydell
parent b876452507
commit 24182fbc19
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/intc/arm_gic_kvm.c
View File

@ -20,6 +20,7 @@
*/ */
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "migration/migration.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "kvm_arm.h" #include "kvm_arm.h"
#include "gic_internal.h" #include "gic_internal.h"
@ -307,11 +308,6 @@ static void kvm_arm_gic_put(GICState *s)
int num_cpu; int num_cpu;
int num_irq; int num_irq;
if (!kvm_arm_gic_can_save_restore(s)) {
DPRINTF("Cannot put kernel gic state, no kernel interface");
return;
}
/* Note: We do the restore in a slightly different order than the save /* Note: We do the restore in a slightly different order than the save
* (where the order doesn't matter and is simply ordered according to the * (where the order doesn't matter and is simply ordered according to the
* register offset values */ * register offset values */
@ -411,11 +407,6 @@ static void kvm_arm_gic_get(GICState *s)
int i; int i;
int cpu; int cpu;
if (!kvm_arm_gic_can_save_restore(s)) {
DPRINTF("Cannot get kernel gic state, no kernel interface");
return;
}
/***************************************************************** /*****************************************************************
* Distributor State * Distributor State
*/ */
@ -503,7 +494,10 @@ static void kvm_arm_gic_reset(DeviceState *dev)
KVMARMGICClass *kgc = KVM_ARM_GIC_GET_CLASS(s); KVMARMGICClass *kgc = KVM_ARM_GIC_GET_CLASS(s);
kgc->parent_reset(dev); kgc->parent_reset(dev);
kvm_arm_gic_put(s);
if (kvm_arm_gic_can_save_restore(s)) {
kvm_arm_gic_put(s);
}
} }
static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
@ -573,6 +567,12 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_DEV_ARM_VGIC_GRP_ADDR,
KVM_VGIC_V2_ADDR_TYPE_CPU, KVM_VGIC_V2_ADDR_TYPE_CPU,
s->dev_fd); s->dev_fd);
if (!kvm_arm_gic_can_save_restore(s)) {
error_setg(&s->migration_blocker, "This operating system kernel does "
"not support vGICv2 migration");
migrate_add_blocker(s->migration_blocker);
}
} }
static void kvm_arm_gic_class_init(ObjectClass *klass, void *data) static void kvm_arm_gic_class_init(ObjectClass *klass, void *data)

1
include/hw/intc/arm_gic_common.h
View File

@ -111,6 +111,7 @@ typedef struct GICState {
bool security_extn; bool security_extn;
bool irq_reset_nonsecure; /* configure IRQs as group 1 (NS) on reset? */ bool irq_reset_nonsecure; /* configure IRQs as group 1 (NS) on reset? */
int dev_fd; /* kvm device fd if backed by kvm vgic support */ int dev_fd; /* kvm device fd if backed by kvm vgic support */
Error *migration_blocker;
} GICState; } GICState;
#define TYPE_ARM_GIC_COMMON "arm_gic_common" #define TYPE_ARM_GIC_COMMON "arm_gic_common"