From nobody Sat May 18 07:31:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658043399; cv=none; d=zohomail.com; s=zohoarc; b=mAFvpYtP1VNHY2myJlmYs73HKdptnINhkLSv0eFY1Tx5UY5ZO0nZzNl/i+CUllbCoCawUHCxp2GzLlAbinqcaP5vWhsDovqup54vZ0f+TKrRS6EFZd9ksBXKM0BXI5Kty5XY0NEEKb3CQw27nuyonO0lMKUj+5PZZ/k4lE3fqBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658043399; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=v4Dbno0uczAci5Stt8XHLw1ZcbE+ysUhS/WKo4Vsy58=; b=IHKgeYcWXuGsZZx+Tj/IduGjKx00DxgDKkuofUS4yADryWU03b6HKFuFyaS2Iv8j62zMdOYYu/8Mzp4YShU87yEcg6rj75RlJOcQsoPoO0iyi5rCduK5ebPC77nNjb3BRlaG8Sgj9580GSrSMsHuQ4Ac32/mof4rvh20cBcwzTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658043399231841.9146555558646; Sun, 17 Jul 2022 00:36:39 -0700 (PDT) Received: from localhost ([::1]:38586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCypP-0004A5-MZ for importer@patchew.org; Sun, 17 Jul 2022 03:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCymo-0001ZE-9Y for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:54 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:50994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCyml-00052a-J1 for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:53 -0400 Received: by mail-pj1-x102b.google.com with SMTP id a15so9216197pjs.0 for ; Sun, 17 Jul 2022 00:33:51 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c360:8200:ece4:54e6:b565:8dcd]) by smtp.gmail.com with ESMTPSA id j12-20020a170903024c00b0016c4546fbf9sm6793364plh.128.2022.07.17.00.33.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 17 Jul 2022 00:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v4Dbno0uczAci5Stt8XHLw1ZcbE+ysUhS/WKo4Vsy58=; b=E+ELuzcEtzaMWlKqxJCbxTiU4WB7/BP6kli0UWwJneu+6Aaavao6el4mfNdGz+YD+P L+tH3fvDvQXHxSK8DPP8RAmfso4iBa20M1vr/O5101yx11gW6iWVeh/pl1YQECYGzHyn IjayoxFq3+7G8lbsEVkstuB8EMHLZyMrP91u6r5ibo2gZFXQfvDecDSyJ6wqqRTSSHMj 1222sGnV/SwAZsH67xbVZ2vnREjokqXISrDSUQfe7GE164pDtovpz5twHU8SPiqRDuQ3 Si0AaWF5Wxkgw61inqkXBhQcIjnuAX8rCpTRIs62zRXQCTW2rmpO43X6U93W/vAYENuX cDcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v4Dbno0uczAci5Stt8XHLw1ZcbE+ysUhS/WKo4Vsy58=; b=kbJ9T3stLFgIwBglVoZlkdtc8jc2FTyJaBNQ7WU8rDJauJm5ZdRz16bMlrfHnL1paV KI3hO59exbKNqMuB2Jo3pg2sWm/aOXz1kMGRVqCI41Ur9v6Loz0j9DEweQwNxY8MfIw3 wkXR/uX9bX1VbilcNy2pVUZcsGpjqQYaYKLOkphMXxX0P5iMEwHhlEeDK1gRW7cmOkMV js5xmN091YlJJNSzMcyZHzW/4vNLfxo4P18gObU3DctazTriLOlZ9z+yiANCXFKsJL2c joCQSkWTDlKniB0JuQD2SNMMn9UYBjM87jhBmv9KI79w+TgCgOr/hYTgOKNyRLm2boPJ B6nw== X-Gm-Message-State: AJIora9KbmQgFR6orRFxUtTzmk2aupGIg9sdmM+FYehtz46ThkV3qDwH hsnX5KWDRhmxdeuP0NVyIt7QrWMIeNA= X-Google-Smtp-Source: AGRyM1s4IzyKWxfR/TTvkVFDgMAAGgh6OO1gA4r05Hqi0JB8Diiwtn76/Nedk0nnizGzygV266s5pQ== X-Received: by 2002:a17:90b:1b48:b0:1ef:a90d:eae1 with SMTP id nv8-20020a17090b1b4800b001efa90deae1mr31394821pjb.68.1658043229666; Sun, 17 Jul 2022 00:33:49 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, Peter Maydell , Paolo Bonzini , Gerd Hoffmann , Emanuele Giuseppe Esposito , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH v4 1/3] ui/cocoa: Run qemu_init in the main thread Date: Sun, 17 Jul 2022 16:33:38 +0900 Message-Id: <20220717073340.25830-2-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) In-Reply-To: <20220717073340.25830-1-akihiko.odaki@gmail.com> References: <20220717073340.25830-1-akihiko.odaki@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=akihiko.odaki@gmail.com; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658043399708100001 Content-Type: text/plain; charset="utf-8" This work is based on: https://patchew.org/QEMU/20220317125534.38706-1-philippe.mathieu.daude@gmai= l.com/ Simplify the initialization dance by running qemu_init() in the main thread before the Cocoa event loop starts. The secondary thread only runs only qemu_main_loop() and qemu_cleanup(). This fixes a case where addRemovableDevicesMenuItems() calls qmp_query_block() while expecting the main thread to still hold the BQL. Overriding the code after calling qemu_init() is done by dynamically replacing a function pointer variable, qemu_main when initializing ui/cocoa, which unifies the static implementation of main() for builds with ui/cocoa and ones without ui/cocoa. Signed-off-by: Akihiko Odaki Reviewed-by: Paolo Bonzini --- docs/devel/fuzzing.rst | 4 +- include/qemu-main.h | 3 +- include/sysemu/sysemu.h | 2 +- softmmu/main.c | 14 ++-- softmmu/vl.c | 2 +- tests/qtest/fuzz/fuzz.c | 2 +- ui/cocoa.m | 168 ++++++++++++++-------------------------- 7 files changed, 74 insertions(+), 121 deletions(-) diff --git a/docs/devel/fuzzing.rst b/docs/devel/fuzzing.rst index 784ecb99e66..715330c8561 100644 --- a/docs/devel/fuzzing.rst +++ b/docs/devel/fuzzing.rst @@ -287,8 +287,8 @@ select the fuzz target. Then, the qtest client is initi= alized. If the target requires qos, qgraph is set up and the QOM/LIBQOS modules are initialized. Then the QGraph is walked and the QEMU cmd_line is determined and saved. =20 -After this, the ``vl.c:qemu_main`` is called to set up the guest. There are -target-specific hooks that can be called before and after qemu_main, for +After this, the ``vl.c:main`` is called to set up the guest. There are +target-specific hooks that can be called before and after main, for additional setup(e.g. PCI setup, or VM snapshotting). =20 ``LLVMFuzzerTestOneInput``: Uses qtest/qos functions to act based on the f= uzz diff --git a/include/qemu-main.h b/include/qemu-main.h index 6a3e90d0ad5..6889375e7c2 100644 --- a/include/qemu-main.h +++ b/include/qemu-main.h @@ -5,6 +5,7 @@ #ifndef QEMU_MAIN_H #define QEMU_MAIN_H =20 -int qemu_main(int argc, char **argv, char **envp); +void qemu_default_main(void); +extern void (*qemu_main)(void); =20 #endif /* QEMU_MAIN_H */ diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 812f66a31a9..254c1eabf57 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -102,7 +102,7 @@ void qemu_boot_set(const char *boot_order, Error **errp= ); =20 bool defaults_enabled(void); =20 -void qemu_init(int argc, char **argv, char **envp); +void qemu_init(int argc, char **argv); void qemu_main_loop(void); void qemu_cleanup(void); =20 diff --git a/softmmu/main.c b/softmmu/main.c index c00432ff098..41a091f2c72 100644 --- a/softmmu/main.c +++ b/softmmu/main.c @@ -30,18 +30,18 @@ #include #endif =20 -int qemu_main(int argc, char **argv, char **envp) +void qemu_default_main(void) { - qemu_init(argc, argv, envp); qemu_main_loop(); qemu_cleanup(); - - return 0; } =20 -#ifndef CONFIG_COCOA +void (*qemu_main)(void) =3D qemu_default_main; + int main(int argc, char **argv) { - return qemu_main(argc, argv, NULL); + qemu_init(argc, argv); + qemu_main(); + + return 0; } -#endif diff --git a/softmmu/vl.c b/softmmu/vl.c index 3f264d4b093..e8c73d0bb40 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2589,7 +2589,7 @@ void qmp_x_exit_preconfig(Error **errp) } } =20 -void qemu_init(int argc, char **argv, char **envp) +void qemu_init(int argc, char **argv) { QemuOpts *opts; QemuOpts *icount_opts =3D NULL, *accel_opts =3D NULL; diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 0ad4ba9e94d..678c312923a 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -236,7 +236,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char = ***envp) g_free(pretty_cmd_line); } =20 - qemu_init(result.we_wordc, result.we_wordv, NULL); + qemu_init(result.we_wordc, result.we_wordv); =20 /* re-enable the rcu atfork, which was previously disabled in qemu_ini= t */ rcu_enable_atfork(); diff --git a/ui/cocoa.m b/ui/cocoa.m index 6a4dccff7f0..415fc0cf041 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -100,13 +100,11 @@ static void cocoa_switch(DisplayChangeListener *dcl, static int left_command_key_enabled =3D 1; static bool swap_opt_cmd; =20 -static int gArgc; -static char **gArgv; +static QemuThread qemu_main_thread; +static bool qemu_main_terminating; static bool stretch_video; static NSTextField *pauseLabel; =20 -static QemuSemaphore display_init_sem; -static QemuSemaphore app_started_sem; static bool allow_events; =20 static NSInteger cbchangecount =3D -1; @@ -585,7 +583,7 @@ - (void) updateUIInfo /* * Don't try to tell QEMU about UI information in the application * startup phase -- we haven't yet registered dcl with the QEMU UI - * layer, and also trying to take the iothread lock would deadlock. + * layer. * When cocoa_display_init() does register the dcl, the UI layer * will call cocoa_switch(), which will call updateUIInfo, so * we don't lose any information here. @@ -778,16 +776,6 @@ - (void) handleMonitorInput:(NSEvent *)event =20 - (bool) handleEvent:(NSEvent *)event { - if(!allow_events) { - /* - * Just let OSX have all events that arrive before - * applicationDidFinishLaunching. - * This avoids a deadlock on the iothread lock, which cocoa_displa= y_init() - * will not drop until after the app_started_sem is posted. (In th= eory - * there should not be any such events, but OSX Catalina now emits= some.) - */ - return false; - } return bool_with_iothread_lock(^{ return [self handleEventLocked:event]; }); @@ -1283,8 +1271,6 @@ - (void)applicationDidFinishLaunching: (NSNotificatio= n *) note { COCOA_DEBUG("QemuCocoaAppController: applicationDidFinishLaunching\n"); allow_events =3D true; - /* Tell cocoa_display_init to proceed */ - qemu_sem_post(&app_started_sem); } =20 - (void)applicationWillTerminate:(NSNotification *)aNotification @@ -1296,12 +1282,7 @@ - (void)applicationWillTerminate:(NSNotification *)a= Notification qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); }); =20 - /* - * Sleep here, because returning will cause OSX to kill us - * immediately; the QEMU main loop will handle the shutdown - * request and terminate the process. - */ - [NSThread sleepForTimeInterval:INFINITY]; + qemu_thread_join(&qemu_main_thread); } =20 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)t= heApplication @@ -1313,7 +1294,7 @@ - (NSApplicationTerminateReply)applicationShouldTermi= nate: (NSApplication *)= sender { COCOA_DEBUG("QemuCocoaAppController: applicationShouldTerminate\n"); - return [self verifyQuit]; + return qemu_main_terminating || [self verifyQuit]; } =20 - (void)windowDidChangeScreen:(NSNotification *)notification @@ -1915,92 +1896,44 @@ static void cocoa_clipboard_request(QemuClipboardIn= fo *info, /* * The startup process for the OSX/Cocoa UI is complicated, because * OSX insists that the UI runs on the initial main thread, and so we - * need to start a second thread which runs the vl.c qemu_main(): - * - * Initial thread: 2nd thread: + * need to start a second thread which runs the qemu_default_main(): * in main(): - * create qemu-main thread - * wait on display_init semaphore - * call qemu_main() - * ... - * in cocoa_display_init(): - * post the display_init semaphore - * wait on app_started semaphore - * create application, menus, etc - * enter OSX run loop - * in applicationDidFinishLaunching: - * post app_started semaphore - * tell main thread to fullscreen if n= eeded - * [...] - * run qemu main-loop - * - * We do this in two stages so that we don't do the creation of the - * GUI application menus and so on for command line options like --help - * where we want to just print text to stdout and exit immediately. + * in cocoa_display_init(): + * assign cocoa_main to qemu_main + * create application, menus, etc + * in cocoa_main(): + * create qemu-main thread + * enter OSX run loop */ =20 static void *call_qemu_main(void *opaque) { - int status; - - COCOA_DEBUG("Second thread: calling qemu_main()\n"); - status =3D qemu_main(gArgc, gArgv, *_NSGetEnviron()); - COCOA_DEBUG("Second thread: qemu_main() returned, exiting\n"); + COCOA_DEBUG("Second thread: calling qemu_default_main()\n"); + qemu_mutex_lock_iothread(); + qemu_default_main(); + qemu_mutex_unlock_iothread(); + COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); [cbowner release]; - exit(status); -} - -int main (int argc, char **argv) { - QemuThread thread; - - COCOA_DEBUG("Entered main()\n"); - gArgc =3D argc; - gArgv =3D argv; - - qemu_sem_init(&display_init_sem, 0); - qemu_sem_init(&app_started_sem, 0); - - qemu_thread_create(&thread, "qemu_main", call_qemu_main, - NULL, QEMU_THREAD_DETACHED); - - COCOA_DEBUG("Main thread: waiting for display_init_sem\n"); - qemu_sem_wait(&display_init_sem); - COCOA_DEBUG("Main thread: initializing app\n"); - - NSAutoreleasePool * pool =3D [[NSAutoreleasePool alloc] init]; - - // Pull this console process up to being a fully-fledged graphical - // app with a menubar and Dock icon - ProcessSerialNumber psn =3D { 0, kCurrentProcess }; - TransformProcessType(&psn, kProcessTransformToForegroundApplication); - - [QemuApplication sharedApplication]; + dispatch_async(dispatch_get_main_queue(), ^{ + qemu_main_terminating =3D true; + [NSApp terminate:nil]; + }); =20 - create_initial_menus(); + return NULL; +} =20 - /* - * Create the menu entries which depend on QEMU state (for consoles - * and removeable devices). These make calls back into QEMU functions, - * which is OK because at this point we know that the second thread - * holds the iothread lock and is synchronously waiting for us to - * finish. - */ - add_console_menu_entries(); - addRemovableDevicesMenuItems(); +static void cocoa_main() +{ + COCOA_DEBUG("Entered %s()\n", __func__); =20 - // Create an Application controller - QemuCocoaAppController *appController =3D [[QemuCocoaAppController all= oc] init]; - [NSApp setDelegate:appController]; + qemu_mutex_unlock_iothread(); + qemu_thread_create(&qemu_main_thread, "qemu_main", call_qemu_main, + NULL, QEMU_THREAD_JOINABLE); =20 // Start the main event loop COCOA_DEBUG("Main thread: entering OSX run loop\n"); [NSApp run]; COCOA_DEBUG("Main thread: left OSX run loop, exiting\n"); - - [appController release]; - [pool release]; - - return 0; } =20 =20 @@ -2079,25 +2012,42 @@ static void cocoa_refresh(DisplayChangeListener *dc= l) =20 static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) { + NSAutoreleasePool * pool =3D [[NSAutoreleasePool alloc] init]; + COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n"); =20 - /* Tell main thread to go ahead and create the app and enter the run l= oop */ - qemu_sem_post(&display_init_sem); - qemu_sem_wait(&app_started_sem); - COCOA_DEBUG("cocoa_display_init: app start completed\n"); + qemu_main =3D cocoa_main; + + // Pull this console process up to being a fully-fledged graphical + // app with a menubar and Dock icon + ProcessSerialNumber psn =3D { 0, kCurrentProcess }; + TransformProcessType(&psn, kProcessTransformToForegroundApplication); + + [QemuApplication sharedApplication]; + + create_initial_menus(); + + /* + * Create the menu entries which depend on QEMU state (for consoles + * and removeable devices). These make calls back into QEMU functions, + * which is OK because at this point we know that the second thread + * holds the iothread lock and is synchronously waiting for us to + * finish. + */ + add_console_menu_entries(); + addRemovableDevicesMenuItems(); + + // Create an Application controller + QemuCocoaAppController *controller =3D [[QemuCocoaAppController alloc]= init]; + [NSApp setDelegate:controller]; =20 - QemuCocoaAppController *controller =3D (QemuCocoaAppController *)[[NSA= pplication sharedApplication] delegate]; /* if fullscreen mode is to be used */ if (opts->has_full_screen && opts->full_screen) { - dispatch_async(dispatch_get_main_queue(), ^{ - [NSApp activateIgnoringOtherApps: YES]; - [controller toggleFullScreen: nil]; - }); + [NSApp activateIgnoringOtherApps: YES]; + [controller toggleFullScreen: nil]; } if (opts->u.cocoa.has_full_grab && opts->u.cocoa.full_grab) { - dispatch_async(dispatch_get_main_queue(), ^{ - [controller setFullGrab: nil]; - }); + [controller setFullGrab: nil]; } =20 if (opts->has_show_cursor && opts->show_cursor) { @@ -2117,6 +2067,8 @@ static void cocoa_display_init(DisplayState *ds, Disp= layOptions *opts) qemu_event_init(&cbevent, false); cbowner =3D [[QemuCocoaPasteboardTypeOwner alloc] init]; qemu_clipboard_peer_register(&cbpeer); + + [pool release]; } =20 static QemuDisplay qemu_display_cocoa =3D { --=20 2.32.1 (Apple Git-133) From nobody Sat May 18 07:31:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658043409; cv=none; d=zohomail.com; s=zohoarc; b=OKrYYDlc3VCPlsmFBVaC0fN1q2BtQkdDPXAJ7MRZEidpqh6nw6uCBlb4Edyjf/b2gsaqi6OEbjSjSkCFRiHoXqsr4BHhP89JhB1JwLL86A1iHAy7qPMrmaUGWTTN0abNSsiR3+MuIBgPWov1Lo3dhFthodWMqNTxeiGrM+JwivM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658043409; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=ylb4woiWl7rRdOJRD6I0pk2qnNC5s/O1KGQ+3BsXcPM=; b=jChm/XCwb42nN8pY9VbLartyFZyqYNPDVNBYH7hSu1po2xejXWyXMBNbcytvZChVJ3hCR2XQRAfvSiUtVM01phwzp6fKsAZvlpiPYCXaJmEHS9T/V+gft9NxWip9/zhjYU2Z3aKpReqaIOyYN87Oj9Nztetrr9Khwex0TkXkRaE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658043409057841.3651263020737; Sun, 17 Jul 2022 00:36:49 -0700 (PDT) Received: from localhost ([::1]:38768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCypc-0004Iz-1x for importer@patchew.org; Sun, 17 Jul 2022 03:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCymp-0001bR-Uw for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:55 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:45790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCymo-00052y-9m for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:55 -0400 Received: by mail-pg1-x52a.google.com with SMTP id f65so8022299pgc.12 for ; Sun, 17 Jul 2022 00:33:53 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c360:8200:ece4:54e6:b565:8dcd]) by smtp.gmail.com with ESMTPSA id j12-20020a170903024c00b0016c4546fbf9sm6793364plh.128.2022.07.17.00.33.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 17 Jul 2022 00:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ylb4woiWl7rRdOJRD6I0pk2qnNC5s/O1KGQ+3BsXcPM=; b=JoiUQe3tQH1lAzO3H38djXU3xg6c71EkYXvoP81XmKgAIhhp6mcmJTt8I3xM4FA9xN cNeh5TR7FL/03ROA+G6N6DAKQqZcigsCT014rlEL4zCIx4Wj6R2sWyg2y403YXutO9zg V8HZrpt9oUyswgUSfst+6g5hx7lP1w0ORBPp0bQfpN77OH9hzbfW5uWc7piEk8vaPbll /jWMTe4xtf5YrcRwgLAGiaiLDuoZhGyrZHbhhKIqDuqE5VDNW4Smgr9/xbG2D0FFw4cA SJ+Ym9Dw61809PhmtxDib/wyzQSpj3r2c7R4Sx66Ewrzu27DMJU11DbSRiY4GD7T6cVm UhYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ylb4woiWl7rRdOJRD6I0pk2qnNC5s/O1KGQ+3BsXcPM=; b=t6ZFZn/Fe4Gl6WZzcIC1BAAFf6qLIjgUCp8tvrnWiQi/GCqwlnN/eeXb/2h4NrRPWT Ok1O3LEYUZtwQjoKabv84LBxutInlKyaUiRw60l9BMA4P7bJxdHWfhKvrvloFy/uT7tc bbVWhNuZwhB7btnHhr9MAIX3axTz2Lwu6irhNzeq5zt0K3C4NzHxMakWfr5wBVVqZXsg Ip4xy5tzdlDYukE+Gpo4Y3ABrqnd3BFoeCzCjOZIHklUv3MzKP2jnDarOm1HV6GBfyTb 2sQi39Euf7LoHXuLF3Ypwc5adR02RAPm/yrQW6jRVRsGGPPOIi5kohaiTPLndeaDDjsG XxJQ== X-Gm-Message-State: AJIora9a341Fn409eHaB9hgNwi9E//hpiEBu4/7Si4tU/RyWiSBz4YpZ +YoSyF+F4nsEeMZ/w48o7EGMYxZ0nqE= X-Google-Smtp-Source: AGRyM1t5SqS26/cW0ft4MUehAGP7V3Jy9T7M3aZ54MTt7v4sZSo1mVR8AWSftqqFNfWfRA0uF3Wqjw== X-Received: by 2002:a65:6a05:0:b0:3db:27cb:9123 with SMTP id m5-20020a656a05000000b003db27cb9123mr19591543pgu.497.1658043232479; Sun, 17 Jul 2022 00:33:52 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, Peter Maydell , Paolo Bonzini , Gerd Hoffmann , Emanuele Giuseppe Esposito , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH v4 2/3] Revert "main-loop: Disable block backend global state assertion on Cocoa" Date: Sun, 17 Jul 2022 16:33:39 +0900 Message-Id: <20220717073340.25830-3-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) In-Reply-To: <20220717073340.25830-1-akihiko.odaki@gmail.com> References: <20220717073340.25830-1-akihiko.odaki@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=akihiko.odaki@gmail.com; helo=mail-pg1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658043409593100001 Content-Type: text/plain; charset="utf-8" This reverts commit 47281859f66bdab1974fb122cab2cbb4a1c9af7f. Signed-off-by: Akihiko Odaki Reviewed-by: Peter Maydell Reviewed-by: Paolo Bonzini --- include/qemu/main-loop.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 5518845299d..0aa36a4f17e 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -280,23 +280,10 @@ bool qemu_mutex_iothread_locked(void); bool qemu_in_main_thread(void); =20 /* Mark and check that the function is part of the global state API. */ -#ifdef CONFIG_COCOA -/* - * When using the Cocoa UI, addRemovableDevicesMenuItems() is called from - * a thread different from the QEMU main thread and can not take the BQL, - * triggering this assertions in the block layer (commit 0439c5a462). - * As the Cocoa fix is not trivial, disable this assertion for the v7.0.0 - * release (when using Cocoa); we will restore it immediately after the - * release. - * This issue is tracked as https://gitlab.com/qemu-project/qemu/-/issues/= 926 - */ -#define GLOBAL_STATE_CODE() -#else #define GLOBAL_STATE_CODE() \ do { \ assert(qemu_in_main_thread()); \ } while (0) -#endif /* CONFIG_COCOA */ =20 /* Mark and check that the function is part of the I/O API. */ #define IO_CODE() \ --=20 2.32.1 (Apple Git-133) From nobody Sat May 18 07:31:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658043415; cv=none; d=zohomail.com; s=zohoarc; b=B7u5/rQzern6cpubsDuZ4hY57uvBMeQuVR90yRtZ57M3umjs6fr4+s6Yq7dacQ5wf1v/R1rTmT0KyT8chdR5IKmTgEQYMhXlQeM1iEMAWvxm/9SiHfBHXyUIT5VN1kBfkmWKBcWj5fUWCkpIPYTsuLMwgbc/dZHVNvvgLj62tRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658043415; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=zJST1JlzrBFRfYOJJKYdNOjdYpGZW6q5WVfQSu/8SsM=; b=c7A/YJppt3uAs80OVeQSkVS1eRONsWxMxCVuZanbOzY7JU1n93d8tZOelaboBlehQilhyWIhglPYFULgOMrzH3YprASN7+0VXbb2KKF3ua1aAniLaLHPxP7u+lAlPvWZr2NAGMCj6Gk1Kwa2TdnJM++7d/uhzvH5cfMkhEocVSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658043415294427.51974890563747; Sun, 17 Jul 2022 00:36:55 -0700 (PDT) Received: from localhost ([::1]:39048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCypg-0004Vg-VO for importer@patchew.org; Sun, 17 Jul 2022 03:36:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCyms-0001hs-M5 for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:58 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:44987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCymr-00053J-5l for qemu-devel@nongnu.org; Sun, 17 Jul 2022 03:33:58 -0400 Received: by mail-pg1-x536.google.com with SMTP id bf13so8032808pgb.11 for ; Sun, 17 Jul 2022 00:33:56 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c360:8200:ece4:54e6:b565:8dcd]) by smtp.gmail.com with ESMTPSA id j12-20020a170903024c00b0016c4546fbf9sm6793364plh.128.2022.07.17.00.33.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 17 Jul 2022 00:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zJST1JlzrBFRfYOJJKYdNOjdYpGZW6q5WVfQSu/8SsM=; b=jUdgcaZd+LXoh9WZ3xjWgCa5GPlHrP9Hei/sooH6Akxro13DU7fd1E5yJvXjcCFWgO pGBnaBUCyWm5iG8HK0o6ZIWO4ueBv4V3ti39MzfhgHJPp3eU8Fdg+Yun57PQxNLvoBEV VQYte7Q6oVTMfFgzII8HW2+fdJXuR+5VBg6C39LHS9fnttxPFxALdgy9nMyewp2nfctD XOLT8FhXOfiv0vKAvtZZvHyCMM5cmkj64HB4HzLMZwo/AhIe6V8WcIk92qUgF9yDgKg8 NPiIJkug+HfuJeKtDhR2+jXpSr74JRFgiW95RJtU6xBnjfVqwptlJGoBRkrnaByLqMvW CwaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zJST1JlzrBFRfYOJJKYdNOjdYpGZW6q5WVfQSu/8SsM=; b=ihrIhjurolVvS+jY84OKUIZ6Zj1rLRqYqRIwqzr4kzeDwsmdUsvhQWp6SNy3WFkuBr wNnl7V/9eKUKHlnhgmgDzXOpR9n07w30S0cWEgzKBAwmjZcqoSTknUf/1ibjrkuzHCtj hhpTVmoWkU5S5kfxGSbf7UGY4XmbqL++ZvGRJaMMNzYaxukzmYU2ESvek8ttC2CWzWmo +XSNDByQfCU46gjh1UcxZU/NT/UmiV3qU2moILAeTE9eZw3GcZcLFmyO6eOKkc0acgRO 5bi7eFoBDpynFfNC/INRapJxeq5pyvlJfOC/DDEHma6ncQaMCx+RePoMnioyu2HDuKvQ wuAA== X-Gm-Message-State: AJIora/Ox/OfS4Nz9EWh3hFlhpiJX904E/U1YdwrhBlRzsoq2bfVxji/ NDNcLuRvVttDnP3R6zmsC7Sf2P8BXWU= X-Google-Smtp-Source: AGRyM1sZNukTvxk/vPgC7K3xFaCrO1xktRsbZtr4srMymdUkGxSp4UtiMafyZJgGUavPm9Hg09p40w== X-Received: by 2002:a63:6aca:0:b0:419:cb1b:8b4f with SMTP id f193-20020a636aca000000b00419cb1b8b4fmr13109622pgc.92.1658043235467; Sun, 17 Jul 2022 00:33:55 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, Peter Maydell , Paolo Bonzini , Gerd Hoffmann , Emanuele Giuseppe Esposito , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH v4 3/3] meson: Allow to enable gtk and sdl while cocoa is enabled Date: Sun, 17 Jul 2022 16:33:40 +0900 Message-Id: <20220717073340.25830-4-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) In-Reply-To: <20220717073340.25830-1-akihiko.odaki@gmail.com> References: <20220717073340.25830-1-akihiko.odaki@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=akihiko.odaki@gmail.com; helo=mail-pg1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658043415470100001 Content-Type: text/plain; charset="utf-8" As ui/cocoa does no longer override main(), ui/gtk and ui/sdl can be enabled even ui/cocoa is enabled. Signed-off-by: Akihiko Odaki Reviewed-by: Peter Maydell Reviewed-by: Paolo Bonzini --- meson.build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index bc5569ace15..7baec7896ef 100644 --- a/meson.build +++ b/meson.build @@ -583,12 +583,6 @@ if get_option('attr').allowed() endif =20 cocoa =3D dependency('appleframeworks', modules: 'Cocoa', required: get_op= tion('cocoa')) -if cocoa.found() and get_option('sdl').enabled() - error('Cocoa and SDL cannot be enabled at the same time') -endif -if cocoa.found() and get_option('gtk').enabled() - error('Cocoa and GTK+ cannot be enabled at the same time') -endif =20 vmnet =3D dependency('appleframeworks', modules: 'vmnet', required: get_op= tion('vmnet')) if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h', @@ -915,7 +909,7 @@ if not get_option('brlapi').auto() or have_system endif =20 sdl =3D not_found -if not get_option('sdl').auto() or (have_system and not cocoa.found()) +if not get_option('sdl').auto() or have_system sdl =3D dependency('sdl2', required: get_option('sdl'), kwargs: static_k= wargs) sdl_image =3D not_found endif @@ -1181,7 +1175,7 @@ endif gtk =3D not_found gtkx11 =3D not_found vte =3D not_found -if not get_option('gtk').auto() or (have_system and not cocoa.found()) +if not get_option('gtk').auto() or have_system gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', method: 'pkg-config', required: get_option('gtk'), --=20 2.32.1 (Apple Git-133)