trivial patches for 2015-01-15
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUt3myAAoJEL7lnXSkw9fbKXkH/00rjLDjazEuCNlitZDEDbPi gSNEHVk65xSmhhHURpvilKfA2IfXt67H9zDKp8FYFR0qfyLjgm5nMZQ7JWAcBk8e UD851zL3anuJyjxQUB//vK5VmNyoG29IFyFXQAqXwuvZDZAflvAuXxsQYHh+tB/f mIcQZNUmIAjLeg/JdY55s3b5ZLUcmd8Mmtzi1wZQPHeZQq5CxG3GGTKMB7wI4zJ/ 76NnP163Gdvr8J1J00icjE8sl7f0o/tJzhR7lbK5QtzySMtRVj8lkDBYC77lOe6U CaWTZgDCLtxtEVJ7xP/1hjg/TmSiPuOiAAvPFaUjdzb641Adshk4EaKF8ww2g9I= =YF9X -----END PGP SIGNATURE----- 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>
This commit is contained in:
Peter Maydell
commit
df58887b20
4
Makefile
4
Makefile
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
typedef struct SuperIOConfig
|
||||
{
|
||||
uint8_t config[0xff];
|
||||
uint8_t config[0x100];
|
||||
uint8_t index;
|
||||
uint8_t data;
|
||||
} SuperIOConfig;
|
||||
|
|
|
|||
|
|
@ -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> */
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -1402,6 +1402,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
|
|||
}
|
||||
|
||||
close(slave_fd);
|
||||
qemu_set_nonblock(master_fd);
|
||||
|
||||
chr = qemu_chr_alloc();
|
||||
|
||||
|
|
|
|||
|
|
@ -972,7 +972,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
|
|||
* The override is necessary because of the overly-broad TLB_LOCKDOWN
|
||||
* definition.
|
||||
*/
|
||||
/* MAIR0/1 are defined seperately from their 64-bit counterpart which
|
||||
/* MAIR0/1 are defined separately from their 64-bit counterpart which
|
||||
* allows them to assign the correct fieldoffset based on the endianness
|
||||
* handled in the field definitions.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1320,7 +1320,7 @@ static void dec_sys(DisasContext *dc, uint32_t insn)
|
|||
#ifdef OPENRISC_DISAS
|
||||
uint32_t K16;
|
||||
#endif
|
||||
op0 = extract32(insn, 16, 8);
|
||||
op0 = extract32(insn, 16, 10);
|
||||
#ifdef OPENRISC_DISAS
|
||||
K16 = extract32(insn, 0, 16);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ A(0xE200, CPM0, TRICORE_FEATURE_13)
|
|||
A(0xE280, CPM1, TRICORE_FEATURE_13)
|
||||
A(0xE300, CPM2, TRICORE_FEATURE_13)
|
||||
A(0xE380, CPM3, TRICORE_FEATURE_13)
|
||||
/* memory Managment Registers */
|
||||
/* memory management registers */
|
||||
A(0x8000, MMU_CON, TRICORE_FEATURE_13)
|
||||
A(0x8004, MMU_ASI, TRICORE_FEATURE_13)
|
||||
A(0x800C, MMU_TVA, TRICORE_FEATURE_13)
|
||||
|
|
|
|||
|
|
@ -5022,7 +5022,7 @@ static void decode_32Bit_opc(CPUTriCoreState *env, DisasContext *ctx)
|
|||
case OPCM_32_RR_LOGICAL_SHIFT:
|
||||
decode_rr_logical_shift(env, ctx);
|
||||
break;
|
||||
case OPCM_32_RR_ADRESS:
|
||||
case OPCM_32_RR_ADDRESS:
|
||||
decode_rr_address(env, ctx);
|
||||
break;
|
||||
case OPCM_32_RR_IDIRECT:
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ enum {
|
|||
/* RR Format */
|
||||
OPCM_32_RR_LOGICAL_SHIFT = 0x0f,
|
||||
OPCM_32_RR_ACCUMULATOR = 0x0b,
|
||||
OPCM_32_RR_ADRESS = 0x01,
|
||||
OPCM_32_RR_ADDRESS = 0x01,
|
||||
OPCM_32_RR_DIVIDE = 0x4b,
|
||||
OPCM_32_RR_IDIRECT = 0x2d,
|
||||
/* RR1 Format */
|
||||
|
|
@ -1082,7 +1082,7 @@ enum {
|
|||
OPC2_32_RR_XOR_LT_U = 0x32,
|
||||
OPC2_32_RR_XOR_NE = 0x30,
|
||||
};
|
||||
/* OPCM_32_RR_ADRESS */
|
||||
/* OPCM_32_RR_ADDRESS */
|
||||
enum {
|
||||
OPC2_32_RR_ADD_A = 0x01,
|
||||
OPC2_32_RR_ADDSC_A = 0x60,
|
||||
|
|
|
|||
|
|
@ -1289,7 +1289,7 @@ static void ahci_test_identify(QPCIDevice *ahci, void *hba_base)
|
|||
PX_WREG(i, AHCI_PX_IS, reg);
|
||||
g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0);
|
||||
|
||||
/* Wipe the FIS-Recieve Buffer */
|
||||
/* Wipe the FIS-Receive Buffer */
|
||||
fb = PX_RREG(i, AHCI_PX_FB);
|
||||
g_assert_cmphex(fb, !=, 0);
|
||||
qmemset(fb, 0x00, 0x100);
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@
|
|||
#include "qemu-common.h"
|
||||
#include "libqtest.h"
|
||||
|
||||
static const char test_image[] = "/tmp/qtest.XXXXXX";
|
||||
|
||||
static char *create_test_img(int secs)
|
||||
{
|
||||
char *template = strdup("/tmp/qtest.XXXXXX");
|
||||
|
|
|
|||
|
|
@ -276,14 +276,14 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr)
|
|||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
static inline void map_exec(void *addr, long size)
|
||||
static __attribute__((unused)) void map_exec(void *addr, long size)
|
||||
{
|
||||
DWORD old_protect;
|
||||
VirtualProtect(addr, size,
|
||||
PAGE_EXECUTE_READWRITE, &old_protect);
|
||||
}
|
||||
#else
|
||||
static inline void map_exec(void *addr, long size)
|
||||
static __attribute__((unused)) void map_exec(void *addr, long size)
|
||||
{
|
||||
unsigned long start, end, page_size;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue