7325eaecfb
- Include upstream patches targeted for the next stable release (bug fixes only) spapr-Fix-failure-path-for-attempting-to.patch target-i386-do-not-set-unsupported-VMX-s.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch vhost-user-gpu-Release-memory-returned-b.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch - Fix bug causing weak encryption in PAuth for ARM (CVE-2020-10702 bsc#1168681) target-arm-Fix-PAuth-sbox-functions.patch - Fix OOB in tulip NIC emulation (CVE-2020-11102 bsc#1168713 net-tulip-check-frame-size-and-r-w-data-.patch - Note that previously included patch addresses CVE-2020-1711 and bsc#1166240 iscsi-Cap-block-count-from-GET-LBA-STATU.patch - Include performance improvement (and related?) patch aio-wait-delegate-polling-of-main-AioCon.patch async-use-explicit-memory-barriers.patch - Rework previous patch at Olaf H.'s direction hw-i386-disable-smbus-migration-for-xenf.patch - Eliminate is_opensuse usage in producing seabios version string what we are doing here is just replacing the upstream string with one indicating that the openSUSE build service built it, and so just leave it as "-rebuilt.opensuse.org" - Alter algorithm used to produce "unique" symbol for coordinating qemu with the optional modules it may load. This is a reasonable relaxation for broader compatibility configure-remove-pkgversion-from-CONFIG_.patch - Tweak supported.*.txt for latest deprecations, and other fixes - Tweak update_git.sh, config.sh - One more fix is needed for: s390x Protected Virtualization support - start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) s390x-s390-virtio-ccw-Fix-build-on-syste.patch OBS-URL: https://build.opensuse.org/request/show/795118 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=542
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From: David Gibson <david@gibson.dropbear.id.au>
|
|
Date: Thu, 26 Mar 2020 16:12:40 +1100
|
|
Subject: spapr: Fix failure path for attempting to hot unplug PCI bridges
|
|
|
|
Git-commit: 7aab5899764887f6b0512cb2e5c11bdc2a5d3644
|
|
|
|
For various technical reasons we can't currently allow unplug a PCI to PCI
|
|
bridge on the pseries machine. spapr_pci_unplug_request() correctly
|
|
generates an error message if that's attempted.
|
|
|
|
But.. if the given errp is not error_abort or error_fatal, it doesn't
|
|
actually stop trying to unplug the bridge anyway.
|
|
|
|
Fixes: 14e714900f6b "spapr: Allow hot plug/unplug of PCI bridges and devices under PCI bridges"
|
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/ppc/spapr_pci.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
|
|
index f6fbcf99edaaf9844fe669951716..5b544adb4a4d7868cf17d6534e19 100644
|
|
--- a/hw/ppc/spapr_pci.c
|
|
+++ b/hw/ppc/spapr_pci.c
|
|
@@ -1663,6 +1663,7 @@ static void spapr_pci_unplug_request(HotplugHandler *plug_handler,
|
|
|
|
if (pc->is_bridge) {
|
|
error_setg(errp, "PCI: Hot unplug of PCI bridges not supported");
|
|
+ return;
|
|
}
|
|
|
|
/* ensure any other present functions are pending unplug */
|