OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

This commit is contained in:
Anthony Liguori 2011-06-08 12:13:58 -05:00
parent 99cce9fa4e 7665385a85
commit 13748cf499
25 changed files with 24 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -170,6 +170,7 @@ user-obj-y += cutils.o cache-utils.o
hw-obj-y = hw-obj-y =
hw-obj-y += vl.o loader.o hw-obj-y += vl.o loader.o
hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
hw-obj-y += fw_cfg.o hw-obj-y += fw_cfg.o
hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
hw-obj-$(CONFIG_PCI) += msix.o msi.o hw-obj-$(CONFIG_PCI) += msix.o msi.o

1
Makefile.target
View File

@ -190,7 +190,6 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
# need to fix this properly # need to fix this properly
obj-$(CONFIG_NO_PCI) += pci-stub.o obj-$(CONFIG_NO_PCI) += pci-stub.o
obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
obj-y += vhost_net.o obj-y += vhost_net.o
obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_VHOST_NET) += vhost.o
obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o

2
audio/audio_pt_int.c
View File

@ -6,8 +6,6 @@
#include "audio_int.h" #include "audio_int.h"
#include "audio_pt_int.h" #include "audio_pt_int.h"
#include <signal.h>
static void GCC_FMT_ATTR(3, 4) logerr (struct audio_pt *pt, int err, static void GCC_FMT_ATTR(3, 4) logerr (struct audio_pt *pt, int err,
const char *fmt, ...) const char *fmt, ...)
{ {

1
audio/sdlaudio.c
View File

@ -32,7 +32,6 @@
#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
#include <pthread.h> #include <pthread.h>
#endif #endif
#include <signal.h>
#endif #endif
#define AUDIO_CAP "sdl" #define AUDIO_CAP "sdl"

2
block/raw-posix.c
View File

@ -43,7 +43,6 @@
#ifdef __sun__ #ifdef __sun__
#define _POSIX_PTHREAD_SEMANTICS 1 #define _POSIX_PTHREAD_SEMANTICS 1
#include <signal.h>
#include <sys/dkio.h> #include <sys/dkio.h>
#endif #endif
#ifdef __linux__ #ifdef __linux__
@ -53,7 +52,6 @@
#include <linux/fd.h> #include <linux/fd.h>
#endif #endif
#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <signal.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <sys/cdio.h> #include <sys/cdio.h>
#endif #endif

1
bsd-user/syscall.c
View File

@ -31,7 +31,6 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <signal.h>
#include <utime.h> #include <utime.h>
#include "qemu.h" #include "qemu.h"

3
darwin-user/signal.c
View File

@ -21,7 +21,6 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include <errno.h> #include <errno.h>
#include <sys/ucontext.h> #include <sys/ucontext.h>
@ -32,8 +31,6 @@
#undef uc_link #undef uc_link
#endif #endif
#include <signal.h>
#include "qemu.h" #include "qemu.h"
#include "qemu-common.h" #include "qemu-common.h"

1
exec.c
View File

@ -36,7 +36,6 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
#include <qemu.h> #include <qemu.h>
#include <signal.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/param.h> #include <sys/param.h>
#if __FreeBSD_version >= 700104 #if __FreeBSD_version >= 700104

1
linux-user/signal.c
View File

@ -21,7 +21,6 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <sys/ucontext.h> #include <sys/ucontext.h>

2
net/slirp.c
View File

@ -614,7 +614,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str,
} }
fwd = qemu_malloc(sizeof(struct GuestFwd)); fwd = qemu_malloc(sizeof(struct GuestFwd));
snprintf(buf, sizeof(buf), "guestfwd.tcp:%d", port); snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port);
fwd->hd = qemu_chr_open(buf, p, NULL); fwd->hd = qemu_chr_open(buf, p, NULL);
if (!fwd->hd) { if (!fwd->hd) {
error_report("could not open guest forwarding device '%s'", buf); error_report("could not open guest forwarding device '%s'", buf);

1
net/tap.c
View File

@ -27,7 +27,6 @@
#include "config-host.h" #include "config-host.h"
#include <signal.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>

1
posix-aio-compat.c
View File

@ -17,7 +17,6 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <signal.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

1
qemu-char.c
View File

@ -35,7 +35,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>

1
qemu-common.h
View File

@ -39,6 +39,7 @@ typedef struct Monitor Monitor;
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <assert.h> #include <assert.h>
#include <signal.h>
#ifdef _WIN32 #ifdef _WIN32
#include "qemu-os-win32.h" #include "qemu-os-win32.h"

1
qemu-progress.c
View File

@ -26,7 +26,6 @@
#include "osdep.h" #include "osdep.h"
#include "sysemu.h" #include "sysemu.h"
#include <stdio.h> #include <stdio.h>
#include <signal.h>
struct progress_state { struct progress_state {
float current; float current;

1
savevm.c
View File

@ -23,7 +23,6 @@
*/ */
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>

1
target-i386/helper.c
View File

@ -21,7 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <signal.h>
#include "cpu.h" #include "cpu.h"
#include "exec-all.h" #include "exec-all.h"

2
target-i386/translate.c
View File

@ -7538,7 +7538,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
break; break;
case 5: /* lfence */ case 5: /* lfence */
case 6: /* mfence */ case 6: /* mfence */
if ((modrm & 0xc7) != 0xc0 || !(s->cpuid_features & CPUID_SSE)) if ((modrm & 0xc7) != 0xc0 || !(s->cpuid_features & CPUID_SSE2))
goto illegal_op; goto illegal_op;
break; break;
case 7: /* sfence / clflush */ case 7: /* sfence / clflush */

43
target-m68k/translate.c
View File

@ -171,9 +171,6 @@ typedef void (*disas_proc)(DisasContext *, uint16_t);
static void disas_##name (DisasContext *s, uint16_t insn) static void disas_##name (DisasContext *s, uint16_t insn)
#endif #endif
/* FIXME: Remove this. */
#define gen_im32(val) tcg_const_i32(val)
/* Generate a load from the specified address. Narrow values are /* Generate a load from the specified address. Narrow values are
sign extended to full register width. */ sign extended to full register width. */
static inline TCGv gen_load(DisasContext * s, int opsize, TCGv addr, int sign) static inline TCGv gen_load(DisasContext * s, int opsize, TCGv addr, int sign)
@ -339,7 +336,7 @@ static TCGv gen_lea_indexed(DisasContext *s, int opsize, TCGv base)
if ((ext & 0x80) == 0) { if ((ext & 0x80) == 0) {
/* base not suppressed */ /* base not suppressed */
if (IS_NULL_QREG(base)) { if (IS_NULL_QREG(base)) {
base = gen_im32(offset + bd); base = tcg_const_i32(offset + bd);
bd = 0; bd = 0;
} }
if (!IS_NULL_QREG(add)) { if (!IS_NULL_QREG(add)) {
@ -355,7 +352,7 @@ static TCGv gen_lea_indexed(DisasContext *s, int opsize, TCGv base)
add = tmp; add = tmp;
} }
} else { } else {
add = gen_im32(bd); add = tcg_const_i32(bd);
} }
if ((ext & 3) != 0) { if ((ext & 3) != 0) {
/* memory indirect */ /* memory indirect */
@ -536,15 +533,15 @@ static TCGv gen_lea(DisasContext *s, uint16_t insn, int opsize)
case 0: /* Absolute short. */ case 0: /* Absolute short. */
offset = ldsw_code(s->pc); offset = ldsw_code(s->pc);
s->pc += 2; s->pc += 2;
return gen_im32(offset); return tcg_const_i32(offset);
case 1: /* Absolute long. */ case 1: /* Absolute long. */
offset = read_im32(s); offset = read_im32(s);
return gen_im32(offset); return tcg_const_i32(offset);
case 2: /* pc displacement */ case 2: /* pc displacement */
offset = s->pc; offset = s->pc;
offset += ldsw_code(s->pc); offset += ldsw_code(s->pc);
s->pc += 2; s->pc += 2;
return gen_im32(offset); return tcg_const_i32(offset);
case 3: /* pc index+displacement. */ case 3: /* pc index+displacement. */
return gen_lea_indexed(s, opsize, NULL_QREG); return gen_lea_indexed(s, opsize, NULL_QREG);
case 4: /* Immediate. */ case 4: /* Immediate. */
@ -1209,16 +1206,16 @@ DISAS_INSN(arith_im)
break; break;
case 2: /* subi */ case 2: /* subi */
tcg_gen_mov_i32(dest, src1); tcg_gen_mov_i32(dest, src1);
gen_helper_xflag_lt(QREG_CC_X, dest, gen_im32(im)); gen_helper_xflag_lt(QREG_CC_X, dest, tcg_const_i32(im));
tcg_gen_subi_i32(dest, dest, im); tcg_gen_subi_i32(dest, dest, im);
gen_update_cc_add(dest, gen_im32(im)); gen_update_cc_add(dest, tcg_const_i32(im));
s->cc_op = CC_OP_SUB; s->cc_op = CC_OP_SUB;
break; break;
case 3: /* addi */ case 3: /* addi */
tcg_gen_mov_i32(dest, src1); tcg_gen_mov_i32(dest, src1);
tcg_gen_addi_i32(dest, dest, im); tcg_gen_addi_i32(dest, dest, im);
gen_update_cc_add(dest, gen_im32(im)); gen_update_cc_add(dest, tcg_const_i32(im));
gen_helper_xflag_lt(QREG_CC_X, dest, gen_im32(im)); gen_helper_xflag_lt(QREG_CC_X, dest, tcg_const_i32(im));
s->cc_op = CC_OP_ADD; s->cc_op = CC_OP_ADD;
break; break;
case 5: /* eori */ case 5: /* eori */
@ -1228,7 +1225,7 @@ DISAS_INSN(arith_im)
case 6: /* cmpi */ case 6: /* cmpi */
tcg_gen_mov_i32(dest, src1); tcg_gen_mov_i32(dest, src1);
tcg_gen_subi_i32(dest, dest, im); tcg_gen_subi_i32(dest, dest, im);
gen_update_cc_add(dest, gen_im32(im)); gen_update_cc_add(dest, tcg_const_i32(im));
s->cc_op = CC_OP_SUB; s->cc_op = CC_OP_SUB;
break; break;
default: default:
@ -1324,8 +1321,8 @@ DISAS_INSN(clr)
default: default:
abort(); abort();
} }
DEST_EA(insn, opsize, gen_im32(0), NULL); DEST_EA(insn, opsize, tcg_const_i32(0), NULL);
gen_logic_cc(s, gen_im32(0)); gen_logic_cc(s, tcg_const_i32(0));
} }
static TCGv gen_get_ccr(DisasContext *s) static TCGv gen_get_ccr(DisasContext *s)
@ -1589,7 +1586,7 @@ DISAS_INSN(jump)
} }
if ((insn & 0x40) == 0) { if ((insn & 0x40) == 0) {
/* jsr */ /* jsr */
gen_push(s, gen_im32(s->pc)); gen_push(s, tcg_const_i32(s->pc));
} }
gen_jmp(s, tmp); gen_jmp(s, tmp);
} }
@ -1617,7 +1614,7 @@ DISAS_INSN(addsubq)
tcg_gen_addi_i32(dest, dest, val); tcg_gen_addi_i32(dest, dest, val);
} }
} else { } else {
src2 = gen_im32(val); src2 = tcg_const_i32(val);
if (insn & 0x0100) { if (insn & 0x0100) {
gen_helper_xflag_lt(QREG_CC_X, dest, src2); gen_helper_xflag_lt(QREG_CC_X, dest, src2);
tcg_gen_subi_i32(dest, dest, val); tcg_gen_subi_i32(dest, dest, val);
@ -1666,7 +1663,7 @@ DISAS_INSN(branch)
} }
if (op == 1) { if (op == 1) {
/* bsr */ /* bsr */
gen_push(s, gen_im32(s->pc)); gen_push(s, tcg_const_i32(s->pc));
} }
gen_flush_cc_op(s); gen_flush_cc_op(s);
if (op > 1) { if (op > 1) {
@ -1757,7 +1754,7 @@ DISAS_INSN(mov3q)
val = (insn >> 9) & 7; val = (insn >> 9) & 7;
if (val == 0) if (val == 0)
val = -1; val = -1;
src = gen_im32(val); src = tcg_const_i32(val);
gen_logic_cc(s, src); gen_logic_cc(s, src);
DEST_EA(insn, OS_LONG, src, NULL); DEST_EA(insn, OS_LONG, src, NULL);
} }
@ -1883,7 +1880,7 @@ DISAS_INSN(shift_im)
tmp = (insn >> 9) & 7; tmp = (insn >> 9) & 7;
if (tmp == 0) if (tmp == 0)
tmp = 8; tmp = 8;
shift = gen_im32(tmp); shift = tcg_const_i32(tmp);
/* No need to flush flags becuse we know we will set C flag. */ /* No need to flush flags becuse we know we will set C flag. */
if (insn & 0x100) { if (insn & 0x100) {
gen_helper_shl_cc(reg, cpu_env, reg, shift); gen_helper_shl_cc(reg, cpu_env, reg, shift);
@ -2191,7 +2188,7 @@ DISAS_INSN(fpu)
switch ((ext >> 10) & 7) { switch ((ext >> 10) & 7) {
case 4: /* FPCR */ case 4: /* FPCR */
/* Not implemented. Always return zero. */ /* Not implemented. Always return zero. */
tmp32 = gen_im32(0); tmp32 = tcg_const_i32(0);
break; break;
case 1: /* FPIAR */ case 1: /* FPIAR */
case 2: /* FPSR */ case 2: /* FPSR */
@ -2592,7 +2589,7 @@ DISAS_INSN(mac)
/* Skip the accumulate if the value is already saturated. */ /* Skip the accumulate if the value is already saturated. */
l1 = gen_new_label(); l1 = gen_new_label();
tmp = tcg_temp_new(); tmp = tcg_temp_new();
gen_op_and32(tmp, QREG_MACSR, gen_im32(MACSR_PAV0 << acc)); gen_op_and32(tmp, QREG_MACSR, tcg_const_i32(MACSR_PAV0 << acc));
gen_op_jmp_nz32(tmp, l1); gen_op_jmp_nz32(tmp, l1);
} }
#endif #endif
@ -2626,7 +2623,7 @@ DISAS_INSN(mac)
/* Skip the accumulate if the value is already saturated. */ /* Skip the accumulate if the value is already saturated. */
l1 = gen_new_label(); l1 = gen_new_label();
tmp = tcg_temp_new(); tmp = tcg_temp_new();
gen_op_and32(tmp, QREG_MACSR, gen_im32(MACSR_PAV0 << acc)); gen_op_and32(tmp, QREG_MACSR, tcg_const_i32(MACSR_PAV0 << acc));
gen_op_jmp_nz32(tmp, l1); gen_op_jmp_nz32(tmp, l1);
} }
#endif #endif

1
target-ppc/helper.c
View File

@ -21,7 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <signal.h>
#include "cpu.h" #include "cpu.h"
#include "exec-all.h" #include "exec-all.h"

1
target-sparc/helper.c
View File

@ -21,7 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <signal.h>
#include "cpu.h" #include "cpu.h"
#include "exec-all.h" #include "exec-all.h"

1
ui/curses.c
View File

@ -24,7 +24,6 @@
#include <curses.h> #include <curses.h>
#ifndef _WIN32 #ifndef _WIN32
#include <signal.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <termios.h> #include <termios.h>
#endif #endif

4
ui/sdl.c
View File

@ -28,10 +28,6 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h> #include <SDL_syswm.h>
#ifndef _WIN32
#include <signal.h>
#endif
#include "qemu-common.h" #include "qemu-common.h"
#include "console.h" #include "console.h"
#include "sysemu.h" #include "sysemu.h"

1
usb-bsd.c
View File

@ -39,7 +39,6 @@
#else #else
#include <bus/usb/usb.h> #include <bus/usb/usb.h>
#endif #endif
#include <signal.h>
/* This value has maximum potential at 16. /* This value has maximum potential at 16.
* You should also set hw.usb.debug to gain * You should also set hw.usb.debug to gain

1
usb-linux.c
View File

@ -37,7 +37,6 @@
#include <dirent.h> #include <dirent.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <signal.h>
#include <linux/usbdevice_fs.h> #include <linux/usbdevice_fs.h>
#include <linux/version.h> #include <linux/version.h>