Message ID | 1549305379-51117-34-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tvxBe/yV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tcPJ6Zdfz9sML for <incoming@patchwork.ozlabs.org>; Tue, 5 Feb 2019 05:56:20 +1100 (AEDT) Received: from localhost ([127.0.0.1]:47543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gqjPm-0003g3-QK for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2019 13:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj72-0005FX-LB for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj71-0003gQ-TU for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:56 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41795) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj71-0003fP-AW for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:55 -0500 Received: by mail-wr1-x42d.google.com with SMTP id x10so941874wrs.8 for <qemu-devel@nongnu.org>; Mon, 04 Feb 2019 10:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=3RYvBCv/cFNp7C2IyBijE2HqicmWsyaoN6Rat+6VgvA=; b=tvxBe/yVhICYMqNtyhspys8jrNJqzQvGI45dOBcaSDG5gLXDVYnw/bMljEte3rxt8i zjoHKM257cbi49Ijo90P4SAhnzT1HpKglQxA9nvVDKexf9jI1odvmorEPPpFp7cVrVME 9Yi9zo9cNsgH6t4xanqkSwpPwL94mccIljyuyms7u24RmDpXbTk1XHSHy/tXdGY7LwVQ Xo8/LDjfKo/E3YgwSe5Kxdvf3O4VU47BaAK44EnHowzCxT6ZQlCFuixyc0h1IW9qLkIy su2hcg5MV74X+Jtb8953dD2BMHuIKgEee33UkM1tPPNiMwd+HuNMlg0awuWpb4Vf5SBy l3qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=3RYvBCv/cFNp7C2IyBijE2HqicmWsyaoN6Rat+6VgvA=; b=XRXqpZoemJ7g52VHagKV1LuudSSp3sRHwo3aVTL+MVTFv4+47xlUm0yEMHjNgxRIq7 jDr0NJ52/XWppSlB6xBNCcOt6v3dOGcc1NW66ebpF8+2QOgA+xOIPYvS666nUw/FOVOi dVjCMSlL+XfMDPDPOdhERFTxZkBtaqRHkyJZMqPSO495uE8fc66sH52a3rgIXGdj+Jx8 n929BdUzC/gdvF0Z8LI5VBo/1y2Ew46AUkSRpQHzfPhwfzu5DShlme4er+24Hj3KaZGT 7D54lT69OYIWt/Aj2OCinAY/gW6BpBtvOQZgTHtanh9/dlS79d0p962wLnwN4TxvSiDc v0EQ== X-Gm-Message-State: AHQUAuaY4HUn6dpUkKeHa3wx5pi65cNIhGVq6Ev/yA4KeLWoWce3i0kf DYv0vby0RBdDDSTpcWDSTHMlxGl0 X-Google-Smtp-Source: AHgI3IZK4hg+qyf9//FhFiXMLJjfxNSCcNFEkJYRzDaj0iLPMzTnHYepXTgyLDU9u4mfxZJ6gyMPRg== X-Received: by 2002:adf:f9c1:: with SMTP id w1mr557147wrr.267.1549305413873; Mon, 04 Feb 2019 10:36:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.36.53 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:36:53 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:35:35 +0100 Message-Id: <1549305379-51117-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 33/77] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/77] vhost-user-test: use g_cond_broadcast
|
expand
|
diff --git a/monitor.c b/monitor.c index c09fa63..e5de576 100644 --- a/monitor.c +++ b/monitor.c @@ -4617,8 +4617,6 @@ void monitor_init(Chardev *chr, int flags) void monitor_cleanup(void) { - Monitor *mon, *next; - /* * We need to explicitly stop the I/O thread (but not destroy it), * clean up the monitor resources, then destroy the I/O thread since @@ -4632,7 +4630,8 @@ void monitor_cleanup(void) /* Flush output buffers and destroy monitors */ qemu_mutex_lock(&monitor_lock); monitor_destroyed = true; - QTAILQ_FOREACH_SAFE(mon, &mon_list, entry, next) { + while (!QTAILQ_EMPTY(&mon_list)) { + Monitor *mon = QTAILQ_FIRST(&mon_list); QTAILQ_REMOVE(&mon_list, mon, entry); /* Permit QAPI event emission from character frontend release */ qemu_mutex_unlock(&monitor_lock);
monitor_qmp_requests_pop_any_with_lock cannot modify the monitor list concurrently with monitor_cleanup, since the dispatch bottom half runs in the main thread, but anyway it is a bit ugly to keep "next" live across critical sections of monitor_lock and Coverity complains (CID 1397072). Replace QTAILQ_FOREACH_SAFE with a while loop and QTAILQ_FIRST, it is cleaner and more future-proof. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- monitor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)