* [Qemu-devel] [PATCH v3 0/1] virtio-scsi-ccw: fix iotest 068 for s390x
@ 2017-07-04 8:32 QingFeng Hao
2017-07-04 8:32 ` [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
0 siblings, 1 reply; 4+ messages in thread
From: QingFeng Hao @ 2017-07-04 8:32 UTC (permalink / raw)
To: qemu-devel, qemu-block
Cc: borntraeger, zyimin, stefanha, kwolf, famz, peterx, cohuck, QingFeng Hao
This commit fixes iotest 068 for s390x as s390x uses virtio-scsi-ccw.
It's based on commit c324fd0a39c by Stefan Hajnoczi.
Thanks!
Change history:
v3:
Take Christian Borntraeger and Cornelia Huck's comment to check
if kvm is enabled in s390_assign_subch_ioeventfd instead of
kvm_s390_assign_subch_ioeventfd to as the former is a general one.
v2:
Remove Stefan from sign-off list and change the patch's commit message
according to Christian Borntraeger's comment.
QingFeng Hao (1):
virtio-scsi-ccw: use ioeventfd even when KVM is disabled
hw/s390x/virtio-ccw.c | 2 +-
target/s390x/cpu.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
--
2.11.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 8:32 [Qemu-devel] [PATCH v3 0/1] virtio-scsi-ccw: fix iotest 068 for s390x QingFeng Hao
@ 2017-07-04 8:32 ` QingFeng Hao
2017-07-04 9:34 ` Cornelia Huck
0 siblings, 1 reply; 4+ messages in thread
From: QingFeng Hao @ 2017-07-04 8:32 UTC (permalink / raw)
To: qemu-devel, qemu-block
Cc: borntraeger, zyimin, stefanha, kwolf, famz, peterx, cohuck, QingFeng Hao
This patch is based on a similar patch from Stefan Hajnoczi -
commit c324fd0a39c (" virtio-pci: use ioeventfd even when KVM is disabled)
Do not check kvm_eventfds_enabled() when KVM is disabled since it
always returns 0. Since commit 8c56c1a592b5092d91da8d8943c17777d6462a6f
("memory: emulate ioeventfd") it has been possible to use ioeventfds in
qtest or TCG mode.
This patch makes -device virtio-scsi-ccw,iothread=iothread0 work even
when KVM is disabled.
I have tested that virtio-scsi-ccw works under tcg both with and without
iothread.
This patch fixes qemu-iotests 068, which was accidentally merged early
despite the dependency on ioeventfd.
Signed-off-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
---
hw/s390x/virtio-ccw.c | 2 +-
target/s390x/cpu.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 90d37cb9ff..35896eb007 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -711,7 +711,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
sch->cssid, sch->ssid, sch->schid, sch->devno,
ccw_dev->devno.valid ? "user-configured" : "auto-configured");
- if (!kvm_eventfds_enabled()) {
+ if (kvm_enabled() && !kvm_eventfds_enabled()) {
dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
}
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 9faca04b52..bdb9bdbc9d 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -1264,7 +1264,11 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,
uint32_t sch_id, int vq,
bool assign)
{
- return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
+ if (kvm_enabled()) {
+ return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
+ } else {
+ return 0;
+ }
}
static inline void s390_crypto_reset(void)
--
2.11.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 8:32 ` [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
@ 2017-07-04 9:34 ` Cornelia Huck
2017-07-04 9:45 ` QingFeng Hao
0 siblings, 1 reply; 4+ messages in thread
From: Cornelia Huck @ 2017-07-04 9:34 UTC (permalink / raw)
To: QingFeng Hao
Cc: qemu-devel, qemu-block, borntraeger, zyimin, stefanha, kwolf,
famz, peterx
On Tue, 4 Jul 2017 10:32:31 +0200
QingFeng Hao <haoqf@linux.vnet.ibm.com> wrote:
> This patch is based on a similar patch from Stefan Hajnoczi -
> commit c324fd0a39c (" virtio-pci: use ioeventfd even when KVM is disabled)
>
> Do not check kvm_eventfds_enabled() when KVM is disabled since it
> always returns 0. Since commit 8c56c1a592b5092d91da8d8943c17777d6462a6f
> ("memory: emulate ioeventfd") it has been possible to use ioeventfds in
> qtest or TCG mode.
>
> This patch makes -device virtio-scsi-ccw,iothread=iothread0 work even
> when KVM is disabled.
It might be good to add a sentence that we don't have an equivalent to
"memory: emulate ioeventfd" for ccw yet, but that this doesn't hurt.
>
> I have tested that virtio-scsi-ccw works under tcg both with and without
> iothread.
>
> This patch fixes qemu-iotests 068, which was accidentally merged early
> despite the dependency on ioeventfd.
>
> Signed-off-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
> ---
> hw/s390x/virtio-ccw.c | 2 +-
> target/s390x/cpu.h | 6 +++++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 90d37cb9ff..35896eb007 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -711,7 +711,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
> sch->cssid, sch->ssid, sch->schid, sch->devno,
> ccw_dev->devno.valid ? "user-configured" : "auto-configured");
>
> - if (!kvm_eventfds_enabled()) {
> + if (kvm_enabled() && !kvm_eventfds_enabled()) {
> dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
> }
>
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 9faca04b52..bdb9bdbc9d 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -1264,7 +1264,11 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,
> uint32_t sch_id, int vq,
> bool assign)
> {
> - return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
> + if (kvm_enabled()) {
> + return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
> + } else {
> + return 0;
> + }
> }
>
> static inline void s390_crypto_reset(void)
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 9:34 ` Cornelia Huck
@ 2017-07-04 9:45 ` QingFeng Hao
0 siblings, 0 replies; 4+ messages in thread
From: QingFeng Hao @ 2017-07-04 9:45 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-block, borntraeger, zyimin, stefanha, kwolf,
famz, peterx
在 2017/7/4 17:34, Cornelia Huck 写道:
> On Tue, 4 Jul 2017 10:32:31 +0200
> QingFeng Hao <haoqf@linux.vnet.ibm.com> wrote:
>
>> This patch is based on a similar patch from Stefan Hajnoczi -
>> commit c324fd0a39c (" virtio-pci: use ioeventfd even when KVM is disabled)
>>
>> Do not check kvm_eventfds_enabled() when KVM is disabled since it
>> always returns 0. Since commit 8c56c1a592b5092d91da8d8943c17777d6462a6f
>> ("memory: emulate ioeventfd") it has been possible to use ioeventfds in
>> qtest or TCG mode.
>>
>> This patch makes -device virtio-scsi-ccw,iothread=iothread0 work even
>> when KVM is disabled.
> It might be good to add a sentence that we don't have an equivalent to
> "memory: emulate ioeventfd" for ccw yet, but that this doesn't hurt.
Ok, I'll add it. thanks.
>
>> I have tested that virtio-scsi-ccw works under tcg both with and without
>> iothread.
>>
>> This patch fixes qemu-iotests 068, which was accidentally merged early
>> despite the dependency on ioeventfd.
>>
>> Signed-off-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
>> ---
>> hw/s390x/virtio-ccw.c | 2 +-
>> target/s390x/cpu.h | 6 +++++-
>> 2 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
>> index 90d37cb9ff..35896eb007 100644
>> --- a/hw/s390x/virtio-ccw.c
>> +++ b/hw/s390x/virtio-ccw.c
>> @@ -711,7 +711,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
>> sch->cssid, sch->ssid, sch->schid, sch->devno,
>> ccw_dev->devno.valid ? "user-configured" : "auto-configured");
>>
>> - if (!kvm_eventfds_enabled()) {
>> + if (kvm_enabled() && !kvm_eventfds_enabled()) {
>> dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
>> }
>>
>> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
>> index 9faca04b52..bdb9bdbc9d 100644
>> --- a/target/s390x/cpu.h
>> +++ b/target/s390x/cpu.h
>> @@ -1264,7 +1264,11 @@ static inline int s390_assign_subch_ioeventfd(EventNotifier *notifier,
>> uint32_t sch_id, int vq,
>> bool assign)
>> {
>> - return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
>> + if (kvm_enabled()) {
>> + return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
>> + } else {
>> + return 0;
>> + }
>> }
>>
>> static inline void s390_crypto_reset(void)
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Thanks!
>
--
Regards
QingFeng Hao
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-07-04 9:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-04 8:32 [Qemu-devel] [PATCH v3 0/1] virtio-scsi-ccw: fix iotest 068 for s390x QingFeng Hao
2017-07-04 8:32 ` [Qemu-devel] [PATCH v3 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
2017-07-04 9:34 ` Cornelia Huck
2017-07-04 9:45 ` QingFeng Hao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.