[Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
ioh3420_interrupts_init() pass 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.
Cc: "Michael S. Tsirkin"
Cc: Marcel Apfelbaum
Signed-off-by: Mao Zhongyi
Reviewed-by: Eric Blake
Reviewed-by: Marcel Apfelbaum
Reviewed-by: Philippe Mathieu-Daudé
---
v4:
it not apply clearly on HEAD, so rebase it and modify the commit
message.
---
hw/pci-bridge/ioh3420.c | 4 +---
1 file changed, 1 insertion(+), 3 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;
--
2.9.4
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
On Sat, Sep 09, 2017 at 02:22:26PM +0800, Mao Zhongyi wrote: > ioh3420_interrupts_init() pass 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. > > Cc: "Michael S. Tsirkin" > Cc: Marcel Apfelbaum > Signed-off-by: Mao Zhongyi > Reviewed-by: Eric Blake > Reviewed-by: Marcel Apfelbaum > Reviewed-by: Philippe Mathieu-Daudé > --- > v4: > it not apply clearly on HEAD, so rebase it and modify the commit > message. > --- > > hw/pci-bridge/ioh3420.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
On 09/12/2017 06:16 PM, Stefan Hajnoczi wrote: On Sat, Sep 09, 2017 at 02:22:26PM +0800, Mao Zhongyi wrote: ioh3420_interrupts_init() pass 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. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Mao Zhongyi Reviewed-by: Eric Blake Reviewed-by: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé --- v4: it not apply clearly on HEAD, so rebase it and modify the commit message. --- hw/pci-bridge/ioh3420.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi Hi, Long time no news. Ping... Thanks, Mao
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
On Thu, Oct 12, 2017 at 10:44:26AM +0800, Mao Zhongyi wrote: > On 09/12/2017 06:16 PM, Stefan Hajnoczi wrote: > > On Sat, Sep 09, 2017 at 02:22:26PM +0800, Mao Zhongyi wrote: > > > ioh3420_interrupts_init() pass 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. > > > > > > Cc: "Michael S. Tsirkin" > > > Cc: Marcel Apfelbaum > > > Signed-off-by: Mao Zhongyi > > > Reviewed-by: Eric Blake > > > Reviewed-by: Marcel Apfelbaum > > > Reviewed-by: Philippe Mathieu-Daudé > > > --- > > > v4: > > > it not apply clearly on HEAD, so rebase it and modify the commit > > > message. > > > --- > > > > > > hw/pci-bridge/ioh3420.c | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > Reviewed-by: Stefan Hajnoczi > > Hi, > > Long time no news. Ping... This patch should go through Michael Tsirkin's tree. Stefan signature.asc Description: PGP signature
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
On 11/03/2017 11:10 PM, Stefan Hajnoczi wrote: On Thu, Oct 12, 2017 at 10:44:26AM +0800, Mao Zhongyi wrote: On 09/12/2017 06:16 PM, Stefan Hajnoczi wrote: On Sat, Sep 09, 2017 at 02:22:26PM +0800, Mao Zhongyi wrote: ioh3420_interrupts_init() pass 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. Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Signed-off-by: Mao Zhongyi Reviewed-by: Eric Blake Reviewed-by: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé --- v4: it not apply clearly on HEAD, so rebase it and modify the commit message. --- hw/pci-bridge/ioh3420.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi Hi, Long time no news. Ping... This patch should go through Michael Tsirkin's tree. Hi, Stefan Thanks for the info. This patch has merged by Michael S. Tsirkin. Stefan
