From: Marc-André Lureau <marcandre.lur...@redhat.com> A VGA interface is available if it has no class_names, or we can look up any of the names - we shouldn't call module_object_class_by_name(NULL), as happening for ex with TCX or CG3 on x86.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- system/vl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index a3eede5fa5..398f88b0f0 100644 --- a/system/vl.c +++ b/system/vl.c @@ -999,9 +999,16 @@ static bool vga_interface_available(VGAInterfaceType t) const VGAInterfaceInfo *ti = &vga_interfaces[t]; assert(t < VGA_TYPE_MAX); - return !ti->class_names[0] || - module_object_class_by_name(ti->class_names[0]) || - module_object_class_by_name(ti->class_names[1]); + + if (!ti->class_names[0] || module_object_class_by_name(ti->class_names[0])) { + return true; + } + + if (ti->class_names[1] && module_object_class_by_name(ti->class_names[1])) { + return true; + } + + return false; } static const char * -- 2.41.0.28.gd7d8841f67