From patchwork Tue Jan 28 20:28:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 314820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BAF72C00A3 for ; Wed, 29 Jan 2014 07:29:13 +1100 (EST) Received: from localhost ([::1]:39332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8FHT-00074M-4N for incoming@patchwork.ozlabs.org; Tue, 28 Jan 2014 15:29:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8FGw-0006yn-Ch for qemu-devel@nongnu.org; Tue, 28 Jan 2014 15:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8FGq-0004d1-CJ for qemu-devel@nongnu.org; Tue, 28 Jan 2014 15:28:38 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:64399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8FGq-0004cu-6D for qemu-devel@nongnu.org; Tue, 28 Jan 2014 15:28:32 -0500 Received: by mail-pd0-f173.google.com with SMTP id y10so787172pdj.18 for ; Tue, 28 Jan 2014 12:28:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PSa7gTwNAbZiKV8tU47RLyHCHcbj9h+FlrChL0MkQH4=; b=MUKzvSqIK8Q3jEOFanIqOgkglFfGgVSt6dwAN5EXkufKXRnq64CebrAD0Uv7tiUa58 lpw17o9uW7XDkCtAzbb52KXkTsCTvDz0RYHeU+KYcn6xRW+q/flHCYwkRqYkK3v3cpgR DEvyzFMuEvyXEnDF6VVLfvnYlr6fIgBRTnrvxPslF77aZSUhD2PrV/oVhfTx8p2DHlxg 2ejZPQ1OW649yHWEDtZyBl8JFgPWiWFvd8CfnpPv4tpHl7fmOYIXC374bbdr62RSW/lU X+BrSt5hlaz50ks5kaySWpw74xl/wFG5i0E4ArDDBSzy2TpQJJWRXkTwjgtbwRAc1mTe Bt8g== X-Gm-Message-State: ALoCoQkBA7ehHg26KuE1eUREX7ZdTKzmFstmLRG6GxICQHPEdzmcnRZ47WHTZMpI7VKlv5XbS+Mr X-Received: by 10.68.218.65 with SMTP id pe1mr3629424pbc.1.1390940911146; Tue, 28 Jan 2014 12:28:31 -0800 (PST) Received: from localhost.localdomain (c-67-169-181-221.hsd1.ca.comcast.net. [67.169.181.221]) by mx.google.com with ESMTPSA id bc4sm45466251pbb.2.2014.01.28.12.28.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Jan 2014 12:28:30 -0800 (PST) From: Christoffer Dall To: qemu-devel@nongnu.org Date: Tue, 28 Jan 2014 12:28:08 -0800 Message-Id: <1390940890-1868-3-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390940890-1868-1-git-send-email-christoffer.dall@linaro.org> References: <1390940890-1868-1-git-send-email-christoffer.dall@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.173 Cc: kvmarm@lists.cs.columbia.edu, Christoffer Dall , patches@linaro.org Subject: [Qemu-devel] [PATCH v4 2/4] kvm: Introduce kvm_arch_irqchip_create 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 Introduce kvm_arch_irqchip_create an arch-specific hook in preparation for architecture-specific use of the device control API to create IRQ chips. Following patches will implement the ARM irqchip create method to prefer the device control API over the older KVM_CREATE_IRQCHIP API. Reviewed-by: Peter Maydell Signed-off-by: Christoffer Dall --- Changelog[v1 -> v2]: - Proper formatted function comments - Use QEMU's stubs mechanism for KVM stubs include/sysemu/kvm.h | 12 ++++++++++++ kvm-all.c | 11 +++++++++-- stubs/Makefile.objs | 1 + stubs/kvm.c | 7 +++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 stubs/kvm.c diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 3b25f27..e4e43b8 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -319,4 +319,16 @@ int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq); void kvm_pc_gsi_handler(void *opaque, int n, int level); void kvm_pc_setup_irq_routing(bool pci_enabled); void kvm_init_irq_routing(KVMState *s); + +/** + * kvm_arch_irqchip_create: + * @KVMState: The KVMState pointer + * + * Allow architectures to create an in-kernel irq chip themselves. + * + * Returns: < 0: error + * 0: irq chip was not created + * > 0: irq chip was created + */ +int kvm_arch_irqchip_create(KVMState *s); #endif diff --git a/kvm-all.c b/kvm-all.c index a3fb8de..a890152 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1298,10 +1298,17 @@ static int kvm_irqchip_create(KVMState *s) return 0; } - ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); + /* First probe and see if there's a arch-specific hook to create the + * in-kernel irqchip for us */ + ret = kvm_arch_irqchip_create(s); if (ret < 0) { - fprintf(stderr, "Create kernel irqchip failed\n"); return ret; + } else if (ret == 0) { + ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); + if (ret < 0) { + fprintf(stderr, "Create kernel irqchip failed\n"); + return ret; + } } kvm_kernel_irqchip = true; diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index df92fe5..df3aa7a 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -27,3 +27,4 @@ stub-obj-y += vm-stop.o stub-obj-y += vmstate.o stub-obj-$(CONFIG_WIN32) += fd-register.o stub-obj-y += cpus.o +stub-obj-y += kvm.o diff --git a/stubs/kvm.c b/stubs/kvm.c new file mode 100644 index 0000000..e7c60b6 --- /dev/null +++ b/stubs/kvm.c @@ -0,0 +1,7 @@ +#include "qemu-common.h" +#include "sysemu/kvm.h" + +int kvm_arch_irqchip_create(KVMState *s) +{ + return 0; +}