Re: [Qemu-devel] [RFC PATCH v12 16/21]

2015-05-06 Thread Pavel Dovgaluk
> From: Paolo Bonzini [mailto:pbonz...@redhat.com]
> On 05/05/2015 12:22, Pavel Dovgaluk wrote:
> > This patch is the reduced version of prior "bottom halves" patch.
> 
> dma-helpers.c is also related to block devices, so it's better not to
> change it now.

Ok.

> Perhaps you can add a replay event for ptimers instead of touching
> bottom halves?

It seems reasonable.
Then I'll have to use BH as a simple callback by implementing "run bh" function.
This BH will be added to replay queue instead of adding it to BH queue.

Pavel Dovgalyuk
> >
> >
> >> -Original Message-
> >> From: Pavel Dovgalyuk [mailto:pavel.dovga...@ispras.ru]
> >> Sent: Tuesday, May 05, 2015 1:19 PM
> >> To: qemu-devel@nongnu.org
> >> Cc: peter.mayd...@linaro.org; peter.crosthwa...@xilinx.com; 
> >> ebl...@redhat.com;
> >> mark.bur...@greensocs.com; r...@ispras.ru; batuz...@ispras.ru;
> maria.klimushenk...@ispras.ru;
> >> pavel.dovga...@ispras.ru; pbonz...@redhat.com; alex.ben...@linaro.org;
> >> fred.kon...@greensocs.com
> >> Subject: [RFC PATCH v12 16/21]
> >>
> >>
> >>
> >> Signed-off-by: Pavel Dovgalyuk 
> >> ---
> >>  async.c  |   24 +++-
> >>  dma-helpers.c|4 +++-
> >>  hw/timer/arm_timer.c |2 +-
> >>  include/block/aio.h  |   18 ++
> >>  include/qemu/main-loop.h |1 +
> >>  main-loop.c  |5 +
> >>  replay/replay-events.c   |   16 
> >>  replay/replay-internal.h |1 +
> >>  replay/replay.h  |2 ++
> >>  stubs/replay.c   |4 
> >>  10 files changed, 74 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/async.c b/async.c
> >> index bd975c9..d092aa2 100644
> >> --- a/async.c
> >> +++ b/async.c
> >> @@ -27,6 +27,7 @@
> >>  #include "block/thread-pool.h"
> >>  #include "qemu/main-loop.h"
> >>  #include "qemu/atomic.h"
> >> +#include "replay/replay.h"
> >>
> >>  /***/
> >>  /* bottom halves (can be seen as timers which expire ASAP) */
> >> @@ -39,6 +40,8 @@ struct QEMUBH {
> >>  bool scheduled;
> >>  bool idle;
> >>  bool deleted;
> >> +bool replay;
> >> +uint64_t id;
> >>  };
> >>
> >>  QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
> >> @@ -56,6 +59,21 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, 
> >> void *opaque)
> >>  return bh;
> >>  }
> >>
> >> +QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
> >> +  uint64_t id)
> >> +{
> >> +QEMUBH *bh = aio_bh_new(ctx, cb, opaque);
> >> +bh->replay = true;
> >> +bh->id = id;
> >> +return bh;
> >> +}
> >> +
> >> +void aio_bh_call(void *opaque)
> >> +{
> >> +QEMUBH *bh = (QEMUBH *)opaque;
> >> +bh->cb(bh->opaque);
> >> +}
> >> +
> >>  /* Multiple occurrences of aio_bh_poll cannot be called concurrently */
> >>  int aio_bh_poll(AioContext *ctx)
> >>  {
> >> @@ -78,7 +96,11 @@ int aio_bh_poll(AioContext *ctx)
> >>  if (!bh->idle)
> >>  ret = 1;
> >>  bh->idle = 0;
> >> -bh->cb(bh->opaque);
> >> +if (!bh->replay) {
> >> +aio_bh_call(bh);
> >> +} else {
> >> +replay_add_bh_event(bh, bh->id);
> >> +}
> >>  }
> >>  }
> >>
> >> diff --git a/dma-helpers.c b/dma-helpers.c
> >> index 6918572..357d7e9 100644
> >> --- a/dma-helpers.c
> >> +++ b/dma-helpers.c
> >> @@ -13,6 +13,7 @@
> >>  #include "qemu/range.h"
> >>  #include "qemu/thread.h"
> >>  #include "qemu/main-loop.h"
> >> +#include "replay/replay.h"
> >>
> >>  /* #define DEBUG_IOMMU */
> >>
> >> @@ -96,7 +97,8 @@ static void continue_after_map_failure(void *opaque)
> >>  {
> >>  DMAAIOCB *dbs = (DMAAIOCB *)opaque;
> >>
> >> -dbs->bh = qemu_bh_new(reschedule_dma, dbs);
> >> +dbs->bh = qemu_bh_new_replay(reschedule_dma, dbs,
> >> + replay_get_current_step());
> >>  qemu_bh_schedule(dbs->bh);
> >>  }
> >>
> >> diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
> >> index 1452910..97784a0 100644
> >> --- a/hw/timer/arm_timer.c
> >> +++ b/hw/timer/arm_timer.c
> >> @@ -168,7 +168,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq)
> >>  s->freq = freq;
> >>  s->control = TIMER_CTRL_IE;
> >>
> >> -bh = qemu_bh_new(arm_timer_tick, s);
> >> +bh = qemu_bh_new_replay(arm_timer_tick, s, 0);
> >>  s->timer = ptimer_init(bh);
> >>  vmstate_register(NULL, -1, &vmstate_arm_timer, s);
> >>  return s;
> >> diff --git a/include/block/aio.h b/include/block/aio.h
> >> index 82cdf78..ed76b43 100644
> >> --- a/include/block/aio.h
> >> +++ b/include/block/aio.h
> >> @@ -35,6 +35,8 @@ struct BlockAIOCB {
> >>  const AIOCBInfo *aiocb_info;
> >>  BlockDriverState *bs;
> >>  BlockCompletionFunc *cb;
> >> +bool replay;
> >> +uint64_t replay_step;
> >>  void *opaque;
> >>  int refcnt;
> >>  };
> >> @@ -1

Re: [Qemu-devel] [RFC PATCH v12 16/21]

2015-05-05 Thread Peter Maydell
On 5 May 2015 at 11:19, Pavel Dovgalyuk  wrote:
>
>
> Signed-off-by: Pavel Dovgalyuk 
> ---
>  async.c  |   24 +++-
>  dma-helpers.c|4 +++-
>  hw/timer/arm_timer.c |2 +-
>  include/block/aio.h  |   18 ++
>  include/qemu/main-loop.h |1 +
>  main-loop.c  |5 +
>  replay/replay-events.c   |   16 
>  replay/replay-internal.h |1 +
>  replay/replay.h  |2 ++
>  stubs/replay.c   |4 
>  10 files changed, 74 insertions(+), 3 deletions(-)

Please don't send patches with no commit messages...
(this one doesn't even have a subject line summary)

thanks
-- PMM



Re: [Qemu-devel] [RFC PATCH v12 16/21]

2015-05-05 Thread Paolo Bonzini


On 05/05/2015 12:22, Pavel Dovgaluk wrote:
> This patch is the reduced version of prior "bottom halves" patch.

dma-helpers.c is also related to block devices, so it's better not to
change it now.

Perhaps you can add a replay event for ptimers instead of touching
bottom halves?

Paolo

> Pavel Dovgalyuk
> 
> 
>> -Original Message-
>> From: Pavel Dovgalyuk [mailto:pavel.dovga...@ispras.ru]
>> Sent: Tuesday, May 05, 2015 1:19 PM
>> To: qemu-devel@nongnu.org
>> Cc: peter.mayd...@linaro.org; peter.crosthwa...@xilinx.com; 
>> ebl...@redhat.com;
>> mark.bur...@greensocs.com; r...@ispras.ru; batuz...@ispras.ru; 
>> maria.klimushenk...@ispras.ru;
>> pavel.dovga...@ispras.ru; pbonz...@redhat.com; alex.ben...@linaro.org;
>> fred.kon...@greensocs.com
>> Subject: [RFC PATCH v12 16/21]
>>
>>
>>
>> Signed-off-by: Pavel Dovgalyuk 
>> ---
>>  async.c  |   24 +++-
>>  dma-helpers.c|4 +++-
>>  hw/timer/arm_timer.c |2 +-
>>  include/block/aio.h  |   18 ++
>>  include/qemu/main-loop.h |1 +
>>  main-loop.c  |5 +
>>  replay/replay-events.c   |   16 
>>  replay/replay-internal.h |1 +
>>  replay/replay.h  |2 ++
>>  stubs/replay.c   |4 
>>  10 files changed, 74 insertions(+), 3 deletions(-)
>>
>> diff --git a/async.c b/async.c
>> index bd975c9..d092aa2 100644
>> --- a/async.c
>> +++ b/async.c
>> @@ -27,6 +27,7 @@
>>  #include "block/thread-pool.h"
>>  #include "qemu/main-loop.h"
>>  #include "qemu/atomic.h"
>> +#include "replay/replay.h"
>>
>>  /***/
>>  /* bottom halves (can be seen as timers which expire ASAP) */
>> @@ -39,6 +40,8 @@ struct QEMUBH {
>>  bool scheduled;
>>  bool idle;
>>  bool deleted;
>> +bool replay;
>> +uint64_t id;
>>  };
>>
>>  QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
>> @@ -56,6 +59,21 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void 
>> *opaque)
>>  return bh;
>>  }
>>
>> +QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
>> +  uint64_t id)
>> +{
>> +QEMUBH *bh = aio_bh_new(ctx, cb, opaque);
>> +bh->replay = true;
>> +bh->id = id;
>> +return bh;
>> +}
>> +
>> +void aio_bh_call(void *opaque)
>> +{
>> +QEMUBH *bh = (QEMUBH *)opaque;
>> +bh->cb(bh->opaque);
>> +}
>> +
>>  /* Multiple occurrences of aio_bh_poll cannot be called concurrently */
>>  int aio_bh_poll(AioContext *ctx)
>>  {
>> @@ -78,7 +96,11 @@ int aio_bh_poll(AioContext *ctx)
>>  if (!bh->idle)
>>  ret = 1;
>>  bh->idle = 0;
>> -bh->cb(bh->opaque);
>> +if (!bh->replay) {
>> +aio_bh_call(bh);
>> +} else {
>> +replay_add_bh_event(bh, bh->id);
>> +}
>>  }
>>  }
>>
>> diff --git a/dma-helpers.c b/dma-helpers.c
>> index 6918572..357d7e9 100644
>> --- a/dma-helpers.c
>> +++ b/dma-helpers.c
>> @@ -13,6 +13,7 @@
>>  #include "qemu/range.h"
>>  #include "qemu/thread.h"
>>  #include "qemu/main-loop.h"
>> +#include "replay/replay.h"
>>
>>  /* #define DEBUG_IOMMU */
>>
>> @@ -96,7 +97,8 @@ static void continue_after_map_failure(void *opaque)
>>  {
>>  DMAAIOCB *dbs = (DMAAIOCB *)opaque;
>>
>> -dbs->bh = qemu_bh_new(reschedule_dma, dbs);
>> +dbs->bh = qemu_bh_new_replay(reschedule_dma, dbs,
>> + replay_get_current_step());
>>  qemu_bh_schedule(dbs->bh);
>>  }
>>
>> diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
>> index 1452910..97784a0 100644
>> --- a/hw/timer/arm_timer.c
>> +++ b/hw/timer/arm_timer.c
>> @@ -168,7 +168,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq)
>>  s->freq = freq;
>>  s->control = TIMER_CTRL_IE;
>>
>> -bh = qemu_bh_new(arm_timer_tick, s);
>> +bh = qemu_bh_new_replay(arm_timer_tick, s, 0);
>>  s->timer = ptimer_init(bh);
>>  vmstate_register(NULL, -1, &vmstate_arm_timer, s);
>>  return s;
>> diff --git a/include/block/aio.h b/include/block/aio.h
>> index 82cdf78..ed76b43 100644
>> --- a/include/block/aio.h
>> +++ b/include/block/aio.h
>> @@ -35,6 +35,8 @@ struct BlockAIOCB {
>>  const AIOCBInfo *aiocb_info;
>>  BlockDriverState *bs;
>>  BlockCompletionFunc *cb;
>> +bool replay;
>> +uint64_t replay_step;
>>  void *opaque;
>>  int refcnt;
>>  };
>> @@ -144,6 +146,17 @@ void aio_context_release(AioContext *ctx);
>>  QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
>>
>>  /**
>> + * aio_bh_new_replay: Allocate a new bottom half structure for replay.
>> + *
>> + * This function calls aio_bh_new function and also fills replay parameters
>> + * of the BH structure. BH created with this function in record/replay mode
>> + * are executed through the replay queue only at checkpoints and 
>> instructions
>> + * executions.
>> + */
>> +

Re: [Qemu-devel] [RFC PATCH v12 16/21]

2015-05-05 Thread Pavel Dovgaluk
This patch is the reduced version of prior "bottom halves" patch.

Pavel Dovgalyuk


> -Original Message-
> From: Pavel Dovgalyuk [mailto:pavel.dovga...@ispras.ru]
> Sent: Tuesday, May 05, 2015 1:19 PM
> To: qemu-devel@nongnu.org
> Cc: peter.mayd...@linaro.org; peter.crosthwa...@xilinx.com; ebl...@redhat.com;
> mark.bur...@greensocs.com; r...@ispras.ru; batuz...@ispras.ru; 
> maria.klimushenk...@ispras.ru;
> pavel.dovga...@ispras.ru; pbonz...@redhat.com; alex.ben...@linaro.org;
> fred.kon...@greensocs.com
> Subject: [RFC PATCH v12 16/21]
> 
> 
> 
> Signed-off-by: Pavel Dovgalyuk 
> ---
>  async.c  |   24 +++-
>  dma-helpers.c|4 +++-
>  hw/timer/arm_timer.c |2 +-
>  include/block/aio.h  |   18 ++
>  include/qemu/main-loop.h |1 +
>  main-loop.c  |5 +
>  replay/replay-events.c   |   16 
>  replay/replay-internal.h |1 +
>  replay/replay.h  |2 ++
>  stubs/replay.c   |4 
>  10 files changed, 74 insertions(+), 3 deletions(-)
> 
> diff --git a/async.c b/async.c
> index bd975c9..d092aa2 100644
> --- a/async.c
> +++ b/async.c
> @@ -27,6 +27,7 @@
>  #include "block/thread-pool.h"
>  #include "qemu/main-loop.h"
>  #include "qemu/atomic.h"
> +#include "replay/replay.h"
> 
>  /***/
>  /* bottom halves (can be seen as timers which expire ASAP) */
> @@ -39,6 +40,8 @@ struct QEMUBH {
>  bool scheduled;
>  bool idle;
>  bool deleted;
> +bool replay;
> +uint64_t id;
>  };
> 
>  QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
> @@ -56,6 +59,21 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void 
> *opaque)
>  return bh;
>  }
> 
> +QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
> +  uint64_t id)
> +{
> +QEMUBH *bh = aio_bh_new(ctx, cb, opaque);
> +bh->replay = true;
> +bh->id = id;
> +return bh;
> +}
> +
> +void aio_bh_call(void *opaque)
> +{
> +QEMUBH *bh = (QEMUBH *)opaque;
> +bh->cb(bh->opaque);
> +}
> +
>  /* Multiple occurrences of aio_bh_poll cannot be called concurrently */
>  int aio_bh_poll(AioContext *ctx)
>  {
> @@ -78,7 +96,11 @@ int aio_bh_poll(AioContext *ctx)
>  if (!bh->idle)
>  ret = 1;
>  bh->idle = 0;
> -bh->cb(bh->opaque);
> +if (!bh->replay) {
> +aio_bh_call(bh);
> +} else {
> +replay_add_bh_event(bh, bh->id);
> +}
>  }
>  }
> 
> diff --git a/dma-helpers.c b/dma-helpers.c
> index 6918572..357d7e9 100644
> --- a/dma-helpers.c
> +++ b/dma-helpers.c
> @@ -13,6 +13,7 @@
>  #include "qemu/range.h"
>  #include "qemu/thread.h"
>  #include "qemu/main-loop.h"
> +#include "replay/replay.h"
> 
>  /* #define DEBUG_IOMMU */
> 
> @@ -96,7 +97,8 @@ static void continue_after_map_failure(void *opaque)
>  {
>  DMAAIOCB *dbs = (DMAAIOCB *)opaque;
> 
> -dbs->bh = qemu_bh_new(reschedule_dma, dbs);
> +dbs->bh = qemu_bh_new_replay(reschedule_dma, dbs,
> + replay_get_current_step());
>  qemu_bh_schedule(dbs->bh);
>  }
> 
> diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
> index 1452910..97784a0 100644
> --- a/hw/timer/arm_timer.c
> +++ b/hw/timer/arm_timer.c
> @@ -168,7 +168,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq)
>  s->freq = freq;
>  s->control = TIMER_CTRL_IE;
> 
> -bh = qemu_bh_new(arm_timer_tick, s);
> +bh = qemu_bh_new_replay(arm_timer_tick, s, 0);
>  s->timer = ptimer_init(bh);
>  vmstate_register(NULL, -1, &vmstate_arm_timer, s);
>  return s;
> diff --git a/include/block/aio.h b/include/block/aio.h
> index 82cdf78..ed76b43 100644
> --- a/include/block/aio.h
> +++ b/include/block/aio.h
> @@ -35,6 +35,8 @@ struct BlockAIOCB {
>  const AIOCBInfo *aiocb_info;
>  BlockDriverState *bs;
>  BlockCompletionFunc *cb;
> +bool replay;
> +uint64_t replay_step;
>  void *opaque;
>  int refcnt;
>  };
> @@ -144,6 +146,17 @@ void aio_context_release(AioContext *ctx);
>  QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
> 
>  /**
> + * aio_bh_new_replay: Allocate a new bottom half structure for replay.
> + *
> + * This function calls aio_bh_new function and also fills replay parameters
> + * of the BH structure. BH created with this function in record/replay mode
> + * are executed through the replay queue only at checkpoints and instructions
> + * executions.
> + */
> +QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
> +  uint64_t id);
> +
> +/**
>   * aio_notify: Force processing of pending events.
>   *
>   * Similar to signaling a condition variable, aio_notify forces
> @@ -159,6 +172,11 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void 
> *opaque);
>  void aio_notify(A

[Qemu-devel] [RFC PATCH v12 16/21]

2015-05-05 Thread Pavel Dovgalyuk


Signed-off-by: Pavel Dovgalyuk 
---
 async.c  |   24 +++-
 dma-helpers.c|4 +++-
 hw/timer/arm_timer.c |2 +-
 include/block/aio.h  |   18 ++
 include/qemu/main-loop.h |1 +
 main-loop.c  |5 +
 replay/replay-events.c   |   16 
 replay/replay-internal.h |1 +
 replay/replay.h  |2 ++
 stubs/replay.c   |4 
 10 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/async.c b/async.c
index bd975c9..d092aa2 100644
--- a/async.c
+++ b/async.c
@@ -27,6 +27,7 @@
 #include "block/thread-pool.h"
 #include "qemu/main-loop.h"
 #include "qemu/atomic.h"
+#include "replay/replay.h"
 
 /***/
 /* bottom halves (can be seen as timers which expire ASAP) */
@@ -39,6 +40,8 @@ struct QEMUBH {
 bool scheduled;
 bool idle;
 bool deleted;
+bool replay;
+uint64_t id;
 };
 
 QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
@@ -56,6 +59,21 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void 
*opaque)
 return bh;
 }
 
+QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+  uint64_t id)
+{
+QEMUBH *bh = aio_bh_new(ctx, cb, opaque);
+bh->replay = true;
+bh->id = id;
+return bh;
+}
+
+void aio_bh_call(void *opaque)
+{
+QEMUBH *bh = (QEMUBH *)opaque;
+bh->cb(bh->opaque);
+}
+
 /* Multiple occurrences of aio_bh_poll cannot be called concurrently */
 int aio_bh_poll(AioContext *ctx)
 {
@@ -78,7 +96,11 @@ int aio_bh_poll(AioContext *ctx)
 if (!bh->idle)
 ret = 1;
 bh->idle = 0;
-bh->cb(bh->opaque);
+if (!bh->replay) {
+aio_bh_call(bh);
+} else {
+replay_add_bh_event(bh, bh->id);
+}
 }
 }
 
diff --git a/dma-helpers.c b/dma-helpers.c
index 6918572..357d7e9 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -13,6 +13,7 @@
 #include "qemu/range.h"
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
+#include "replay/replay.h"
 
 /* #define DEBUG_IOMMU */
 
@@ -96,7 +97,8 @@ static void continue_after_map_failure(void *opaque)
 {
 DMAAIOCB *dbs = (DMAAIOCB *)opaque;
 
-dbs->bh = qemu_bh_new(reschedule_dma, dbs);
+dbs->bh = qemu_bh_new_replay(reschedule_dma, dbs,
+ replay_get_current_step());
 qemu_bh_schedule(dbs->bh);
 }
 
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 1452910..97784a0 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -168,7 +168,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq)
 s->freq = freq;
 s->control = TIMER_CTRL_IE;
 
-bh = qemu_bh_new(arm_timer_tick, s);
+bh = qemu_bh_new_replay(arm_timer_tick, s, 0);
 s->timer = ptimer_init(bh);
 vmstate_register(NULL, -1, &vmstate_arm_timer, s);
 return s;
diff --git a/include/block/aio.h b/include/block/aio.h
index 82cdf78..ed76b43 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -35,6 +35,8 @@ struct BlockAIOCB {
 const AIOCBInfo *aiocb_info;
 BlockDriverState *bs;
 BlockCompletionFunc *cb;
+bool replay;
+uint64_t replay_step;
 void *opaque;
 int refcnt;
 };
@@ -144,6 +146,17 @@ void aio_context_release(AioContext *ctx);
 QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
 
 /**
+ * aio_bh_new_replay: Allocate a new bottom half structure for replay.
+ *
+ * This function calls aio_bh_new function and also fills replay parameters
+ * of the BH structure. BH created with this function in record/replay mode
+ * are executed through the replay queue only at checkpoints and instructions
+ * executions.
+ */
+QEMUBH *aio_bh_new_replay(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
+  uint64_t id);
+
+/**
  * aio_notify: Force processing of pending events.
  *
  * Similar to signaling a condition variable, aio_notify forces
@@ -159,6 +172,11 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void 
*opaque);
 void aio_notify(AioContext *ctx);
 
 /**
+ * aio_bh_call: Executes callback function of the specified BH.
+ */
+void aio_bh_call(void *opaque);
+
+/**
  * aio_bh_poll: Poll bottom halves for an AioContext.
  *
  * These are internal functions used by the QEMU main loop.
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index 62c68c0..f5a98fe 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -306,6 +306,7 @@ void qemu_iohandler_fill(GArray *pollfds);
 void qemu_iohandler_poll(GArray *pollfds, int rc);
 
 QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
+QEMUBH *qemu_bh_new_replay(QEMUBHFunc *cb, void *opaque, uint64_t id);
 void qemu_bh_schedule_idle(QEMUBH *bh);
 
 #endif
diff --git a/main-loop.c b/main-loop.c
index 06aad06..87ebad4 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -514,3 +514,8 @@ Q