diff mbox series

[v2,4/4] block: Remove dead deprecation warning code

Message ID 20180614095544.31549-5-kwolf@redhat.com
State New
Headers show
Series block: Remove deprecated -drive options | expand

Commit Message

Kevin Wolf June 14, 2018, 9:55 a.m. UTC
We removed all options from the 'deprecated' array, so the code is dead
and can be removed as well.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Markus Armbruster June 14, 2018, 1:17 p.m. UTC | #1
Kevin Wolf <kwolf@redhat.com> writes:

> We removed all options from the 'deprecated' array, so the code is dead
> and can be removed as well.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff mbox series

Patch

diff --git a/blockdev.c b/blockdev.c
index 695e10d398..4ab3d6ec0b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -774,8 +774,6 @@  DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
     const char *filename;
     Error *local_err = NULL;
     int i;
-    const char *deprecated[] = {
-    };
 
     /* Change legacy command line options into QMP ones */
     static const struct {
@@ -852,16 +850,6 @@  DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
         goto fail;
     }
 
-    /* Other deprecated options */
-    if (!qtest_enabled()) {
-        for (i = 0; i < ARRAY_SIZE(deprecated); i++) {
-            if (qemu_opt_get(legacy_opts, deprecated[i]) != NULL) {
-                error_report("'%s' is deprecated, please use the corresponding "
-                             "option of '-device' instead", deprecated[i]);
-            }
-        }
-    }
-
     /* Media type */
     value = qemu_opt_get(legacy_opts, "media");
     if (value) {