diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-27 17:08:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-27 17:08:30 +0000 |
| commit | 9c5793c5036c7608ff2c87846c6d11f904c08b58 (patch) | |
| tree | 317de6eba463d944a287cd6eeb5bcc6b0ff39c9e /hw/intc | |
| parent | c6c09ba9950407a075bfe19c7604f09b71499a20 (diff) | |
| parent | 76ac9940c3114db35df92582f3549d9a64a369c4 (diff) | |
| download | qemu-9c5793c5036c7608ff2c87846c6d11f904c08b58.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
PowerPC queue for 2.0
* OpenPIC fix
* MSR fixes for POWER7 upwards
* TCG instruction set support fix for POWER8
# gpg: Signature made Thu 27 Mar 2014 16:12:12 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/ppc-for-2.0:
target-ppc: MSR_POW not supported on POWER7/7+/8
target-ppc: POWER7+ supports the MSR_VSX bit
target-ppc: POWER8 supports isel
target-ppc: POWER8 supports the MSR_LE bit
intc/openpic_kvm: Fix MemListener delete region callback function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/openpic_kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 87fdb126cf..afa604d59b 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -200,7 +200,7 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp) qdev_init_gpio_in(dev, kvm_openpic_set_irq, OPENPIC_MAX_IRQ); opp->mem_listener.region_add = kvm_openpic_region_add; - opp->mem_listener.region_add = kvm_openpic_region_del; + opp->mem_listener.region_del = kvm_openpic_region_del; memory_listener_register(&opp->mem_listener, &address_space_memory); /* indicate pic capabilities */ |