From nobody Sun Feb 8 15:42:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637760632; cv=none; d=zohomail.com; s=zohoarc; b=aI8QttaggyN57LxX6cZ6TkHCVLLPjeXfXZ14cvFCkBfFINAsa5m6rih4kClNz0smf6XdxqNGEJC6gb/UW0ohwCt54Vy0JEFbZy4T0BU/4z/M2ZnLu3YU/94bQct7HrTGWv+30hf3SWsSZS4gMuPPJwQej4sqhN+KTTxFDMldE3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637760632; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZcZTBBHN0QFjr5QQ70+4muyYw0LS1A7xI97pmOgrtLM=; b=SECVD31vJ2GBGXjhssFhDa6YRP1bVT4cuJuK9nwVbM6zOBnNnxU+/IhDqn+DnUMUU2SNKKYIZXCcTexyrNc3dWrYq6MAHbZjqmFYiDxrGM1tg5zwbuIiTPHW3Bk/jpz8dHZ9n4WyfTJSlZ/5TG2LdZFYcYvl8J5L1i4L/amu+SU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637760632916223.79453513644262; Wed, 24 Nov 2021 05:30:32 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-500-XHaTArE8OceelvG0kxox8g-1; Wed, 24 Nov 2021 08:30:29 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE2ED83DD25; Wed, 24 Nov 2021 13:30:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D001160C05; Wed, 24 Nov 2021 13:30:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A72D31809CB7; Wed, 24 Nov 2021 13:30:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AODTX3S012649 for ; Wed, 24 Nov 2021 08:29:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id B048FADDC; Wed, 24 Nov 2021 13:29:33 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38E215DF21 for ; Wed, 24 Nov 2021 13:29:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637760631; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZcZTBBHN0QFjr5QQ70+4muyYw0LS1A7xI97pmOgrtLM=; b=EuuemaxSw7CLdzY/xfW3pYavDBbDD/qjO57inFTGJCpIkCcbwsGqeGRLGrIzXXm1eOoZpo 9nXTrrC4CBNl88ZNvalu9/ekrIvREhXNfAaQ0fFMFfZc+4hSrsz4vz9l978pIfOHZbeE+7 uWmRqMVZvqUSAQXSHrI6Qa9w/eVgDdw= X-MC-Unique: XHaTArE8OceelvG0kxox8g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] qemu: absorb qemuDomainObjExitMonitorInternal Date: Wed, 24 Nov 2021 14:28:55 +0100 Message-Id: <84ad5de85acaf2b716d867835b5e335ed86fdc46.1637760513.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637760633772100002 qemuDomainObjExitMonitor is just an alias for it at this point. This also removes the incomplete ATTRIBUTE_NONNULL(1) annotation. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dea7dae4b3..080510e683 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5857,9 +5857,14 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriver *dri= ver, return 0; } =20 -static void ATTRIBUTE_NONNULL(1) -qemuDomainObjExitMonitorInternal(virQEMUDriver *driver, - virDomainObj *obj) +/* obj must NOT be locked before calling + * + * Should be paired with an earlier qemuDomainObjEnterMonitor() call + * + */ +void +qemuDomainObjExitMonitor(virQEMUDriver *driver, + virDomainObj *obj) { qemuDomainObjPrivate *priv =3D obj->privateData; bool hasRefs; @@ -5890,16 +5895,6 @@ void qemuDomainObjEnterMonitor(virQEMUDriver *driver, QEMU_ASYNC_JOB_NONE)); } =20 -/* obj must NOT be locked before calling - * - * Should be paired with an earlier qemuDomainObjEnterMonitor() call - */ -void qemuDomainObjExitMonitor(virQEMUDriver *driver, - virDomainObj *obj) -{ - qemuDomainObjExitMonitorInternal(driver, obj); -} - /* * obj must be locked before calling * --=20 2.31.1