diff options
| author | Peter Maydell | 2015-01-15 11:08:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-01-15 11:08:46 +0100 |
| commit | df58887b20fab8fe8a6dcca4db30cd4e4077d53a (patch) | |
| tree | f4831cf96c57d4974e6fe6d61b5ee98114de72e0 /hw | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | vl.c: fix some alignment issues (diff) | |
| download | qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.tar.gz qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.tar.xz qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-01-15' into staging
trivial patches for 2015-01-15
# gpg: Signature made Thu 15 Jan 2015 08:26:26 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-01-15:
vl.c: fix some alignment issues
blizzard: do not depend on VGA internals
Makefile: Remove config.status and common.env during 'make distclean'
target-openrisc: bugfix for dec_sys to decode instructions correctly
Do not hang on full PTY
misc: Fix new typos in comments
target-arm: Fix typo in comment (seperately -> separately)
target-tricore: Fix new typos
migration/qemu-file.c: Don't shift left into sign bit
translate-all: Mark map_exec() with the 'unused' attribute
tests/hd-geo-test.c: Remove unused test_image variable
vt82c686: avoid out-of-bounds read
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/blizzard.c | 1 | ||||
| -rw-r--r-- | hw/isa/vt82c686.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 92b1fac563..5019bbbef1 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -21,7 +21,6 @@ #include "qemu-common.h" #include "ui/console.h" #include "hw/devices.h" -#include "vga_int.h" #include "ui/pixel_ops.h" typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 223b947939..2f53bf8194 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -36,7 +36,7 @@ typedef struct SuperIOConfig { - uint8_t config[0xff]; + uint8_t config[0x100]; uint8_t index; uint8_t data; } SuperIOConfig; |