Commit df58887b authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b629a38a 99efa84d

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ qemu-%.tar.bz2: 


distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f config-all-devices.mak config-all-disas.mak

	rm -f po/*.mo

	rm -f config-all-devices.mak config-all-disas.mak config.status

	rm -f po/*.mo tests/qemu-iotests/common.env

	rm -f roms/seabios/config.mak roms/vgabios/config.mak

	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi

	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys

hw/display/blizzard.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

hw/isa/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


typedef struct SuperIOConfig

{

    uint8_t config[0xff];

    uint8_t config[0x100];

    uint8_t index;

    uint8_t data;

} SuperIOConfig;

include/hw/hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler, 
 *                  require asynchronous unplug handling.

 * @unplug: unplug callback.

 *          Used for device removal with devices that implement

 *          asynchronous and synchronous (suprise) removal.

 *          asynchronous and synchronous (surprise) removal.

 */

typedef struct HotplugHandlerClass {

    /* <private> */

migration/qemu-file.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ unsigned int qemu_get_be16(QEMUFile *f) 
unsigned int qemu_get_be32(QEMUFile *f)

{

    unsigned int v;

    v = qemu_get_byte(f) << 24;

    v = (unsigned int)qemu_get_byte(f) << 24;

    v |= qemu_get_byte(f) << 16;

    v |= qemu_get_byte(f) << 8;

    v |= qemu_get_byte(f);