Merge remote-tracking branch 'stefanha/trivial-patches' into staging
This commit is contained in:
Anthony Liguori
commit
cac1e30af7
@ -20,7 +20,7 @@ Descriptions of section entries:
|
||||
Supported: Someone is actually paid to look after this.
|
||||
Maintained: Someone actually looks after it.
|
||||
Odd Fixes: It has a maintainer but they don't have time to do
|
||||
much other than throw the odd patch in. See below..
|
||||
much other than throw the odd patch in. See below.
|
||||
Orphan: No current maintainer [but maybe you could take the
|
||||
role as you write your new code].
|
||||
Obsolete: Old code. Something tagged obsolete generally means
|
||||
|
||||
@ -126,7 +126,7 @@ the authentication ID is not provided.
|
||||
VNC_DISCONNECTED
|
||||
----------------
|
||||
|
||||
Emitted when the conection is closed.
|
||||
Emitted when the connection is closed.
|
||||
|
||||
Data:
|
||||
|
||||
|
||||
@ -1624,7 +1624,7 @@ arm_decode_shift (long given, fprintf_function func, void *stream,
|
||||
}
|
||||
|
||||
/* Print one coprocessor instruction on INFO->STREAM.
|
||||
Return true if the instuction matched, false if this is not a
|
||||
Return true if the instruction matched, false if this is not a
|
||||
recognised coprocessor instruction. */
|
||||
|
||||
static bfd_boolean
|
||||
@ -2214,7 +2214,7 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
|
||||
}
|
||||
|
||||
/* Print one neon instruction on INFO->STREAM.
|
||||
Return true if the instuction matched, false if this is not a
|
||||
Return true if the instruction matched, false if this is not a
|
||||
recognised neon instruction. */
|
||||
|
||||
static bfd_boolean
|
||||
@ -3927,7 +3927,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
|
||||
n = last_mapping_sym - 1;
|
||||
|
||||
/* No mapping symbol found at this address. Look backwards
|
||||
for a preceeding one. */
|
||||
for a preceding one. */
|
||||
for (; n >= 0; n--)
|
||||
{
|
||||
if (get_sym_code_type (info, n, &type))
|
||||
|
||||
@ -92,7 +92,7 @@ static int cow_open(BlockDriverState *bs, int flags)
|
||||
}
|
||||
|
||||
/*
|
||||
* XXX(hch): right now these functions are extremly ineffcient.
|
||||
* XXX(hch): right now these functions are extremely ineffcient.
|
||||
* We should just read the whole bitmap we'll need in one go instead.
|
||||
*/
|
||||
static inline int cow_set_bit(BlockDriverState *bs, int64_t bitnum)
|
||||
|
||||
@ -92,7 +92,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
|
||||
if (offset > s->cluster_size)
|
||||
printf("qcow2_read_extension: suspicious offset %lu\n", offset);
|
||||
|
||||
printf("attemting to read extended header in offset %lu\n", offset);
|
||||
printf("attempting to read extended header in offset %lu\n", offset);
|
||||
#endif
|
||||
|
||||
if (bdrv_pread(bs->file, offset, &ext, sizeof(ext)) != sizeof(ext)) {
|
||||
@ -821,7 +821,7 @@ static int qcow2_create2(const char *filename, int64_t total_size,
|
||||
int flags, size_t cluster_size, int prealloc,
|
||||
QEMUOptionParameter *options)
|
||||
{
|
||||
/* Calulate cluster_bits */
|
||||
/* Calculate cluster_bits */
|
||||
int cluster_bits;
|
||||
cluster_bits = ffs(cluster_size) - 1;
|
||||
if (cluster_bits < MIN_CLUSTER_BITS || cluster_bits > MAX_CLUSTER_BITS ||
|
||||
|
||||
@ -1153,7 +1153,7 @@ static int cdrom_open(BlockDriverState *bs, const char *filename, int flags)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* make sure the door isnt locked at this time */
|
||||
/* make sure the door isn't locked at this time */
|
||||
ioctl(s->fd, CDIOCALLOW);
|
||||
return 0;
|
||||
}
|
||||
@ -1184,7 +1184,7 @@ static int cdrom_reopen(BlockDriverState *bs)
|
||||
}
|
||||
s->fd = fd;
|
||||
|
||||
/* make sure the door isnt locked at this time */
|
||||
/* make sure the door isn't locked at this time */
|
||||
ioctl(s->fd, CDIOCALLOW);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -368,7 +368,7 @@ DECLARE_TLS(CPUState *,cpu_single_env);
|
||||
#define CPU_INTERRUPT_TGT_EXT_4 0x1000
|
||||
|
||||
/* Several target-specific internal interrupts. These differ from the
|
||||
preceeding target-specific interrupts in that they are intended to
|
||||
preceding target-specific interrupts in that they are intended to
|
||||
originate from within the cpu itself, typically in response to some
|
||||
instruction being executed. These, therefore, are not masked while
|
||||
single-stepping within the debugger. */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef CPU_COMMON_H
|
||||
#define CPU_COMMON_H 1
|
||||
|
||||
/* CPU interfaces that are target indpendent. */
|
||||
/* CPU interfaces that are target independent. */
|
||||
|
||||
#ifdef TARGET_PHYS_ADDR_BITS
|
||||
#include "targphys.h"
|
||||
|
||||
2
cpus.c
2
cpus.c
@ -281,7 +281,7 @@ void qemu_clock_warp(QEMUClock *clock)
|
||||
* (related to the time left until the next event) has passed. This
|
||||
* rt_clock timer will do this. This avoids that the warps are too
|
||||
* visible externally---for example, you will not be sending network
|
||||
* packets continously instead of every 100ms.
|
||||
* packets continuously instead of every 100ms.
|
||||
*/
|
||||
qemu_mod_timer(icount_warp_timer, vm_clock_warp_start + deadline);
|
||||
} else {
|
||||
|
||||
@ -460,7 +460,7 @@ int load_object(const char *filename, struct target_pt_regs * regs, void ** mh)
|
||||
int mach_hdr_pos = 0;
|
||||
struct mach_header mach_hdr;
|
||||
|
||||
/* for symbol lookup whith -d flag. */
|
||||
/* for symbol lookup with -d flag. */
|
||||
struct symtab_command * symtabcmd = 0;
|
||||
struct nlist_extended *symtab, *sym;
|
||||
struct nlist *symtab_std, *syment;
|
||||
@ -645,7 +645,7 @@ int load_object(const char *filename, struct target_pt_regs * regs, void ** mh)
|
||||
case LC_PREBIND_CKSUM:
|
||||
case LC_SUB_LIBRARY:
|
||||
break;
|
||||
default: fprintf(stderr, "warning: unkown command 0x%x in '%s'\n", lc->cmd, filename);
|
||||
default: fprintf(stderr, "warning: unknown command 0x%x in '%s'\n", lc->cmd, filename);
|
||||
}
|
||||
lc = (struct load_command*)((int)(lc)+(lc->cmdsize));
|
||||
}
|
||||
@ -809,7 +809,7 @@ unsigned long setup_arg_pages(void * mh, char ** argv, char ** env)
|
||||
page_set_flags((int)env[i], (int)(env[i]+strlen(env[i])), PROT_READ | PAGE_VALID);
|
||||
}
|
||||
|
||||
/* Add on the stack the interp_prefix choosen if so */
|
||||
/* Add on the stack the interp_prefix chosen if so */
|
||||
if(interp_prefix[0])
|
||||
{
|
||||
char *dyld_root;
|
||||
|
||||
@ -394,7 +394,7 @@ void cpu_loop(CPUPPCState *env)
|
||||
queue_signal(info.si_signo, &info);
|
||||
break;
|
||||
case POWERPC_EXCP_PIT: /* Programmable interval timer IRQ */
|
||||
cpu_abort(env, "Programable interval timer interrupt "
|
||||
cpu_abort(env, "Programmable interval timer interrupt "
|
||||
"while in user mode. Aborting\n");
|
||||
break;
|
||||
case POWERPC_EXCP_IO: /* IO error exception */
|
||||
|
||||
@ -270,8 +270,7 @@ int do_sigaction(int sig, const struct sigaction *act,
|
||||
host_sig = target_to_host_signal(sig);
|
||||
if (host_sig != SIGSEGV && host_sig != SIGBUS) {
|
||||
#if defined(DEBUG_SIGNAL)
|
||||
fprintf(stderr, "sigaction handler going to call sigaction\n",
|
||||
act->sa_handler, act->sa_flags, act->sa_mask);
|
||||
fprintf(stderr, "sigaction handler going to call sigaction\n");
|
||||
#endif
|
||||
|
||||
sigfillset(&act1.sa_mask);
|
||||
|
||||
@ -755,7 +755,7 @@ struct attrbuf_header {
|
||||
|
||||
static inline void byteswap_attrbuf(struct attrbuf_header *attrbuf, struct attrlist *attrlist)
|
||||
{
|
||||
DPRINTF("attrBuf.lenght %lx\n", attrbuf->length);
|
||||
DPRINTF("attrBuf.length %lx\n", attrbuf->length);
|
||||
}
|
||||
|
||||
static inline void byteswap_statfs(struct statfs *s)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Internal memory managment interfaces
|
||||
* Internal memory management interfaces
|
||||
*
|
||||
* Copyright 2011 Red Hat, Inc. and/or its affiliates
|
||||
*
|
||||
|
||||
@ -564,7 +564,7 @@ If not, see <http://www.gnu.org/licenses/>. */
|
||||
*/
|
||||
|
||||
/* There are two kinds of delay slot nullification: normal which is
|
||||
* controled by the nullification bit, and conditional, which depends
|
||||
* controlled by the nullification bit, and conditional, which depends
|
||||
* on the direction of the branch and its success or failure.
|
||||
*
|
||||
* NONE is unfortunately #defined in the hiux system include files.
|
||||
|
||||
@ -516,7 +516,7 @@ static void write_register(dp8393xState *s, int reg, uint16_t val)
|
||||
switch (reg) {
|
||||
/* Command register */
|
||||
case SONIC_CR:
|
||||
do_command(s, val);;
|
||||
do_command(s, val);
|
||||
break;
|
||||
/* Prevent write to read-only registers */
|
||||
case SONIC_CAP2:
|
||||
|
||||
@ -157,7 +157,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
|
||||
{
|
||||
QEMUCursor *c;
|
||||
uint8_t *image, *mask;
|
||||
int size;
|
||||
size_t size;
|
||||
|
||||
c = cursor_alloc(cursor->header.width, cursor->header.height);
|
||||
c->hot_x = cursor->header.hot_spot_x;
|
||||
|
||||
@ -125,7 +125,7 @@ vcard_response_new_bytes(VCard *card, unsigned char *buf, int len, int Le,
|
||||
}
|
||||
|
||||
/*
|
||||
* get a new Reponse buffer that only has a status.
|
||||
* get a new Response buffer that only has a status.
|
||||
*/
|
||||
static VCardResponse *
|
||||
vcard_response_new_status(vcard_7816_status_t status)
|
||||
@ -239,7 +239,7 @@ vcard_apdu_set_class(VCardAPDU *apdu) {
|
||||
}
|
||||
|
||||
/*
|
||||
* set the Le and Lc fiels according to table 5 of the
|
||||
* set the Le and Lc fields according to table 5 of the
|
||||
* 7816-4 part 4 spec
|
||||
*/
|
||||
static vcard_7816_status_t
|
||||
|
||||
@ -23,7 +23,7 @@ VCardResponse *vcard_response_new_bytes(VCard *card, unsigned char *buf,
|
||||
/* response from just status bytes */
|
||||
VCardResponse *vcard_response_new_status_bytes(unsigned char sw1,
|
||||
unsigned char sw2);
|
||||
/* response from just status: NOTE this cannot fail, it will alwyas return a
|
||||
/* response from just status: NOTE this cannot fail, it will always return a
|
||||
* valid response, if it can't allocate memory, the response will be
|
||||
* VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE */
|
||||
VCardResponse *vcard_make_response(vcard_7816_status_t status);
|
||||
|
||||
@ -1250,7 +1250,7 @@ vcard_emul_usage(void)
|
||||
" {card_type_to_emulate} What card interface to present to the guest\n"
|
||||
" {param_for_card} Card interface specific parameters\n"
|
||||
" {slot_name} NSS slot that contains the certs\n"
|
||||
" {vreader_name} Virutal reader name to present to the guest\n"
|
||||
" {vreader_name} Virtual reader name to present to the guest\n"
|
||||
" {certN} Nickname of the certificate n on the virtual card\n"
|
||||
"\n"
|
||||
"These parameters come as a single string separated by blanks or newlines."
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
* to the existing messages, addition of fields.
|
||||
*
|
||||
* The major digit is for a breaking change of protocol, presumably
|
||||
* something that cannot be accomodated with the existing protocol.
|
||||
* something that cannot be accommodated with the existing protocol.
|
||||
*/
|
||||
|
||||
#define VSCARD_VERSION MAKE_VERSION(0, 0, 2)
|
||||
|
||||
@ -2339,7 +2339,7 @@ static void fill_auxv_note(struct memelfnote *note, const TaskState *ts)
|
||||
* strictly necessary but we do it here for sake of completeness.
|
||||
*/
|
||||
|
||||
/* find out lenght of the vector, AT_NULL is terminator */
|
||||
/* find out length of the vector, AT_NULL is terminator */
|
||||
i = len = 0;
|
||||
do {
|
||||
get_user_ual(val, auxv);
|
||||
|
||||
@ -575,7 +575,7 @@ static int load_flat_file(struct linux_binprm * bprm,
|
||||
* help simplify all this mumbo jumbo
|
||||
*
|
||||
* We've got two different sections of relocation entries.
|
||||
* The first is the GOT which resides at the begining of the data segment
|
||||
* The first is the GOT which resides at the beginning of the data segment
|
||||
* and is terminated with a -1. This one can be relocated in place.
|
||||
* The second is the extra relocation entries tacked after the image's
|
||||
* data segment. These require a little more processing as the entry is
|
||||
|
||||
@ -1638,7 +1638,7 @@ void cpu_loop(CPUPPCState *env)
|
||||
queue_signal(env, info.si_signo, &info);
|
||||
break;
|
||||
case POWERPC_EXCP_PIT: /* Programmable interval timer IRQ */
|
||||
cpu_abort(env, "Programable interval timer interrupt "
|
||||
cpu_abort(env, "Programmable interval timer interrupt "
|
||||
"while in user mode. Aborting\n");
|
||||
break;
|
||||
case POWERPC_EXCP_IO: /* IO error exception */
|
||||
@ -2434,7 +2434,7 @@ void cpu_loop (CPUState *env)
|
||||
if (env->iflags & D_FLAG) {
|
||||
env->sregs[SR_ESR] |= 1 << 12;
|
||||
env->sregs[SR_PC] -= 4;
|
||||
/* FIXME: if branch was immed, replay the imm aswell. */
|
||||
/* FIXME: if branch was immed, replay the imm as well. */
|
||||
}
|
||||
|
||||
env->iflags &= ~(IMM_FLAG | D_FLAG);
|
||||
|
||||
@ -80,7 +80,7 @@ static uint8_t host_to_target_signal_table[_NSIG] = {
|
||||
[SIGSYS] = TARGET_SIGSYS,
|
||||
/* next signals stay the same */
|
||||
/* Nasty hack: Reverse SIGRTMIN and SIGRTMAX to avoid overlap with
|
||||
host libpthread signals. This assumes noone actually uses SIGRTMAX :-/
|
||||
host libpthread signals. This assumes no one actually uses SIGRTMAX :-/
|
||||
To fix this properly we need to do manual signal delivery multiplexed
|
||||
over a single host signal. */
|
||||
[__SIGRTMIN] = __SIGRTMAX,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* common syscall defines for all architectures */
|
||||
|
||||
/* Note: although the syscall numbers change between architectures,
|
||||
most of them stay the same, so we handle it by puting ifdefs if
|
||||
most of them stay the same, so we handle it by putting ifdefs if
|
||||
necessary */
|
||||
|
||||
#include "syscall_nr.h"
|
||||
@ -669,7 +669,7 @@ typedef struct target_siginfo {
|
||||
* SIGBUS si_codes
|
||||
*/
|
||||
#define TARGET_BUS_ADRALN (1) /* invalid address alignment */
|
||||
#define TARGET_BUS_ADRERR (2) /* non-existant physical address */
|
||||
#define TARGET_BUS_ADRERR (2) /* non-existent physical address */
|
||||
#define TARGET_BUS_OBJERR (3) /* object specific hardware error */
|
||||
|
||||
/*
|
||||
@ -868,7 +868,7 @@ struct target_pollfd {
|
||||
#define TARGET_CDROM_GET_MCN 0x5311 /* Obtain the "Universal Product Code"
|
||||
if available (struct cdrom_mcn) */
|
||||
#define TARGET_CDROM_GET_UPC TARGET_CDROM_GET_MCN /* This one is depricated,
|
||||
but here anyway for compatability */
|
||||
but here anyway for compatibility */
|
||||
#define TARGET_CDROMRESET 0x5312 /* hard-reset the drive */
|
||||
#define TARGET_CDROMVOLREAD 0x5313 /* Get the drive's volume setting
|
||||
(struct cdrom_volctrl) */
|
||||
|
||||
@ -3518,7 +3518,7 @@ const struct m68k_opcode m68k_opcodes[] =
|
||||
|
||||
/* NOTE: The mcf5200 family programmer's reference manual does not
|
||||
indicate the byte form of the movea instruction is invalid (as it
|
||||
is on 68000 family cpus). However, experiments on the 5202 yeild
|
||||
is on 68000 family cpus). However, experiments on the 5202 yield
|
||||
unexpected results. The value is copied, but it is not sign extended
|
||||
(as is done with movea.w) and the top three bytes in the address
|
||||
register are not disturbed. I don't know if this is the intended
|
||||
|
||||
@ -111,7 +111,7 @@ typedef int PollingFunc(void *opaque);
|
||||
* qemu_add_wait_object.
|
||||
*
|
||||
* Polling callbacks really have nothing Windows specific in them, but
|
||||
* as they are a hack and are currenly not necessary under POSIX systems,
|
||||
* as they are a hack and are currently not necessary under POSIX systems,
|
||||
* they are only available when QEMU is running under Windows.
|
||||
*
|
||||
* @func: The function that does the polling, and returns 1 to force
|
||||
|
||||
4
nbd.c
4
nbd.c
@ -203,7 +203,7 @@ int nbd_negotiate(int csock, off_t size, uint32_t flags)
|
||||
return -1;
|
||||
}
|
||||
|
||||
TRACE("Negotation succeeded.");
|
||||
TRACE("Negotiation succeeded.");
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -215,7 +215,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
|
||||
uint64_t magic, s;
|
||||
uint16_t tmp;
|
||||
|
||||
TRACE("Receiving negotation.");
|
||||
TRACE("Receiving negotiation.");
|
||||
|
||||
if (read_sync(csock, buf, 8) != 8) {
|
||||
LOG("read failed");
|
||||
|
||||
@ -445,7 +445,7 @@ static int read_f(int argc, char **argv)
|
||||
}
|
||||
|
||||
if ((pattern_count < 0) || (pattern_count + pattern_offset > count)) {
|
||||
printf("pattern verfication range exceeds end of read data\n");
|
||||
printf("pattern verification range exceeds end of read data\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -480,7 +480,7 @@ void print_option_parameters(QEMUOptionParameter *list)
|
||||
printf("%s=%" PRId64 " ", list->name, list->value.n);
|
||||
break;
|
||||
default:
|
||||
printf("%s=(unkown type) ", list->name);
|
||||
printf("%s=(unknown type) ", list->name);
|
||||
break;
|
||||
}
|
||||
list++;
|
||||
|
||||
2
qerror.c
2
qerror.c
@ -223,7 +223,7 @@ static const QErrorStringTable qerror_table[] = {
|
||||
},
|
||||
{
|
||||
.error_fmt = QERR_UNDEFINED_ERROR,
|
||||
.desc = "An undefined error has ocurred",
|
||||
.desc = "An undefined error has occurred",
|
||||
},
|
||||
{
|
||||
.error_fmt = QERR_UNSUPPORTED,
|
||||
|
||||
2
savevm.c
2
savevm.c
@ -1552,7 +1552,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
|
||||
}
|
||||
|
||||
/*
|
||||
* this funtion has three return values:
|
||||
* this function has three return values:
|
||||
* negative: there was one error, and we have -errno.
|
||||
* 0 : We haven't finished, caller have to go again
|
||||
* 1 : We have finished, we can go to complete phase
|
||||
|
||||
@ -1901,7 +1901,7 @@ sub process {
|
||||
# printk should use KERN_* levels. Note that follow on printk's on the
|
||||
# same line do not need a level, so we use the current block context
|
||||
# to try and find and validate the current printk. In summary the current
|
||||
# printk includes all preceeding printk's which have no newline on the end.
|
||||
# printk includes all preceding printk's which have no newline on the end.
|
||||
# we assume the first bad printk is the one to report.
|
||||
if ($line =~ /\bprintk\((?!KERN_)\s*"/) {
|
||||
my $ok = 0;
|
||||
|
||||
@ -18,7 +18,7 @@ Linux user mode emulation status:
|
||||
a few programs start to run. Most crash at a certain point, dereferencing a
|
||||
NULL pointer. It seems that the UNIQUE register is not initialized properly.
|
||||
It may appear that old executables, not relying on TLS support, run but
|
||||
this is to be prooved...
|
||||
this is to be proved...
|
||||
|
||||
Full system emulation status:
|
||||
* Alpha PALCode emulation is in a very early stage and is not sufficient
|
||||
|
||||
@ -243,7 +243,7 @@ typedef struct CPUMBState {
|
||||
#define DRTE_FLAG (1 << 17)
|
||||
#define DRTB_FLAG (1 << 18)
|
||||
#define D_FLAG (1 << 19) /* Bit in ESR. */
|
||||
/* TB dependant CPUState. */
|
||||
/* TB dependent CPUState. */
|
||||
#define IFLAGS_TB_MASK (D_FLAG | IMM_FLAG | DRTI_FLAG | DRTE_FLAG | DRTB_FLAG)
|
||||
uint32_t iflags;
|
||||
|
||||
|
||||
@ -120,7 +120,7 @@ static inline int sign_extend(unsigned int val, unsigned int width)
|
||||
|
||||
static inline void t_sync_flags(DisasContext *dc)
|
||||
{
|
||||
/* Synch the tb dependant flags between translator and runtime. */
|
||||
/* Synch the tb dependent flags between translator and runtime. */
|
||||
if (dc->tb_flags != dc->synced_flags) {
|
||||
tcg_gen_movi_tl(env_iflags, dc->tb_flags);
|
||||
dc->synced_flags = dc->tb_flags;
|
||||
@ -1122,7 +1122,7 @@ static void dec_store(DisasContext *dc)
|
||||
if ((dc->env->pvr.regs[2] & PVR2_UNALIGNED_EXC_MASK) && size > 1) {
|
||||
tcg_gen_movi_tl(cpu_SR[SR_PC], dc->pc);
|
||||
/* FIXME: if the alignment is wrong, we should restore the value
|
||||
* in memory. One possible way to acheive this is to probe
|
||||
* in memory. One possible way to achieve this is to probe
|
||||
* the MMU prior to the memaccess, thay way we could put
|
||||
* the alignment checks in between the probe and the mem
|
||||
* access.
|
||||
|
||||
@ -678,7 +678,7 @@ static inline int mips_vpe_active(CPUState *env)
|
||||
if (!(env->mvp->CP0_MVPControl & (1 << CP0MVPCo_EVP))) {
|
||||
active = 0;
|
||||
}
|
||||
/* Check that the VPE is actived. */
|
||||
/* Check that the VPE is activated. */
|
||||
if (!(env->CP0_VPEConf0 & (1 << CP0VPEC0_VPA))) {
|
||||
active = 0;
|
||||
}
|
||||
|
||||
@ -302,7 +302,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
|
||||
for (i = 0; i < MIPS_FPU_MAX; i++)
|
||||
load_fpu(f, &env->fpus[i]);
|
||||
|
||||
/* XXX: ensure compatiblity for halted bit ? */
|
||||
/* XXX: ensure compatibility for halted bit ? */
|
||||
tlb_flush(env, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1004,7 +1004,7 @@ struct CPUPPCState {
|
||||
int error_code;
|
||||
uint32_t pending_interrupts;
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
/* This is the IRQ controller, which is implementation dependant
|
||||
/* This is the IRQ controller, which is implementation dependent
|
||||
* and only relevant when emulating a complete machine.
|
||||
*/
|
||||
uint32_t irq_input_state;
|
||||
@ -1024,7 +1024,7 @@ struct CPUPPCState {
|
||||
|
||||
/* Those resources are used only in Qemu core */
|
||||
target_ulong hflags; /* hflags is a MSR & HFLAGS_MASK */
|
||||
target_ulong hflags_nmsr; /* specific hflags, not comming from MSR */
|
||||
target_ulong hflags_nmsr; /* specific hflags, not coming from MSR */
|
||||
int mmu_idx; /* precomputed MMU index to speed up mem accesses */
|
||||
|
||||
/* Power management */
|
||||
|
||||
@ -11,7 +11,7 @@ int main (void)
|
||||
|
||||
printf("static const uint8_t mfrom_ROM_table[602] =\n{\n ");
|
||||
for (i = 0; i < 602; i++) {
|
||||
/* Extremly decomposed:
|
||||
/* Extremely decomposed:
|
||||
* -T0 / 256
|
||||
* T0 = 256 * log10(10 + 1.0) + 0.5
|
||||
*/
|
||||
|
||||
@ -1795,7 +1795,7 @@ void helper_rfsvc (void)
|
||||
/* 602 specific instructions */
|
||||
/* mfrom is the most crazy instruction ever seen, imho ! */
|
||||
/* Real implementation uses a ROM table. Do the same */
|
||||
/* Extremly decomposed:
|
||||
/* Extremely decomposed:
|
||||
* -arg / 256
|
||||
* return 256 * log10(10 + 1.0) + 0.5
|
||||
*/
|
||||
@ -3070,7 +3070,7 @@ static inline uint32_t word_reverse(uint32_t val)
|
||||
(byte_reverse(val >> 8) << 16) | (byte_reverse(val) << 24);
|
||||
}
|
||||
|
||||
#define MASKBITS 16 // Random value - to be fixed (implementation dependant)
|
||||
#define MASKBITS 16 // Random value - to be fixed (implementation dependent)
|
||||
target_ulong helper_brinc (target_ulong arg1, target_ulong arg2)
|
||||
{
|
||||
uint32_t a, b, d, mask;
|
||||
|
||||
@ -817,7 +817,7 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr)
|
||||
/*
|
||||
* TODO : Evaluate CCR and check if the cache is on or off.
|
||||
* Now CCR is not in CPUSH4State, but in SH7750State.
|
||||
* When you move the ccr inot CPUSH4State, the code will be
|
||||
* When you move the ccr into CPUSH4State, the code will be
|
||||
* as follows.
|
||||
*/
|
||||
#if 0
|
||||
|
||||
@ -15,7 +15,7 @@ CPU common:
|
||||
- NPC/PC static optimisations (use JUMP_TB when possible)? (Is this
|
||||
obsolete?)
|
||||
- Synthetic instructions
|
||||
- MMU model dependant on CPU model
|
||||
- MMU model dependent on CPU model
|
||||
- Select ASI helper at translation time (on V9 only if known)
|
||||
- KQemu/KVM support for VM only
|
||||
- Hardware breakpoint/watchpoint support
|
||||
|
||||
@ -1555,7 +1555,7 @@ static void temp_save(TCGContext *s, int temp, TCGRegSet allocated_regs)
|
||||
}
|
||||
}
|
||||
|
||||
/* save globals to their cannonical location and assume they can be
|
||||
/* save globals to their canonical location and assume they can be
|
||||
modified be the following code. 'allocated_regs' is used in case a
|
||||
temporary registers needs to be allocated to store a constant. */
|
||||
static void save_globals(TCGContext *s, TCGRegSet allocated_regs)
|
||||
|
||||
@ -178,7 +178,7 @@ typedef tcg_target_ulong TCGArg;
|
||||
/* Define a type and accessor macros for variables. Using a struct is
|
||||
nice because it gives some level of type safely. Ideally the compiler
|
||||
be able to see through all this. However in practice this is not true,
|
||||
expecially on targets with braindamaged ABIs (e.g. i386).
|
||||
especially on targets with braindamaged ABIs (e.g. i386).
|
||||
We use plain int by default to avoid this runtime overhead.
|
||||
Users of tcg_gen_* don't need to know about any of this, and should
|
||||
treat TCGv as an opaque type.
|
||||
|
||||
@ -166,7 +166,7 @@ static void test_nested_structs(void)
|
||||
QString *str;
|
||||
|
||||
ud1.integer = 42;
|
||||
ud1.string = strdup("fourty two");
|
||||
ud1.string = strdup("forty two");
|
||||
|
||||
/* sanity check */
|
||||
mo = qmp_output_visitor_new();
|
||||
@ -179,13 +179,13 @@ static void test_nested_structs(void)
|
||||
g_assert(obj);
|
||||
qobject_decref(obj);
|
||||
|
||||
ud2.string = strdup("fourty three");
|
||||
ud2.dict.string = strdup("fourty four");
|
||||
ud2.string = strdup("forty three");
|
||||
ud2.dict.string = strdup("forty four");
|
||||
ud2.dict.dict.userdef = ud1_p;
|
||||
ud2.dict.dict.string = strdup("fourty five");
|
||||
ud2.dict.dict.string = strdup("forty five");
|
||||
ud2.dict.has_dict2 = true;
|
||||
ud2.dict.dict2.userdef = ud1_p;
|
||||
ud2.dict.dict2.string = strdup("fourty six");
|
||||
ud2.dict.dict2.string = strdup("forty six");
|
||||
|
||||
/* c type -> qobject */
|
||||
mo = qmp_output_visitor_new();
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
\
|
||||
/* Now we can test with the required version. */ \
|
||||
if (version < __LINUX_KERNEL_VERSION) \
|
||||
/* Not sufficent. */ \
|
||||
/* Not sufficient. */ \
|
||||
FATAL ("FATAL: kernel too old\n"); \
|
||||
\
|
||||
_dl_osversion = version; \
|
||||
|
||||
@ -20,7 +20,7 @@ int main(void)
|
||||
if (t != 10)
|
||||
err();
|
||||
|
||||
/* make sure moveq doesnt clobber the zflag. */
|
||||
/* make sure moveq doesn't clobber the zflag. */
|
||||
cris_tst_cc_init();
|
||||
asm volatile ("setf vnc\n");
|
||||
asm volatile ("clearf z\n");
|
||||
@ -29,7 +29,7 @@ int main(void)
|
||||
if (t != 0)
|
||||
err();
|
||||
|
||||
/* make sure moveq doesnt clobber the nflag.
|
||||
/* make sure moveq doesn't clobber the nflag.
|
||||
Also check large immediates */
|
||||
cris_tst_cc_init();
|
||||
asm volatile ("setf zvc\n");
|
||||
|
||||
4
ui/vnc.c
4
ui/vnc.c
@ -1732,7 +1732,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
|
||||
|
||||
/*
|
||||
* Start from the end because the encodings are sent in order of preference.
|
||||
* This way the prefered encoding (first encoding defined in the array)
|
||||
* This way the preferred encoding (first encoding defined in the array)
|
||||
* will be set at the end of the loop.
|
||||
*/
|
||||
for (i = n_encodings - 1; i >= 0; i--) {
|
||||
@ -2117,7 +2117,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len)
|
||||
|
||||
/* Compare expected vs actual challenge response */
|
||||
if (memcmp(response, data, VNC_AUTH_CHALLENGE_SIZE) != 0) {
|
||||
VNC_DEBUG("Client challenge reponse did not match\n");
|
||||
VNC_DEBUG("Client challenge response did not match\n");
|
||||
goto reject;
|
||||
} else {
|
||||
VNC_DEBUG("Accepting VNC challenge response\n");
|
||||
|
||||
2
vl.c
2
vl.c
@ -820,7 +820,7 @@ static void validate_bootdevices(char *devices)
|
||||
/* Allowed boot devices are:
|
||||
* a-b: floppy disk drives
|
||||
* c-f: IDE disk drives
|
||||
* g-m: machine implementation dependant drives
|
||||
* g-m: machine implementation dependent drives
|
||||
* n-p: network devices
|
||||
* It's up to each machine implementation to check if the given boot
|
||||
* devices match the actual hardware implementation and firmware
|
||||
|
||||
Loading…
Reference in New Issue
Block a user