summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--hw/intc/xics_kvm.c3
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/slof.binbin926392 -> 926432 bytes
m---------roms/SLOF0
4 files changed, 4 insertions, 1 deletions
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 51433b19b0..2df1f3e92c 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -257,6 +257,9 @@ int ics_set_kvm_state_one(ICSState *ics, int srcno, Error **errp)
         << KVM_XICS_PRIORITY_SHIFT;
     if (irq->priority != irq->saved_priority) {
         assert(irq->priority == 0xff);
+    }
+
+    if (irq->priority == 0xff) {
         state |= KVM_XICS_MASKED;
     }
 
diff --git a/pc-bios/README b/pc-bios/README
index 180795a55b..0a17f3ec6d 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -17,7 +17,7 @@
 - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
   implementation for certain IBM POWER hardware.  The sources are at
   https://github.com/aik/SLOF, and the image currently in qemu is
-  built from git tag qemu-slof-20190114.
+  built from git tag qemu-slof-20190703.
 
 - sgabios (the Serial Graphics Adapter option ROM) provides a means for
   legacy x86 software to communicate with an attached serial console as
diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin
index 65db1a6e57..2def514717 100644
--- a/pc-bios/slof.bin
+++ b/pc-bios/slof.bin
Binary files differdiff --git a/roms/SLOF b/roms/SLOF
-Subproject a5b428e1c1eae703bdd62a3f527223c291ee3fd
+Subproject ba1ab360eebe6338bb8d7d83a9220ccf7e213af