1. Patchew
  2. QEMU
  3. View series

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

Mao Zhongyi posted 1 patch 6 years, 7 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/2896466deb1ff8d832e39ce389ce268ee38e4e4f.1504935362.git.maozy.fnst@cn.fujitsu.com
Test checkpatch passed
Test docker passed
Test s390x passed
hw/pci-bridge/ioh3420.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
[Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
Posted by Mao Zhongyi 6 years, 7 months ago 
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" <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com> 
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>
---
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()
Posted by Stefan Hajnoczi 6 years, 7 months ago 
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" <mst@redhat.com>
> Cc: Marcel Apfelbaum <marcel@redhat.com> 
> 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>
> ---
> 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 <stefanha@redhat.com>
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
Posted by Mao Zhongyi 6 years, 6 months ago 

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" <mst@redhat.com>
>> Cc: Marcel Apfelbaum <marcel@redhat.com>
>> 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>
>> ---
>> 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 <stefanha@redhat.com>
>
>
>


Hi,

Long time no news. Ping...

Thanks,
Mao
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
Posted by Stefan Hajnoczi 6 years, 5 months ago 
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" <mst@redhat.com>
> > > Cc: Marcel Apfelbaum <marcel@redhat.com>
> > > 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>
> > > ---
> > > 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 <stefanha@redhat.com>
> 
> Hi,
> 
> Long time no news. Ping...

This patch should go through Michael Tsirkin's tree.

Stefan
Re: [Qemu-devel] [PATCH v4] pci: Set err to errp directly rather than through error_propagate()
Posted by Mao Zhongyi 6 years, 5 months ago 

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" <mst@redhat.com>
>>>> Cc: Marcel Apfelbaum <marcel@redhat.com>
>>>> 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>
>>>> ---
>>>> 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 <stefanha@redhat.com>
>>
>> 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
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.