[PATCH 0/2] block: remove stale runtime_opts

[PATCH 0/2] block: remove stale runtime_opts

[John Snow]

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(-)

-- 
2.26.2

[PATCH 1/2] block/rbd: remove runtime_opts

[John Snow]

This saw its last use in 4bfb274165ba.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 block/rbd.c | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index 688074c64b7..171c67e3a01 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -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,
-- 
2.26.2

[PATCH 2/2] block/qcow: remove runtime opts

[John Snow]

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

Signed-off-by: John Snow <jsnow@redhat.com>
---
 block/qcow.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index e514a86fe5e..f8919a44d19 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -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)
 {
-- 
2.26.2

Re: [PATCH 0/2] block: remove stale runtime_opts

[Max Reitz]

[-- Attachment #1.1: Type: text/plain, Size: 376 bytes --]

On 06.08.20 23:13, John Snow wrote:
> 
> 
> 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(-)

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]