| Message ID | 20231020171509.87839-5-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/audio/pcspk: Inline pcspk_init() | expand |
On 10/20/23 10:15, Philippe Mathieu-Daudé wrote: > In commit 40f8214fcd ("hw/audio/pcspk: Inline pcspk_init()") > we neglected to give a change to the caller to handle failed > device creation cleanly. Respect the caller API contract and > propagate the error if creating the PC_SPEAKER device ever > failed. This avoid yet another bad API use to be taken as > example and copy / pasted all over the code base. > > Reported-by: Bernhard Beschow <shentey@gmail.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/isa/i82378.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Am 20. Oktober 2023 17:15:08 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>: >In commit 40f8214fcd ("hw/audio/pcspk: Inline pcspk_init()") >we neglected to give a change to the caller to handle failed >device creation cleanly. Respect the caller API contract and >propagate the error if creating the PC_SPEAKER device ever >failed. This avoid yet another bad API use to be taken as >example and copy / pasted all over the code base. > >Reported-by: Bernhard Beschow <shentey@gmail.com> >Suggested-by: Markus Armbruster <armbru@redhat.com> >Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Bernhard Beschow <shentey@gmail.com> >--- > hw/isa/i82378.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c >index 79ffbb52a0..203b92c264 100644 >--- a/hw/isa/i82378.c >+++ b/hw/isa/i82378.c >@@ -105,7 +105,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp) > /* speaker */ > pcspk = isa_new(TYPE_PC_SPEAKER); > object_property_set_link(OBJECT(pcspk), "pit", OBJECT(pit), &error_fatal); >- isa_realize_and_unref(pcspk, isabus, &error_fatal); >+ if (!isa_realize_and_unref(pcspk, isabus, errp)) { >+ return; >+ } > > /* 2 82C37 (dma) */ > isa_create_simple(isabus, "i82374");
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 79ffbb52a0..203b92c264 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -105,7 +105,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp) /* speaker */ pcspk = isa_new(TYPE_PC_SPEAKER); object_property_set_link(OBJECT(pcspk), "pit", OBJECT(pit), &error_fatal); - isa_realize_and_unref(pcspk, isabus, &error_fatal); + if (!isa_realize_and_unref(pcspk, isabus, errp)) { + return; + } /* 2 82C37 (dma) */ isa_create_simple(isabus, "i82374");
In commit 40f8214fcd ("hw/audio/pcspk: Inline pcspk_init()") we neglected to give a change to the caller to handle failed device creation cleanly. Respect the caller API contract and propagate the error if creating the PC_SPEAKER device ever failed. This avoid yet another bad API use to be taken as example and copy / pasted all over the code base. Reported-by: Bernhard Beschow <shentey@gmail.com> Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/isa/i82378.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)