OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc patch queue 2017-11-27 

This series contains a couple of migration fixes for hash guests on
 POWER9 radix MMU hosts.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAloblCMACgkQbDjKyiDZ
 s5LHjRAAy/hpTIcZvrV48Rem48aI+aWP8f0CJBkywkqZIDZFpUPimSr7ETO6Bhhy
 bwLNY1oQSbEdsl7G/B1gpxLK2VkiNVkBUOZVP59yfydVXzw30b6pedoRJN3rpyax
 ex+rSNkfW/ZA4zmjHT2jvrokj+mxRSj1IvjLglfPgAiLaIaKVurWFkOQzP/LLbUB
 IleMRj2Jvh4WS9HIXNfErgyfiwHqdIKdAL5+a5v97J20qTy3Pvz6e8WSItQjUYF1
 RqN5lPDX3a+s0nXRxO4Nko1vLN2gFFqI5sK/M3TcwrMZnoiXfaY50rDQyxxA1Ycu
 leyuIqqopIQDRCAvkHYO6DCS2P2k+BTLQ0K7LcNRgOmMdyqMbOrTQVLQKyNFDQaZ
 4d2OSogJwEI1nFgsBnxXmIT8Lkyydc9j/nFg0q2xpV2ADdHzBv4bgrNW6go2OSkl
 RpV6kViB4Drhkt/oYJ6+NaObDUTPxoD9sAJ+wHFQcUvGgj41zHDDvOF1MuyKxNgc
 xVNE1oUZB4XjsXIIiY6FVR50+OX8ygZSOAjUlDg5cWA4B5k14g7IHQTMPsu4D6p0
 UiGyfNobuQfxV+lhF4kcm0OnlG+AD2EVOmgiwGumg39wzMFOaIw7qxcYbFjUCsAo
 2M0x9wrXw0pslhx2SsVQITtHdiQsOFWap4LqUBR5tmxxPYm5wmk=
 =F0lq
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171127' into staging

ppc patch queue 2017-11-27

This series contains a couple of migration fixes for hash guests on
POWER9 radix MMU hosts.

# gpg: Signature made Mon 27 Nov 2017 04:27:15 GMT
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.11-20171127:
  target/ppc: Fix setting of cpu->compat_pvr on incoming migration
  target/ppc: Move setting of patb_entry on hash table init

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-11-27 11:16:20 +00:00
parent e7b47c22e2 e07cc19295
commit 5e19aed59a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ppc/spapr.c
View File

@ -1373,6 +1373,8 @@ void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift,
DIRTY_HPTE(HPTE(spapr->htab, i));
}
}
/* We're setting up a hash table, so that means we're not radix */
spapr->patb_entry = 0;
}
void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr)
@ -1392,8 +1394,6 @@ void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr)
spapr->rma_size = kvmppc_rma_size(spapr_node0_size(MACHINE(spapr)),
spapr->htab_shift);
}
/* We're setting up a hash table, so that means we're not radix */
spapr->patb_entry = 0;
}
static void find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)

4
target/ppc/machine.c
View File

@ -237,9 +237,11 @@ static int cpu_post_load(void *opaque, int version_id)
#if defined(TARGET_PPC64)
if (cpu->compat_pvr) {
uint32_t compat_pvr = cpu->compat_pvr;
Error *local_err = NULL;
ppc_set_compat(cpu, cpu->compat_pvr, &local_err);
cpu->compat_pvr = 0;
ppc_set_compat(cpu, compat_pvr, &local_err);
if (local_err) {
error_report_err(local_err);
return -1;