On 11/21/19 12:27 PM, David Hildenbrand wrote: > On 20.11.19 12:43, Janosch Frank wrote:
>> @@ -357,6 +353,35 @@ static void s390_machine_reset(MachineState *machine) >> run_on_cpu(cs, s390_do_cpu_initial_reset, RUN_ON_CPU_NULL); >> run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); >> break; >> + case S390_RESET_EXTERNAL: >> + case S390_RESET_REIPL: /* Subcode 4 */ >> + qemu_devices_reset(); >> + s390_crypto_reset(); >> + /* configure and start the ipl CPU only */ >> + run_on_cpu(cs, s390_do_cpu_ipl, RUN_ON_CPU_NULL); >> + break; > > Is there a way to modify this patch to not change unrelated code that > heavily? Makes it harder to review. https://github.com/frankjaa/qemu/commit/8c53d5c8a6bbcc53496c7a2877c7cbffc435b708 And please trim your emails. > >> + case S390_RESET_PV: /* Subcode 10 */ >> + subsystem_reset(); >> + s390_crypto_reset(); >> + >> + CPU_FOREACH(t) { >> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >> + } >> + >> + /* Create SE VM */ >> + s390_pv_vm_create(); >> + CPU_FOREACH(t) { >> + s390_pv_vcpu_create(t); >> + } >> + >> + /* Set SE header and unpack */ >> + s390_ipl_prepare_pv_header(); >> + /* Decrypt image */ >> + s390_ipl_pv_unpack(); >> + /* Verify integrity */ >> + s390_pv_verify(); >> + s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); >> + break; >> default: >> g_assert_not_reached(); >> } >> diff --git a/target/s390x/cpu_features_def.inc.h >> b/target/s390x/cpu_features_def.inc.h >> index 31dff0d84e..60db28351d 100644 >> --- a/target/s390x/cpu_features_def.inc.h >> +++ b/target/s390x/cpu_features_def.inc.h >> @@ -107,6 +107,7 @@ DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, >> "Deflate-conversion facility ( >> DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, >> "Vector-Packed-Decimal-Enhancement Facility") >> DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, >> "Message-security-assist-extension-9 facility (excluding subfunctions)") >> DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") >> +DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility") >> >> /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to >> byte-80) */ >> DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: >> Guest-storage-limit-suppression facility") >> > >
signature.asc
Description: OpenPGP digital signature
