Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2020-02-24 15:50:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Mon Feb 24 15:50:10 2020 rev:169 rq:777725 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-01-30 09:41:06.941480950 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new.26092/qemu.changes 2020-02-24 15:50:52.099266350 +0100 @@ -1,0 +2,22 @@ +Wed Feb 19 18:48:47 UTC 2020 - Bruce Rogers <[email protected]> + +- Fix xenfv migration from xen host with pre-v4.0 qemu. We had + previously dropped a similar patch, but have decided that for now + we need to go with this type of solution (bsc#1159755) + hw-i386-disable-smbus-migration-for-xenf.patch + +------------------------------------------------------------------- +Tue Feb 4 04:01:19 UTC 2020 - Liang Yan <[email protected]> + +- Avoid query-cpu-model-expansion crashed qemu when using + machine type none, patch is queued in upstream now, will + update commit id later (bsc#1159443) + target-arm-monitor-query-cpu-model-expan.patch + +------------------------------------------------------------------- +Mon Feb 3 16:00:26 UTC 2020 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(libudev) instead of libudev-devel: Allow + OBS to shortcut through -mini flavors. + +------------------------------------------------------------------- New: ---- hw-i386-disable-smbus-migration-for-xenf.patch target-arm-monitor-query-cpu-model-expan.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.WKyNSu/_old 2020-02-24 15:50:58.323280211 +0100 +++ /var/tmp/diff_new_pack.WKyNSu/_new 2020-02-24 15:50:58.331280229 +0100 @@ -219,6 +219,8 @@ Patch00089: roms-Makefile-enable-cross-compile-for-b.patch Patch00090: iscsi-Cap-block-count-from-GET-LBA-STATU.patch Patch00091: block-backup-fix-memory-leak-in-bdrv_bac.patch +Patch00092: target-arm-monitor-query-cpu-model-expan.patch +Patch00093: 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 @@ -349,9 +351,9 @@ BuildRequires: libseccomp-devel >= 2.3.0 BuildRequires: libspice-server-devel >= 0.12.5 BuildRequires: libssh-devel >= 0.8 -BuildRequires: libudev-devel BuildRequires: libusb-1_0-devel >= 1.0.13 BuildRequires: libvdeplug-devel +BuildRequires: pkgconfig(libudev) %if 0%{?is_opensuse} BuildRequires: lzfse-devel %endif @@ -1017,6 +1019,8 @@ %patch00089 -p1 %patch00090 -p1 %patch00091 -p1 +%patch00092 -p1 +%patch00093 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 ++++++ bundles.tar.xz ++++++ Binary files old/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle and new/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle differ Binary files old/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle and new/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle differ ++++++ hw-i386-disable-smbus-migration-for-xenf.patch ++++++ From: Olaf Hering <[email protected]> Date: Wed, 19 Feb 2020 15:15:15 +0100 Subject: hw/i386: disable smbus migration for xenfv 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. Adjust 'xenfv' to stay compatible with with 'pc-i440fx-3.1': - the toolstack can not use '-M pc-i440fx-3.1,accel=xen -device xen-platform' because this would move the PCI device from 00:02.0 to 00:04.0 - disable pvh. Running PVH may require dedicated device_model_args= options which select 'pc-i440fx-4.x' Signed-off-by: Olaf Hering <[email protected]> Signed-off-by: Bruce Rogers <[email protected]> --- hw/i386/pc_piix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d760d3589607daf4997ea76854c4..7bf1021200a3baa06a58fa36c430 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -1043,6 +1043,11 @@ DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, #ifdef CONFIG_XEN static void xenfv_machine_options(MachineClass *m) { + /* compat with pc_i440fx_3_1_machine_options */ + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pcmc->do_not_add_smb_acpi = true; + m->smbus_no_migration_support = true; + pcmc->pvh_enabled = false; /* FIXME */ m->desc = "Xen Fully-virtualized PC"; m->max_cpus = HVM_MAX_VCPUS; m->default_machine_opts = "accel=xen"; ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.WKyNSu/_old 2020-02-24 15:50:58.699281048 +0100 +++ /var/tmp/diff_new_pack.WKyNSu/_new 2020-02-24 15:50:58.703281057 +0100 @@ -236,9 +236,9 @@ BuildRequires: libseccomp-devel >= 2.3.0 BuildRequires: libspice-server-devel >= 0.12.5 BuildRequires: libssh-devel >= 0.8 -BuildRequires: libudev-devel BuildRequires: libusb-1_0-devel >= 1.0.13 BuildRequires: libvdeplug-devel +BuildRequires: pkgconfig(libudev) %if 0%{?is_opensuse} BuildRequires: lzfse-devel %endif ++++++ target-arm-monitor-query-cpu-model-expan.patch ++++++ From: Liang Yan <[email protected]> Date: Fri, 31 Jan 2020 14:54:06 -0500 Subject: target/arm/monitor: query-cpu-model-expansion crashed qemu when using machine type none References: bsc#1159443 Commit e19afd566781 mentioned that target-arm only supports queryable cpu models 'max', 'host', and the current type when KVM is in use. The logic works well until using machine type none. For machine type none, cpu_type will be null if cpu option is not set by command line, strlen(cpu_type) will terminate process. So We add a check above it. This won't affect i386 and s390x since they do not use current_cpu. [LY: patch only queued in upstream, will update commit id later] Signed-off-by: Liang Yan <[email protected]> --- target/arm/monitor.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/target/arm/monitor.c b/target/arm/monitor.c index fa054f8a369c8221c8746b8d8046..782085ca2120b243584f7c058ef8 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -136,17 +136,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } if (kvm_enabled()) { - const char *cpu_type = current_machine->cpu_type; - int len = strlen(cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); bool supported = false; if (!strcmp(model->name, "host") || !strcmp(model->name, "max")) { /* These are kvmarm's recommended cpu types */ supported = true; - } else if (strlen(model->name) == len && - !strncmp(model->name, cpu_type, len)) { - /* KVM is enabled and we're using this type, so it works. */ - supported = true; + } else if (current_machine->cpu_type) { + const char *cpu_type = current_machine->cpu_type; + int len = strlen(cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); + + if (strlen(model->name) == len && + !strncmp(model->name, cpu_type, len)) { + /* KVM is enabled and we're using this type, so it works. */ + supported = true; + } } if (!supported) { error_setg(errp, "We cannot guarantee the CPU type '%s' works "
