From patchwork Wed Feb 8 20:01:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 140211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E14DCB71A5 for ; Thu, 9 Feb 2012 07:04:50 +1100 (EST) Received: from localhost ([::1]:42102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvDl2-0003iN-RZ for incoming@patchwork.ozlabs.org; Wed, 08 Feb 2012 15:04:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvDkX-0002ZH-HL for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:04:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvDk9-0003lW-QZ for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:04:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvDk9-0003jk-IY for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:03:53 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q18K3pWd025378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Feb 2012 15:03:51 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q18K3pWj026662; Wed, 8 Feb 2012 15:03:51 -0500 Received: from amt.cnet (vpn-8-93.rdu.redhat.com [10.11.8.93]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id q18K3m0O023562; Wed, 8 Feb 2012 15:03:49 -0500 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 99C84652169; Wed, 8 Feb 2012 18:01:53 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q18K1pA2007734; Wed, 8 Feb 2012 18:01:51 -0200 From: Marcelo Tosatti To: Anthony Liguori Date: Wed, 8 Feb 2012 18:01:44 -0200 Message-Id: <3d4b26494fdce89354dac49ef909356ccda77914.1328731305.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 2/3] kvm: Implement kvm_irqchip_in_kernel like kvm_enabled 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 From: Jan Kiszka To both avoid that kvm_irqchip_in_kernel always has to be paired with kvm_enabled and that the former ends up in a function call, implement it like the latter. This means keeping the state in a global variable and defining kvm_irqchip_in_kernel as a preprocessor macro. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- hw/pc.c | 4 ++-- hw/pc_piix.c | 6 +++--- kvm-all.c | 13 ++++--------- kvm-stub.c | 5 ----- kvm.h | 8 +++++--- target-i386/kvm.c | 4 ++-- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 7f3aa65..3b35735 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -889,7 +889,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) DeviceState *dev; static int apic_mapped; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { dev = qdev_create(NULL, "kvm-apic"); } else { dev = qdev_create(NULL, "apic"); @@ -908,7 +908,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) } /* KVM does not support MSI yet. */ - if (!kvm_enabled() || !kvm_irqchip_in_kernel()) { + if (!kvm_irqchip_in_kernel()) { msi_supported = true; } diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c06f1b5..17f8d5d 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -104,7 +104,7 @@ static void ioapic_init(GSIState *gsi_state) SysBusDevice *d; unsigned int i; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { dev = qdev_create(NULL, "kvm-ioapic"); } else { dev = qdev_create(NULL, "ioapic"); @@ -183,7 +183,7 @@ static void pc_init1(MemoryRegion *system_memory, } gsi_state = g_malloc0(sizeof(*gsi_state)); - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { kvm_piix3_setup_irq_routing(pci_enabled); gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state, GSI_NUM_PINS); @@ -209,7 +209,7 @@ static void pc_init1(MemoryRegion *system_memory, } isa_bus_irqs(isa_bus, gsi); - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { i8259 = kvm_i8259_init(isa_bus); } else if (xen_enabled()) { i8259 = xen_interrupt_controller_init(); diff --git a/kvm-all.c b/kvm-all.c index 0b87658..c4babda 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -74,7 +74,6 @@ struct KVMState #ifdef KVM_CAP_SET_GUEST_DEBUG struct kvm_sw_breakpoint_head kvm_sw_breakpoints; #endif - int irqchip_in_kernel; int pit_in_kernel; int xsave, xcrs; int many_ioeventfds; @@ -88,6 +87,7 @@ struct KVMState }; KVMState *kvm_state; +bool kvm_kernel_irqchip; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), @@ -193,11 +193,6 @@ static void kvm_reset_vcpu(void *opaque) kvm_arch_reset_vcpu(env); } -int kvm_irqchip_in_kernel(void) -{ - return kvm_state->irqchip_in_kernel; -} - int kvm_pit_in_kernel(void) { return kvm_state->pit_in_kernel; @@ -742,7 +737,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level) struct kvm_irq_level event; int ret; - assert(s->irqchip_in_kernel); + assert(kvm_irqchip_in_kernel()); event.level = level; event.irq = irq; @@ -862,7 +857,7 @@ static int kvm_irqchip_create(KVMState *s) if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) { s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS; } - s->irqchip_in_kernel = 1; + kvm_kernel_irqchip = true; kvm_init_irq_routing(s); @@ -1315,7 +1310,7 @@ int kvm_has_gsi_routing(void) int kvm_allows_irq0_override(void) { - return !kvm_enabled() || !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); + return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); } void kvm_setup_guest_memory(void *start, size_t size) diff --git a/kvm-stub.c b/kvm-stub.c index 6c2b06b..f63a0d2 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -16,11 +16,6 @@ #include "gdbstub.h" #include "kvm.h" -int kvm_irqchip_in_kernel(void) -{ - return 0; -} - int kvm_pit_in_kernel(void) { return 0; diff --git a/kvm.h b/kvm.h index 40b5ffc..f9f1dc8 100644 --- a/kvm.h +++ b/kvm.h @@ -23,11 +23,14 @@ #endif extern int kvm_allowed; +extern bool kvm_kernel_irqchip; #if defined CONFIG_KVM || !defined NEED_CPU_H -#define kvm_enabled() (kvm_allowed) +#define kvm_enabled() (kvm_allowed) +#define kvm_irqchip_in_kernel() (kvm_kernel_irqchip) #else -#define kvm_enabled() (0) +#define kvm_enabled() (0) +#define kvm_irqchip_in_kernel() (false) #endif struct kvm_run; @@ -80,7 +83,6 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset); #endif int kvm_pit_in_kernel(void); -int kvm_irqchip_in_kernel(void); int kvm_on_sigbus_vcpu(CPUState *env, int code, void *addr); int kvm_on_sigbus(int code, void *addr); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 445c060..981192d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1356,7 +1356,7 @@ static int kvm_get_apic(CPUState *env) struct kvm_lapic_state kapic; int ret; - if (apic && kvm_enabled() && kvm_irqchip_in_kernel()) { + if (apic && kvm_irqchip_in_kernel()) { ret = kvm_vcpu_ioctl(env, KVM_GET_LAPIC, &kapic); if (ret < 0) { return ret; @@ -1372,7 +1372,7 @@ static int kvm_put_apic(CPUState *env) DeviceState *apic = env->apic_state; struct kvm_lapic_state kapic; - if (apic && kvm_enabled() && kvm_irqchip_in_kernel()) { + if (apic && kvm_irqchip_in_kernel()) { kvm_put_apic_state(apic, &kapic); return kvm_vcpu_ioctl(env, KVM_SET_LAPIC, &kapic);