From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
To: Marcel Apfelbaum <marcel@redhat.com>, qemu-devel@nongnu.org
Cc: dmitry@daynix.com, jasowang@redhat.com,
alex.williamson@redhat.com, mst@redhat.com, armbru@redhat.com
Subject: Re: [Qemu-devel] [PATCH v2 3/6] pci: Fix the wrong return value judgment condition
Date: Tue, 6 Jun 2017 09:14:58 +0800 [thread overview]
Message-ID: <f923cf78-250b-bcf5-1377-bd01fb935f9b@cn.fujitsu.com> (raw)
In-Reply-To: <1fc3b8d8-5571-6f74-11c1-a764a57b44b2@redhat.com>
Hi, Marcel
On 06/06/2017 12:20 AM, Marcel Apfelbaum wrote:
> On 02/06/2017 10:54, Mao Zhongyi wrote:
>> On success, pci_add_capability2() returns a positive value. On
>> failure, it sets an error and return a negative value. It doesn't
>> always return 0. So the judgment condtion of pci_add_capability2()
>> is wrong if it contains the situation where return value equal to
>> 0. Fix the error checks from its callers.
>>
>
> Hi,
> I would suggest changing the above to a simpler:
>
> pci_add_capability returns a strictly positive value on success,
> correct asserts.
>
> Thanks,
> Marcel
OK, I see.
Thanks a lot.
Mao
>
>> Cc: dmitry@daynix.com
>> Cc: jasowang@redhat.com
>> Cc: alex.williamson@redhat.com
>> Cc: marcel@redhat.com
>> Cc: mst@redhat.com
>> Cc: armbru@redhat.com
>> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
>> ---
>> hw/net/e1000e.c | 2 +-
>> hw/net/eepro100.c | 2 +-
>> hw/vfio/pci.c | 2 +-
>> 3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
>> index 6e23493..8259d67 100644
>> --- a/hw/net/e1000e.c
>> +++ b/hw/net/e1000e.c
>> @@ -374,7 +374,7 @@ e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc)
>> {
>> int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF);
>> - if (ret >= 0) {
>> + if (ret > 0) {
>> pci_set_word(pdev->config + offset + PCI_PM_PMC,
>> PCI_PM_CAP_VER_1_1 |
>> pmc);
>> diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
>> index 4bf71f2..da36816 100644
>> --- a/hw/net/eepro100.c
>> +++ b/hw/net/eepro100.c
>> @@ -571,7 +571,7 @@ static void e100_pci_reset(EEPRO100State * s)
>> int cfg_offset = 0xdc;
>> int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM,
>> cfg_offset, PCI_PM_SIZEOF);
>> - assert(r >= 0);
>> + assert(r > 0);
>> pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21);
>> #if 0 /* TODO: replace dummy code for power management emulation. */
>> /* TODO: Power Management Control / Status. */
>> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
>> index 32aca77..5881968 100644
>> --- a/hw/vfio/pci.c
>> +++ b/hw/vfio/pci.c
>> @@ -1744,7 +1744,7 @@ static int vfio_setup_pcie_cap(VFIOPCIDevice *vdev, int pos, uint8_t size,
>> }
>> pos = pci_add_capability(&vdev->pdev, PCI_CAP_ID_EXP, pos, size);
>> - if (pos >= 0) {
>> + if (pos > 0) {
>> vdev->pdev.exp.exp_cap = pos;
>> }
>>
>
>
>
>
next prev parent reply other threads:[~2017-06-06 1:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 7:54 [Qemu-devel] [PATCH v2 0/6] Convert to realize and cleanup Mao Zhongyi
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 1/6] pci: Clean up error checking in pci_add_capability() Mao Zhongyi
2017-06-06 15:26 ` Michael S. Tsirkin
2017-06-06 16:14 ` Markus Armbruster
2017-06-06 18:06 ` Michael S. Tsirkin
2017-06-06 18:53 ` Markus Armbruster
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 2/6] pci: Add comment for pci_add_capability2() Mao Zhongyi
2017-06-05 13:34 ` Marcel Apfelbaum
2017-06-06 1:34 ` Mao Zhongyi
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 3/6] pci: Fix the wrong return value judgment condition Mao Zhongyi
2017-06-05 16:20 ` Marcel Apfelbaum
2017-06-06 1:14 ` Mao Zhongyi [this message]
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 4/6] net/eepro100: Fixed code style Mao Zhongyi
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 5/6] pci: Make errp the last parameter of pci_add_capability() Mao Zhongyi
2017-06-02 17:45 ` Eduardo Habkost
2017-06-05 3:06 ` Mao Zhongyi
2017-06-02 7:54 ` [Qemu-devel] [PATCH v2 6/6] pci: Convert to realize Mao Zhongyi
2017-06-06 15:23 ` [Qemu-devel] [PATCH v2 0/6] Convert to realize and cleanup Michael S. Tsirkin
2017-06-07 2:51 ` Mao Zhongyi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f923cf78-250b-bcf5-1377-bd01fb935f9b@cn.fujitsu.com \
--to=maozy.fnst@cn.fujitsu.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=dmitry@daynix.com \
--cc=jasowang@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.