On Fri, Jul 17, 2020 at 04:04:16PM +0200, Peter Krempa wrote:
On Thu, Jul 16, 2020 at 11:53:56 +0200, Pavel Hrdina wrote:
I've tried building RPMs both from the pre-patch tree state and after your patchset. I've then extracted all the RPMs toghether and compared the file lists (minus the 'build-id' directory which differs).
I'm not sure whether it's due to the RPM or regular build process though.
It's because we don't track these files with autotools so there is no conflict when rebasing this series. I tried to make sure nothing like this happens by going through all the new commits since the last rebase but it's easy to miss something. It the missing HTML docs files and XML CPU files have to be fixed (I'll do it right now and update gitlab). The qemu probes file location was moved because it is generated in qemu directory with meson, I will check if we need to update our spec file. Thanks for the comparison. Pavel
Here are differences which should be considered to be addressed:
Specifically lines with '-' are MISSING from the RPMs obtained by building the meson-generated tarball:
--- files-automake 2020-07-17 15:44:29.602038223 +0200 +++ files-meson 2020-07-17 15:44:38.204937457 +0200 @@ -1531,8 +1571,6 @@ .. backing_chains.html domainstatecapture.html -incrementalbackupinternals.html -kvm-realtime.html launch_security_sev.html locking.html locking-lockd.html @@ -1540,7 +1578,6 @@ migrationinternals.html qemu-passthrough-security.html rpm-deployment.html -s390_protected_virt.html secureusage.html virtiofs.html
@@ -1564,6 +1601,8 @@ logo-square-powered-96.png logo-square-powered.svg logo-square.svg +logo-sticker-hexagon.svg +logo-sticker-square.svg
unpack/usr/share/doc/libvirt-docs/html/manpages: . @@ -1636,7 +1675,6 @@ x86_Broadwell-noTSX-IBRS.xml x86_Broadwell-noTSX.xml x86_Broadwell.xml -x86_Cascadelake-Server-noTSX.xml x86_Cascadelake-Server.xml x86_Conroe.xml x86_Cooperlake.xml @@ -1644,7 +1682,6 @@ x86_coreduo.xml x86_cpu64-rhel5.xml x86_cpu64-rhel6.xml -x86_Dhyana.xml x86_EPYC-IBPB.xml x86_EPYC.xml x86_features.xml @@ -3274,10 +3311,10 @@ esx hyperv libvirt_probes.h -libvirt_qemu_probes.h locking logging lxc +qemu remote rpc util @@ -3340,6 +3377,11 @@ lxc_monitor_protocol.c lxc_monitor_protocol.h
+unpack/usr/src/debug/libvirt-6.6.0-1.fc32.x86_64/x86_64-redhat-linux-gnu/src/qemu: +. +.. +libvirt_qemu_probes.h + unpack/usr/src/debug/libvirt-6.6.0-1.fc32.x86_64/x86_64-redhat-linux-gnu/src/remote: . ..
I'm unsure about the 'probes' file location. The 'kbase' articles are unfortunate, but the cpu modes could pose real problems.
The CPU xml files are from usr/share/libvirt/cpu_map