[Qemu-devel] [PATCH 04/10] block: Reuse NULL options check from bdrv_open()

[Max Reitz]

Remove the check whether options is NULL form bdrv_file_open() and rely
on the one in bdrv_open() instead.

Signed-off-by: Max Reitz <address@hidden>
---
 block.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index 0fb7892..c7219cb 100644
--- a/block.c
+++ b/block.c
@@ -958,11 +958,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const 
char *filename,
     Error *local_err = NULL;
     int ret;
 
-    /* NULL means an empty set of options */
-    if (options == NULL) {
-        options = qdict_new();
-    }
-
     if (reference) {
         if (filename || qdict_size(options)) {
             error_setg(errp, "Cannot reference an existing block device with "
@@ -1228,17 +1223,17 @@ int bdrv_open(BlockDriverState **pbs, const char 
*filename,
     const char *drvname;
     Error *local_err = NULL;
 
+    /* NULL means an empty set of options */
+    if (options == NULL) {
+        options = qdict_new();
+    }
+
     if (flags & BDRV_O_PROTOCOL) {
         assert(!drv);
         return bdrv_file_open(pbs, filename, reference, options,
                               flags & ~BDRV_O_PROTOCOL, errp);
     }
 
-    /* NULL means an empty set of options */
-    if (options == NULL) {
-        options = qdict_new();
-    }
-
     if (reference) {
         bool options_non_empty = qdict_size(options);
         QDECREF(options);
-- 
1.8.5.3