Skip to contentSkip to conversation

block: remove stale runtime_opts

PATCH Applied John Snow 2 participants 4 messages Aug 6, 2020 – Sep 11, 2020 Block layer

lore
Share & tools
lore

John Snow

author
#0 lore raw

cover block: remove stale runtime_opts

John Snow (2):
block/rbd: remove runtime_opts
block/qcow: remove runtime opts

 block/qcow.c |  9 ---------
 block/rbd.c  | 42 ------------------------------------------
 2 files changed, 51 deletions(-)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 1/2 block/rbd: remove runtime_opts

This saw its last use in 4bfb274165ba.

---
 block/rbd.c | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
block/rbd.c +0 -42
index 688074c64b7..171c67e3a01 100644
@@ -341,48 +341,6 @@ static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs)
     }
 }
 
-static QemuOptsList runtime_opts = {
-    .name = "rbd",
-    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
-    .desc = {
-        {
-            .name = "pool",
-            .type = QEMU_OPT_STRING,
-            .help = "Rados pool name",
-        },
-        {
-            .name = "namespace",
-            .type = QEMU_OPT_STRING,
-            .help = "Rados namespace name in the pool",
-        },
-        {
-            .name = "image",
-            .type = QEMU_OPT_STRING,
-            .help = "Image name in the pool",
-        },
-        {
-            .name = "conf",
-            .type = QEMU_OPT_STRING,
-            .help = "Rados config file location",
-        },
-        {
-            .name = "snapshot",
-            .type = QEMU_OPT_STRING,
-            .help = "Ceph snapshot name",
-        },
-        {
-            /* maps to 'id' in rados_create() */
-            .name = "user",
-            .type = QEMU_OPT_STRING,
-            .help = "Rados id name",
-        },
-        /*
-         * server.* extracted manually, see qemu_rbd_mon_host()
-         */
-        { /* end of list */ }
-    },
-};
-
 /* FIXME Deprecate and remove keypairs or make it available in QMP. */
 static int qemu_rbd_do_create(BlockdevCreateOptions *options,
                               const char *keypairs, const char *password_secret,
Signature · 1 line
2.26.2
author
#2 lore raw

PATCH 2/2 block/qcow: remove runtime opts

In reply to John Snow

Introduced by d85f4222b468,
These were seemingly never used at all.

---
 block/qcow.c | 9 ---------
 1 file changed, 9 deletions(-)
block/qcow.c +0 -9
index e514a86fe5e..f8919a44d19 100644
@@ -105,15 +105,6 @@ static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename)
         return 0;
 }
 
-static QemuOptsList qcow_runtime_opts = {
-    .name = "qcow",
-    .head = QTAILQ_HEAD_INITIALIZER(qcow_runtime_opts.head),
-    .desc = {
-        BLOCK_CRYPTO_OPT_DEF_QCOW_KEY_SECRET("encrypt."),
-        { /* end of list */ }
-    },
-};
-
 static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
                      Error **errp)
 {
Signature · 1 line
2.26.2