From cc3ac9c4a6fd0574b767c599e4a582be8f23260d Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Fri, 28 Jun 2013 09:28:06 +0200 Subject: virtio-ccw: fix build breakage on windows event_notifier_get_fd() is not available on windows hosts. Fix this by moving the calls to event_notifier_get_fd() to the kvm code. Reported-by: Stefan Weil Reviewed-by: Paolo Bonzini Signed-off-by: Cornelia Huck --- target-s390x/cpu.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'target-s390x/cpu.h') diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 918c819c64..741c4e4dd1 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1081,7 +1081,8 @@ void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, void kvm_s390_crw_mchk(S390CPU *cpu); void kvm_s390_enable_css_support(S390CPU *cpu); int kvm_s390_get_registers_partial(CPUState *cpu); -int kvm_s390_assign_subch_ioeventfd(int fd, uint32_t sch, int vq, bool assign); +int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch, + int vq, bool assign); #else static inline void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, @@ -1100,7 +1101,8 @@ static inline int kvm_s390_get_registers_partial(CPUState *cpu) { return -ENOSYS; } -static inline int kvm_s390_assign_subch_ioeventfd(int fd, uint32_t sch, int vq, +static inline int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, + uint32_t sch, int vq, bool assign) { return -ENOSYS; @@ -1131,11 +1133,12 @@ static inline void s390_crw_mchk(S390CPU *cpu) } } -static inline int s390_assign_subch_ioeventfd(int fd, uint32_t sch_id, int vq, +static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier, + uint32_t sch_id, int vq, bool assign) { if (kvm_enabled()) { - return kvm_s390_assign_subch_ioeventfd(fd, sch_id, vq, assign); + return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign); } else { return -ENOSYS; } -- cgit v1.2.3