* [Qemu-devel] [PATCH] xio3130_downstream: Report error if pcie_chassis_add_slot() failed
@ 2017-08-25 19:54 Eduardo Habkost
2017-08-27 7:44 ` Marcel Apfelbaum
0 siblings, 1 reply; 3+ messages in thread
From: Eduardo Habkost @ 2017-08-25 19:54 UTC (permalink / raw)
To: qemu-devel; +Cc: Marcel Apfelbaum, Michael S . Tsirkin, Mao Zhongyi
On commit f8cd1b02 ("pci: Convert to realize"), no error_set*()
call was added for the pcie_chassis_add_slot() error case.
pcie_chassis_add_slot() errors get ignored, making QEMU crash
later. e.g.:
$ qemu-system-x86_64 -device ioh3420 -device xio3130-downstream
qemu-system-x86_64: memory.c:2166: memory_region_del_subregion: Assertion `subregion->container == mr' failed.
Aborted (core dumped)
Fix it by reporting the error using error_setg().
Fixes: f8cd1b0201c41d88bb97dcafb80348a0e88d8805
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/pci-bridge/xio3130_downstream.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index e706f36..5a882b0 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -94,6 +94,7 @@ static void xio3130_downstream_realize(PCIDevice *d, Error **errp)
pcie_chassis_create(s->chassis);
rc = pcie_chassis_add_slot(s);
if (rc < 0) {
+ error_setg(errp, "Can't add chassis slot, error %d", rc);
goto err_pcie_cap;
}
--
2.9.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] xio3130_downstream: Report error if pcie_chassis_add_slot() failed
2017-08-25 19:54 [Qemu-devel] [PATCH] xio3130_downstream: Report error if pcie_chassis_add_slot() failed Eduardo Habkost
@ 2017-08-27 7:44 ` Marcel Apfelbaum
2017-09-19 20:08 ` Eduardo Habkost
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Apfelbaum @ 2017-08-27 7:44 UTC (permalink / raw)
To: Eduardo Habkost, qemu-devel; +Cc: Michael S . Tsirkin, Mao Zhongyi
Hi Eduardo,
On 25/08/2017 22:54, Eduardo Habkost wrote:
> On commit f8cd1b02 ("pci: Convert to realize"), no error_set*()
> call was added for the pcie_chassis_add_slot() error case.
> pcie_chassis_add_slot() errors get ignored, making QEMU crash
> later. e.g.:
>
> $ qemu-system-x86_64 -device ioh3420 -device xio3130-downstream
> qemu-system-x86_64: memory.c:2166: memory_region_del_subregion: Assertion `subregion->container == mr' failed.
> Aborted (core dumped)
>
> Fix it by reporting the error using error_setg().
>
> Fixes: f8cd1b0201c41d88bb97dcafb80348a0e88d8805
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> hw/pci-bridge/xio3130_downstream.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
> index e706f36..5a882b0 100644
> --- a/hw/pci-bridge/xio3130_downstream.c
> +++ b/hw/pci-bridge/xio3130_downstream.c
> @@ -94,6 +94,7 @@ static void xio3130_downstream_realize(PCIDevice *d, Error **errp)
> pcie_chassis_create(s->chassis);
> rc = pcie_chassis_add_slot(s);
> if (rc < 0) {
> + error_setg(errp, "Can't add chassis slot, error %d", rc);
> goto err_pcie_cap;
> }
>
>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] xio3130_downstream: Report error if pcie_chassis_add_slot() failed
2017-08-27 7:44 ` Marcel Apfelbaum
@ 2017-09-19 20:08 ` Eduardo Habkost
0 siblings, 0 replies; 3+ messages in thread
From: Eduardo Habkost @ 2017-09-19 20:08 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: qemu-devel, Mao Zhongyi, Michael S . Tsirkin
On Sun, Aug 27, 2017 at 10:44:26AM +0300, Marcel Apfelbaum wrote:
> Hi Eduardo,
>
> On 25/08/2017 22:54, Eduardo Habkost wrote:
> > On commit f8cd1b02 ("pci: Convert to realize"), no error_set*()
> > call was added for the pcie_chassis_add_slot() error case.
> > pcie_chassis_add_slot() errors get ignored, making QEMU crash
> > later. e.g.:
> >
> > $ qemu-system-x86_64 -device ioh3420 -device xio3130-downstream
> > qemu-system-x86_64: memory.c:2166: memory_region_del_subregion: Assertion `subregion->container == mr' failed.
> > Aborted (core dumped)
> >
> > Fix it by reporting the error using error_setg().
> >
> > Fixes: f8cd1b0201c41d88bb97dcafb80348a0e88d8805
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> > hw/pci-bridge/xio3130_downstream.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
> > index e706f36..5a882b0 100644
> > --- a/hw/pci-bridge/xio3130_downstream.c
> > +++ b/hw/pci-bridge/xio3130_downstream.c
> > @@ -94,6 +94,7 @@ static void xio3130_downstream_realize(PCIDevice *d, Error **errp)
> > pcie_chassis_create(s->chassis);
> > rc = pcie_chassis_add_slot(s);
> > if (rc < 0) {
> > + error_setg(errp, "Can't add chassis slot, error %d", rc);
> > goto err_pcie_cap;
> > }
> >
>
>
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks!
Michael, do you want to merge this, or should I queue it?
--
Eduardo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-19 20:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-25 19:54 [Qemu-devel] [PATCH] xio3130_downstream: Report error if pcie_chassis_add_slot() failed Eduardo Habkost
2017-08-27 7:44 ` Marcel Apfelbaum
2017-09-19 20:08 ` Eduardo Habkost
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).