Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2018-10-02 19:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Tue Oct 2 19:44:11 2018 rev:146 rq:638230 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2018-09-11 17:08:35.492219123 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2018-10-02 19:44:17.794023137 +0200 @@ -1,0 +2,24 @@ +Fri Sep 21 19:35:23 UTC 2018 - Bruce Rogers <[email protected]> + +- Make spec file improvements, including the following: +* Add qemu.keyring to enable package source verification +* Create srcname macro to identify source file name separately from + package name +* Sort some entries +* Minor file tweaks as done by osc format_spec_file service + +------------------------------------------------------------------- +Fri Sep 14 21:19:22 UTC 2018 - Bruce Rogers <[email protected]> + +- Remove BuildRequires for libattr-devel-static since it's not needed. +- Re-sync openSUSE and SUSE SLE qemu-linux-user package. This changes + file is the openSUSE one with this entry providing the intervening + SLE CVE, FATE, and bugzilla references, which are still addressed + in this package, and not yet called out in this changes file. +* <none> +* Patches added: + 0040-linux-headers-update.patch + 0041-s390x-kvm-add-etoken-facility.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2018-09-11 17:08:35.532219060 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.changes 2018-10-02 19:44:19.950020943 +0200 @@ -1,0 +2,49 @@ +Mon Sep 24 21:25:37 UTC 2018 - Bruce Rogers <[email protected]> + +- Do more misc spec file fixes: +* Be explicit in spec file about Version used for all subpackages + (again, to avoid subpackage ordering issues). Default Release + tag is also brought in by obs format_spec_file service +* Delete binary blob s390-netboot.img, which we rebuild +* Don't provide separate Url for qemu-kvm package - the main qemu + website provides easily findable link for kvm specifics +* Associate petalogix-ml605.dtb with qemu-extra instead of qemu-ppc +* More entry sorting + +------------------------------------------------------------------- +Fri Sep 21 19:35:23 UTC 2018 - Bruce Rogers <[email protected]> + +- Correct some versioning as follows: +* Accurately reflect the qemu-ipxe package version value by adding + "+" at the end +* Don't overwrite seabios .version file, since now (for quite some + time actually) upstream tarball creation creates this file and + the value we are writing to it is actually wrong +- Make spec file improvements, including the following: +* Add qemu.keyring to enable package source verification +* Create srcname macro to identify source file name separately from + package name +* Create alternate to %version to avoid subpackage ordering + causing inadvertantly wrong %version value at point of use +* Sort some entries +* Be more consistent with macro syntax usage +* Minor file tweaks as done by osc format_spec_file service + +------------------------------------------------------------------- +Fri Sep 14 21:16:52 UTC 2018 - Bruce Rogers <[email protected]> + +- Re-sync openSUSE and SUSE SLE qemu packages. This changes file + is the openSUSE one with this entry providing the intervening + SLE CVE, FATE, and bugzilla references, which are still addressed + in this package, and not yet called out in this changes file. +* CVE-2018-11806 CVE-2018-12617 CVE-2018-7550 CVE-2018-15746 +* fate#325467 +* bsc#1091695 bsc#1094725 bsc#1094913 bsc#1096223 bsc#1098735 + bsc#1103628 bsc#1105279 bsc#1106222 bsc#1106222 bsc#1107489 +* Patches added: +* only enable glusterfs for openSUSE + 0040-linux-headers-update.patch + 0041-s390x-kvm-add-etoken-facility.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0 + +------------------------------------------------------------------- qemu.changes: same change New: ---- 0040-linux-headers-update.patch 0041-s390x-kvm-add-etoken-facility.patch qemu.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ --- /var/tmp/diff_new_pack.7feRhO/_old 2018-10-02 19:44:22.346018504 +0200 +++ /var/tmp/diff_new_pack.7feRhO/_new 2018-10-02 19:44:22.346018504 +0200 @@ -12,19 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define srcname qemu Name: qemu-linux-user -Url: http://www.qemu.org/ +Url: https://www.qemu.org/ Summary: CPU emulator for user space License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC Version: 3.0.0 Release: 0 -Source: qemu-3.0.0.tar.xz -# Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch +%define qemuver 3.0.0 +Source: https://wiki.qemu.org/download/%{srcname}-%{version}.tar.xz +Source99: https://wiki.qemu.org/download/%{srcname}-%{version}.tar.xz.sig +Source100: %{srcname}.keyring +Source400: update_git.sh +# Upstream First -- https://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-qemu-binfmt-conf-Modify-default-pat.patch @@ -65,9 +70,10 @@ Patch0037: 0037-tests-test-thread-pool-is-racy-add-.patch Patch0038: 0038-xen-add-block-resize-support-for-xe.patch Patch0039: 0039-tests-boot-serial-test-Bump-timeout.patch +Patch0040: 0040-linux-headers-update.patch +Patch0041: 0041-s390x-kvm-add-etoken-facility.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. -Source400: update_git.sh ExcludeArch: s390 BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: gcc-PIE @@ -76,7 +82,6 @@ BuildRequires: gcc-c++ BuildRequires: glib2-devel-static BuildRequires: glibc-devel-static -BuildRequires: libattr-devel-static BuildRequires: makeinfo BuildRequires: pcre-devel-static %if 0%{?suse_version} > 1320 @@ -97,7 +102,7 @@ syscall layer occurs on the native hardware and operating system. %prep -%setup -q -n qemu-3.0.0 +%setup -q -n %{srcname}-%{version} %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -137,6 +142,8 @@ %patch0037 -p1 %patch0038 -p1 %patch0039 -p1 +%patch0040 -p1 +%patch0041 -p1 %build ./configure \ ++++++ qemu-testsuite.spec ++++++ ++++ 690 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.spec ++++ and /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.spec qemu.spec: same change ++++++ 0040-linux-headers-update.patch ++++++ >From 8194d18811df960052d42d93cdc5105b8ef089cc Mon Sep 17 00:00:00 2001 From: Fei Li <[email protected]> Date: Fri, 7 Sep 2018 14:15:05 +0800 Subject: [PATCH] linux-headers: update Update to Linux upstream commit 2ad0d5269970 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") Signed-off-by: Cornelia Huck <[email protected]> (cherry picked from commit d36f7de82995a42b749c29c5b60ba31483995a42) [FL: bsc#1107489 - actually only backport the linux-header's update for the etoken cpu feature used on the s390x platform) Signed-off-by: Fei Li <[email protected]> --- linux-headers/asm-s390/kvm.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 11def14301..1ab9901911 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -4,7 +4,7 @@ /* * KVM s390 specific structures and definitions * - * Copyright IBM Corp. 2008 + * Copyright IBM Corp. 2008, 2018 * * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> @@ -225,6 +225,7 @@ struct kvm_guest_debug_arch { #define KVM_SYNC_FPRS (1UL << 8) #define KVM_SYNC_GSCB (1UL << 9) #define KVM_SYNC_BPBC (1UL << 10) +#define KVM_SYNC_ETOKEN (1UL << 11) /* length and alignment of the sdnx as a power of two */ #define SDNXC 8 #define SDNXL (1UL << SDNXC) @@ -258,6 +259,8 @@ struct kvm_sync_regs { struct { __u64 reserved1[2]; __u64 gscb[4]; + __u64 etoken; + __u64 etoken_extension; }; }; }; ++++++ 0041-s390x-kvm-add-etoken-facility.patch ++++++ >From 3ff69067e3144565368ace51672cbbeaefd62489 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger <[email protected]> Date: Tue, 31 Jul 2018 11:04:48 +0200 Subject: [PATCH] s390x/kvm: add etoken facility Provide the etoken facility. We need to handle cpu model, migration and clear reset. Signed-off-by: Christian Borntraeger <[email protected]> Acked-by: Janosch Frank <[email protected]> Message-Id: <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Cornelia Huck <[email protected]> (cherry picked from commit 27e84d4ebd25b981ab27cb590fe06d1b0fcd06d2) [FL: bsc#1107489] Signed-off-by: Fei Li <[email protected]> --- target/s390x/cpu.h | 3 +++ target/s390x/cpu_features.c | 3 ++- target/s390x/cpu_features_def.h | 3 ++- target/s390x/gen-features.c | 3 ++- target/s390x/kvm.c | 11 +++++++++++ target/s390x/machine.c | 20 +++++++++++++++++++- 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 2c3dd2d189..21b2f211fe 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -2,6 +2,7 @@ * S/390 virtual CPU header * * Copyright (c) 2009 Ulrich Hecht + * Copyright IBM Corp. 2012, 2018 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,6 +69,8 @@ struct CPUS390XState { uint32_t aregs[16]; /* access registers */ uint8_t riccb[64]; /* runtime instrumentation control */ uint64_t gscb[4]; /* guarded storage control */ + uint64_t etoken; /* etoken */ + uint64_t etoken_extension; /* etoken extension */ /* Fields up to this point are not cleared by initial CPU reset */ struct {} start_initial_reset_fields; diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c index 3b9e2745e9..e05e6aaaf4 100644 --- a/target/s390x/cpu_features.c +++ b/target/s390x/cpu_features.c @@ -1,7 +1,7 @@ /* * CPU features/facilities for s390x * - * Copyright 2016 IBM Corp. + * Copyright IBM Corp. 2016, 2018 * * Author(s): David Hildenbrand <[email protected]> * @@ -106,6 +106,7 @@ static const S390FeatDef s390_features[] = { FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"), FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"), FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"), + FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"), /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */ FEAT_INIT("gsls", S390_FEAT_TYPE_SCLP_CONF_CHAR, 40, "SIE: Guest-storage-limit-suppression facility"), diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h index 7c5915c7b2..ac2c947f30 100644 --- a/target/s390x/cpu_features_def.h +++ b/target/s390x/cpu_features_def.h @@ -1,7 +1,7 @@ /* * CPU features/facilities for s390 * - * Copyright 2016 IBM Corp. + * Copyright IBM Corp. 2016, 2018 * * Author(s): Michael Mueller <[email protected]> * David Hildenbrand <[email protected]> @@ -93,6 +93,7 @@ typedef enum { S390_FEAT_INSERT_REFERENCE_BITS_MULT, S390_FEAT_MSA_EXT_8, S390_FEAT_CMM_NT, + S390_FEAT_ETOKEN, /* Sclp Conf Char */ S390_FEAT_SIE_GSLS, diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 6626b6f565..5af042c003 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -1,7 +1,7 @@ /* * S390 feature list generator * - * Copyright 2016 IBM Corp. + * Copyright IBM Corp. 2016, 2018 * * Author(s): Michael Mueller <[email protected]> * David Hildenbrand <[email protected]> @@ -471,6 +471,7 @@ static uint16_t full_GEN14_GA1[] = { S390_FEAT_GROUP_MSA_EXT_7, S390_FEAT_GROUP_MSA_EXT_8, S390_FEAT_CMM_NT, + S390_FEAT_ETOKEN, S390_FEAT_HPMA2, S390_FEAT_SIE_KSS, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index d923cf4240..af83955e5f 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -493,6 +493,12 @@ int kvm_arch_put_registers(CPUState *cs, int level) cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_BPBC; } + if (can_sync_regs(cs, KVM_SYNC_ETOKEN)) { + cs->kvm_run->s.regs.etoken = env->etoken; + cs->kvm_run->s.regs.etoken_extension = env->etoken_extension; + cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ETOKEN; + } + /* Finally the prefix */ if (can_sync_regs(cs, KVM_SYNC_PREFIX)) { cs->kvm_run->s.regs.prefix = env->psa; @@ -607,6 +613,11 @@ int kvm_arch_get_registers(CPUState *cs) env->bpbc = cs->kvm_run->s.regs.bpbc; } + if (can_sync_regs(cs, KVM_SYNC_ETOKEN)) { + env->etoken = cs->kvm_run->s.regs.etoken; + env->etoken_extension = cs->kvm_run->s.regs.etoken_extension; + } + /* pfault parameters */ if (can_sync_regs(cs, KVM_SYNC_PFAULT)) { env->pfault_token = cs->kvm_run->s.regs.pft; diff --git a/target/s390x/machine.c b/target/s390x/machine.c index bd3230d027..cb792aa103 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -1,7 +1,7 @@ /* * S390x machine definitions and functions * - * Copyright IBM Corp. 2014 + * Copyright IBM Corp. 2014, 2018 * * Authors: * Thomas Huth <[email protected]> @@ -216,6 +216,23 @@ const VMStateDescription vmstate_bpbc = { } }; +static bool etoken_needed(void *opaque) +{ + return s390_has_feat(S390_FEAT_ETOKEN); +} + +const VMStateDescription vmstate_etoken = { + .name = "cpu/etoken", + .version_id = 1, + .minimum_version_id = 1, + .needed = etoken_needed, + .fields = (VMStateField[]) { + VMSTATE_UINT64(env.etoken, S390CPU), + VMSTATE_UINT64(env.etoken_extension, S390CPU), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_s390_cpu = { .name = "cpu", .post_load = cpu_post_load, @@ -251,6 +268,7 @@ const VMStateDescription vmstate_s390_cpu = { &vmstate_exval, &vmstate_gscb, &vmstate_bpbc, + &vmstate_etoken, NULL }, }; ++++++ qemu-linux-user.spec.in ++++++ --- /var/tmp/diff_new_pack.7feRhO/_old 2018-10-02 19:44:22.718018125 +0200 +++ /var/tmp/diff_new_pack.7feRhO/_new 2018-10-02 19:44:22.722018122 +0200 @@ -12,24 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define srcname qemu Name: qemu-linux-user -Url: http://www.qemu.org/ +Url: https://www.qemu.org/ Summary: CPU emulator for user space License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC QEMU_VERSION Release: 0 -Source: qemu-3.0.0.tar.xz -# Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch +Source: https://wiki.qemu.org/download/%{srcname}-%{version}.tar.xz +Source99: https://wiki.qemu.org/download/%{srcname}-%{version}.tar.xz.sig +Source100: %{srcname}.keyring +Source400: update_git.sh +# Upstream First -- https://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu PATCH_FILES # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. -Source400: update_git.sh ExcludeArch: s390 BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: gcc-PIE @@ -38,7 +41,6 @@ BuildRequires: gcc-c++ BuildRequires: glib2-devel-static BuildRequires: glibc-devel-static -BuildRequires: libattr-devel-static BuildRequires: makeinfo BuildRequires: pcre-devel-static %if 0%{?suse_version} > 1320 @@ -59,7 +61,7 @@ syscall layer occurs on the native hardware and operating system. %prep -%setup -q -n qemu-3.0.0 +%setup -q -n %{srcname}-%{version} PATCH_EXEC %build ++++++ qemu.spec.in ++++++ ++++ 671 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu.spec.in ++++ and /work/SRC/openSUSE:Factory/.qemu.new/qemu.spec.in ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.7feRhO/_old 2018-10-02 19:44:22.930017910 +0200 +++ /var/tmp/diff_new_pack.7feRhO/_new 2018-10-02 19:44:22.942017897 +0200 @@ -105,8 +105,9 @@ done elif [ "$line" = "QEMU_VERSION" ]; then echo "Version: $QEMU_VERSION" + echo "%define qemuver $QEMU_VERSION" elif [[ "$line" =~ ^Source: ]]; then - QEMU_TARBALL=qemu-`echo "$line" | cut -d '-' -f 2-` + QEMU_TARBALL=qemu-$QEMU_VERSION.tar.xz VERSION_FILE=${QEMU_TARBALL%.tar.xz}/roms/seabios/.version SEABIOS_VERSION=`tar JxfO "$QEMU_TARBALL" "$VERSION_FILE"` SEABIOS_VERSION=`echo $SEABIOS_VERSION | cut -d '-' -f 2`
