[Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint()

From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Jeff Cody" <codyprime@gmail.com>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Subbaraya Sundeep" <sundeep.lkml@gmail.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Daniel P. =?utf-8?q?Berrang=C3=A9=22?= <berrange@redhat.com>,
	qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
	qemu-s390x@nongnu.org"@d06av21.portsmouth.uk.ibm.com,
	"David Hildenbrand" <david@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Eric Farman" <farman@linux.ibm.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Yuval Shaia" <yuval.shaia@oracle.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint()
Date: Tue, 17 Sep 2019 12:21:21 +0200	[thread overview]
Message-ID: <156871568135.196432.6958597878926788347.stgit@bahia.lan> (raw)
In-Reply-To: <156871562997.196432.17776290406203122029.stgit@bahia.lan>

Ensure that hints are added even if errp is &error_fatal or &error_abort.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/pci-bridge/pcie_root_port.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index 012c2cb12c10..086f9c17723d 100644
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -65,15 +65,17 @@ static void rp_realize(PCIDevice *d, Error **errp)
     PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(d);
     PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d);
     int rc;
+    Error *local_err = NULL;
 
     pci_config_set_interrupt_pin(d->config, 1);
     pci_bridge_initfn(d, TYPE_PCIE_BUS);
     pcie_port_init_reg(d);
 
     rc = pci_bridge_ssvid_init(d, rpc->ssvid_offset, dc->vendor_id,
-                               rpc->ssid, errp);
+                               rpc->ssid, &local_err);
     if (rc < 0) {
-        error_append_hint(errp, "Can't init SSV ID, error %d\n", rc);
+        error_append_hint(&local_err, "Can't init SSV ID, error %d\n", rc);
+        error_propagate(errp, local_err);
         goto err_bridge;
     }
 
@@ -85,10 +87,11 @@ static void rp_realize(PCIDevice *d, Error **errp)
     }
 
     rc = pcie_cap_init(d, rpc->exp_offset, PCI_EXP_TYPE_ROOT_PORT,
-                       p->port, errp);
+                       p->port, &local_err);
     if (rc < 0) {
-        error_append_hint(errp, "Can't add Root Port capability, "
+        error_append_hint(&local_err, "Can't add Root Port capability, "
                           "error %d\n", rc);
+        error_propagate(errp, local_err);
         goto err_int;
     }
 


