* Due to lack of MSI(-X), event delivery from USB devices to the guest

macOS isn't working correctly. My current conclusion is that the

OS's XHCI driver simply was never designed to work with legacy IRQs.

The upshot is that keyboard and mouse/tablet input is very laggy.

The solution would be to implement MSI(-X) support or figure out how

to make hcd-xhci-sysbus work with the macOS guest, if at all possible.

(EHCI and UHCI/OHCI controllers are not an option as the VMAPPLE

guest kernel does not include drivers for these.)

My part of this work has been sponsored by Sauce Labs Inc.

MAINTAINERS | 15 +

contrib/vmapple/uuid.sh | 9 +

docs/system/arm/vmapple.rst | 60 +++

docs/system/target-arm.rst | 1 +

hw/Kconfig | 1 +

hw/arm/sbsa-ref.c | 2 +-

hw/arm/virt.c | 2 +-

hw/block/virtio-blk.c | 58 ++-

hw/display/Kconfig | 13 +

hw/display/apple-gfx-mmio.m | 290 +++++++++++

hw/display/apple-gfx-pci.m | 155 ++++++

hw/display/apple-gfx.h | 77 +++

hw/display/apple-gfx.m | 867 +++++++++++++++++++++++++++++++++

hw/display/meson.build | 5 +

hw/display/trace-events | 30 ++

hw/i386/microvm.c | 2 +-

hw/loongarch/virt.c | 2 +-

hw/meson.build | 1 +

hw/mips/loongson3_virt.c | 2 +-

hw/misc/Kconfig | 4 +

hw/misc/meson.build | 1 +

hw/misc/pvpanic-mmio.c | 61 +++

hw/openrisc/virt.c | 12 +-

hw/pci-host/gpex.c | 43 +-

hw/riscv/virt.c | 12 +-

hw/vmapple/Kconfig | 32 ++

hw/vmapple/aes.c | 579 ++++++++++++++++++++++

hw/vmapple/bdif.c | 271 +++++++++++

hw/vmapple/cfg.c | 196 ++++++++

hw/vmapple/meson.build | 5 +

hw/vmapple/trace-events | 21 +

hw/vmapple/trace.h | 1 +

hw/vmapple/virtio-blk.c | 226 +++++++++

hw/vmapple/vmapple.c | 638 ++++++++++++++++++++++++

hw/xtensa/virt.c | 2 +-

include/hw/misc/pvpanic.h | 1 +

include/hw/pci-host/gpex.h | 7 +-

include/hw/pci/pci_ids.h | 1 +

include/hw/virtio/virtio-blk.h | 11 +-

include/hw/vmapple/vmapple.h | 25 +

include/qemu-main.h | 3 +-

include/qemu/cutils.h | 15 +

include/qemu/typedefs.h | 1 +

meson.build | 5 +

system/main.c | 50 +-

target/arm/hvf/hvf.c | 9 +

ui/cocoa.m | 54 +-

ui/sdl2.c | 4 +

util/hexdump.c | 18 +

49 files changed, 3794 insertions(+), 106 deletions(-)

2.39.3 (Apple Git-145)

include/qemu-main.h | 3 +--

include/qemu/typedefs.h | 1 +

system/main.c | 50 ++++++++++++++++++++++++++++++++++----

ui/cocoa.m | 54 ++++++++++-------------------------------

ui/sdl2.c | 4 +++

5 files changed, 64 insertions(+), 48 deletions(-)

-extern int (*qemu_main)(void);

+extern qemu_main_fn qemu_main;

-#ifdef CONFIG_SDL

-#include <SDL.h>

#endif

-int qemu_default_main(void)

+static int qemu_default_main(void)

@@ -XXX,XX +XXX,XX @@ int qemu_default_main(void)

return status;

}

+/*

+ * Various macOS system libraries, including the Cocoa UI and anything using

+ * libdispatch, such as ParavirtualizedGraphics.framework, requires that the

+ * main runloop, on the main (initial) thread be running or at least regularly

+ * polled for events. A special mode is therefore supported, where the QEMU

+ * main loop runs on a separate thread and the main thread handles the

+ * CF/Cocoa runloop.

+ */

+

+static void *call_qemu_default_main(void *opaque)

+{

+ int status;

+

+ bql_lock();

+ status = qemu_default_main();

+ bql_unlock();

+

+ exit(status);

+}

+ abort();

+

+qemu_main_fn qemu_main = os_darwin_cfrunloop_main;

+#else

+qemu_main_fn qemu_main;

+ call_qemu_default_main, NULL, QEMU_THREAD_DETACHED);

+ bql_unlock();

+ qemu_default_main();

2.39.3 (Apple Git-145)

hw/display/apple-gfx-mmio.m | 282 +++++++++++++

hw/display/apple-gfx.h | 65 +++

hw/display/apple-gfx.m | 769 ++++++++++++++++++++++++++++++++++++

hw/display/meson.build | 4 +

7 files changed, 1161 insertions(+)

+ PGIOSurfaceHostDevice *iosfc_host_dev = nil;

+ apple_gfx_common_realize(&s->common, desc, errp);

+ if (*errp) {

+void apple_gfx_common_realize(AppleGFXState *s, PGDeviceDescriptor *desc,

+ Error **errp);

+ if (add_new_region(task->mapped_regions, region)) {

+static void apple_gfx_render_frame_completed(AppleGFXState *s,

+ uint32_t width, uint32_t height);

+

+static void apple_gfx_render_new_frame_bql_unlock(AppleGFXState *s)

+{

+ BOOL r;

+

+ bql_unlock();

+

+ /* This is not safe to call from the BQL due to PVG-internal locks causing

+ * deadlocks. */

+ r = [s->pgdisp encodeCurrentFrameToCommandBuffer:command_buffer

+ texture:texture

+ region:region];

+ if (!r) {

+ bql_lock();

+ --s->pending_frames;

+ bql_unlock();

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "%s: encodeCurrentFrameToCommandBuffer:texture:region: "

+ "failed\n", __func__);

+ return;

+ }

+

+ if (managed_texture) {

+ /* "Managed" textures exist in both VRAM and RAM and must be synced. */

+ id<MTLBlitCommandEncoder> blit = [command_buffer blitCommandEncoder];

+ [blit synchronizeResource:texture];

+ [blit endEncoding];

+ }

+ [texture release];

+ [command_buffer addCompletedHandler:

+ ^(id<MTLCommandBuffer> cb)

+ {

+ dispatch_async(s->render_queue, ^{

+ apple_gfx_render_frame_completed(s, width, height);

+ });

+ }];

+ [command_buffer commit];

+ /* TODO: Skip this entirely on a pure Metal or headless/guest-only

+ * (double?) buffering design. */

+static void apple_gfx_render_frame_completed(AppleGFXState *s,

+ uint32_t width, uint32_t height)

+{

+ bql_lock();

+ --s->pending_frames;

+ assert(s->pending_frames >= 0);

+

+ /* Only update display if mode hasn't changed since we started rendering. */

+ if (width == surface_width(s->surface) &&

+ height == surface_height(s->surface)) {

+ copy_mtl_texture_to_surface_mem(s->texture, surface_data(s->surface));

+ if (s->gfx_update_requested) {

+ s->gfx_update_requested = false;

+ dpy_gfx_update_full(s->con);

+ graphic_hw_update_done(s->con);

+ s->new_frame_ready = false;

+ } else {

+ s->new_frame_ready = true;

+ }

+ if (s->pending_frames > 0) {

+ apple_gfx_render_new_frame_bql_unlock(s);

+ } else {

+ bql_unlock();

+ }

+

+ s->using_managed_texture_storage =

+ (s->texture.storageMode == MTLStorageModeManaged);

+ /* NSBitmapImageRep's red & blue channels are swapped

+ * compared to QEMUCursor's. */

+ dispatch_async(s->render_queue, ^{

+ /* Drop frames if we get too far ahead. */

+ bql_lock();

+ if (s->pending_frames >= 2) {

+ bql_unlock();

+ return;

+ }

+ ++s->pending_frames;

+ if (s->pending_frames > 1) {

+ bql_unlock();

+ return;

+ }

+ @autoreleasepool {

+ apple_gfx_render_new_frame_bql_unlock(s);

+ }

+ });

+ NSArray<PGDisplayMode*>* mode_array = nil;

+void apple_gfx_common_realize(AppleGFXState *s, PGDeviceDescriptor *desc,

+ Error **errp)

+{

+ PGDisplayDescriptor *disp_desc = nil;

+ return;

+ port:0 serialNum:1234];

+ s->con = graphic_console_init(NULL, 0, &apple_gfx_fb_ops, s);

+

+ qatomic_set(&s->cursor_show, true);

+system_ss.add(when: 'CONFIG_MAC_PVG', if_true: [files('apple-gfx.m'), pvg, metal])

+if cpu == 'aarch64'

+ system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx-mmio.m'), pvg, metal])

+pvg = []

2.39.3 (Apple Git-145)

hw/display/apple-gfx-pci.m | 148 +++++++++++++++++++++++++++++++++++++

3 files changed, 153 insertions(+)

+ /* The following is done on device not class init to avoid running

+ * ObjC code before fork() in -daemonize mode. */

+ false /*msi_per_vector_mask*/, errp);

+ apple_gfx_common_realize(&s->common, desc, errp);

+ // TODO: Property for setting mode list

@@ -XXX,XX +XXX,XX @@ system_ss.add(when: 'CONFIG_MAC_PVG', if_true: [files('apple-gfx.m'), pv

if cpu == 'aarch64'

system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx-mmio.m'), pvg, metal])

endif

+system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx-pci.m'), pvg, metal])

if config_all_devices.has_key('CONFIG_VIRTIO_GPU')

virtio_gpu_ss = ss.source_set()

2.39.3 (Apple Git-145)

hw/display/apple-gfx.h | 12 ++++

hw/display/apple-gfx.m | 136 +++++++++++++++++++++++++++++++-----

5 files changed, 147 insertions(+), 20 deletions(-)

- // TODO: Property for setting mode list

void apple_gfx_common_init(Object *obj, AppleGFXState *s, const char* obj_name);

void apple_gfx_common_realize(AppleGFXState *s, PGDeviceDescriptor *desc,

Error **errp);

@@ -XXX,XX +XXX,XX @@ void* apple_gfx_host_ptr_for_gpa_range(uint64_t guest_physical,

/* ------ PGTask and task operations: new/destroy/map/unmap ------ */

@@ -XXX,XX +XXX,XX @@ static void apple_gfx_register_task_mapping_handlers(AppleGFXState *s,

- NSArray<PGDisplayMode*>* mode_array = nil;

@@ -XXX,XX +XXX,XX @@ void apple_gfx_common_realize(AppleGFXState *s, PGDeviceDescriptor *desc,

Error **errp)

PGDisplayDescriptor *disp_desc = nil;

@@ -XXX,XX +XXX,XX @@ void apple_gfx_common_realize(AppleGFXState *s, PGDeviceDescriptor *desc,

s->pgdisp = [s->pgdev newDisplayWithDescriptor:disp_desc

port:0 serialNum:1234];