mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-10 11:04:58 -06:00
i386: hvf: remove ZERO_INIT macro
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
746827825d
commit
715f396dfb
3 changed files with 4 additions and 6 deletions
|
@ -53,7 +53,8 @@ bool x86_read_segment_descriptor(struct CPUState *cpu,
|
||||||
addr_t base;
|
addr_t base;
|
||||||
uint32_t limit;
|
uint32_t limit;
|
||||||
|
|
||||||
ZERO_INIT(*desc);
|
memset(desc, 0, sizeof(*desc));
|
||||||
|
|
||||||
/* valid gdt descriptors start from index 1 */
|
/* valid gdt descriptors start from index 1 */
|
||||||
if (!sel.index && GDT_SEL == sel.ti) {
|
if (!sel.index && GDT_SEL == sel.ti) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -104,7 +105,7 @@ bool x86_read_call_gate(struct CPUState *cpu, struct x86_call_gate *idt_desc,
|
||||||
addr_t base = rvmcs(cpu->hvf_fd, VMCS_GUEST_IDTR_BASE);
|
addr_t base = rvmcs(cpu->hvf_fd, VMCS_GUEST_IDTR_BASE);
|
||||||
uint32_t limit = rvmcs(cpu->hvf_fd, VMCS_GUEST_IDTR_LIMIT);
|
uint32_t limit = rvmcs(cpu->hvf_fd, VMCS_GUEST_IDTR_LIMIT);
|
||||||
|
|
||||||
ZERO_INIT(*idt_desc);
|
memset(idt_desc, 0, sizeof(*idt_desc));
|
||||||
if (gate * 8 >= limit) {
|
if (gate * 8 >= limit) {
|
||||||
printf("%s: idt limit\n", __func__);
|
printf("%s: idt limit\n", __func__);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -2091,8 +2091,7 @@ static void decode_opcodes(CPUX86State *env, struct x86_decode *decode)
|
||||||
|
|
||||||
uint32_t decode_instruction(CPUX86State *env, struct x86_decode *decode)
|
uint32_t decode_instruction(CPUX86State *env, struct x86_decode *decode)
|
||||||
{
|
{
|
||||||
ZERO_INIT(*decode);
|
memset(decode, 0, sizeof(*decode));
|
||||||
|
|
||||||
decode_prefix(env, decode);
|
decode_prefix(env, decode);
|
||||||
set_addressing_size(env, decode);
|
set_addressing_size(env, decode);
|
||||||
set_operand_size(env, decode);
|
set_operand_size(env, decode);
|
||||||
|
|
|
@ -44,6 +44,4 @@ typedef uint64_t addr_t;
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ZERO_INIT(obj) memset((void *) &obj, 0, sizeof(obj))
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue