提交 a499973f 编写于 作者: A Aurelien Jarno 提交者: Alexander Graf

virtio-ccw: disable ioevent bit when ioeventfds are not enabled

This remove the corresponding error messages in TCG mode, and allow to
simplify the s390_assign_subch_ioeventfd() function.
Signed-off-by: NAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: NAlexander Graf <agraf@suse.de>
上级 d49f4ab4
...@@ -1401,6 +1401,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) ...@@ -1401,6 +1401,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
return; return;
} }
if (!kvm_eventfds_enabled()) {
dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
}
sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus); sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus);
css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid,
......
...@@ -1215,11 +1215,7 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier, ...@@ -1215,11 +1215,7 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,
uint32_t sch_id, int vq, uint32_t sch_id, int vq,
bool assign) bool assign)
{ {
if (kvm_enabled()) { return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
} else {
return -ENOSYS;
}
} }
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册