summary refs log tree commit diff stats
path: root/hw/display/bochs-display.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-06-04 15:46:15 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-06-04 15:46:15 +0100
commit5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c (patch)
tree5f64df14b1ae8c4835327537f32645b8b831ad50 /hw/display/bochs-display.c
parentcfe672510d77e8aa646c5e34768745271ffd772b (diff)
parent6bc2fd57e1fc2d1957d1ff952793c53764130218 (diff)
downloadfocaccia-qemu-5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c.tar.gz
focaccia-qemu-5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180604-pull-request' into staging
Two little vga fixes.

# gpg: Signature made Mon 04 Jun 2018 09:48:53 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20180604-pull-request:
  vga: cleanup surface handling
  bochs-display: add missing break

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/bochs-display.c')
-rw-r--r--hw/display/bochs-display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index c33524b558..1187d77576 100644
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -158,6 +158,7 @@ static int bochs_display_get_mode(BochsDisplayState *s,
         /* best effort: support native endianess only */
         mode->format = PIXMAN_r5g6b5;
         mode->bytepp = 2;
+        break;
     case 32:
         mode->format = s->big_endian_fb
             ? PIXMAN_BE_x8r8g8b8