Re: [libvirt] [PATCH 4/4] tests: Enable *-headless and *-graphics in qemuxml2xml

On Tue, 2019-06-25 at 20:38 +0200, Ján Tomko wrote: > On Fri, Jun 14, 2019 at 10:04:39AM +0200, Andrea Bolognani wrote: [...] > > + <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> > > + <nvram>/home/abologna/.config/libvirt/qemu/nvram/guest_VARS.fd</nvram> > > Haha, nope. > 928) QEMU XML-2-XML-inactive aarch64-virt-graphics ... > In '/home/jtomko/work/libvirt/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml': > Offset 582 > Expect [abologna] > Actual [jtomko] > ... Expected result code=0 but received code=4FAILED Just rename your home directory and it will pass O:-) Anyway, if I squash the diff below into 2/4 this problem will go away. I'm a bit confused by the fact that it would only show up with xml2xml and not with xml2argv, which generates the correct NVRAM path just as I would expect... I'd have to dig a bit further to figure out what's going on there. In the meantime, are you okay with this going in once I've squashed the diff below into 2/4? diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml index 490eb45daf..e908d24ac2 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -12,6 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> + <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemuxml2argvdata/aarch64-virt-headless.xml index 2ed7d9a904..7e4fe64b43 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -12,6 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> + <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features>