From nobody Tue Feb 10 15:45:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549392722481124.54388536774127; Tue, 5 Feb 2019 10:52:02 -0800 (PST) Received: from localhost ([127.0.0.1]:37870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5p6-0006Ik-DG for importer@patchew.org; Tue, 05 Feb 2019 13:51:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5GV-0002Vy-Kd for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5GN-0003w5-8R for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:09 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:40588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5GM-0003v2-Uw for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:03 -0500 Received: by mail-wm1-x32a.google.com with SMTP id f188so4725654wmf.5 for ; Tue, 05 Feb 2019 10:16:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:00 -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=G7Tp8xbJHdqkkmVZNwiNpKARUVKeqGqlYzZPp6xngHMjWxOAsior9ihJAv92splPhh L8GRVErQXQS3thc/lal2IodtbHNsnkduZRqKC8f5swUPxZSncN3DfgBrkba8kwo1m4UJ rAiOXeO0WNTu9cmh/ujMDxdV71dFhUheb+MT5R0JL0TW4RNc24frx136/e6Oa0ZgZKLa pEcPoeK6Eb4upKo7KFRbJSiuHiEfwQd4IFE36ZsDEVDXXOqWNkEJXTNQQF+cOLTRJky5 Cnf4cMKQD/UilJQimWsXXSQfc9faRU+X6MHDh26uPSxiYonrigQuPF3hihN53lOP2cj/ aSWA== 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=JsJgGTlkiXsGueBz2ce3oj4mO2K6Zy8ytdTfecQfrESLT3bBRyn+tE66wAFlaARnkw TOyDqRmtnoWXhMRQ50HpsXmPiyIS1/ob4EOyxSupEod2gtHnnK1GESLfQbzXJOnxh8TD iBEnB/pDr19814sZQgREQ4BtV16LqmWtV9yQYsOu9cnO6eLk3X4NOZXeLoMr8pXy+/8/ 4LnTiPpazPSX8N3/qcChLpwTsf/bDa0HM+UixKjCUxHj7B4xIwpwe2vKpRR9vzTU5ppJ CAChB3FA3zdRnX/9ldq93+Pm/J/jZZIqANd2BXzx27JhhX7QPefPvFZ9Opf0LjMc4BDs sFHg== X-Gm-Message-State: AHQUAua16Wkqr0EJUIEGBitfx2e4V6Z3R+BvUM1w1A+s8thEu9Eb4FNT DojuIooL65uMK/ZtwEvRFtJa3gHR X-Google-Smtp-Source: AHgI3IZYgR1al8wAQ/Bf4S6LYWFWuDNnJrTEc2HCupmpKFMGoyrHaVsq8bNguaOvkBOBQfTXEaG9jw== X-Received: by 2002:a1c:7dd6:: with SMTP id y205mr4450478wmc.121.1549390561526; Tue, 05 Feb 2019 10:16:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:14:42 +0100 Message-Id: <1549390526-24246-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-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::32a Subject: [Qemu-devel] [PULL 32/76] 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: 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: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- monitor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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) =20 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 =3D true; - QTAILQ_FOREACH_SAFE(mon, &mon_list, entry, next) { + while (!QTAILQ_EMPTY(&mon_list)) { + Monitor *mon =3D QTAILQ_FIRST(&mon_list); QTAILQ_REMOVE(&mon_list, mon, entry); /* Permit QAPI event emission from character frontend release */ qemu_mutex_unlock(&monitor_lock); --=20 1.8.3.1