diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
| commit | e38c4f55fe6ef6c393388ae181630ab3a92f77dd (patch) | |
| tree | 24970faea32f21f96b9048f8a36c8e8d9dafe2b2 /tools/ioemu/target-i386-dm | |
| parent | 03c9b741df33f676c99c7885ca7f795190df37d5 (diff) | |
| parent | df5b25e9af9248d8e00d0ef7e4ce3eec9eb44f97 (diff) | |
| download | xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.gz xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.bz2 xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'tools/ioemu/target-i386-dm')
| -rw-r--r-- | tools/ioemu/target-i386-dm/cpu.h | 4 | ||||
| -rw-r--r-- | tools/ioemu/target-i386-dm/helper2.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/ioemu/target-i386-dm/cpu.h b/tools/ioemu/target-i386-dm/cpu.h index 017b8c021b..6071a8529e 100644 --- a/tools/ioemu/target-i386-dm/cpu.h +++ b/tools/ioemu/target-i386-dm/cpu.h @@ -37,17 +37,21 @@ #include "cpu-defs.h" +#ifdef CONFIG_SOFTFLOAT #include "softfloat.h" +#endif #if defined(__i386__) && !defined(CONFIG_SOFTMMU) #define USE_CODE_COPY #endif +#ifdef CONFIG_SOFTFLOAT #ifdef USE_X86LDOUBLE typedef floatx80 CPU86_LDouble; #else typedef float64 CPU86_LDouble; #endif +#endif /* Empty for now */ typedef struct CPUX86State { diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c index d45ac7a999..4896b11ab8 100644 --- a/tools/ioemu/target-i386-dm/helper2.c +++ b/tools/ioemu/target-i386-dm/helper2.c @@ -218,7 +218,7 @@ static ioreq_t *__cpu_get_ioreq(int vcpu) return NULL; } - rmb(); /* see IOREQ_READY /then/ read contents of ioreq */ + xen_rmb(); /* see IOREQ_READY /then/ read contents of ioreq */ req->state = STATE_IOREQ_INPROCESS; return req; @@ -568,7 +568,7 @@ void __handle_buffered_iopage(CPUState *env) __handle_ioreq(env, &req); - mb(); + xen_mb(); buffered_io_page->read_pointer += qw ? 2 : 1; } } @@ -603,7 +603,7 @@ void cpu_handle_ioreq(void *opaque) return; } - wmb(); /* Update ioreq contents /then/ update state. */ + xen_wmb(); /* Update ioreq contents /then/ update state. */ /* * We do this before we send the response so that the tools |