Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2020-01-19 20:51:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Sun Jan 19 20:51:50 2020 rev:167 rq:764411 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-01-13 22:19:51.890472044 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new.26092/qemu.changes 2020-01-19 20:52:09.115883662 +0100 @@ -1,0 +2,18 @@ +Tue Jan 14 18:10:53 UTC 2020 - Bruce Rogers <[email protected]> + +- Fix xenfv migration from xen host with pre-v4.0 qemu (bsc#1159755) + hw-i386-disable-smbus-migration-for-xenf.patch + +------------------------------------------------------------------- +Tue Jan 14 16:14:03 UTC 2020 - [email protected] + +- Create files within bundles.tar.xz with fixed timestamp and uid + +------------------------------------------------------------------- +Sat Jan 11 01:54:12 UTC 2020 - Bruce Rogers <[email protected]> + +- Add a %bcond_without system_membarrier along with related + processing to the spec file, to better investigate running QEMU + with the --disable-membarrier configure option + +------------------------------------------------------------------- New: ---- hw-i386-disable-smbus-migration-for-xenf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.483893311 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.487893313 +0100 @@ -87,6 +87,8 @@ %define summary_string Machine emulator and virtualizer %endif +%bcond_without system_membarrier + %define qemuver 4.2.0 %define srcver 4.2.0 %define sbver 1.12.1+ @@ -204,6 +206,7 @@ Patch00076: tests-Disable-some-block-tests-for-now.patch Patch00077: test-add-mapping-from-arch-of-i686-to-qe.patch Patch00078: roms-Makefile-enable-cross-compile-for-b.patch +Patch00079: hw-i386-disable-smbus-migration-for-xenf.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -989,6 +992,7 @@ %patch00076 -p1 %patch00077 -p1 %patch00078 -p1 +%patch00079 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 @@ -1211,7 +1215,11 @@ %endif --enable-lzo \ --disable-malloc-trim \ +%if %{with system_membarrier} --enable-membarrier \ +%else + --disable-membarrier \ +%endif --enable-mpath \ --disable-netmap \ --disable-nettle \ @@ -1300,7 +1308,11 @@ --disable-iconv \ --disable-kvm \ --disable-malloc-trim \ +%if %{with system_membarrier} --enable-membarrier \ +%else + --disable-membarrier \ +%endif --disable-parallels \ --disable-plugins \ --disable-qcow1 \ ++++++ README.PACKAGING ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.579893362 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.579893362 +0100 @@ -29,7 +29,7 @@ The current status as of 31 Oct 2019 is that for this incarnation of qemu packaging, the previous workflow which relied on the patches being in a shared git repo on github or gitlab is no longer supported. This new bundle based -workflos is still a work in progress. +workflow is still a work in progress. If it isn't working right, please contact Bruce Rogers <[email protected]>. *** END SPECIAL NOTE *** @@ -47,7 +47,7 @@ Bug or feature tracking identifiers should also be added to the patch similarly, using the abbreviations identified here: http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations -using the "Reference:" tag, with multiple entries comma separated. +using the "References:" tag, with multiple entries comma separated. The ability to provide a conditional inclusion of a patch (eg based on architecture, is provided by using the "Include-If:" tag similarly, as follows: ++++++ bundles.tar.xz ++++++ Binary files old/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle and new/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle differ ++++++ hw-i386-disable-smbus-migration-for-xenf.patch ++++++ From: Olaf Hering <[email protected]> Date: Mon, 13 Jan 2020 18:45:21 +0100 Subject: hw/i386: disable smbus migration for xenfv Git-commit: 0000000000000000000000000000000000000000 References: bsc#1159755 With commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea a new member smbus_no_migration_support was added, and enabled in two places. With commit 4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new elements, which are conditionally filled. As a result, an incoming migration expected smbus related data unless smbus migration was disabled for a given MachineClass. Since commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle xenfv, live migration to receiving hosts using qemu-4.0 and later is broken. Therefore this patch must be applied to stable-4.x as well. Signed-off-by: Olaf Hering <[email protected]> [BR: changed patch as obtained from qemu-devel mailing list to reference xenfv, not xenpv, as Olaf indicated in followup email] Signed-off-by: Bruce Rogers <[email protected]> --- hw/i386/pc_piix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d760d3589607daf4997ea76854c4..10d4972179a0dbe40aa9eaddf37e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -1046,6 +1046,7 @@ static void xenfv_machine_options(MachineClass *m) m->desc = "Xen Fully-virtualized PC"; m->max_cpus = HVM_MAX_VCPUS; m->default_machine_opts = "accel=xen"; + m->smbus_no_migration_support = true; } DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init, ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.827893492 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.827893492 +0100 @@ -87,6 +87,8 @@ %define summary_string Machine emulator and virtualizer %endif +%bcond_without system_membarrier + INSERT_VERSIONING %define srcname qemu Name: qemu%{name_suffix} @@ -1016,7 +1018,11 @@ %endif --enable-lzo \ --disable-malloc-trim \ +%if %{with system_membarrier} --enable-membarrier \ +%else + --disable-membarrier \ +%endif --enable-mpath \ --disable-netmap \ --disable-nettle \ @@ -1105,7 +1111,11 @@ --disable-iconv \ --disable-kvm \ --disable-malloc-trim \ +%if %{with system_membarrier} --enable-membarrier \ +%else + --disable-membarrier \ +%endif --disable-parallels \ --disable-plugins \ --disable-qcow1 \ ++++++ target-i386-Add-missed-features-to-Coope.patch ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.915893538 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.915893538 +0100 @@ -2,7 +2,7 @@ Date: Wed, 8 Jan 2020 13:32:40 +0100 Subject: target/i386: Add missed features to Cooperlake CPU model -Git-commit: 0000000000000000000000000000000000000000 +Git-commit: 2dea9d9ca4ea7e9afe83d0b4153b21a16987e866 References: jsc#SLE-7923 It lacks VMX features and two security feature bits (disclosed recently) in ++++++ target-i386-Add-new-bit-definitions-of-M.patch ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.923893542 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.923893542 +0100 @@ -2,7 +2,7 @@ Date: Wed, 8 Jan 2020 13:32:39 +0100 Subject: target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES -Git-commit: 0000000000000000000000000000000000000000 +Git-commit: 6c997b4adb300788d61d72e2b8bc67c03a584956 References: jsc#SLE-7923 The bit 6, 7 and 8 of MSR_IA32_ARCH_CAPABILITIES are recently disclosed ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.aX7NR2/_old 2020-01-19 20:52:27.967893565 +0100 +++ /var/tmp/diff_new_pack.aX7NR2/_new 2020-01-19 20:52:27.971893568 +0100 @@ -150,9 +150,14 @@ fi fi done -# keep diffs to a minimum - touch bundle files to "something common" TODO: decide if there's something better -find $BUNDLE_DIR -exec touch -r qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz {} \; -tar --format gnu --xz -cf bundles.tar.xz -C $BUNDLE_DIR . +# keep diffs to a minimum - touch bundle files to "something common" +tar --format gnu --xz \ + --numeric-owner \ + --owner=0 \ + --group=0 \ + --mtime="@$(date -r qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz +%s)" \ + --create \ + -f bundles.tar.xz -C $BUNDLE_DIR . rm -rf $BUNDLE_DIR rm -rf $GIT_DIR } @@ -579,9 +584,6 @@ if [ -e qemu.changes.added ]; then rm -f qemu.changes.added fi - if [[ "0" = "$(expr $CHANGED_COUNT + $DELETED_COUNT + $ADDED_COUNT)" ]]; then - osc revert bundles.tar.xz - fi echo "git patch summary" echo " unchanged: $UNCHANGED_COUNT" echo " changed: $CHANGED_COUNT"
