From nobody Mon May 13 06:52:19 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1708416751198223.37159998751963; Tue, 20 Feb 2024 00:12:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D4F341A2A; Tue, 20 Feb 2024 03:12:29 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E133F18CD; Tue, 20 Feb 2024 03:11:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CA66B19F7; Mon, 19 Feb 2024 17:30:45 -0500 (EST) Received: from icts-p-cavspool-1.kulnet.kuleuven.be (icts-p-cavspool-1.kulnet.kuleuven.be [134.58.240.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E184B1A12 for ; Mon, 19 Feb 2024 17:30:41 -0500 (EST) Received: from icts-p-cavuit-3.kulnet.kuleuven.be (icts-p-cavuit-3.kulnet.kuleuven.be [IPv6:2a02:2c40:0:c0::25:133]) by icts-p-cavspool-1.kulnet.kuleuven.be (Postfix) with ESMTP id DD3502EFC for ; Mon, 19 Feb 2024 23:24:08 +0100 (CET) Received: from icts-p-ceifnet-smtps-1.kuleuven.be (icts-p-ceifnet-smtps.service.icts.svcd [IPv6:2a02:2c40:0:51:130:242:ac11:1f]) by icts-p-cavuit-3.kulnet.kuleuven.be (Postfix) with ESMTP id 44FB220164; Mon, 19 Feb 2024 23:24:03 +0100 (CET) Received: from flutterbat.volkihar.be (unknown [IPv6:2a02:a03f:8ada:7900:fe56:95fc:94fa:d345]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by icts-p-ceifnet-smtps-1.kuleuven.be (Postfix) with ESMTPSA id 11214D4F2E781; Mon, 19 Feb 2024 23:24:03 +0100 (CET) Received: by flutterbat.volkihar.be (Postfix, from userid 1000) id AED114D60; Mon, 19 Feb 2024 23:24:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Greylist: delayed 394 seconds by postgrey-1.37 at lists.libvirt.org; Mon, 19 Feb 2024 17:30:41 EST X-KULeuven-Envelope-From: libvirt-e6954efa@volkihar.be X-KULeuven-Scanned: Found to be clean X-KULeuven-ID: 44FB220164.A7ED8 X-KULeuven-Information: Katholieke Universiteit Leuven BCmilterd-Mark-Subject: no BCmilterd-Errors: BCmilterd-Report: X-CAV-Cluster: smtps X-Kuleuven: This mail passed the K.U.Leuven mailcluster From: Vincent Vanlaer To: devel@lists.libvirt.org Subject: [PATCH] daemon: fix wrong request count for sparse stream Date: Mon, 19 Feb 2024 23:24:02 +0100 Message-ID: <20240219222402.426515-1-libvirt-e6954efa@volkihar.be> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-MailFrom: libvirt-e6954efa@volkihar.be X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: ROYIYTZOVPAYX3EM53KRFXV6CJL5SYHE X-Message-ID-Hash: ROYIYTZOVPAYX3EM53KRFXV6CJL5SYHE X-Mailman-Approved-At: Tue, 20 Feb 2024 08:11:16 -0500 CC: Vincent Vanlaer X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1708416752010100001 Similar to when actual data is being written to the stream, it is necessary to acknowledge handling of the client request when a hole is encountered. This is done later in daemonStreamHandleWrite by sending a fake zero-length reply if the status variable is set to VIR_STREAM_CONTINUE. It seems that setting status from the message header was missed for holes in the introduction of the sparse stream feature. Signed-off-by: Vincent Vanlaer Reviewed-by: Michal Privoznik --- src/remote/remote_daemon_stream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 1a89ff822c..453728a66b 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -747,6 +747,7 @@ daemonStreamHandleWrite(virNetServerClient *client, * Otherwise just carry on with processing stream * data. */ ret =3D daemonStreamHandleHole(client, stream, msg); + status =3D msg->header.status; } else if (msg->header.type =3D=3D VIR_NET_STREAM) { status =3D msg->header.status; switch (status) { --=20 2.42.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org