vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc patch queue 2020-07-27 

Only one patch in this batch, but it fixes a fairly important
 regression, so we want it in qemu-5.1
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl8ea30ACgkQbDjKyiDZ
 s5L6LBAAtAwKnTqZ3V4o23KCpCdLSn+SRo38WfocaAOFKdePAyQYaBSjyYB6yuLt
 eeTbaq8DC+Di+OtDJf14ZNcYwm5+DEwNKzXdYEOx0gqb+TGEnqv8sNZm8f/kOiyK
 ZEgMEBKB3ty+sHkcGfTom57jMppIchYJGwOX+c7UF66KwmNUyrxaI9eWu7J016Vw
 SvvMcNLDZEXff3pnjEbD4WhevWyseLudRaKI4Ea7crPqJSt1ADgCF2bHh7G5d/Pe
 aZrsjL4yZ0t7Q5gQKA2+8rqvIt7x3eC59a2p5JFOoCRe03oOepRjaRHxIchdSMrY
 mN/lYTMDnvRtbgovhTu0b5EzsGE0z7nr1AWCbXRxyVPtE6O0HZnUpTDmt9duGMQy
 8jHJQsmxvHqjci7zWwcWcStwlkNOU0oIoOxQqRTCkx8GIWfKxinDFPyGNN+r+OSX
 Cfav+l8CVaAAOwF7RjAeTmb08Km0nHZL+fqwo/c8R8yJ9ApesVxNtfIUpnhQUpAS
 xCXo2UI/p1yQl8sMSf5xnWzuiWEGlA6vwH4un4MMLY8z/26+Q+J+V/cTsptDRuwz
 3KJLh5m5mklCtCVTVbmX5I2nv2ty4cMUHZW59o3Kj3uQkW9iUHX0a0fhwSfW3aV2
 24hbAhG4AjkFomHqbN8UYmh7Eh2F88GP2QmRE1CxObYP6Yu54BA=
 =Pb4l
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.1-20200727' into staging

ppc patch queue 2020-07-27

Only one patch in this batch, but it fixes a fairly important
regression, so we want it in qemu-5.1

# gpg: Signature made Mon 27 Jul 2020 06:51:57 BST
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-5.1-20200727:
  pseries: fix kvmppc_set_fwnmi()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2020-07-27 09:33:04 +01:00
parent 194f8ca825 aef92d87c5
commit 4215d34132
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ppc/spapr_rtas.c
View File

@ -438,7 +438,7 @@ static void rtas_ibm_nmi_register(PowerPCCPU *cpu,
}
if (kvm_enabled()) {
if (kvmppc_set_fwnmi() < 0) {
if (kvmppc_set_fwnmi(cpu) < 0) {
rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED);
return;
}

3
target/ppc/kvm.c
View File

@ -2071,9 +2071,8 @@ bool kvmppc_get_fwnmi(void)
return cap_fwnmi;
}
int kvmppc_set_fwnmi(void)
int kvmppc_set_fwnmi(PowerPCCPU *cpu)
{
PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
CPUState *cs = CPU(cpu);
return kvm_vcpu_enable_cap(cs, KVM_CAP_PPC_FWNMI, 0);

4
target/ppc/kvm_ppc.h
View File

@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu);
int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
bool kvmppc_get_fwnmi(void);
int kvmppc_set_fwnmi(void);
int kvmppc_set_fwnmi(PowerPCCPU *cpu);
int kvmppc_smt_threads(void);
void kvmppc_error_append_smt_possible_hint(Error *const *errp);
int kvmppc_set_smt_threads(int smt);
@ -169,7 +169,7 @@ static inline bool kvmppc_get_fwnmi(void)
return false;
}
static inline int kvmppc_set_fwnmi(void)
static inline int kvmppc_set_fwnmi(PowerPCCPU *cpu)
{
return -1;
}