From nobody Sun Feb 8 20:12:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1659444723; cv=none; d=zohomail.com; s=zohoarc; b=lqhUtx3z6CHgdxgeh5fT+oQsp3I2qwgU0beRy/VDeWySnsUutNe/So25Ju/LEjPmq5a5Bq33CK+98gop54K9T9VbIWCvZcLsGHR6//pmxYA1iSap+t7q8kzvD4sBsLWRhi12NHQ/SHxdNffEar0rYBZ3R3FACXLxbYBO40p8ZLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659444723; 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=a2hToMWr7gbxPQo0m4eFf4y9udicCEKPngXTQlSgS3s=; b=LfAgoj88VLcIq44TRGubMA8TEVcoyCYdOkGReop6kuOEZzr3Zr3hsc91+mWjpzS5xxQyEGtUk0V1M1ZYBAV9WI3VBmA20CjGqGKr0wqpBCBkeB0e7ASi8dsyOl9HSZyS5yc3KvppJ3gswoufDg1rHg3DBFN+31m6QhcmH9nUIYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1659444723260737.7790088070873; Tue, 2 Aug 2022 05:52:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-ZaO8Y6FAOxSBCyA5Cuj7lw-1; Tue, 02 Aug 2022 08:52:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C100801755; Tue, 2 Aug 2022 12:51:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A26B1121314; Tue, 2 Aug 2022 12:51:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 30BBF1946A5D; Tue, 2 Aug 2022 12:51:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 16DED1946A50 for ; Tue, 2 Aug 2022 12:51:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D08F5492C3B; Tue, 2 Aug 2022 12:51:54 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25EDE492CA8 for ; Tue, 2 Aug 2022 12:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659444722; 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=a2hToMWr7gbxPQo0m4eFf4y9udicCEKPngXTQlSgS3s=; b=MVsdOAGtH/xLIcR51XiWnIY1XxHSwFt6w46Xho2Edmoi2DJZ8KqYx7ejKsUZ+pxGXF1COt KWWYY27FVpxl+flHCZF8qBRzp3TwrTP9uRnIlWQsrWvGuNEIF2PKekSG3zDG1N2CHVGi8J Za+iLXiXM+e08aLjLc2NGHxkk6ThXcQ= X-MC-Unique: ZaO8Y6FAOxSBCyA5Cuj7lw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] qemuMonitorOpenUnix: Remove 'retry' argument Date: Tue, 2 Aug 2022 14:51:47 +0200 Message-Id: <4440517d8f3ab4f2b6c1b4e49eebaec02cc708c5.1659444625.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659444725477100001 Content-Type: text/plain; charset="utf-8" All callers now pass false for 'retry' we are guaranteed to have a monitor socket present. This means that the retry code can be removed. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 47 ++++++------------------------------ src/qemu/qemu_monitor.h | 1 - src/qemu/qemu_process.c | 3 +-- tests/qemumonitortestutils.c | 1 - 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 91e9f76944..ad5e121359 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -223,16 +223,12 @@ qemuMonitorDispose(void *obj) g_free(mon->domainName); } -#define QEMU_DEFAULT_MONITOR_WAIT 30 static int -qemuMonitorOpenUnix(const char *monitor, - pid_t cpid, - bool retry) +qemuMonitorOpenUnix(const char *monitor) { struct sockaddr_un addr; VIR_AUTOCLOSE monfd =3D -1; - virTimeBackOffVar timebackoff; int ret =3D -1; if ((monfd =3D socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { @@ -249,39 +245,11 @@ qemuMonitorOpenUnix(const char *monitor, return -1; } - if (retry) { - if (virTimeBackOffStart(&timebackoff, 1, QEMU_DEFAULT_MONITOR_WAIT= * 1000) < 0) - return -1; - while (virTimeBackOffWait(&timebackoff)) { - ret =3D connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); - - if (ret =3D=3D 0) - break; - - if ((errno =3D=3D ENOENT || errno =3D=3D ECONNREFUSED) && - (!cpid || virProcessKill(cpid, 0) =3D=3D 0)) { - /* ENOENT : Socket may not have shown up yet - * ECONNREFUSED : Leftover socket hasn't been removed yet = */ - continue; - } - - virReportSystemError(errno, "%s", - _("failed to connect to monitor socket")); - return -1; - } - - if (ret !=3D 0) { - virReportSystemError(errno, "%s", - _("monitor socket did not show up")); - return -1; - } - } else { - ret =3D connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); - if (ret < 0) { - virReportSystemError(errno, "%s", - _("failed to connect to monitor socket")); - return -1; - } + ret =3D connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + if (ret < 0) { + virReportSystemError(errno, "%s", + _("failed to connect to monitor socket")); + return -1; } ret =3D monfd; @@ -707,7 +675,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, qemuMonitor * qemuMonitorOpen(virDomainObj *vm, virDomainChrSourceDef *config, - bool retry, GMainContext *context, qemuMonitorCallbacks *cb) { @@ -722,7 +689,7 @@ qemuMonitorOpen(virDomainObj *vm, } virObjectUnlock(vm); - fd =3D qemuMonitorOpenUnix(config->data.nix.path, vm->pid, retry); + fd =3D qemuMonitorOpenUnix(config->data.nix.path); virObjectLock(vm); if (fd < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 2ef9118b84..742bfd4cdc 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -408,7 +408,6 @@ struct _qemuMonitorCallbacks { qemuMonitor *qemuMonitorOpen(virDomainObj *vm, virDomainChrSourceDef *config, - bool retry, GMainContext *context, qemuMonitorCallbacks *cb) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c51d704af8..d29da63242 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1899,7 +1899,6 @@ qemuConnectMonitor(virQEMUDriver *driver, mon =3D qemuMonitorOpen(vm, priv->monConfig, - false, virEventThreadGetContext(priv->eventThread), &monitorCallbacks); @@ -9493,7 +9492,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc) proc->vm->pid =3D proc->pid; - if (!(proc->mon =3D qemuMonitorOpen(proc->vm, &monConfig, false, + if (!(proc->mon =3D qemuMonitorOpen(proc->vm, &monConfig, virEventThreadGetContext(proc->event= Thread), &callbacks))) return -1; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 1ea8d72711..db0f450e40 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1109,7 +1109,6 @@ qemuMonitorTestNew(virDomainXMLOption *xmlopt, test->qapischema =3D schema; if (!(test->mon =3D qemuMonitorOpen(test->vm, &src, - false, virEventThreadGetContext(test->event= Thread), &qemuMonitorTestCallbacks))) goto error; --=20 2.36.1