[Qemu-devel] [PULL 0/1] target-i386: Fix I/O bitmap regression

[Qemu-devel] [PULL 0/1] target-i386: Fix I/O bitmap regression

[Kevin Wolf]

The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:

  Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)

are available in the git repository at:

  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 6d093a4f499fd945b39bd55b307dd9192dc99ead:

  target-i386: Fix I/O bitmap checks for in/out (2014-02-19 16:40:19 +0100)

----------------------------------------------------------------
This fixes a target-i386 emulation regression

----------------------------------------------------------------
Kevin Wolf (1):
      target-i386: Fix I/O bitmap checks for in/out

 target-i386/translate.c | 2 ++
 1 file changed, 2 insertions(+)

[Qemu-devel] [PULL 1/1] target-i386: Fix I/O bitmap checks for in/out

[Kevin Wolf]

Commit 1b90d56e changed the implementation of in/out imm to not assign
the accessed port number to cpu_T[0] as it appeared unnecessary.
However, currently gen_check_io() makes use of cpu_T[0] to implement the
I/O bitmap checks, so it's in fact still used and the change broke the
check, leading to #GP in legitimate cases (and probably also allowing
access to ports that shouldn't be allowed).

This patch reintroduces the missing assignment for these cases.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
---
 target-i386/translate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target-i386/translate.c b/target-i386/translate.c
index b0f2279..5dd2450 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -6284,6 +6284,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
     case 0xe5:
         ot = mo_b_d32(b, dflag);
         val = cpu_ldub_code(env, s->pc++);
+        tcg_gen_movi_tl(cpu_T[0], val);
         gen_check_io(s, ot, pc_start - s->cs_base,
                      SVM_IOIO_TYPE_MASK | svm_is_rep(prefixes));
         if (use_icount)
@@ -6300,6 +6301,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
     case 0xe7:
         ot = mo_b_d32(b, dflag);
         val = cpu_ldub_code(env, s->pc++);
+        tcg_gen_movi_tl(cpu_T[0], val);
         gen_check_io(s, ot, pc_start - s->cs_base,
                      svm_is_rep(prefixes));
         gen_op_mov_v_reg(ot, cpu_T[1], R_EAX);
-- 
1.8.1.4

Re: [Qemu-devel] [PULL 0/1] target-i386: Fix I/O bitmap regression

[Peter Maydell]

On 19 February 2014 15:47, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
>
>   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to 6d093a4f499fd945b39bd55b307dd9192dc99ead:
>
>   target-i386: Fix I/O bitmap checks for in/out (2014-02-19 16:40:19 +0100)
>
> ----------------------------------------------------------------
> This fixes a target-i386 emulation regression
>
> ----------------------------------------------------------------
> Kevin Wolf (1):
>       target-i386: Fix I/O bitmap checks for in/out

Applied, thanks.

-- PMM