hw/ppc/spapr.c: Extract MMU mode error reporting into a function
A following patch will make use of it. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Message-Id: <20210505001130.3999968-2-farosas@linux.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
1 parent
c313e52e64
commit
068479e1e1
3 files changed
+19
-12
No files matched your search
@@ -1556,6 +1556,22 @@ void spapr_setup_hpt(SpaprMachineState *spapr)
|
||||
}
|
||||
}
|
||||
|
||||
void spapr_check_mmu_mode(bool guest_radix)
|
||||
{
|
||||
if (guest_radix) {
|
||||
if (kvm_enabled() && !kvmppc_has_cap_mmu_radix()) {
|
||||
error_report("Guest requested unavailable MMU mode (radix).");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
} else {
|
||||
if (kvm_enabled() && kvmppc_has_cap_mmu_radix()
|
||||
&& !kvmppc_has_cap_mmu_hash_v3()) {
|
||||
error_report("Guest requested unavailable MMU mode (hash).");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void spapr_machine_reset(MachineState *machine)
|
||||
{
|
||||
SpaprMachineState *spapr = SPAPR_MACHINE(machine);
|
||||
|
||||
+2
-12
@@ -1760,18 +1760,8 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu,
|
||||
spapr_ovec_intersect(spapr->ov5_cas, spapr->ov5, ov5_guest);
|
||||
spapr_ovec_cleanup(ov5_guest);
|
||||
|
||||
if (guest_radix) {
|
||||
if (kvm_enabled() && !kvmppc_has_cap_mmu_radix()) {
|
||||
error_report("Guest requested unavailable MMU mode (radix).");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
} else {
|
||||
if (kvm_enabled() && kvmppc_has_cap_mmu_radix()
|
||||
&& !kvmppc_has_cap_mmu_hash_v3()) {
|
||||
error_report("Guest requested unavailable MMU mode (hash).");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
spapr_check_mmu_mode(guest_radix);
|
||||
|
||||
spapr->cas_pre_isa3_guest = !spapr_ovec_test(ov1_guest, OV1_PPC_3_00);
|
||||
spapr_ovec_cleanup(ov1_guest);
|
||||
|
||||
|
||||
Reference in new issue
Block a user