block: protect tracked_requests and flush_queue with reqs_lock

[qemu.git] / block / null.c

diff --git a/block/null.c b/block/null.c
index 356209a42bcdc40ca4a7a13dfb21e45b4516ee20..876f90965bfb85dfab196ac4d838657cb502bf5e 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -141,11 +141,7 @@ static void null_bh_cb(void *opaque)
 static void null_timer_cb(void *opaque)
 {
     NullAIOCB *acb = opaque;
-    AioContext *ctx = bdrv_get_aio_context(acb->common.bs);
-
-    aio_context_acquire(ctx);
     acb->common.cb(acb->common.opaque, 0);
-    aio_context_release(ctx);
     timer_deinit(&acb->timer);
     qemu_aio_unref(acb);
 }
@@ -236,7 +232,7 @@ static void null_refresh_filename(BlockDriverState *bs, QDict *opts)
                  bs->drv->format_name);
     }
 
-    qdict_put(opts, "driver", qstring_from_str(bs->drv->format_name));
+    qdict_put_str(opts, "driver", bs->drv->format_name);
     bs->full_open_options = opts;
 }