From nobody Fri Nov 7 14:34:58 2025 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548095962490303.14097529464084; Mon, 21 Jan 2019 10:39:22 -0800 (PST) Received: from localhost ([127.0.0.1]:57822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleTU-0006Un-48 for importer@patchew.org; Mon, 21 Jan 2019 13:39:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyW-0004mX-4D for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyU-0004bd-3i for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:08 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyT-0004aj-SD for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:06 -0500 Received: by mail-wr1-x435.google.com with SMTP id p4so24475672wrt.7 for ; Mon, 21 Jan 2019 10:07:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.07.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:07:03 -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=61BzCROIDPzWJBBFOn3MOLdgIctRgiS0pnOjT7TGTIE=; b=rgpotcYiaPwX36SmiFuL+2pmhCjnrc1TOzaBeIBWW5amVoj8z1o++9kV4d9B+VdM+8 4VDtKwo32+XbvA0oJ4Qbn1OaBWCb1xRcr7CHIqtzCDcxg0PRE0/Azer3pyYguXZwPb3d yxTRivpRtOgpCXVLZZadw49jzc4Thg7WqbnTTDjaptC5sHTd0oy0M0YXqdsSApscGGSH wRievHT7LrJKCN+8TF+ziMZyftpm06VZ1OHFkzHKBrCkuP6xR0fsZNuBIoq+UEyxQ6PO zJvGzViADEciXeHYhOt2BrTSkW76Y6dd/t+q2UOENkZ1MgUmrV5TSI0OTGIQTbcQRrl9 DBRg== 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=61BzCROIDPzWJBBFOn3MOLdgIctRgiS0pnOjT7TGTIE=; b=NmQMAvpAb0jv/DPaQwAmX/ZiVQeCW+nPqvObsM49dcK78t2I0sfAtRWJJ388W0KMFV 1KgZdyg0ouwiSySB047eYq76F++k2pvHdgAV5Gr3zULwFx51Eh17tScYGkzNKKkBKKy8 7EsbleWmsMvitxTZfs38a5+MUhDAc+pxQNhL61e/Ixhv/S+e5Z7du3OXmhq6CYkRj0fF nrfvVazszk8kHz+TCjbTU0MO28uHJGmOosTcCE1BtDFKJOzUQGXiRdQi/c3abBLsIJmM +/zAf1BUM6g0E6oJBJShvjT4Tn/OssFivfQjqCIJQ9C8YlPJrc4Ubrw4bCmlIZ/VdCrb iBEQ== X-Gm-Message-State: AJcUukfweC21Aq3e26Cr1vcdiSBw/o+5ttqTMLoMbNDGnoXcv5SQGiJt Rcuwn2a76vCEdmZnr3yBGu+yoYjp X-Google-Smtp-Source: ALg8bN69r+tC5ZSJ/Ys7VnatFyB3PRfElmxvrn9GE3WgHVYLNaN9T7Q6du17EzcLulZDtnfpmxxU+Q== X-Received: by 2002:adf:91c3:: with SMTP id 61mr28262630wri.324.1548094024616; Mon, 21 Jan 2019 10:07:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:13 +0100 Message-Id: <1548093980-43088-43-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-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::435 Subject: [Qemu-devel] [PULL 42/49] 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 eb39fb0..2bacaad 100644 --- a/monitor.c +++ b/monitor.c @@ -4619,8 +4619,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 @@ -4634,7 +4632,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