From patchwork Thu Jan 31 15:08:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 217198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 26EAC2C0091 for ; Fri, 1 Feb 2013 02:09:14 +1100 (EST) Received: from localhost ([::1]:47601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0vlI-00040I-22 for incoming@patchwork.ozlabs.org; Thu, 31 Jan 2013 10:09:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0vl5-000405-9K for qemu-devel@nongnu.org; Thu, 31 Jan 2013 10:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0vl0-0001P8-SV for qemu-devel@nongnu.org; Thu, 31 Jan 2013 10:08:59 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42291 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0vl0-0001Ov-Jm for qemu-devel@nongnu.org; Thu, 31 Jan 2013 10:08:54 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id AE494A398D; Thu, 31 Jan 2013 16:08:53 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2013 16:08:44 +0100 Message-Id: <1359644924-29389-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: imammedo@redhat.com, Anthony Liguori , ehabkost@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH for-1.4?] target-i386: Pass X86CPU to cpu_x86_set_a20() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Prepares for cpu_interrupt() changing argument to CPUState. While touching it, rename to x86_cpu_...() now that it takes an X86CPU. Signed-off-by: Andreas Färber Reviewed-by: Eduardo Habkost --- Extracted from my qom-cpu-8 queue. hw/pc.c | 7 ++++--- target-i386/cpu.h | 2 +- target-i386/helper.c | 4 +++- 3 Dateien geändert, 8 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/hw/pc.c b/hw/pc.c index 34b6dff..53cc173 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -527,11 +527,11 @@ type_init(port92_register_types) static void handle_a20_line_change(void *opaque, int irq, int level) { - CPUX86State *cpu = opaque; + X86CPU *cpu = opaque; /* XXX: send to all CPUs ? */ /* XXX: add logic to handle multiple A20 line sources */ - cpu_x86_set_a20(cpu, level); + x86_cpu_set_a20(cpu, level); } int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) @@ -1085,7 +1085,8 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, } } - a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); + a20_line = qemu_allocate_irqs(handle_a20_line_change, + x86_env_get_cpu(first_cpu), 2); i8042 = isa_create_simple(isa_bus, "i8042"); i8042_setup_a20_line(i8042, &a20_line[0]); if (!no_vmport) { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 62508dc..9e6e1a6 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1011,7 +1011,7 @@ void host_cpuid(uint32_t function, uint32_t count, int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, int is_write, int mmu_idx); #define cpu_handle_mmu_fault cpu_x86_handle_mmu_fault -void cpu_x86_set_a20(CPUX86State *env, int a20_state); +void x86_cpu_set_a20(X86CPU *cpu, int a20_state); static inline bool hw_local_breakpoint_enabled(unsigned long dr7, int index) { diff --git a/target-i386/helper.c b/target-i386/helper.c index bf43d6a..29217ef 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -366,8 +366,10 @@ void cpu_dump_state(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, /* x86 mmu */ /* XXX: add PGE support */ -void cpu_x86_set_a20(CPUX86State *env, int a20_state) +void x86_cpu_set_a20(X86CPU *cpu, int a20_state) { + CPUX86State *env = &cpu->env; + a20_state = (a20_state != 0); if (a20_state != ((env->a20_mask >> 20) & 1)) { #if defined(DEBUG_MMU)