From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org, Eduardo Habkost <eduardo@habkost.net>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Stefan Weil" <sw@weilnetz.de>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 1/7] hw/net/eepro100: Abort if pci_add_capability() ever fail
Date: Mon, 13 Feb 2023 11:10:42 +0100 [thread overview]
Message-ID: <20230213101048.94519-2-philmd@linaro.org> (raw)
In-Reply-To: <20230213101048.94519-1-philmd@linaro.org>
If pci_add_capability() ever fail, the EEPRO100 device is broken,
which is a bug. No need to report that to the user, abort instead.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/eepro100.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index dc07984ae9..dce75039ec 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -549,13 +549,8 @@ static void e100_pci_reset(EEPRO100State *s, Error **errp)
if (info->power_management) {
/* Power Management Capabilities */
int cfg_offset = 0xdc;
- int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM,
- cfg_offset, PCI_PM_SIZEOF,
- errp);
- if (r < 0) {
- return;
- }
-
+ pci_add_capability(&s->dev, PCI_CAP_ID_PM, cfg_offset, PCI_PM_SIZEOF,
+ &error_abort);
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. */
--
2.38.1
next prev parent reply other threads:[~2023-02-13 10:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 10:10 [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion Philippe Mathieu-Daudé
2023-02-13 10:10 ` Philippe Mathieu-Daudé [this message]
2023-02-13 10:10 ` [PATCH v2 2/7] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 4/7] hw/net/eepro100: Pass E100PCIDeviceInfo as class init data Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 5/7] hw/net/eepro100: Remove instance EEPRO100State::has_extended_tcb_support Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 6/7] hw/net/eepro100: Remove instance's EEPRO100State::device Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 7/7] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100() Philippe Mathieu-Daudé
2023-02-23 15:16 ` [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion Philippe Mathieu-Daudé
2023-02-28 13:40 ` Philippe Mathieu-Daudé
2023-03-03 8:01 ` Jason Wang
2023-03-03 10:32 ` Philippe Mathieu-Daudé
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=20230213101048.94519-2-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=eduardo@habkost.net \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).