diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-15 21:48:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-15 21:48:03 +0100 |
| commit | f3b9e787aee6ef7d216b616675db0f1c124da5e4 (patch) | |
| tree | 727afbc45f70391d38ec652c795aba34a3bbf13a /include/hw | |
| parent | e5bfef86fe57fcf11cb761ac9a59006442f5de8a (diff) | |
| parent | e703d2f71c0f3f721b66bd2955135524538d2c58 (diff) | |
| download | qemu-f3b9e787aee6ef7d216b616675db0f1c124da5e4.tar.gz qemu-f3b9e787aee6ef7d216b616675db0f1c124da5e4.tar.bz2 qemu-f3b9e787aee6ef7d216b616675db0f1c124da5e4.zip | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160815' into staging
ppc patch queue for 2016-08-15
Just a single patch here, I hope this is the last ppc / spapr fix to
squeeze into qemu-2.7.
# gpg: Signature made Mon 15 Aug 2016 07:46:36 BST
# 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: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-2.7-20160815:
ppc: parse cpu features once
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/ppc/ppc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index 520c72a08d..00c1fb1e72 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -106,4 +106,5 @@ enum { /* ppc_booke.c */ void ppc_booke_timers_init(PowerPCCPU *cpu, uint32_t freq, uint32_t flags); +void ppc_cpu_parse_features(const char *cpu_model); #endif |