[02/26] hw/vmapple/apple-gfx: BQL renaming update

Commit Message

Phil Dennis-Jordan July 15, 2024, 9:06 p.m. UTC

Since the original apple-gfx code was written, the BQL functions have
been renamed. This change updates the apple-gfx code to use the new
names.

Signed-off-by: Phil Dennis-Jordan <[e-mail]>
---
 hw/vmapple/apple-gfx.m | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Patch

diff --git a/hw/vmapple/apple-gfx.m b/hw/vmapple/apple-gfx.m
index f75da5c610..3b437e2519 100644
--- a/hw/vmapple/apple-gfx.m
+++ b/hw/vmapple/apple-gfx.m
@@ -168,9 +168,9 @@  static void apple_gfx_write(void *opaque, hwaddr offset, uint64_t val, unsigned
 
     trace_apple_gfx_write(offset, val);
 
-    qemu_mutex_unlock_iothread();
+    bql_unlock();
     [s->pgdev mmioWriteAtOffset:offset value:val];
-    qemu_mutex_lock_iothread();
+    bql_lock();
 }
 
 static const MemoryRegionOps apple_gfx_ops = {
@@ -192,9 +192,9 @@  static uint64_t apple_iosfc_read(void *opaque, hwaddr offset, unsigned size)
     AppleGFXState *s = opaque;
     uint64_t res = 0;
 
-    qemu_mutex_unlock_iothread();
+    bql_unlock();
     res = [s->pgiosfc mmioReadAtOffset:offset];
-    qemu_mutex_lock_iothread();
+    bql_lock();
 
     trace_apple_iosfc_read(offset, res);
 
@@ -396,7 +396,7 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
             PGPhysicalMemoryRange_t *range = &ranges[i];
             MemoryRegion *tmp_mr;
             /* TODO: Bounds checks? r/o? */
-            qemu_mutex_lock_iothread();
+            bql_lock();
             AppleGFXMR *mr = apple_gfx_mapMemory(s, task, virtualOffset,
                                                  range->physicalAddress,
                                                  range->physicalLength);
@@ -416,7 +416,7 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
             trace_apple_gfx_remap(retval, source, target);
             g_assert(retval == KERN_SUCCESS);
 
-            qemu_mutex_unlock_iothread();
+            bql_unlock();
 
             virtualOffset += mr->len;
         }
@@ -428,7 +428,7 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
         AppleGFXMR *mr, *next;
 
         trace_apple_gfx_unmap_memory(task, virtualOffset, length);
-        qemu_mutex_lock_iothread();
+        bql_lock();
         QTAILQ_FOREACH_SAFE(mr, &s->mrs, node, next) {
             if (mr->va >= (task->mem + virtualOffset) &&
                 (mr->va + mr->len) <= (task->mem + virtualOffset + length)) {
@@ -438,7 +438,7 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
                 g_free(mr);
             }
         }
-        qemu_mutex_unlock_iothread();
+        bql_unlock();
         return (bool)true;
     };
 
@@ -452,13 +452,13 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
         bool locked;
 
         trace_apple_gfx_raise_irq(vector);
-        locked = qemu_mutex_iothread_locked();
+        locked = bql_locked();
         if (!locked) {
-            qemu_mutex_lock_iothread();
+            bql_lock();
         }
         qemu_irq_pulse(s->irq_gfx);
         if (!locked) {
-            qemu_mutex_unlock_iothread();
+            bql_unlock();
         }
     };
 
@@ -534,13 +534,13 @@  static void apple_gfx_realize(DeviceState *dev, Error **errp)
 
     iosfc_desc.raiseInterrupt = ^(uint32_t vector) {
         trace_apple_iosfc_raise_irq(vector);
-        bool locked = qemu_mutex_iothread_locked();
+        bool locked = bql_locked();
         if (!locked) {
-            qemu_mutex_lock_iothread();
+            bql_lock();
         }
         qemu_irq_pulse(s->irq_iosfc);
         if (!locked) {
-            qemu_mutex_unlock_iothread();
+            bql_unlock();
         }
         return (bool)true;
     };