* 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 +

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

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 | 292 ++++++++++++

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

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

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

hw/display/meson.build | 5 +

hw/display/trace-events | 28 ++

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 | 572 +++++++++++++++++++++++

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

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

hw/vmapple/meson.build | 5 +

hw/vmapple/trace-events | 23 +

hw/vmapple/trace.h | 1 +

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

hw/vmapple/vmapple.c | 652 ++++++++++++++++++++++++++

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 | 21 +

include/qemu-main.h | 3 +-

include/qemu/cutils.h | 15 +

include/qemu/typedefs.h | 1 +

include/sysemu/os-posix.h | 2 +

include/sysemu/os-win32.h | 2 +

include/ui/console.h | 12 +

meson.build | 5 +

os-posix.c | 20 +

system/main.c | 45 +-

system/vl.c | 2 +

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

ui/cocoa.m | 55 +--

ui/console.c | 32 +-

ui/sdl2.c | 2 +

ui/trace-events | 1 +

util/hexdump.c | 14 +

55 files changed, 3790 insertions(+), 112 deletions(-)

2.39.3 (Apple Git-145)

This change formalises main thread handling. UI (Display) and OS

platform implementations can declare requirements or preferences:

* The Cocoa UI specifies that Qemu's main loop must run on a

background thread and provides a function to run on the main thread

which runs the NSApplication event handling runloop.

* The SDL UI specifies that Qemu's main loop must run on the main

thus work in all configurations.

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

include/qemu/typedefs.h | 1 +

include/sysemu/os-posix.h | 2 ++

include/sysemu/os-win32.h | 2 ++

include/ui/console.h | 12 +++++++++

os-posix.c | 20 ++++++++++++++

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

system/vl.c | 2 ++

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

ui/console.c | 32 +++++++++++++++++++++--

ui/sdl2.c | 2 ++

ui/trace-events | 1 +

12 files changed, 123 insertions(+), 54 deletions(-)

-extern int (*qemu_main)(void);

+extern qemu_main_fn qemu_main;

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/typedefs.h

+++ b/include/qemu/typedefs.h

@@ -XXX,XX +XXX,XX @@ typedef struct IRQState *qemu_irq;

* Function types

*/

typedef void (*qemu_irq_handler)(void *opaque, int n, int level);

+typedef int (*qemu_main_fn)(void);

#endif /* QEMU_TYPEDEFS_H */

diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/os-posix.h

+++ b/include/sysemu/os-posix.h

@@ -XXX,XX +XXX,XX @@

#ifndef QEMU_OS_POSIX_H

#define QEMU_OS_POSIX_H

+#include "qemu/typedefs.h"

#include <sys/mman.h>

#include <sys/socket.h>

#include <netinet/in.h>

@@ -XXX,XX +XXX,XX @@ void os_set_chroot(const char *path);

void os_setup_limits(void);

void os_setup_post(void);

int os_mlock(void);

+qemu_main_fn os_non_loop_main_thread_fn(void);

/**

* qemu_alloc_stack:

diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/os-win32.h

+++ b/include/sysemu/os-win32.h

@@ -XXX,XX +XXX,XX @@

#ifndef QEMU_OS_WIN32_H

#define QEMU_OS_WIN32_H

+#include "qemu/typedefs.h"

#include <winsock2.h>

#include <windows.h>

#include <ws2tcpip.h>

@@ -XXX,XX +XXX,XX @@ void os_set_line_buffering(void);

void os_setup_early_signal_handling(void);

int getpagesize(void);

+static inline qemu_main_fn os_non_loop_main_thread_fn(void) { return NULL; }

#if !defined(EPROTONOSUPPORT)

# define EPROTONOSUPPORT EINVAL

diff --git a/include/ui/console.h b/include/ui/console.h

index XXXXXXX..XXXXXXX 100644

--- a/include/ui/console.h

+++ b/include/ui/console.h

@@ -XXX,XX +XXX,XX @@ typedef struct QemuDisplay QemuDisplay;

struct QemuDisplay {

DisplayType type;

+ /*

+ * Some UIs have special requirements, for the qemu_main event loop running

+ * on either the process's initial (main) thread ('Off'), or on an

+ * explicitly created background thread ('On') because of platform-specific

+ * event handling.

+ * The default, 'Auto', indicates the display will work with both setups.

+ * If 'On', either a qemu_main_thread_fn must be supplied, or it must be

+ * ensured that all applicable host OS platforms supply a default main.

+ * (via os_non_loop_main_thread_fn())

+ */

+ OnOffAuto qemu_main_on_bg_thread;

+ qemu_main_fn qemu_main_thread_fn;

void (*early_init)(DisplayOptions *opts);

void (*init)(DisplayState *ds, DisplayOptions *opts);

const char *vc;

diff --git a/os-posix.c b/os-posix.c

index XXXXXXX..XXXXXXX 100644

--- a/os-posix.c

+++ b/os-posix.c

@@ -XXX,XX +XXX,XX @@

#ifdef CONFIG_LINUX

#include <sys/prctl.h>

+#elif defined(CONFIG_DARWIN)

#endif

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

return -ENOSYS;

#endif

}

+ abort();

+ qemu_run_default_main_on_new_thread();

+ bql_unlock();

+ qemu_default_main();

}

- .type = DISPLAY_TYPE_COCOA,

- .init = cocoa_display_init,

+ .type = DISPLAY_TYPE_COCOA,

+ .init = cocoa_display_init,

+ /* The Cocoa UI will run the NSApplication runloop on the main thread.*/

+ .qemu_main_on_bg_thread = ON_OFF_AUTO_ON,

+ .qemu_main_thread_fn = cocoa_main,

};

static void register_cocoa(void)

diff --git a/ui/console.c b/ui/console.c

index XXXXXXX..XXXXXXX 100644

--- a/ui/console.c

+++ b/ui/console.c

@@ -XXX,XX +XXX,XX @@

#include "chardev/char.h"

#include "trace.h"

#include "exec/memory.h"

@@ -XXX,XX +XXX,XX @@ void qemu_display_early_init(DisplayOptions *opts)

void qemu_display_init(DisplayState *ds, DisplayOptions *opts)

{

+ QemuDisplay *display;

+ bool bg_main_loop;

+

assert(opts->type < DISPLAY_TYPE__MAX);

if (opts->type == DISPLAY_TYPE_NONE) {

return;

}

- assert(dpys[opts->type] != NULL);

- dpys[opts->type]->init(ds, opts);

+ display = dpys[opts->type];

+ assert(display != NULL);

+ display->init(ds, opts);

+

+ switch (display->qemu_main_on_bg_thread) {

+ case ON_OFF_AUTO_OFF:

+ bg_main_loop = false;

+ qemu_main = NULL;

+ break;

+ case ON_OFF_AUTO_ON:

+ bg_main_loop = true;

+ break;

+ case ON_OFF_AUTO_AUTO:

+ default:

+ bg_main_loop = qemu_main;

+ break;

+ }

+

+ trace_qemu_display_init_main_thread(

+ DisplayType_str(display->type), display->qemu_main_thread_fn, qemu_main,

+ OnOffAuto_lookup.array[display->qemu_main_on_bg_thread],

+ display->qemu_main_on_bg_thread, bg_main_loop);

+ if (bg_main_loop && display->qemu_main_thread_fn) {

+ qemu_main = display->qemu_main_thread_fn;

+ }

+ assert(!bg_main_loop || qemu_main);

}

const char *qemu_display_get_vc(DisplayOptions *opts)

@@ -XXX,XX +XXX,XX @@ static QemuDisplay qemu_display_sdl2 = {

.type = DISPLAY_TYPE_SDL,

.early_init = sdl2_display_early_init,

.init = sdl2_display_init,

+ /* SDL must poll for events (via dpy_refresh) on main thread */

+ .qemu_main_on_bg_thread = ON_OFF_AUTO_OFF,

};

static void register_sdl1(void)

diff --git a/ui/trace-events b/ui/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/ui/trace-events

+++ b/ui/trace-events

@@ -XXX,XX +XXX,XX @@ displaysurface_free(void *display_surface) "surface=%p"

displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]"

displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]"

ppm_save(int fd, void *image) "fd=%d image=%p"

+qemu_display_init_main_thread(const char *display_name, bool qemu_display_sets_main_fn, bool qemu_main_is_set, const char *display_bg_main_loop_preference, int preference, bool bg_main_loop) "display '%s': sets main thread function: %d, platform provides main function: %d, display background main loop preference: %s (%d); main loop will run on background thread: %d"

# gtk-egl.c

# gtk-gl-area.c

2.39.3 (Apple Git-145)