[PATCH v2 0/2] A couple nbdkit-related fixes
Changes in v2 - patch 1 now includes the same patch for both start and stop storage source functions Jonathon Jongsma (2): qemu: Fix bug in nbdkit-backed backing chains tests: Remove readahead and timeout from ssh tests src/qemu/qemu_nbdkit.c | 4 ++-- tests/qemuxml2argvdata/disk-network-ssh-key.xml | 4 ---- tests/qemuxml2argvdata/disk-network-ssh-password.xml | 2 -- tests/qemuxml2argvdata/disk-network-ssh.xml | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) -- 2.43.0
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 <jjongsma@redhat.com> --- 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; for (backing = src; backing != NULL; backing = backing->backingStore) { - qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); + qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(backing); if (priv && priv->nbdkitProcess && qemuNbdkitProcessStart(priv->nbdkitProcess, vm, driver) < 0) @@ -919,7 +919,7 @@ qemuNbdkitStopStorageSource(virStorageSource *src, virStorageSource *backing; for (backing = src; backing != NULL; backing = backing->backingStore) { - qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); + qemuDomainStorageSourcePrivate *priv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(backing); if (priv && priv->nbdkitProcess && qemuNbdkitProcessStop(priv->nbdkitProcess, vm) < 0) -- 2.43.0
On Tue, Jan 23, 2024 at 15:25:05 -0600, Jonathon Jongsma wrote:
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 <jjongsma@redhat.com> --- src/qemu/qemu_nbdkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
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 <jjongsma@redhat.com> --- 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/qemuxml2argvdata/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 @@ <driver name='qemu' type='raw'/> <source protocol='ssh' name='test1.img'> <host name='example.org' port='2222'/> - <timeout seconds='1234'/> - <readahead size='1024'/> <identity username='myuser' agentsock='/path/to/agent/socket'/> <knownHosts path="/path/to/ssh_known_hosts1"/> </source> @@ -28,8 +26,6 @@ <driver name='qemu' type='raw'/> <source protocol='ssh' name='test2.img'> <host name='example.org' port='2222'/> - <timeout seconds='1234'/> - <readahead size='1024'/> <identity username='myuser2' keyfile='/path/to/id_rsa'/> <knownHosts path="/path/to/ssh_known_hosts2"/> </source> diff --git a/tests/qemuxml2argvdata/disk-network-ssh-password.xml b/tests/qemuxml2argvdata/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 @@ <driver name='qemu' type='raw'/> <source protocol='ssh' name='test2.img'> <host name='example.org' port='2222'/> - <timeout seconds='1234'/> - <readahead size='1024'/> <auth username='testuser'> <secret type='iscsi' usage='mycluster_myname'/> </auth> diff --git a/tests/qemuxml2argvdata/disk-network-ssh.xml b/tests/qemuxml2argvdata/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 @@ <driver name='qemu' type='raw'/> <source protocol='ssh' name='test.img'> <host name='example.org' port='2222'/> - <timeout seconds='1234'/> - <readahead size='1024'/> <knownHosts path="/path/to/ssh_known_hosts"/> </source> <target dev='vda' bus='virtio'/> -- 2.43.0
participants (2)
-
Jonathon Jongsma -
Peter Krempa