| Message ID | 1338880564-12277-1-git-send-email-jfrei@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
Am 05.06.2012 09:16, schrieb 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 <jfrei@linux.vnet.ibm.com> A patch by Jan moves the first chunk instead and fixes another issue as well in v2. Cc'ing Jan to verify. Andreas > --- > 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) {
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) {
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 <jfrei@linux.vnet.ibm.com> --- kvm-all.c | 4 ++++ 1 file changed, 4 insertions(+)