Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 318E3ECE587 for ; Mon, 14 Oct 2019 12:54:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0E6D20673 for ; Mon, 14 Oct 2019 12:54:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jLUCMp7U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0E6D20673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJzs6-00044V-3T for qemu-devel@archiver.kernel.org; Mon, 14 Oct 2019 08:54:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33160) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJzrK-0003c9-5l for qemu-devel@nongnu.org; Mon, 14 Oct 2019 08:53:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJzrI-0002Ua-Vm for qemu-devel@nongnu.org; Mon, 14 Oct 2019 08:53:58 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:37988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJzrI-0002TX-QC for qemu-devel@nongnu.org; Mon, 14 Oct 2019 08:53:56 -0400 Received: by mail-pl1-x642.google.com with SMTP id w8so7982593plq.5 for ; Mon, 14 Oct 2019 05:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vc2c5WMfkiOfguRP8cbAU26pLvXspd7bpIyEPOg1kuA=; b=jLUCMp7Un0LU+LEi5WeDxcreNafdeQZGSvqpQu791pksiqIgFY9cO+9eKY7+2o0PJJ 3GZJz2hkehBwWizOnQJtlH+d+HEUe3QcZ8PLpNKtFLQMBwOjljqE03rFZyY4Ul35fRHj J72lscNJj/yOokJqVC2zRp/SaWCigNbHEv1srsVe05FA2YYc19HGnQdw2ZUdqGiNltHF 4R1kScf+ZfDNhKKPrhEVfTz07LBPluh54qoAsCntvzAyTBJRGA39V6F0zUKp/2jlyzzx v13CiBghMIMZU+gXXJUQI+2NEELCoFbktcST4MLy6v3TyA8ZcDD3BUsEolnTK/yTtnFE w9Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vc2c5WMfkiOfguRP8cbAU26pLvXspd7bpIyEPOg1kuA=; b=GjQ4GY8GGVAkjJONxS6M57JeRENlmyCU52VEWLaetvu1bkwWX9TqZXOQyMkHmggl9Y yfSzPRHlS9LeQI/5qI3U22hb9pEhby0v6XLWO+gP5klHHErWOG0DJdZR1+NU6LCasOn8 eo26UFttgWfaBGnS03xT/BUKQqKZUfklK46JX6EmRwtbNdF3jyy1c3//AqY8ZFBdbM7q YAA016othpD4GNLU9S8448pIIOrS0Gs1K/OKHK63TdifXqGFWWNwNnvbBcKSVXqSihmC 2KOeBDhSNHAyDY8MN6Xmxp4C41YbGC5R+uadoCbFjyBPRp+7XdxeAW1CvU5xT+ag1/Db lr3A== X-Gm-Message-State: APjAAAWekqdNbR2tWUXF8XqumDg/1SuebAG/OWj1Gs7ectOyIrkyqB6S PBo9UWRGxvvhb3/18RP/0i7bghi9wd8= X-Google-Smtp-Source: APXvYqzCNytAIfQ3RvIOwzMAqhJ1KLYwbZ1pgDVvp4X08gTswtoAxE5xvN6gxa4UxE8KGLMh9xjGzw== X-Received: by 2002:a17:902:8bc4:: with SMTP id r4mr28750810plo.341.1571057634923; Mon, 14 Oct 2019 05:53:54 -0700 (PDT) Received: from t03.z01.hikalium.com.com (113x36x63x49.ap113.ftth.ucom.ne.jp. [113.36.63.49]) by smtp.gmail.com with ESMTPSA id l184sm1208431pfl.76.2019.10.14.05.53.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 05:53:53 -0700 (PDT) From: hikarupsp@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH] This patch fixes hanging up Cocoa display on macOS 10.15 (Catalina) Date: Mon, 14 Oct 2019 21:52:54 +0900 Message-Id: <20191014125254.74913-1-hikarupsp@gmail.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Hikaru Nishida , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Hikaru Nishida An NSEvent is fired before applicationDidFinishLaunching on macOS Catalina. This causes deadlock of iothread_lock by calling bool_with_iothread_lock in handleEvent while its already locked. This patch prevents to call bool_with_iothread_lock until the app_started_sem is released to prevent this deadlock. Buglink: https://bugs.launchpad.net/qemu/+bug/1847906 Signed-off-by: Hikaru Nishida --- ui/cocoa.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/cocoa.m b/ui/cocoa.m index f12e21df6e..f16d341a0a 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -134,6 +134,7 @@ static QemuSemaphore display_init_sem; static QemuSemaphore app_started_sem; +volatile sig_atomic_t allow_events; // Utility functions to run specified code block with iothread lock held typedef void (^CodeBlock)(void); @@ -729,6 +730,9 @@ - (void) handleMonitorInput:(NSEvent *)event - (bool) handleEvent:(NSEvent *)event { + if(!allow_events) { + return false; + } return bool_with_iothread_lock(^{ return [self handleEventLocked:event]; }); @@ -1897,6 +1901,7 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) /* Tell main thread to go ahead and create the app and enter the run loop */ qemu_sem_post(&display_init_sem); qemu_sem_wait(&app_started_sem); + allow_events = true; COCOA_DEBUG("cocoa_display_init: app start completed\n"); /* if fullscreen mode is to be used */ -- 2.21.0 (Apple Git-122)