From nobody Tue May 14 20:05:17 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1706045252585130.72135238468388; Tue, 23 Jan 2024 13:27:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7E5B41A2C; Tue, 23 Jan 2024 16:27:31 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 346221A67; Tue, 23 Jan 2024 16:25:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8FB6919AD; Tue, 23 Jan 2024 16:25:10 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 7AEB419A2 for ; Tue, 23 Jan 2024 16:25:09 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-qMSBr6lTO-C6bdC7iol-UA-1; Tue, 23 Jan 2024 16:25:07 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8998D3C025B4 for ; Tue, 23 Jan 2024 21:25:07 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.17.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65310492BC6 for ; Tue, 23 Jan 2024 21:25:07 +0000 (UTC) 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,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: qMSBr6lTO-C6bdC7iol-UA-1 From: Jonathon Jongsma To: devel@lists.libvirt.org Subject: [PATCH v2 1/2] qemu: Fix bug in nbdkit-backed backing chains Date: Tue, 23 Jan 2024 15:25:05 -0600 Message-ID: <20240123212506.603309-2-jjongsma@redhat.com> In-Reply-To: <20240123212506.603309-1-jjongsma@redhat.com> References: <20240123212506.603309-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: CMFWBJFQQBNKDTXHRGT3TL2TUQ3AUIR2 X-Message-ID-Hash: CMFWBJFQQBNKDTXHRGT3TL2TUQ3AUIR2 X-MailFrom: jjongsma@redhat.com 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header 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"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706045253281100001 When trying to start nbdkit-backed disks in backing chains, we were accidentally always checking the private data of the top of the chain instead of using the loop variable. Signed-off-by: Jonathon Jongsma Reviewed-by: Peter Krempa --- src/qemu/qemu_nbdkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_nbdkit.c b/src/qemu/qemu_nbdkit.c index 85e61be44c..1c72b6fe6a 100644 --- a/src/qemu/qemu_nbdkit.c +++ b/src/qemu/qemu_nbdkit.c @@ -901,7 +901,7 @@ qemuNbdkitStartStorageSource(virQEMUDriver *driver, virStorageSource *backing; =20 for (backing =3D src; backing !=3D NULL; backing =3D backing->backingS= tore) { - qemuDomainStorageSourcePrivate *priv =3D QEMU_DOMAIN_STORAGE_SOURC= E_PRIVATE(src); + qemuDomainStorageSourcePrivate *priv =3D QEMU_DOMAIN_STORAGE_SOURC= E_PRIVATE(backing); =20 if (priv && priv->nbdkitProcess && qemuNbdkitProcessStart(priv->nbdkitProcess, vm, driver) < 0) @@ -919,7 +919,7 @@ qemuNbdkitStopStorageSource(virStorageSource *src, virStorageSource *backing; =20 for (backing =3D src; backing !=3D NULL; backing =3D backing->backingS= tore) { - qemuDomainStorageSourcePrivate *priv =3D QEMU_DOMAIN_STORAGE_SOURC= E_PRIVATE(src); + qemuDomainStorageSourcePrivate *priv =3D QEMU_DOMAIN_STORAGE_SOURC= E_PRIVATE(backing); =20 if (priv && priv->nbdkitProcess && qemuNbdkitProcessStop(priv->nbdkitProcess, vm) < 0) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 20:05:17 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1706045335306189.2241350985522; Tue, 23 Jan 2024 13:28:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4A46417B1; Tue, 23 Jan 2024 16:28:54 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2478F1A79; Tue, 23 Jan 2024 16:25:25 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D3F5619AB; Tue, 23 Jan 2024 16:25:10 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 3094019A9 for ; Tue, 23 Jan 2024 16:25:10 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-pUO54mcJMtGBFoxZxQ4w8g-1; Tue, 23 Jan 2024 16:25:08 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1EC92806408 for ; Tue, 23 Jan 2024 21:25:07 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.17.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DB5A492BC6 for ; Tue, 23 Jan 2024 21:25:07 +0000 (UTC) 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,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: pUO54mcJMtGBFoxZxQ4w8g-1 From: Jonathon Jongsma To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] tests: Remove readahead and timeout from ssh tests Date: Tue, 23 Jan 2024 15:25:06 -0600 Message-ID: <20240123212506.603309-3-jjongsma@redhat.com> In-Reply-To: <20240123212506.603309-1-jjongsma@redhat.com> References: <20240123212506.603309-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SHHMQYJORGBHDLHKZLXWMV5ADS5TK3SQ X-Message-ID-Hash: SHHMQYJORGBHDLHKZLXWMV5ADS5TK3SQ X-MailFrom: jjongsma@redhat.com 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header 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"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706045335519100001 These values are currently unsupported for ssh disks, and in fact aren't even parsed for ssh disks. So while this didn't result in any test errors, we can remove them from the test input files. Signed-off-by: Jonathon Jongsma --- tests/qemuxml2argvdata/disk-network-ssh-key.xml | 4 ---- tests/qemuxml2argvdata/disk-network-ssh-password.xml | 2 -- tests/qemuxml2argvdata/disk-network-ssh.xml | 2 -- 3 files changed, 8 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-network-ssh-key.xml b/tests/qemuxm= l2argvdata/disk-network-ssh-key.xml index 6328a9b7ef..1277a9b3cf 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh-key.xml +++ b/tests/qemuxml2argvdata/disk-network-ssh-key.xml @@ -17,8 +17,6 @@ - - @@ -28,8 +26,6 @@ - - diff --git a/tests/qemuxml2argvdata/disk-network-ssh-password.xml b/tests/q= emuxml2argvdata/disk-network-ssh-password.xml index bdb4cf6e35..1ba0cb094c 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh-password.xml +++ b/tests/qemuxml2argvdata/disk-network-ssh-password.xml @@ -17,8 +17,6 @@ - - diff --git a/tests/qemuxml2argvdata/disk-network-ssh.xml b/tests/qemuxml2ar= gvdata/disk-network-ssh.xml index a3aeca0c99..f5956fcc6f 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh.xml +++ b/tests/qemuxml2argvdata/disk-network-ssh.xml @@ -17,8 +17,6 @@ - - --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org