From patchwork Tue Jan 15 16:32:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 212221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D47FC2C00A5 for ; Wed, 16 Jan 2013 03:29:03 +1100 (EST) Received: from localhost ([::1]:34841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Nm-00021V-0Z for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 11:29:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Na-00021K-Sp for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:28:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9NU-0007cp-Hk for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:28:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9NU-0007bz-9l; Tue, 15 Jan 2013 11:28:44 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FGSgUV027618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jan 2013 11:28:42 -0500 Received: from redhat.com ([10.35.212.26]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FGSbw4016623; Tue, 15 Jan 2013 11:28:39 -0500 Date: Tue, 15 Jan 2013 18:32:37 +0200 From: "Michael S. Tsirkin" To: Andreas =?iso-8859-1?Q?F=E4rber?= Message-ID: <20130115163237.GA7997@redhat.com> References: <20130113104728.GA23188@redhat.com> <50F52AD2.6080400@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50F52AD2.6080400@suse.de> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id r0FGSgUV027618 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-stable@nongnu.org, Alexander Graf , qemu-devel@nongnu.org, alex.williamson@redhat.com, Anthony Liguori , pbonzini@redhat.com Subject: Re: [Qemu-devel] [PULL] pci,virtio 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 On Tue, Jan 15, 2013 at 11:09:22AM +0100, Andreas Färber wrote: > Am 13.01.2013 11:47, schrieb Michael S. Tsirkin: > > The following changes since commit 8e4a424b305e29dc0e454f52df3b35577f342975: > > > > Revert "virtio-pci: replace byte swap hack" (2013-01-06 18:30:17 +0000) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony > > > > for you to fetch changes up to feb9a2ab4b0260d8d680a7ffd25063dafc7ec628: > > > > pci-assign: Enable MSIX on device to match guest (2013-01-09 12:11:16 +0200) > > > > ---------------------------------------------------------------- > > pci,virtio > > > > This further optimizes MSIX handling in virtio-pci. > > Also included is pci cleanup by Paolo, and pci device > > assignment fix by Alex. > > > > Signed-off-by: Michael S. Tsirkin > > > > ---------------------------------------------------------------- > > Alex Williamson (1): > > pci-assign: Enable MSIX on device to match guest > > > > Michael S. Tsirkin (8): > > virtio: don't waste irqfds on control vqs > > msix: add api to access msix message > > kvm: add stub for update msi route > > virtio-pci: cache msix messages > > This broke the build with PowerKVM: > > LINK ppc64-softmmu/qemu-system-ppc64 > ../hw/virtio-pci.o: In function `kvm_virtio_pci_vq_vector_unmask': > /home/andreas/QEMU/qemu/hw/virtio-pci.c:622: undefined reference to > `kvm_irqchip_update_msi_route' > collect2: error: ld returned 1 exit status > make[1]: *** [qemu-system-ppc64] Fehler 1 > make: *** [subdir-ppc64-softmmu] Fehler 2 > > Can you supply a fix? It's not obvious to me how. > > Thanks, > Andreas I'm not sure how to build this. Can you tell me pls? Maybe the below helps? kvm: add stub for kvm_irqchip_update_msi_route Signed-off-by: Michael S. Tsirkin Tested-by: Andreas Färber diff --git a/kvm-all.c b/kvm-all.c index fc0c6e7..bac67da 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1182,6 +1182,11 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) { abort(); } + +int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) +{ + return -ENOSYS; +} #endif /* !KVM_CAP_IRQ_ROUTING */ int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq)