Skip to content

Commit 2798ee6

Browse files
committed
hw/isa/i82378: Propagate error if PC_SPEAKER device creation failed
In commit 40f8214 ("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> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Bernhard Beschow <shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20231020171509.87839-5-philmd@linaro.org>
1 parent e265ee4 commit 2798ee6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

hw/isa/i82378.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
105105
/* speaker */
106106
pcspk = isa_new(TYPE_PC_SPEAKER);
107107
object_property_set_link(OBJECT(pcspk), "pit", OBJECT(pit), &error_fatal);
108-
isa_realize_and_unref(pcspk, isabus, &error_fatal);
108+
if (!isa_realize_and_unref(pcspk, isabus, errp)) {
109+
return;
110+
}
109111

110112
/* 2 82C37 (dma) */
111113
isa_create_simple(isabus, "i82374");

0 commit comments

Comments
 (0)