From patchwork Wed Aug 7 08:51:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 265412 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2746F2C00CA for ; Wed, 7 Aug 2013 18:52:39 +1000 (EST) Received: from localhost ([::1]:55953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6zTx-0005mD-DB for incoming@patchwork.ozlabs.org; Wed, 07 Aug 2013 04:52:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6zTS-0005Ym-9g for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:52:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6zTJ-00017r-Kr for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:52:06 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6zTJ-00017C-FF for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:51:57 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj1so1921652pad.0 for ; Wed, 07 Aug 2013 01:51:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ULo3SQo6aCE4T205es43Dr9Hy1ix6RJ6atTNWIV0YM4=; b=XZe14SSnlI6jYAxOHT3q+83sM6dvsjZiez1zQmAE+nyvm/K6nissW6iRVPIYPQlV5e lTdwJT86pWh65L777WoJDyPJIM5ySQ083ZiYBD2P6ADY0uD2EzJ/HoQ7aUdEkONbgVzA 1IeBIDNSTcF4hyU9+Oqm5TtJ0vxUlWTAxVKcemJnp+AdOlPNCu1Oi1lXtXcV4wXvPmoC QdHvzXsbvtZBNP+xQsMgb2FNEQdVP6U5dKnk8pV9W3Gx6csHXajc7n7mMPBhudVuJTo9 hlrNY1+rROuDJaYdPSNylf4xZvuDlss9TJA8pgA0LNK1/nD+GMasT+G5tj9sKUD2hqls cZuQ== X-Gm-Message-State: ALoCoQm+BAqGM9REBeFkN39vPAeVCrIPdPtHWA3JWwVNE/F+cJfbqJlwcoACruDW2UzIY66h3clh X-Received: by 10.68.33.10 with SMTP id n10mr2545654pbi.3.1375865516627; Wed, 07 Aug 2013 01:51:56 -0700 (PDT) Received: from ka1.ozlabs.ibm.com (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPSA id in2sm3677818pbc.37.2013.08.07.01.51.51 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Aug 2013 01:51:55 -0700 (PDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2013 18:51:33 +1000 Message-Id: <1375865493-19143-3-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1375865493-19143-1-git-send-email-aik@ozlabs.ru> References: <1375865493-19143-1-git-send-email-aik@ozlabs.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.41 Cc: Anthony Liguori , "Michael S . Tsirkin" , Alexey Kardashevskiy , Alexander Graf , Alex Williamson , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras Subject: [Qemu-devel] [PATCH 2/2] pseries: enable irqfd for pci 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 Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics_kvm.c | 5 +++++ hw/ppc/spapr_pci.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 1f078f3..9978a47 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -448,6 +448,11 @@ static void xics_kvm_realize(DeviceState *dev, Error **errp) goto fail; } } + + kvm_kernel_irqchip = true; + kvm_irqfds_allowed = true; + kvm_msi_via_irqfd_allowed = true; + return; fail: diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 6e14020..869ca43 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -457,6 +457,11 @@ static void spapr_msi_write(void *opaque, hwaddr addr, qemu_irq_pulse(xics_get_qirq(spapr->icp, irq)); } +static int spapr_pci_map_msi(KVMState *s, PCIBus *bus, MSIMessage msg) +{ + return msg.data; +} + static const MemoryRegionOps spapr_msi_ops = { /* There is no .read as the read result is undefined by PCI spec */ .read = NULL, @@ -631,6 +636,7 @@ static int spapr_phb_init(SysBusDevice *s) sphb->lsi_table[i].irq = irq; } + bus->map_msi = spapr_pci_map_msi; return 0; }