quorum: validate vote threshold against num_children even if read-pattern is fifo

[qemu.git] / block / null.c

diff --git a/block/null.c b/block/null.c
index 828441999cf90171e4b2672028613bdb8f198c8c..7d083233fb4da5a0fab2bf8bbe23cae502db1be4 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -12,8 +12,11 @@
 
 #include "block/block_int.h"
 
 
 #include "block/block_int.h"
 

+#define NULL_OPT_LATENCY "latency-ns"
+

 typedef struct {
     int64_t length;
 typedef struct {
     int64_t length;

+    int64_t latency_ns;

 } BDRVNullState;
 
 static QemuOptsList runtime_opts = {
 } BDRVNullState;
 
 static QemuOptsList runtime_opts = {


@@ -30,6 +33,12 @@ static QemuOptsList runtime_opts = {
             .type = QEMU_OPT_SIZE,
             .help = "size of the null block",
         },
             .type = QEMU_OPT_SIZE,
             .help = "size of the null block",
         },

+        {
+            .name = NULL_OPT_LATENCY,
+            .type = QEMU_OPT_NUMBER,
+            .help = "nanoseconds (approximated) to wait "
+                    "before completing request",
+        },

         { /* end of list */ }
     },
 };
         { /* end of list */ }
     },
 };


@@ -39,13 +48,20 @@ static int null_file_open(BlockDriverState *bs, QDict *options, int flags,
 {
     QemuOpts *opts;
     BDRVNullState *s = bs->opaque;
 {
     QemuOpts *opts;
     BDRVNullState *s = bs->opaque;

+    int ret = 0;

 
     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &error_abort);
     s->length =
         qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30);
 
     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &error_abort);
     s->length =
         qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 1 << 30);

+    s->latency_ns =
+        qemu_opt_get_number(opts, NULL_OPT_LATENCY, 0);
+    if (s->latency_ns < 0) {
+        error_setg(errp, "latency-ns is invalid");
+        ret = -EINVAL;
+    }

     qemu_opts_del(opts);
     qemu_opts_del(opts);

-    return 0;
+    return ret;

 }
 
 static void null_close(BlockDriverState *bs)
 }
 
 static void null_close(BlockDriverState *bs)


@@ -58,28 +74,40 @@ static int64_t null_getlength(BlockDriverState *bs)
     return s->length;
 }
 
     return s->length;
 }
 

+static coroutine_fn int null_co_common(BlockDriverState *bs)
+{
+    BDRVNullState *s = bs->opaque;
+
+    if (s->latency_ns) {
+        co_aio_sleep_ns(bdrv_get_aio_context(bs), QEMU_CLOCK_REALTIME,
+                        s->latency_ns);
+    }
+    return 0;
+}
+

 static coroutine_fn int null_co_readv(BlockDriverState *bs,
                                       int64_t sector_num, int nb_sectors,
                                       QEMUIOVector *qiov)
 {
 static coroutine_fn int null_co_readv(BlockDriverState *bs,
                                       int64_t sector_num, int nb_sectors,
                                       QEMUIOVector *qiov)
 {

-    return 0;
+    return null_co_common(bs);

 }
 
 static coroutine_fn int null_co_writev(BlockDriverState *bs,
                                        int64_t sector_num, int nb_sectors,
                                        QEMUIOVector *qiov)
 {
 }
 
 static coroutine_fn int null_co_writev(BlockDriverState *bs,
                                        int64_t sector_num, int nb_sectors,
                                        QEMUIOVector *qiov)
 {

-    return 0;
+    return null_co_common(bs);

 }
 
 static coroutine_fn int null_co_flush(BlockDriverState *bs)
 {
 }
 
 static coroutine_fn int null_co_flush(BlockDriverState *bs)
 {

-    return 0;
+    return null_co_common(bs);

 }
 
 typedef struct {
 }
 
 typedef struct {

-    BlockDriverAIOCB common;
+    BlockAIOCB common;

     QEMUBH *bh;
     QEMUBH *bh;

+    QEMUTimer timer;

 } NullAIOCB;
 
 static const AIOCBInfo null_aiocb_info = {
 } NullAIOCB;
 
 static const AIOCBInfo null_aiocb_info = {


@@ -94,43 +122,67 @@ static void null_bh_cb(void *opaque)
     qemu_aio_unref(acb);
 }
 
     qemu_aio_unref(acb);
 }
 

-static inline BlockDriverAIOCB *null_aio_common(BlockDriverState *bs,
-                                                BlockDriverCompletionFunc *cb,
-                                                void *opaque)
+static void null_timer_cb(void *opaque)
+{
+    NullAIOCB *acb = opaque;
+    acb->common.cb(acb->common.opaque, 0);
+    timer_deinit(&acb->timer);
+    qemu_aio_unref(acb);
+}
+
+static inline BlockAIOCB *null_aio_common(BlockDriverState *bs,
+                                          BlockCompletionFunc *cb,
+                                          void *opaque)

 {
     NullAIOCB *acb;
 {
     NullAIOCB *acb;

+    BDRVNullState *s = bs->opaque;

 
     acb = qemu_aio_get(&null_aiocb_info, bs, cb, opaque);
 
     acb = qemu_aio_get(&null_aiocb_info, bs, cb, opaque);

-    acb->bh = aio_bh_new(bdrv_get_aio_context(bs), null_bh_cb, acb);
-    qemu_bh_schedule(acb->bh);
+    /* Only emulate latency after vcpu is running. */
+    if (s->latency_ns) {
+        aio_timer_init(bdrv_get_aio_context(bs), &acb->timer,
+                       QEMU_CLOCK_REALTIME, SCALE_NS,
+                       null_timer_cb, acb);
+        timer_mod_ns(&acb->timer,
+                     qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + s->latency_ns);
+    } else {
+        acb->bh = aio_bh_new(bdrv_get_aio_context(bs), null_bh_cb, acb);
+        qemu_bh_schedule(acb->bh);
+    }

     return &acb->common;
 }
 
     return &acb->common;
 }
 

-static BlockDriverAIOCB *null_aio_readv(BlockDriverState *bs,
-                                        int64_t sector_num, QEMUIOVector *qiov,
-                                        int nb_sectors,
-                                        BlockDriverCompletionFunc *cb,
-                                        void *opaque)
+static BlockAIOCB *null_aio_readv(BlockDriverState *bs,
+                                  int64_t sector_num, QEMUIOVector *qiov,
+                                  int nb_sectors,
+                                  BlockCompletionFunc *cb,
+                                  void *opaque)

 {
     return null_aio_common(bs, cb, opaque);
 }
 
 {
     return null_aio_common(bs, cb, opaque);
 }
 

-static BlockDriverAIOCB *null_aio_writev(BlockDriverState *bs,
-                                         int64_t sector_num, QEMUIOVector *qiov,
-                                         int nb_sectors,
-                                         BlockDriverCompletionFunc *cb,
-                                         void *opaque)
+static BlockAIOCB *null_aio_writev(BlockDriverState *bs,
+                                   int64_t sector_num, QEMUIOVector *qiov,
+                                   int nb_sectors,
+                                   BlockCompletionFunc *cb,
+                                   void *opaque)

 {
     return null_aio_common(bs, cb, opaque);
 }
 
 {
     return null_aio_common(bs, cb, opaque);
 }
 

-static BlockDriverAIOCB *null_aio_flush(BlockDriverState *bs,
-                                        BlockDriverCompletionFunc *cb,
-                                        void *opaque)
+static BlockAIOCB *null_aio_flush(BlockDriverState *bs,
+                                  BlockCompletionFunc *cb,
+                                  void *opaque)

 {
     return null_aio_common(bs, cb, opaque);
 }
 
 {
     return null_aio_common(bs, cb, opaque);
 }
 

+static int null_reopen_prepare(BDRVReopenState *reopen_state,
+                               BlockReopenQueue *queue, Error **errp)
+{
+    return 0;
+}
+

 static BlockDriver bdrv_null_co = {
     .format_name            = "null-co",
     .protocol_name          = "null-co",
 static BlockDriver bdrv_null_co = {
     .format_name            = "null-co",
     .protocol_name          = "null-co",


@@ -143,6 +195,7 @@ static BlockDriver bdrv_null_co = {
     .bdrv_co_readv          = null_co_readv,
     .bdrv_co_writev         = null_co_writev,
     .bdrv_co_flush_to_disk  = null_co_flush,
     .bdrv_co_readv          = null_co_readv,
     .bdrv_co_writev         = null_co_writev,
     .bdrv_co_flush_to_disk  = null_co_flush,

+    .bdrv_reopen_prepare    = null_reopen_prepare,

 };
 
 static BlockDriver bdrv_null_aio = {
 };
 
 static BlockDriver bdrv_null_aio = {


@@ -157,6 +210,7 @@ static BlockDriver bdrv_null_aio = {
     .bdrv_aio_readv         = null_aio_readv,
     .bdrv_aio_writev        = null_aio_writev,
     .bdrv_aio_flush         = null_aio_flush,
     .bdrv_aio_readv         = null_aio_readv,
     .bdrv_aio_writev        = null_aio_writev,
     .bdrv_aio_flush         = null_aio_flush,

+    .bdrv_reopen_prepare    = null_reopen_prepare,

 };
 
 static void bdrv_null_init(void)
 };
 
 static void bdrv_null_init(void)