OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

baum: Truncate braille device size to 84x1

Browse Source 
Baum device bigger than 84 do not actually exist, but the user's own
Braille device might be wider than 84 columns.  Some guest drivers
would be upset by such sizes, so clamp the device size.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Message-Id: <20171211001950.27843-1-samuel.thibault@ens-lyon.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Samuel Thibault 2017-12-11 01:19:50 +01:00 committed by Paolo Bonzini
parent a4926d9912
commit 1ef7c96ee2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chardev/baum.c
View File

@ -1,7 +1,7 @@
/* /*
* QEMU Baum Braille Device * QEMU Baum Braille Device
* *
* Copyright (c) 2008, 2010-2011, 2016 Samuel Thibault * Copyright (c) 2008, 2010-2011, 2016-2017 Samuel Thibault
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -239,6 +239,12 @@ static int baum_deferred_init(BaumChardev *baum)
brlapi_perror("baum: brlapi__getDisplaySize"); brlapi_perror("baum: brlapi__getDisplaySize");
return 0; return 0;
} }
if (baum->y > 1) {
baum->y = 1;
}
if (baum->x > 84) {
baum->x = 84;
}
con = qemu_console_lookup_by_index(0); con = qemu_console_lookup_by_index(0);
if (con && qemu_console_is_graphic(con)) { if (con && qemu_console_is_graphic(con)) {