mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
migration: Include migration support for machine check handling
This patch includes migration support for machine check handling. Especially this patch blocks VM migration requests until the machine check error handling is complete as these errors are specific to the source hardware and is irrelevant on the target hardware. Signed-off-by: Aravinda Prasad <arawinda.p@gmail.com> [Do not set FWNMI cap in post_load, now its done in .apply hook] Signed-off-by: Ganesh Goudar <ganeshgr@linux.ibm.com> Message-Id: <20200130184423.20519-7-ganeshgr@linux.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
f03496bc12
commit
2500fb423a
4 changed files with 66 additions and 1 deletions
|
@ -43,6 +43,7 @@
|
|||
#include "qemu/main-loop.h"
|
||||
#include "hw/ppc/spapr_ovec.h"
|
||||
#include <libfdt.h>
|
||||
#include "migration/blocker.h"
|
||||
|
||||
#define RTAS_LOG_VERSION_MASK 0xff000000
|
||||
#define RTAS_LOG_VERSION_6 0x06000000
|
||||
|
@ -843,6 +844,8 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered)
|
|||
{
|
||||
SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
|
||||
CPUState *cs = CPU(cpu);
|
||||
int ret;
|
||||
Error *local_err = NULL;
|
||||
|
||||
if (spapr->guest_machine_check_addr == -1) {
|
||||
/*
|
||||
|
@ -872,8 +875,19 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered)
|
|||
return;
|
||||
}
|
||||
}
|
||||
spapr->mc_status = cpu->vcpu_id;
|
||||
|
||||
ret = migrate_add_blocker(spapr->fwnmi_migration_blocker, &local_err);
|
||||
if (ret == -EBUSY) {
|
||||
/*
|
||||
* We don't want to abort so we let the migration to continue.
|
||||
* In a rare case, the machine check handler will run on the target.
|
||||
* Though this is not preferable, it is better than aborting
|
||||
* the migration or killing the VM.
|
||||
*/
|
||||
warn_report("Received a fwnmi while migration was in progress");
|
||||
}
|
||||
|
||||
spapr->mc_status = cpu->vcpu_id;
|
||||
spapr_mce_dispatch_elog(cpu, recovered);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue