commit 6832deb8ff0807e0b46a8a67f5d2abfa36ca3b47
author Thomas Huth <thuth@redhat.com> Thu Mar 17 09:30:25 2022 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Fri Mar 18 10:15:57 2022 +0100
tree 449b34641837d3930a2f6dcf645cda3696a4d432
parent 5f2011be44b8d17f93680d01d617cd9a96678886

hw/display: Allow vga_common_init() to return errors

The vga_common_init() function currently cannot report errors to its
caller. But in the following patch, we'd need this possibility, so
let's change it to take an "Error **" as parameter for this.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220317083027.16688-3-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

hw/display/cirrus_vga_isa.c

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 4f6fb1a..96144bd 100644
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -56,7 +56,9 @@
         return;
     }
     s->global_vmstate = true;
-    vga_common_init(s, OBJECT(dev));
+    if (!vga_common_init(s, OBJECT(dev), errp)) {
+        return;
+    }
     cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, 0,
                        isa_address_space(isadev),
                        isa_address_space_io(isadev));