* [PATCH] virtio: disable ioeventfd for record/replay
@ 2021-02-11 8:34 Pavel Dovgalyuk
2021-02-11 8:44 ` Cornelia Huck
2021-02-11 8:58 ` Alex Bennée
0 siblings, 2 replies; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-02-11 8:34 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, pbonzini, pavel.dovgalyuk, mst
virtio devices support separate iothreads waiting for
events from file descriptors. These are asynchronous
events that can't be recorded and replayed, therefore
this patch disables ioeventfd for all devices when
record or replay is enabled.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
---
hw/virtio/virtio-pci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 094c36aa3e..76fbc111ea 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -37,6 +37,7 @@
#include "qemu/range.h"
#include "hw/virtio/virtio-bus.h"
#include "qapi/visitor.h"
+#include "sysemu/replay.h"
#define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
@@ -1746,6 +1747,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
}
+ /* fd-based ioevents can't be synchronized in record/replay */
+ if (replay_mode != REPLAY_MODE_NONE) {
+ proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
+ }
+
/*
* virtio pci bar layout used by default.
* subclasses can re-arrange things if needed.
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 8:34 [PATCH] virtio: disable ioeventfd for record/replay Pavel Dovgalyuk
@ 2021-02-11 8:44 ` Cornelia Huck
2021-02-11 8:56 ` Pavel Dovgalyuk
2021-02-11 8:58 ` Alex Bennée
1 sibling, 1 reply; 11+ messages in thread
From: Cornelia Huck @ 2021-02-11 8:44 UTC (permalink / raw)
To: Pavel Dovgalyuk; +Cc: pbonzini, alex.bennee, qemu-devel, mst
On Thu, 11 Feb 2021 11:34:53 +0300
Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> wrote:
> virtio devices support separate iothreads waiting for
> events from file descriptors. These are asynchronous
> events that can't be recorded and replayed, therefore
> this patch disables ioeventfd for all devices when
> record or replay is enabled.
>
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
> hw/virtio/virtio-pci.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 094c36aa3e..76fbc111ea 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -37,6 +37,7 @@
> #include "qemu/range.h"
> #include "hw/virtio/virtio-bus.h"
> #include "qapi/visitor.h"
> +#include "sysemu/replay.h"
>
> #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
>
> @@ -1746,6 +1747,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
> proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> + }
> +
> /*
> * virtio pci bar layout used by default.
> * subclasses can re-arrange things if needed.
>
>
I think you would need to do the same for any device using ioeventfd,
no?
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 8:44 ` Cornelia Huck
@ 2021-02-11 8:56 ` Pavel Dovgalyuk
2021-02-11 9:05 ` Paolo Bonzini
0 siblings, 1 reply; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-02-11 8:56 UTC (permalink / raw)
To: Cornelia Huck; +Cc: pbonzini, alex.bennee, qemu-devel, mst
On 11.02.2021 11:44, Cornelia Huck wrote:
> On Thu, 11 Feb 2021 11:34:53 +0300
> Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> wrote:
>
>> virtio devices support separate iothreads waiting for
>> events from file descriptors. These are asynchronous
>> events that can't be recorded and replayed, therefore
>> this patch disables ioeventfd for all devices when
>> record or replay is enabled.
>>
>> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
>> ---
>> hw/virtio/virtio-pci.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
>> index 094c36aa3e..76fbc111ea 100644
>> --- a/hw/virtio/virtio-pci.c
>> +++ b/hw/virtio/virtio-pci.c
>> @@ -37,6 +37,7 @@
>> #include "qemu/range.h"
>> #include "hw/virtio/virtio-bus.h"
>> #include "qapi/visitor.h"
>> +#include "sysemu/replay.h"
>>
>> #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
>>
>> @@ -1746,6 +1747,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
>> proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
>> }
>>
>> + /* fd-based ioevents can't be synchronized in record/replay */
>> + if (replay_mode != REPLAY_MODE_NONE) {
>> + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
>> + }
>> +
>> /*
>> * virtio pci bar layout used by default.
>> * subclasses can re-arrange things if needed.
>>
>>
>
> I think you would need to do the same for any device using ioeventfd,
> no?
That's right.
It seems, that ioeventfd is used in virtio-ccw, virtio-mmio, and
virtio-pci. The second one is related to KVM only, right?
And the first one should be updated too for replay.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 8:56 ` Pavel Dovgalyuk
@ 2021-02-11 9:05 ` Paolo Bonzini
2021-02-24 9:56 ` Pavel Dovgalyuk
0 siblings, 1 reply; 11+ messages in thread
From: Paolo Bonzini @ 2021-02-11 9:05 UTC (permalink / raw)
To: Pavel Dovgalyuk, Cornelia Huck; +Cc: alex.bennee, qemu-devel, mst
On 11/02/21 09:56, Pavel Dovgalyuk wrote:
>
> That's right.
> It seems, that ioeventfd is used in virtio-ccw, virtio-mmio, and
> virtio-pci. The second one is related to KVM only, right?
No, it's used for TCG as well (with ARM "-M virt" or x86 "-M microvm").
Paolo
> And the first one should be updated too for replay.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 9:05 ` Paolo Bonzini
@ 2021-02-24 9:56 ` Pavel Dovgalyuk
2021-02-24 10:21 ` Paolo Bonzini
0 siblings, 1 reply; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-02-24 9:56 UTC (permalink / raw)
To: Paolo Bonzini, Cornelia Huck; +Cc: alex.bennee, qemu-devel, mst
On 11.02.2021 12:05, Paolo Bonzini wrote:
> On 11/02/21 09:56, Pavel Dovgalyuk wrote:
>>
>> That's right.
>> It seems, that ioeventfd is used in virtio-ccw, virtio-mmio, and
>> virtio-pci. The second one is related to KVM only, right?
>
> No, it's used for TCG as well (with ARM "-M virt" or x86 "-M microvm").
Thanks for pointing at these machines.
But virtio-mmio does not support ioeventfd disabling as in PCI and CCW
devices.
Should this option be added first?
Or the following code means that ioeventfd is used only in KVM mode?
static bool virtio_mmio_ioeventfd_enabled(DeviceState *d)
{
return kvm_eventfds_enabled();
}
Pavel Dovgalyuk
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 8:34 [PATCH] virtio: disable ioeventfd for record/replay Pavel Dovgalyuk
2021-02-11 8:44 ` Cornelia Huck
@ 2021-02-11 8:58 ` Alex Bennée
2021-02-11 11:40 ` Paolo Bonzini
1 sibling, 1 reply; 11+ messages in thread
From: Alex Bennée @ 2021-02-11 8:58 UTC (permalink / raw)
To: Pavel Dovgalyuk; +Cc: pbonzini, qemu-devel, mst
Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:
> virtio devices support separate iothreads waiting for
> events from file descriptors. These are asynchronous
> events that can't be recorded and replayed, therefore
> this patch disables ioeventfd for all devices when
> record or replay is enabled.
Does it always have to be the case? Can a virtio device forgo iothreads
and poll events from the main loop?
>
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
> hw/virtio/virtio-pci.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 094c36aa3e..76fbc111ea 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -37,6 +37,7 @@
> #include "qemu/range.h"
> #include "hw/virtio/virtio-bus.h"
> #include "qapi/visitor.h"
> +#include "sysemu/replay.h"
>
> #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
>
> @@ -1746,6 +1747,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
> proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> + }
> +
> /*
> * virtio pci bar layout used by default.
> * subclasses can re-arrange things if needed.
I think we need a better solution for this. Are we going to end up
sprinkling replay annotations throughout the device backends for each an
every device supported by QEMU?
This seems to be it should be the other way around. We should identify
the devices (or classes of devices) that support the logging and
consistency requirements needed for replay and mark them with a QOM
parameter. Then we can walk the tree of devices and either claim
compatibility with the request to record/replay or report to the user
"can't use record/replay because device %s is not supported".
--
Alex Bennée
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-02-11 8:58 ` Alex Bennée
@ 2021-02-11 11:40 ` Paolo Bonzini
0 siblings, 0 replies; 11+ messages in thread
From: Paolo Bonzini @ 2021-02-11 11:40 UTC (permalink / raw)
To: Alex Bennée, Pavel Dovgalyuk; +Cc: qemu-devel, mst
On 11/02/21 09:58, Alex Bennée wrote:
>> virtio devices support separate iothreads waiting for
>> events from file descriptors. These are asynchronous
>> events that can't be recorded and replayed, therefore
>> this patch disables ioeventfd for all devices when
>> record or replay is enabled.
> Does it always have to be the case? Can a virtio device forgo iothreads
> and poll events from the main loop?
Yes and in fact it's the default, but ioeventfd has the same issue I
think even if the polling happens from the main thread.
Paolo
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] virtio: disable ioeventfd for record/replay
@ 2021-05-17 13:06 Pavel Dovgalyuk
2021-05-31 4:47 ` Pavel Dovgalyuk
2021-06-15 4:44 ` Pavel Dovgalyuk
0 siblings, 2 replies; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-05-17 13:06 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, pbonzini, pavel.dovgalyuk, mst
virtio devices support separate iothreads waiting for
events from file descriptors. These are asynchronous
events that can't be recorded and replayed, therefore
this patch disables ioeventfd for all devices when
record or replay is enabled.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
---
hw/s390x/virtio-ccw.c | 6 ++++++
hw/virtio/virtio-mmio.c | 6 ++++++
hw/virtio/virtio-pci.c | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 92b950e09a..bd8b9c5755 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -31,6 +31,7 @@
#include "trace.h"
#include "hw/s390x/css-bridge.h"
#include "hw/s390x/s390-virtio-ccw.h"
+#include "sysemu/replay.h"
#define NR_CLASSIC_INDICATOR_BITS 64
@@ -769,6 +770,11 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
}
+ /* fd-based ioevents can't be synchronized in record/replay */
+ if (replay_mode != REPLAY_MODE_NONE) {
+ dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
+ }
+
if (k->realize) {
k->realize(dev, &err);
if (err) {
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 5952471b38..1af48a1b04 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -29,6 +29,7 @@
#include "qemu/host-utils.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
+#include "sysemu/replay.h"
#include "hw/virtio/virtio-mmio.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
@@ -740,6 +741,11 @@ static void virtio_mmio_realizefn(DeviceState *d, Error **errp)
proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
}
+ /* fd-based ioevents can't be synchronized in record/replay */
+ if (replay_mode != REPLAY_MODE_NONE) {
+ proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
+ }
+
if (proxy->legacy) {
memory_region_init_io(&proxy->iomem, OBJECT(d),
&virtio_legacy_mem_ops, proxy,
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index b321604d9b..f1e105fa52 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -37,6 +37,7 @@
#include "qemu/range.h"
#include "hw/virtio/virtio-bus.h"
#include "qapi/visitor.h"
+#include "sysemu/replay.h"
#define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
@@ -1760,6 +1761,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
}
+ /* fd-based ioevents can't be synchronized in record/replay */
+ if (replay_mode != REPLAY_MODE_NONE) {
+ proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
+ }
+
/*
* virtio pci bar layout used by default.
* subclasses can re-arrange things if needed.
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-05-17 13:06 Pavel Dovgalyuk
@ 2021-05-31 4:47 ` Pavel Dovgalyuk
2021-06-15 4:44 ` Pavel Dovgalyuk
1 sibling, 0 replies; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-05-31 4:47 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, alex.bennee, mst
ping
On 17.05.2021 16:06, Pavel Dovgalyuk wrote:
> virtio devices support separate iothreads waiting for
> events from file descriptors. These are asynchronous
> events that can't be recorded and replayed, therefore
> this patch disables ioeventfd for all devices when
> record or replay is enabled.
>
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
> hw/s390x/virtio-ccw.c | 6 ++++++
> hw/virtio/virtio-mmio.c | 6 ++++++
> hw/virtio/virtio-pci.c | 6 ++++++
> 3 files changed, 18 insertions(+)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 92b950e09a..bd8b9c5755 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -31,6 +31,7 @@
> #include "trace.h"
> #include "hw/s390x/css-bridge.h"
> #include "hw/s390x/s390-virtio-ccw.h"
> +#include "sysemu/replay.h"
>
> #define NR_CLASSIC_INDICATOR_BITS 64
>
> @@ -769,6 +770,11 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
> dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
> + }
> +
> if (k->realize) {
> k->realize(dev, &err);
> if (err) {
> diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
> index 5952471b38..1af48a1b04 100644
> --- a/hw/virtio/virtio-mmio.c
> +++ b/hw/virtio/virtio-mmio.c
> @@ -29,6 +29,7 @@
> #include "qemu/host-utils.h"
> #include "qemu/module.h"
> #include "sysemu/kvm.h"
> +#include "sysemu/replay.h"
> #include "hw/virtio/virtio-mmio.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> @@ -740,6 +741,11 @@ static void virtio_mmio_realizefn(DeviceState *d, Error **errp)
> proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
> + }
> +
> if (proxy->legacy) {
> memory_region_init_io(&proxy->iomem, OBJECT(d),
> &virtio_legacy_mem_ops, proxy,
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index b321604d9b..f1e105fa52 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -37,6 +37,7 @@
> #include "qemu/range.h"
> #include "hw/virtio/virtio-bus.h"
> #include "qapi/visitor.h"
> +#include "sysemu/replay.h"
>
> #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
>
> @@ -1760,6 +1761,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
> proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> + }
> +
> /*
> * virtio pci bar layout used by default.
> * subclasses can re-arrange things if needed.
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] virtio: disable ioeventfd for record/replay
2021-05-17 13:06 Pavel Dovgalyuk
2021-05-31 4:47 ` Pavel Dovgalyuk
@ 2021-06-15 4:44 ` Pavel Dovgalyuk
1 sibling, 0 replies; 11+ messages in thread
From: Pavel Dovgalyuk @ 2021-06-15 4:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, alex.bennee, mst
ping
On 17.05.2021 16:06, Pavel Dovgalyuk wrote:
> virtio devices support separate iothreads waiting for
> events from file descriptors. These are asynchronous
> events that can't be recorded and replayed, therefore
> this patch disables ioeventfd for all devices when
> record or replay is enabled.
>
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
> hw/s390x/virtio-ccw.c | 6 ++++++
> hw/virtio/virtio-mmio.c | 6 ++++++
> hw/virtio/virtio-pci.c | 6 ++++++
> 3 files changed, 18 insertions(+)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 92b950e09a..bd8b9c5755 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -31,6 +31,7 @@
> #include "trace.h"
> #include "hw/s390x/css-bridge.h"
> #include "hw/s390x/s390-virtio-ccw.h"
> +#include "sysemu/replay.h"
>
> #define NR_CLASSIC_INDICATOR_BITS 64
>
> @@ -769,6 +770,11 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
> dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
> + }
> +
> if (k->realize) {
> k->realize(dev, &err);
> if (err) {
> diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
> index 5952471b38..1af48a1b04 100644
> --- a/hw/virtio/virtio-mmio.c
> +++ b/hw/virtio/virtio-mmio.c
> @@ -29,6 +29,7 @@
> #include "qemu/host-utils.h"
> #include "qemu/module.h"
> #include "sysemu/kvm.h"
> +#include "sysemu/replay.h"
> #include "hw/virtio/virtio-mmio.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> @@ -740,6 +741,11 @@ static void virtio_mmio_realizefn(DeviceState *d, Error **errp)
> proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD;
> + }
> +
> if (proxy->legacy) {
> memory_region_init_io(&proxy->iomem, OBJECT(d),
> &virtio_legacy_mem_ops, proxy,
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index b321604d9b..f1e105fa52 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -37,6 +37,7 @@
> #include "qemu/range.h"
> #include "hw/virtio/virtio-bus.h"
> #include "qapi/visitor.h"
> +#include "sysemu/replay.h"
>
> #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present(dev))
>
> @@ -1760,6 +1761,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
> proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> }
>
> + /* fd-based ioevents can't be synchronized in record/replay */
> + if (replay_mode != REPLAY_MODE_NONE) {
> + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
> + }
> +
> /*
> * virtio pci bar layout used by default.
> * subclasses can re-arrange things if needed.
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-06-15 4:45 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-11 8:34 [PATCH] virtio: disable ioeventfd for record/replay Pavel Dovgalyuk
2021-02-11 8:44 ` Cornelia Huck
2021-02-11 8:56 ` Pavel Dovgalyuk
2021-02-11 9:05 ` Paolo Bonzini
2021-02-24 9:56 ` Pavel Dovgalyuk
2021-02-24 10:21 ` Paolo Bonzini
2021-02-11 8:58 ` Alex Bennée
2021-02-11 11:40 ` Paolo Bonzini
2021-05-17 13:06 Pavel Dovgalyuk
2021-05-31 4:47 ` Pavel Dovgalyuk
2021-06-15 4:44 ` Pavel Dovgalyuk
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.