From patchwork Wed May 25 10:52:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9135195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E71360221 for ; Wed, 25 May 2016 11:26:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2024F28164 for ; Wed, 25 May 2016 11:26:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14745282D4; Wed, 25 May 2016 11:26:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 98E2028164 for ; Wed, 25 May 2016 11:26:53 +0000 (UTC) Received: from localhost ([::1]:59094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5Wxg-0000Jt-JU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 May 2016 07:26:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5WQp-0003Bz-FT for qemu-devel@nongnu.org; Wed, 25 May 2016 06:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5WQk-00011e-Nl for qemu-devel@nongnu.org; Wed, 25 May 2016 06:52:55 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5WQk-00011R-H1; Wed, 25 May 2016 06:52:50 -0400 Received: by mail-wm0-x243.google.com with SMTP id f75so14169837wmf.2; Wed, 25 May 2016 03:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oIiagLQrR2SRZvdfHOsixfouSFtI+yqhdAgnDNiWMRs=; b=Y5Ov67/aAh34GJ0GJqhkd1RciA11Henc4GcV5kM+4HRYDg1AZufLu/ULuQUXLrI+79 baoegzIw9rENlmwU2rOOYkeovQib4KVTbGrLUtTzLgTAqU7koCBL67ZOLnF1w9g2OLyS yy22KStndFv0Se5S9j5JXvXJvL2tyVRb+LQYewY01z6n6WsPE3Cqr8HFpgz7xngcCgwq MaQAE/3YZshMM67GK8LFxhJnyAO5IDPZ2iVD2/rEHEANn1aOUQ8aLLQe1C/pyNBwlbO5 wov/GWmWtkwX5M7BuhZaXD5U4qaECUfYz4P4zE436zd2hbndt1hHDbWpujeEYfyKIDxQ 2UYg== 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=oIiagLQrR2SRZvdfHOsixfouSFtI+yqhdAgnDNiWMRs=; b=NU54YKDZn6b4iNi8Dz0hx4hHghA4JALEK8qQ3YZjDtuQ8R03Rii82j2eISccfDeFDm sqNAyQbNjG9iqZCUbkHtlCDOS6wuFhDuN1qI+K3IcgSfgQw2KPehniRoNc6tWdrV9tsc RuswLDYw/uvJ+f4xCAZjLqrKsCQm+VRCx/ZhkBfGgimwo5sECNNqLVHy7e1WgIhP9LBW dIcvLRFU0c9C6bJDpUHC5OzviX8arCqWJymfkDNQybEZuYyoG/0QB4eQKWc8OxdeTOtR MmwJpNYQlmOuO+cUkbdHTed85+2A63fRInczZmPd27MvC+KWHUmXe2hpK2XespqGeiy9 K5Zw== X-Gm-Message-State: ALyK8tLQ1rngJHRGA9u/m2OBOsLWJjmop1km7k5GSVD9YE+Lc4Ua8R8wqO1wb+bLGSgC9w== X-Received: by 10.194.32.199 with SMTP id l7mr3059627wji.137.1464173569729; Wed, 25 May 2016 03:52:49 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id q125sm8592416wmd.19.2016.05.25.03.52.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2016 03:52:48 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Wed, 25 May 2016 12:52:35 +0200 Message-Id: <1464173555-12800-5-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464173555-12800-1-git-send-email-edgar.iglesias@gmail.com> References: <1464173555-12800-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH v2 4/4] xlnx-zynqmp: Use the in kernel GIC model for KVM runs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, crosthwaite.peter@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Use the in kernel GIC model when running with KVM enabled. Reviewed-by: Peter Maydell Signed-off-by: Edgar E. Iglesias Reviewed-by: Alistair Francis --- hw/arm/xlnx-zynqmp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index db5b82b..9a1bc94 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -22,6 +22,8 @@ #include "hw/arm/xlnx-zynqmp.h" #include "hw/intc/arm_gic_common.h" #include "exec/address-spaces.h" +#include "sysemu/kvm.h" +#include "kvm_arm.h" #define GIC_NUM_SPI_INTR 160 @@ -135,7 +137,7 @@ static void xlnx_zynqmp_init(Object *obj) qdev_prop_allow_set_link_before_realize, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); - object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC); + object_initialize(&s->gic, sizeof(s->gic), gic_class_name()); qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default()); for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {