From patchwork Thu May 19 22:48:53 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: 9128395 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 9BD1E60467 for ; Thu, 19 May 2016 22:53:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FCF01FEDE for ; Thu, 19 May 2016 22:53:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84AA720265; Thu, 19 May 2016 22:53:01 +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 4063D1FEDE for ; Thu, 19 May 2016 22:53:01 +0000 (UTC) Received: from localhost ([::1]:52410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3WoO-0006qG-DD for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 18:53:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Wkb-0003mQ-BC for qemu-devel@nongnu.org; Thu, 19 May 2016 18:49:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3WkZ-0006RD-2c for qemu-devel@nongnu.org; Thu, 19 May 2016 18:49:04 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3WkY-0006R4-SP; Thu, 19 May 2016 18:49:03 -0400 Received: by mail-wm0-x242.google.com with SMTP id 67so1690513wmg.0; Thu, 19 May 2016 15:49:02 -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=fn3lZwjL5v4bKcH0mwCcf92jZwlH3Nw/R30iL02clPc=; b=udqAdXMdsFD9G5lFlJtZpdS4UK6Vtr4Hl9PmSHgd5CrWUjBCBw0VghAXM+hwwMjm9g Lyyr7cXN9Ad+0z0Kw945xZ2ymOgoU2WqX0cwe8Dsz9sBAK8RGwLRViuu2G7AVJ+aM6Lt oV98KfYnetGMMCD/x273pH/IV7FNzHg4DLT8lAKyk/McCU/v88maZiarMCom3/Hq3gxr XUPVYe3d6IHTPxZXjOVXWRFHijcvL1CM8ChrFSSkuK74owl6BprNjT7qqh/K7f1AIMw9 UPOJBT3IIfLI/ID0DWa8kCyVZzdox+JVg0pEu0xRZlDWic+5W1GNJdZ8UbbAJLkGslo/ 1lhA== 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=fn3lZwjL5v4bKcH0mwCcf92jZwlH3Nw/R30iL02clPc=; b=a9PmOe5CI7OzNuX/KLAeIi41Yq+477ozD98wd+67HRwFmhuLwJ57xp/xzzokjzqIHD yERJtX3OUbVe7Nk/ET2OgKntevrO3vZvh6Gxvq4Ii6lkEBhm6t4FxOsov+xfyR4e0iem 8e721eceyT6qmKO6CII+kftz7W6UUOyBrNZ5vutsQj3NRTVqmd70qnRlZg/k9xXoZDH8 fL+H665Bb/s3bTDPOyvZ2vDdaFkY1lYs6Mt9Pvp5WalkP4gEPKoUy8IljagHPMlD6YqH r4yiwYw8J8CeBkqd8cLNU8npBpZ1h/f0tstiBMCBH7INq6egJBkrlzq+tCqWawHC7sJc CR/w== X-Gm-Message-State: AOPr4FUzL5u0TNonKWwjR+CvOlwkh29iw2t2of2LEVVD/nrR57qSEsOk6bYSLBNJY2cwJw== X-Received: by 10.194.133.98 with SMTP id pb2mr15690429wjb.144.1463698142280; Thu, 19 May 2016 15:49:02 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id ac2sm63196wjc.35.2016.05.19.15.49.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 15:49:01 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Fri, 20 May 2016 00:48:53 +0200 Message-Id: <1463698133-30880-6-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1463698133-30880-1-git-send-email-edgar.iglesias@gmail.com> References: <1463698133-30880-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::242 Subject: [Qemu-devel] [PATCH v1 5/5] 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: peter.maydell@linaro.org, crosthwaite.peter@gmail.com, edgar.iglesiasl@xilinx.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. Signed-off-by: Edgar E. Iglesias --- 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 0648028..c3878da 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 @@ -169,7 +171,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++) {