From: David Gibson Date: Thu, 26 Mar 2020 05:12:40 +0000 (+1100) Subject: spapr: Fix failure path for attempting to hot unplug PCI bridges X-Git-Tag: v4.2.1~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c2e242077f7ea6a558ed5828a83f26098077990;p=thirdparty%2Fqemu.git spapr: Fix failure path for attempting to hot unplug PCI bridges 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 Reviewed-by: Greg Kurz (cherry picked from commit 7aab5899764887f6b0512cb2e5c11bdc2a5d3644) Signed-off-by: Michael Roth --- diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index f6fbcf99eda..5b544adb4a4 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 */