openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i386: hvf: abort on decoding error 

Rather than unsupported situations, some VM_PANIC calls actually
are caused by internal errors.  Convert them to just abort.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-10-03 15:00:47 +02:00
parent 715f396dfb
commit e62963bf48
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/i386/hvf/hvf.c
View File

@ -766,7 +766,7 @@ int hvf_vcpu_exec(CPUState *cpu)
env->hvf_emul->fetch_rip = rip;
decode_instruction(env, &decode);
VM_PANIC_ON(ins_len != decode.len);
assert(ins_len == decode.len);
exec_instruction(env, &decode);
store_regs(cpu);

10
target/i386/hvf/x86_emu.c
View File

@ -146,7 +146,7 @@ addr_t read_reg(CPUX86State *env, int reg, int size)
case 8:
return env->hvf_emul->regs[reg].rrx;
default:
VM_PANIC_ON("read_reg size");
abort();
}
return 0;
}
@ -167,7 +167,7 @@ void write_reg(CPUX86State *env, int reg, addr_t val, int size)
env->hvf_emul->regs[reg].rrx = val;
break;
default:
VM_PANIC_ON("write_reg size");
abort();
}
}
@ -189,8 +189,7 @@ addr_t read_val_from_reg(addr_t reg_ptr, int size)
val = *(uint64_t *)reg_ptr;
break;
default:
VM_PANIC_ON_EX(1, "read_val: Unknown size %d\n", size);
break;
abort();
}
return val;
}
@ -211,8 +210,7 @@ void write_val_to_reg(addr_t reg_ptr, addr_t val, int size)
*(uint64_t *)reg_ptr = val;
break;
default:
VM_PANIC("write_val: Unknown size\n");
break;
abort();
}
}