diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-10-03 14:55:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-12-22 15:02:07 +0100 |
| commit | 715f396dfb6d35cf88392770bbc2ed89a6636b8d (patch) | |
| tree | 4f920c924e51df53c4fde22334b150837cecbf88 | |
| parent | 746827825db4f695c0897f103cd13f1e916e5081 (diff) | |
| download | qemu-715f396dfb6d35cf88392770bbc2ed89a6636b8d.zip | |
i386: hvf: remove ZERO_INIT macro
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/hvf/x86.c | 5 | ||||
| -rw-r--r-- | target/i386/hvf/x86_decode.c | 3 | ||||
| -rw-r--r-- | target/i386/hvf/x86_gen.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c index ca0ec2968a..efb28c373c 100644 --- a/target/i386/hvf/x86.c +++ b/target/i386/hvf/x86.c @@ -53,7 +53,8 @@ bool x86_read_segment_descriptor(struct CPUState *cpu, addr_t base; uint32_t limit; - ZERO_INIT(*desc); + memset(desc, 0, sizeof(*desc)); + /* valid gdt descriptors start from index 1 */ if (!sel.index && GDT_SEL == sel.ti) { 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); 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) { printf("%s: idt limit\n", __func__); return false; diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c index 759aa38ee0..4bfd85f2df 100644 --- a/target/i386/hvf/x86_decode.c +++ b/target/i386/hvf/x86_decode.c @@ -2091,8 +2091,7 @@ static void decode_opcodes(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); set_addressing_size(env, decode); set_operand_size(env, decode); diff --git a/target/i386/hvf/x86_gen.h b/target/i386/hvf/x86_gen.h index 69edeffb19..e5739f1de5 100644 --- a/target/i386/hvf/x86_gen.h +++ b/target/i386/hvf/x86_gen.h @@ -44,6 +44,4 @@ typedef uint64_t addr_t; } \ } -#define ZERO_INIT(obj) memset((void *) &obj, 0, sizeof(obj)) - #endif |