From patchwork Wed Jun 12 21:21:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 250884 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 63ED12C0084 for ; Thu, 13 Jun 2013 07:22:27 +1000 (EST) Received: from localhost ([::1]:51943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmsUr-0003Kh-9N for incoming@patchwork.ozlabs.org; Wed, 12 Jun 2013 17:22:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmsUX-0003J4-2h for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmsUU-0000qt-46 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:22:04 -0400 Received: from mail-db8lp0184.outbound.messaging.microsoft.com ([213.199.154.184]:10550 helo=db8outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmsUK-0000au-OD; Wed, 12 Jun 2013 17:21:52 -0400 Received: from mail72-db8-R.bigfish.com (10.174.8.225) by DB8EHSOBE041.bigfish.com (10.174.4.104) with Microsoft SMTP Server id 14.1.225.23; Wed, 12 Jun 2013 21:21:51 +0000 Received: from mail72-db8 (localhost [127.0.0.1]) by mail72-db8-R.bigfish.com (Postfix) with ESMTP id D2C091400C7; Wed, 12 Jun 2013 21:21:51 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1155h) Received: from mail72-db8 (localhost.localdomain [127.0.0.1]) by mail72-db8 (MessageSwitch) id 1371072109521864_753; Wed, 12 Jun 2013 21:21:49 +0000 (UTC) Received: from DB8EHSMHS011.bigfish.com (unknown [10.174.8.245]) by mail72-db8.bigfish.com (Postfix) with ESMTP id 71EDB8C0047; Wed, 12 Jun 2013 21:21:49 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS011.bigfish.com (10.174.4.21) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 12 Jun 2013 21:21:49 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Wed, 12 Jun 2013 21:21:47 +0000 Received: from snotra.am.freescale.net ([10.214.81.158]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r5CLLjtu024557; Wed, 12 Jun 2013 14:21:45 -0700 From: Scott Wood To: Alexander Graf Date: Wed, 12 Jun 2013 16:21:45 -0500 Message-ID: <1371072105-28397-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 213.199.154.184 Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] kvm/openpic: add kvm_irqchip_commit_routes 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 The patch that added kvm_irqchip_commit_routes was originally meant to come after the in-kernel mpic patch, and thus it updated hw/intc/openpic_kvm.c. However, it was applied before the in-kernel mpic patch (which creates hw/intc/openpic_kvm.c), and thus this hunk got lost. Signed-off-by: Scott Wood --- hw/intc/openpic_kvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 809b34b..17d0a35 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -204,6 +204,8 @@ static int kvm_openpic_init(SysBusDevice *dev) kvm_msi_via_irqfd_allowed = true; kvm_gsi_routing_allowed = true; + kvm_irqchip_commit_routes(s); + return 0; }