proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-07 12:58:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sweil/fixes' into staging

Browse Source 
* sweil/fixes:
  qemu-timer: Fix limits for w32 mmtimer
  qom: Fix memory leak in function container_get
  hw/pc_sysfw: Fix memory leak
  qdev: Fix memory leak in function set_pci_devfn
  arm-semi: Rename SYS_XXX macros to TARGET_SYS_XXX (fixes compiler warning)
  target-mips: Remove unused inline function
This commit is contained in:
Anthony Liguori 2012-05-08 09:36:18 -05:00
commit 4b5463bfdf
6 changed files with 63 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
arm-semi.c
View File

@ -37,26 +37,26 @@
#include "hw/arm-misc.h" #include "hw/arm-misc.h"
#endif #endif
#define SYS_OPEN 0x01 #define TARGET_SYS_OPEN 0x01
#define SYS_CLOSE 0x02 #define TARGET_SYS_CLOSE 0x02
#define SYS_WRITEC 0x03 #define TARGET_SYS_WRITEC 0x03
#define SYS_WRITE0 0x04 #define TARGET_SYS_WRITE0 0x04
#define SYS_WRITE 0x05 #define TARGET_SYS_WRITE 0x05
#define SYS_READ 0x06 #define TARGET_SYS_READ 0x06
#define SYS_READC 0x07 #define TARGET_SYS_READC 0x07
#define SYS_ISTTY 0x09 #define TARGET_SYS_ISTTY 0x09
#define SYS_SEEK 0x0a #define TARGET_SYS_SEEK 0x0a
#define SYS_FLEN 0x0c #define TARGET_SYS_FLEN 0x0c
#define SYS_TMPNAM 0x0d #define TARGET_SYS_TMPNAM 0x0d
#define SYS_REMOVE 0x0e #define TARGET_SYS_REMOVE 0x0e
#define SYS_RENAME 0x0f #define TARGET_SYS_RENAME 0x0f
#define SYS_CLOCK 0x10 #define TARGET_SYS_CLOCK 0x10
#define SYS_TIME 0x11 #define TARGET_SYS_TIME 0x11
#define SYS_SYSTEM 0x12 #define TARGET_SYS_SYSTEM 0x12
#define SYS_ERRNO 0x13 #define TARGET_SYS_ERRNO 0x13
#define SYS_GET_CMDLINE 0x15 #define TARGET_SYS_GET_CMDLINE 0x15
#define SYS_HEAPINFO 0x16 #define TARGET_SYS_HEAPINFO 0x16
#define SYS_EXIT 0x18 #define TARGET_SYS_EXIT 0x18
#ifndef O_BINARY #ifndef O_BINARY
#define O_BINARY 0 #define O_BINARY 0
@ -138,11 +138,11 @@ static void arm_semi_cb(CPUARMState *env, target_ulong ret, target_ulong err)
} else { } else {
/* Fixup syscalls that use nonstardard return conventions. */ /* Fixup syscalls that use nonstardard return conventions. */
switch (env->regs[0]) { switch (env->regs[0]) {
case SYS_WRITE: case TARGET_SYS_WRITE:
case SYS_READ: case TARGET_SYS_READ:
env->regs[0] = arm_semi_syscall_len - ret; env->regs[0] = arm_semi_syscall_len - ret;
break; break;
case SYS_SEEK: case TARGET_SYS_SEEK:
env->regs[0] = 0; env->regs[0] = 0;
break; break;
default: default:
@ -190,7 +190,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
nr = env->regs[0]; nr = env->regs[0];
args = env->regs[1]; args = env->regs[1];
switch (nr) { switch (nr) {
case SYS_OPEN: case TARGET_SYS_OPEN:
if (!(s = lock_user_string(ARG(0)))) if (!(s = lock_user_string(ARG(0))))
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
@ -211,14 +211,14 @@ uint32_t do_arm_semihosting(CPUARMState *env)
} }
unlock_user(s, ARG(0), 0); unlock_user(s, ARG(0), 0);
return ret; return ret;
case SYS_CLOSE: case TARGET_SYS_CLOSE:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "close,%x", ARG(0)); gdb_do_syscall(arm_semi_cb, "close,%x", ARG(0));
return env->regs[0]; return env->regs[0];
} else { } else {
return set_swi_errno(ts, close(ARG(0))); return set_swi_errno(ts, close(ARG(0)));
} }
case SYS_WRITEC: case TARGET_SYS_WRITEC:
{ {
char c; char c;
@ -233,7 +233,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return write(STDERR_FILENO, &c, 1); return write(STDERR_FILENO, &c, 1);
} }
} }
case SYS_WRITE0: case TARGET_SYS_WRITE0:
if (!(s = lock_user_string(args))) if (!(s = lock_user_string(args)))
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
@ -246,7 +246,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
} }
unlock_user(s, args, 0); unlock_user(s, args, 0);
return ret; return ret;
case SYS_WRITE: case TARGET_SYS_WRITE:
len = ARG(2); len = ARG(2);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
arm_semi_syscall_len = len; arm_semi_syscall_len = len;
@ -262,7 +262,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return -1; return -1;
return len - ret; return len - ret;
} }
case SYS_READ: case TARGET_SYS_READ:
len = ARG(2); len = ARG(2);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
arm_semi_syscall_len = len; arm_semi_syscall_len = len;
@ -280,17 +280,17 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return -1; return -1;
return len - ret; return len - ret;
} }
case SYS_READC: case TARGET_SYS_READC:
/* XXX: Read from debug cosole. Not implemented. */ /* XXX: Read from debug cosole. Not implemented. */
return 0; return 0;
case SYS_ISTTY: case TARGET_SYS_ISTTY:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "isatty,%x", ARG(0)); gdb_do_syscall(arm_semi_cb, "isatty,%x", ARG(0));
return env->regs[0]; return env->regs[0];
} else { } else {
return isatty(ARG(0)); return isatty(ARG(0));
} }
case SYS_SEEK: case TARGET_SYS_SEEK:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "lseek,%x,%x,0", ARG(0), ARG(1)); gdb_do_syscall(arm_semi_cb, "lseek,%x,%x,0", ARG(0), ARG(1));
return env->regs[0]; return env->regs[0];
@ -300,7 +300,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return -1; return -1;
return 0; return 0;
} }
case SYS_FLEN: case TARGET_SYS_FLEN:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_flen_cb, "fstat,%x,%x", gdb_do_syscall(arm_semi_flen_cb, "fstat,%x,%x",
ARG(0), env->regs[13]-64); ARG(0), env->regs[13]-64);
@ -312,10 +312,10 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return -1; return -1;
return buf.st_size; return buf.st_size;
} }
case SYS_TMPNAM: case TARGET_SYS_TMPNAM:
/* XXX: Not implemented. */ /* XXX: Not implemented. */
return -1; return -1;
case SYS_REMOVE: case TARGET_SYS_REMOVE:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "unlink,%s", ARG(0), (int)ARG(1)+1); gdb_do_syscall(arm_semi_cb, "unlink,%s", ARG(0), (int)ARG(1)+1);
ret = env->regs[0]; ret = env->regs[0];
@ -327,7 +327,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
unlock_user(s, ARG(0), 0); unlock_user(s, ARG(0), 0);
} }
return ret; return ret;
case SYS_RENAME: case TARGET_SYS_RENAME:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "rename,%s,%s", gdb_do_syscall(arm_semi_cb, "rename,%s,%s",
ARG(0), (int)ARG(1)+1, ARG(2), (int)ARG(3)+1); ARG(0), (int)ARG(1)+1, ARG(2), (int)ARG(3)+1);
@ -347,11 +347,11 @@ uint32_t do_arm_semihosting(CPUARMState *env)
unlock_user(s, ARG(0), 0); unlock_user(s, ARG(0), 0);
return ret; return ret;
} }
case SYS_CLOCK: case TARGET_SYS_CLOCK:
return clock() / (CLOCKS_PER_SEC / 100); return clock() / (CLOCKS_PER_SEC / 100);
case SYS_TIME: case TARGET_SYS_TIME:
return set_swi_errno(ts, time(NULL)); return set_swi_errno(ts, time(NULL));
case SYS_SYSTEM: case TARGET_SYS_SYSTEM:
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "system,%s", ARG(0), (int)ARG(1)+1); gdb_do_syscall(arm_semi_cb, "system,%s", ARG(0), (int)ARG(1)+1);
return env->regs[0]; return env->regs[0];
@ -363,13 +363,13 @@ uint32_t do_arm_semihosting(CPUARMState *env)
unlock_user(s, ARG(0), 0); unlock_user(s, ARG(0), 0);
return ret; return ret;
} }
case SYS_ERRNO: case TARGET_SYS_ERRNO:
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
return ts->swi_errno; return ts->swi_errno;
#else #else
return syscall_err; return syscall_err;
#endif #endif
case SYS_GET_CMDLINE: case TARGET_SYS_GET_CMDLINE:
{ {
/* Build a command-line from the original argv. /* Build a command-line from the original argv.
* *
@ -452,7 +452,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
return status; return status;
} }
case SYS_HEAPINFO: case TARGET_SYS_HEAPINFO:
{ {
uint32_t *ptr; uint32_t *ptr;
uint32_t limit; uint32_t limit;
@ -498,7 +498,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
#endif #endif
return 0; return 0;
} }
case SYS_EXIT: case TARGET_SYS_EXIT:
gdb_exit(env, 0); gdb_exit(env, 0);
exit(0); exit(0);
default: default:

3
hw/pc_sysfw.c
View File

@ -85,6 +85,9 @@ static void pc_fw_add_pflash_drv(void)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
opts = drive_add(IF_PFLASH, -1, filename, "readonly=on"); opts = drive_add(IF_PFLASH, -1, filename, "readonly=on");
g_free(filename);
if (opts == NULL) { if (opts == NULL) {
return; return;
} }

1
hw/qdev-properties.c
View File

@ -834,6 +834,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
visit_type_str(v, &str, name, &local_err); visit_type_str(v, &str, name, &local_err);
if (local_err) { if (local_err) {
error_free(local_err);
return set_int32(obj, v, opaque, name, errp); return set_int32(obj, v, opaque, name, errp);
} }

34
qemu-timer.c
View File

@ -611,7 +611,7 @@ static void unix_stop_timer(struct qemu_alarm_timer *t)
#ifdef _WIN32 #ifdef _WIN32
static MMRESULT mm_timer; static MMRESULT mm_timer;
static unsigned mm_period; static TIMECAPS mm_tc;
static void CALLBACK mm_alarm_handler(UINT uTimerID, UINT uMsg, static void CALLBACK mm_alarm_handler(UINT uTimerID, UINT uMsg,
DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dwUser, DWORD_PTR dw1,
@ -628,16 +628,12 @@ static void CALLBACK mm_alarm_handler(UINT uTimerID, UINT uMsg,
static int mm_start_timer(struct qemu_alarm_timer *t) static int mm_start_timer(struct qemu_alarm_timer *t)
{ {
TIMECAPS tc; timeGetDevCaps(&mm_tc, sizeof(mm_tc));
memset(&tc, 0, sizeof(tc)); timeBeginPeriod(mm_tc.wPeriodMin);
timeGetDevCaps(&tc, sizeof(tc));
mm_period = tc.wPeriodMin; mm_timer = timeSetEvent(mm_tc.wPeriodMin, /* interval (ms) */
timeBeginPeriod(mm_period); mm_tc.wPeriodMin, /* resolution */
mm_timer = timeSetEvent(1, /* interval (ms) */
mm_period, /* resolution */
mm_alarm_handler, /* function */ mm_alarm_handler, /* function */
(DWORD_PTR)t, /* parameter */ (DWORD_PTR)t, /* parameter */
TIME_ONESHOT | TIME_CALLBACK_FUNCTION); TIME_ONESHOT | TIME_CALLBACK_FUNCTION);
@ -645,7 +641,7 @@ static int mm_start_timer(struct qemu_alarm_timer *t)
if (!mm_timer) { if (!mm_timer) {
fprintf(stderr, "Failed to initialize win32 alarm timer: %ld\n", fprintf(stderr, "Failed to initialize win32 alarm timer: %ld\n",
GetLastError()); GetLastError());
timeEndPeriod(mm_period); timeEndPeriod(mm_tc.wPeriodMin);
return -1; return -1;
} }
@ -655,23 +651,21 @@ static int mm_start_timer(struct qemu_alarm_timer *t)
static void mm_stop_timer(struct qemu_alarm_timer *t) static void mm_stop_timer(struct qemu_alarm_timer *t)
{ {
timeKillEvent(mm_timer); timeKillEvent(mm_timer);
timeEndPeriod(mm_period); timeEndPeriod(mm_tc.wPeriodMin);
} }
static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta) static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta)
{ {
int64_t nearest_delta_ms = delta / 1000000; int64_t nearest_delta_ms = delta / 1000000;
if (nearest_delta_ms < 1) { if (nearest_delta_ms < mm_tc.wPeriodMin) {
nearest_delta_ms = 1; nearest_delta_ms = mm_tc.wPeriodMin;
} } else if (nearest_delta_ms > mm_tc.wPeriodMax) {
/* UINT_MAX can be 32 bit */ nearest_delta_ms = mm_tc.wPeriodMax;
if (nearest_delta_ms > UINT_MAX) {
nearest_delta_ms = UINT_MAX;
} }
timeKillEvent(mm_timer); timeKillEvent(mm_timer);
mm_timer = timeSetEvent((unsigned int) nearest_delta_ms, mm_timer = timeSetEvent((UINT)nearest_delta_ms,
mm_period, mm_tc.wPeriodMin,
mm_alarm_handler, mm_alarm_handler,
(DWORD_PTR)t, (DWORD_PTR)t,
TIME_ONESHOT | TIME_CALLBACK_FUNCTION); TIME_ONESHOT | TIME_CALLBACK_FUNCTION);
@ -680,7 +674,7 @@ static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta)
fprintf(stderr, "Failed to re-arm win32 alarm timer %ld\n", fprintf(stderr, "Failed to re-arm win32 alarm timer %ld\n",
GetLastError()); GetLastError());
timeEndPeriod(mm_period); timeEndPeriod(mm_tc.wPeriodMin);
exit(1); exit(1);
} }
} }

2
qom/container.c
View File

@ -43,6 +43,8 @@ Object *container_get(Object *root, const char *path)
} }
} }
g_strfreev(parts);
return obj; return obj;
} }

6
target-mips/op_helper.c
View File

@ -192,12 +192,6 @@ static inline uint64_t get_HILO (void)
return ((uint64_t)(env->active_tc.HI[0]) << 32) | (uint32_t)env->active_tc.LO[0]; return ((uint64_t)(env->active_tc.HI[0]) << 32) | (uint32_t)env->active_tc.LO[0];
} }
static inline void set_HILO (uint64_t HILO)
{
env->active_tc.LO[0] = (int32_t)HILO;
env->active_tc.HI[0] = (int32_t)(HILO >> 32);
}
static inline void set_HIT0_LO (target_ulong arg1, uint64_t HILO) static inline void set_HIT0_LO (target_ulong arg1, uint64_t HILO)
{ {
env->active_tc.LO[0] = (int32_t)(HILO & 0xFFFFFFFF); env->active_tc.LO[0] = (int32_t)(HILO & 0xFFFFFFFF);