[RFC v4 1/4] tests: Add 'end-of-file' character to args file in qemuxml2argvdata
From: Hyman <huangy81@chinatelecom.cn> The test file disk-backing-chains-noindex.x86_64-latest.args has 'No newline at end of file', this patch rewrite it in case unexpected behavior bewteen diffrent platform. See the details: https://www.redhat.com/archives/libvir-list/2021-January/msg00626.html Signed-off-by: Hyman <huangy81@chinatelecom.cn> --- ...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++- 1 file changed, 168 insertions(+), 1 deletion(-) mode change 120000 => 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args deleted file mode 120000 index 549eb65512..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args new file mode 100644 index 0000000000..0f6d70a855 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args @@ -0,0 +1,168 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow",\ +"node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-25-storage"}' \ +-blockdev '{"driver":"gluster","volume":"Volume2","path":"Image",\ +"server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,\ +"node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-24-format,\ +id=virtio-disk0,bootindex=1 \ +-blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso",\ +"node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-23-format","read-only":true,"driver":"raw",\ +"file":"libvirt-23-storage"}' \ +-blockdev '{"driver":"file","filename":"/tmp/image5.qcow",\ +"node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-22-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-22-storage","backing":"libvirt-23-format"}' \ +-blockdev '{"driver":"file","filename":"/tmp/image4.qcow",\ +"node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-21-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-21-storage","backing":"libvirt-22-format"}' \ +-blockdev '{"driver":"file","filename":"/tmp/image3.qcow",\ +"node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-20-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-20-storage","backing":"libvirt-21-format"}' \ +-blockdev '{"driver":"file","filename":"/tmp/image2",\ +"node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-19-format","read-only":true,"driver":"vmdk",\ +"file":"libvirt-19-storage","backing":"libvirt-20-format"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-18-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-18-storage","backing":"libvirt-19-format"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},\ +"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,\ +"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-17-format,\ +id=virtio-disk1 \ +-blockdev '{"driver":"gluster","volume":"Volume1","path":"Image",\ +"server":[{"type":"inet","host":"example.org","port":"6000"}],"debug":4,\ +"node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw",\ +"file":"libvirt-16-storage"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-16-format,\ +id=virtio-disk2 \ +-blockdev '{"driver":"file","filename":"/tmp/image.qcow",\ +"node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-15-storage","backing":null}' \ +-object secret,id=libvirt-14-storage-auth-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image",\ +"server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\ +"port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\ +"auth-client-required":["cephx","none"],\ +"key-secret":"libvirt-14-storage-auth-secret0",\ +"node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-14-storage","backing":"libvirt-15-format"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-14-format,\ +id=virtio-disk3 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11",\ +"node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-13-storage"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-13-format,\ +id=virtio-disk4 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow2",\ +"node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-12-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-12-storage","backing":null}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483536402",\ +"node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-11-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-11-storage","backing":"libvirt-12-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483545313",\ +"node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-10-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-10-storage","backing":"libvirt-11-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483545901",\ +"node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-9-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-9-storage","backing":"libvirt-10-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483546244",\ +"node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-8-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-8-storage","backing":"libvirt-9-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483605920",\ +"node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-7-storage","backing":"libvirt-8-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483605924",\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-6-storage","backing":"libvirt-7-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483615252",\ +"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-5-storage","backing":"libvirt-6-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071872",\ +"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071876",\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-3-storage","backing":"libvirt-4-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071877",\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071880",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\ +id=virtio-disk5 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on -- 2.24.3
On Wed, Jan 13, 2021 at 09:19:19 +0000, huangy81@chinatelecom.cn wrote: Firstly, please don't CC libvirt developers directly, since we are subscribed to the list, and we don't need a copy of your patches in our inbox. In this case it's namely, me, Daniel Berrange, and Jan Tomko.
From: Hyman <huangy81@chinatelecom.cn>
The test file disk-backing-chains-noindex.x86_64-latest.args has 'No newline at end of file', this patch rewrite it in case unexpected behavior bewteen diffrent platform. See the details: https://www.redhat.com/archives/libvir-list/2021-January/msg00626.html
See below.
Signed-off-by: Hyman <huangy81@chinatelecom.cn> --- ...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++- 1 file changed, 168 insertions(+), 1 deletion(-) mode change 120000 => 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args deleted file mode 120000 index 549eb65512..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-latest.args \ No newline at end of file
So this means that the 'tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args' file is a symlink to 'disk-backing-chains-noindex.x86_64-latest.args'. Your patch removes the symlink and generates the contents. That is fine, but the commit message is wrong in describing what's happening. Looking at what the patchset does, this actually is not required and I presume that it's an artifact of the manual/scripted conversion process you did on the '.args' files where the symlink was replaced by full contents. Since both files will most likely have the same contents even after your patchset, we don't need to replace the symlink by a full copy of the output so this patch can be dropped.
在 2021/1/13 17:29, Peter Krempa 写道:
On Wed, Jan 13, 2021 at 09:19:19 +0000, huangy81@chinatelecom.cn wrote:
Firstly, please don't CC libvirt developers directly, since we are subscribed to the list, and we don't need a copy of your patches in our inbox. In this case it's namely, me, Daniel Berrange, and Jan Tomko.
Thank you for remainding me. Now, I've seen the Authors.rst.in file and do not try it anymore : )
From: Hyman <huangy81@chinatelecom.cn>
The test file disk-backing-chains-noindex.x86_64-latest.args has 'No newline at end of file', this patch rewrite it in case unexpected behavior bewteen diffrent platform. See the details: https://www.redhat.com/archives/libvir-list/2021-January/msg00626.html
See below.
Signed-off-by: Hyman <huangy81@chinatelecom.cn> --- ...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++- 1 file changed, 168 insertions(+), 1 deletion(-) mode change 120000 => 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args deleted file mode 120000 index 549eb65512..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-latest.args \ No newline at end of file
So this means that the 'tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args' file is a symlink to 'disk-backing-chains-noindex.x86_64-latest.args'.
Your patch removes the symlink and generates the contents.
That is fine, but the commit message is wrong in describing what's happening.
Looking at what the patchset does, this actually is not required and I presume that it's an artifact of the manual/scripted conversion process you did on the '.args' files where the symlink was replaced by full contents.
Indeed, the shell script handing the '.args' files doesn't take the symlink into account. Thank you for helping me figure this out.
Since both files will most likely have the same contents even after your patchset, we don't need to replace the symlink by a full copy of the output so this patch can be dropped.
I have dropped the patch in the next version of patchset and extract the first two patch into one merge request.
participants (3)
-
huangy81＠chinatelecom.cn -
Hyman
-
Peter Krempa