]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
hw/display: Restrict xen_register_framebuffer() call to Xen
authorPhilippe Mathieu-Daudé <philmd@linaro.org>
Tue, 14 Nov 2023 14:38:01 +0000 (15:38 +0100)
committerDavid Woodhouse <dwmw@amazon.co.uk>
Tue, 14 Nov 2023 16:09:27 +0000 (11:09 -0500)
Only call xen_register_framebuffer() when Xen is enabled.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
hw/display/vga.c

index 37557c3442aa8b709e74930502ed3a573da3d222..f9cf3d6f774e915be50ed165cd2b01537e9853c0 100644 (file)
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "sysemu/reset.h"
+#include "sysemu/xen.h"
 #include "qapi/error.h"
 #include "hw/core/cpu.h"
 #include "hw/display/vga.h"
@@ -2223,7 +2224,9 @@ bool vga_common_init(VGACommonState *s, Object *obj, Error **errp)
         return false;
     }
     vmstate_register_ram(&s->vram, s->global_vmstate ? NULL : DEVICE(obj));
-    xen_register_framebuffer(&s->vram);
+    if (xen_enabled()) {
+        xen_register_framebuffer(&s->vram);
+    }
     s->vram_ptr = memory_region_get_ram_ptr(&s->vram);
     s->get_bpp = vga_get_bpp;
     s->get_offsets = vga_get_offsets;