1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH v3] pci: Set err to errp directly rather than through error_propagate()

Mao Zhongyi posted 1 patch 6 years, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/df785b3fbff46e0d5b81aa951737ae1cd64dd9d0.1495862779.git.maozy.fnst@cn.fujitsu.com
Test checkpatch passed
Test docker passed
Test s390x passed
There is a newer version of this series
hw/pci-bridge/ioh3420.c        | 4 +---
hw/pci-bridge/pcie_root_port.c | 7 ++-----
2 files changed, 3 insertions(+), 8 deletions(-)
[Qemu-devel] [PATCH v3] pci: Set err to errp directly rather than through error_propagate()
Posted by Mao Zhongyi 6 years, 11 months ago 
ioh3420_interrupts_init() and its callers rp_realize() fill error
message to local_err, then propagate it to errp by error_propagate(),
which is not necessary. So eliminate it and pass errp directly instead
of local_err. Of course, error_propagate() also has been removed.

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
---
 hw/pci-bridge/ioh3420.c        | 4 +---
 hw/pci-bridge/pcie_root_port.c | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index da4e5bd..5f56a2f 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -64,15 +64,13 @@ static uint8_t ioh3420_aer_vector(const PCIDevice *d)
 static int ioh3420_interrupts_init(PCIDevice *d, Error **errp)
 {
     int rc;
-    Error *local_err = NULL;
 
     rc = msi_init(d, IOH_EP_MSI_OFFSET, IOH_EP_MSI_NR_VECTOR,
                   IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_64BIT,
                   IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_MASKBIT,
-                  &local_err);
+                  errp);
     if (rc < 0) {
         assert(rc == -ENOTSUP);
-        error_propagate(errp, local_err);
     }
 
     return rc;
diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index cf36318..9022996 100644
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -59,7 +59,6 @@ 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);
@@ -72,9 +71,8 @@ static void rp_realize(PCIDevice *d, Error **errp)
     }
 
     if (rpc->interrupts_init) {
-        rc = rpc->interrupts_init(d, &local_err);
+        rc = rpc->interrupts_init(d, errp);
         if (rc < 0) {
-            error_propagate(errp, local_err);
             goto err_bridge;
         }
     }
@@ -98,9 +96,8 @@ static void rp_realize(PCIDevice *d, Error **errp)
     }
 
     rc = pcie_aer_init(d, PCI_ERR_VER, rpc->aer_offset,
-                       PCI_ERR_SIZEOF, &local_err);
+                       PCI_ERR_SIZEOF, errp);
     if (rc < 0) {
-        error_propagate(errp, local_err);
         goto err;
     }
     pcie_aer_root_init(d);
-- 
2.9.3
Re: [Qemu-devel] [PATCH v3] pci: Set err to errp directly rather than through error_propagate()
Posted by Philippe Mathieu-Daudé 6 years, 11 months ago 
On 05/27/2017 02:34 AM, Mao Zhongyi wrote:
> ioh3420_interrupts_init() and its callers rp_realize() fill error
> message to local_err, then propagate it to errp by error_propagate(),
> which is not necessary. So eliminate it and pass errp directly instead
> of local_err. Of course, error_propagate() also has been removed.
>
> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/pci-bridge/ioh3420.c        | 4 +---
>  hw/pci-bridge/pcie_root_port.c | 7 ++-----
>  2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
> index da4e5bd..5f56a2f 100644
> --- a/hw/pci-bridge/ioh3420.c
> +++ b/hw/pci-bridge/ioh3420.c
> @@ -64,15 +64,13 @@ static uint8_t ioh3420_aer_vector(const PCIDevice *d)
>  static int ioh3420_interrupts_init(PCIDevice *d, Error **errp)
>  {
>      int rc;
> -    Error *local_err = NULL;
>
>      rc = msi_init(d, IOH_EP_MSI_OFFSET, IOH_EP_MSI_NR_VECTOR,
>                    IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_64BIT,
>                    IOH_EP_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_MASKBIT,
> -                  &local_err);
> +                  errp);
>      if (rc < 0) {
>          assert(rc == -ENOTSUP);
> -        error_propagate(errp, local_err);
>      }
>
>      return rc;
> diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
> index cf36318..9022996 100644
> --- a/hw/pci-bridge/pcie_root_port.c
> +++ b/hw/pci-bridge/pcie_root_port.c
> @@ -59,7 +59,6 @@ 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);
> @@ -72,9 +71,8 @@ static void rp_realize(PCIDevice *d, Error **errp)
>      }
>
>      if (rpc->interrupts_init) {
> -        rc = rpc->interrupts_init(d, &local_err);
> +        rc = rpc->interrupts_init(d, errp);
>          if (rc < 0) {
> -            error_propagate(errp, local_err);
>              goto err_bridge;
>          }
>      }
> @@ -98,9 +96,8 @@ static void rp_realize(PCIDevice *d, Error **errp)
>      }
>
>      rc = pcie_aer_init(d, PCI_ERR_VER, rpc->aer_offset,
> -                       PCI_ERR_SIZEOF, &local_err);
> +                       PCI_ERR_SIZEOF, errp);
>      if (rc < 0) {
> -        error_propagate(errp, local_err);
>          goto err;
>      }
>      pcie_aer_root_init(d);
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.