* [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x
@ 2017-07-04 13:23 QingFeng Hao
2017-07-04 13:23 ` [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
2017-07-05 15:15 ` [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x Stefan Hajnoczi
0 siblings, 2 replies; 6+ messages in thread
From: QingFeng Hao @ 2017-07-04 13:23 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:
v4:
Got Cornelia Huck's Reviewed-by and take the comment to change the
commit message.
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] 6+ messages in thread
* [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 13:23 [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x QingFeng Hao
@ 2017-07-04 13:23 ` QingFeng Hao
2017-07-04 14:04 ` Christian Borntraeger
2017-07-05 15:15 ` [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x Stefan Hajnoczi
1 sibling, 1 reply; 6+ messages in thread
From: QingFeng Hao @ 2017-07-04 13:23 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.
Currently we don't have an equivalent to "memory: emulate ioeventfd"
for ccw yet, but that this doesn't hurt and qemu-iotests 068 can pass with
skipping iothread arguments.
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>
Reviewed-by: Cornelia Huck <cohuck@redhat.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] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 13:23 ` [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
@ 2017-07-04 14:04 ` Christian Borntraeger
2017-07-05 1:56 ` QingFeng Hao
0 siblings, 1 reply; 6+ messages in thread
From: Christian Borntraeger @ 2017-07-04 14:04 UTC (permalink / raw)
To: QingFeng Hao, qemu-devel, qemu-block
Cc: kwolf, zyimin, famz, cohuck, peterx, stefanha
On 07/04/2017 03:23 PM, QingFeng Hao 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.
> Currently we don't have an equivalent to "memory: emulate ioeventfd"
> for ccw yet, but that this doesn't hurt and qemu-iotests 068 can pass with
> skipping iothread arguments.
>
> 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>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
I will take it via the s390-next tree.
thanks applied.
> ---
> 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)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled
2017-07-04 14:04 ` Christian Borntraeger
@ 2017-07-05 1:56 ` QingFeng Hao
0 siblings, 0 replies; 6+ messages in thread
From: QingFeng Hao @ 2017-07-05 1:56 UTC (permalink / raw)
To: Christian Borntraeger, qemu-devel, qemu-block
Cc: kwolf, zyimin, famz, cohuck, peterx, stefanha
在 2017/7/4 22:04, Christian Borntraeger 写道:
> On 07/04/2017 03:23 PM, QingFeng Hao 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.
>> Currently we don't have an equivalent to "memory: emulate ioeventfd"
>> for ccw yet, but that this doesn't hurt and qemu-iotests 068 can pass with
>> skipping iothread arguments.
>>
>> 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>
>> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> I will take it via the s390-next tree.
>
> thanks applied.
Ok, thanks.
>> ---
>> 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)
>>
--
Regards
QingFeng Hao
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x
2017-07-04 13:23 [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x QingFeng Hao
2017-07-04 13:23 ` [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
@ 2017-07-05 15:15 ` Stefan Hajnoczi
2017-07-06 2:19 ` QingFeng Hao
1 sibling, 1 reply; 6+ messages in thread
From: Stefan Hajnoczi @ 2017-07-05 15:15 UTC (permalink / raw)
To: QingFeng Hao
Cc: qemu-devel, qemu-block, borntraeger, zyimin, kwolf, famz, peterx, cohuck
[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]
On Tue, Jul 04, 2017 at 03:23:49PM +0200, QingFeng Hao wrote:
> 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:
> v4:
> Got Cornelia Huck's Reviewed-by and take the comment to change the
> commit message.
>
> 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(-)
I didn't realize s390 also has this old check. Thanks for fixing it!
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x
2017-07-05 15:15 ` [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x Stefan Hajnoczi
@ 2017-07-06 2:19 ` QingFeng Hao
0 siblings, 0 replies; 6+ messages in thread
From: QingFeng Hao @ 2017-07-06 2:19 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: qemu-devel, qemu-block, borntraeger, zyimin, kwolf, famz, peterx, cohuck
在 2017/7/5 23:15, Stefan Hajnoczi 写道:
> On Tue, Jul 04, 2017 at 03:23:49PM +0200, QingFeng Hao wrote:
>> 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:
>> v4:
>> Got Cornelia Huck's Reviewed-by and take the comment to change the
>> commit message.
>>
>> 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(-)
> I didn't realize s390 also has this old check. Thanks for fixing it!
Thanks Stefan!
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
--
Regards
QingFeng Hao
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-07-06 2:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-04 13:23 [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x QingFeng Hao
2017-07-04 13:23 ` [Qemu-devel] [PATCH v4 1/1] virtio-scsi-ccw: use ioeventfd even when KVM is disabled QingFeng Hao
2017-07-04 14:04 ` Christian Borntraeger
2017-07-05 1:56 ` QingFeng Hao
2017-07-05 15:15 ` [Qemu-devel] [PATCH v4 0/1] virtio-scsi-ccw: fix iotest 068 for s390x Stefan Hajnoczi
2017-07-06 2:19 ` 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.