From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sbo0I-000362-B3 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 03:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sbo0G-00005Q-Nc for qemu-devel@nongnu.org; Tue, 05 Jun 2012 03:16:33 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:60002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sbo0G-0008WP-EX for qemu-devel@nongnu.org; Tue, 05 Jun 2012 03:16:32 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Jun 2012 08:16:30 +0100 Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q557GRW32523240 for ; Tue, 5 Jun 2012 08:16:27 +0100 Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5575k7g006311 for ; Tue, 5 Jun 2012 03:05:46 -0400 From: Jens Freimann Date: Tue, 5 Jun 2012 09:16:04 +0200 Message-Id: <1338880564-12277-1-git-send-email-jfrei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] Fix build of kvm-all.c when no KVM_CAP_IRQ_ROUTING List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jens Freimann In kvm-all.c an #ifdef KVM_CAP_IRQ_ROUTING was missing in two places which broke the build when this capability is not enabled. Found when building the s390-softmmu target. Signed-off-by: Jens Freimann --- kvm-all.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kvm-all.c b/kvm-all.c index 489ee53..95634ef 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -62,10 +62,12 @@ typedef struct KVMSlot typedef struct kvm_dirty_log KVMDirtyLog; +#ifdef KVM_CAP_IRQ_ROUTING typedef struct KVMMSIRoute { struct kvm_irq_routing_entry kroute; QTAILQ_ENTRY(KVMMSIRoute) entry; } KVMMSIRoute; +#endif struct KVMState { @@ -1286,7 +1288,9 @@ int kvm_init(void) s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); #endif +#ifdef KVM_CAP_IRQ_ROUTING s->direct_msi = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0); +#endif ret = kvm_arch_init(s); if (ret < 0) { -- 1.7.10.4