diff mbox series

[4/9] block: Don't look for child references in append_open_options()

Message ID cbbe82e012ffd2dde05fec3012ab1ebc7cd3d045.1535291602.git.berto@igalia.com
State New
Headers show
Series Misc reopen-related patches | expand

Commit Message

Alberto Garcia Aug. 26, 2018, 2:09 p.m. UTC 
In the previous patch we removed child references from bs->options, so
there's no need to look for them here anymore.

Signed-off-by: Alberto Garcia <berto@igalia.com>
---
 block.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

Comments

Max Reitz Aug. 29, 2018, 10:47 a.m. UTC | #1 
On 2018-08-26 16:09, Alberto Garcia wrote:
> In the previous patch we removed child references from bs->options, so
> there's no need to look for them here anymore.
> 
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
>  block.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)

Reviewed-by: Max Reitz <mreitz@redhat.com>
diff mbox series

Patch

diff --git a/block.c b/block.c
index 2f2484965d..92afb3dcce 100644
--- a/block.c
+++ b/block.c
@@ -5153,23 +5153,12 @@  static bool append_open_options(QDict *d, BlockDriverState *bs)
 {
     const QDictEntry *entry;
     QemuOptDesc *desc;
-    BdrvChild *child;
     bool found_any = false;
 
     for (entry = qdict_first(bs->options); entry;
          entry = qdict_next(bs->options, entry))
     {
-        /* Exclude node-name references to children */
-        QLIST_FOREACH(child, &bs->children, next) {
-            if (!strcmp(entry->key, child->name)) {
-                break;
-            }
-        }
-        if (child) {
-            continue;
-        }
-
-        /* And exclude all non-driver-specific options */
+        /* Exclude all non-driver-specific options */
         for (desc = bdrv_runtime_opts.desc; desc->name; desc++) {
             if (!strcmp(qdict_entry_key(entry), desc->name)) {
                 break;