linux-user: fix GPROF build failure

[qemu.git] / block.c

diff --git a/block.c b/block.c
index 16615bc876d0c2695a3de2c851575f0b19467f42..9ae5c0ed2f2bf50fbf4c47e2e81077c1a5932302 100644 (file)
--- a/block.c
+++ b/block.c
@@ -5672,10 +5672,6 @@ void bdrv_detach_aio_context(BlockDriverState *bs)
     BdrvAioNotifier *baf, *baf_tmp;
     BdrvChild *child;
 
     BdrvAioNotifier *baf, *baf_tmp;
     BdrvChild *child;
 

-    if (!bs->drv) {
-        return;
-    }
-

     assert(!bs->walking_aio_notifiers);
     bs->walking_aio_notifiers = true;
     QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) {
     assert(!bs->walking_aio_notifiers);
     bs->walking_aio_notifiers = true;
     QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) {


@@ -5690,7 +5686,7 @@ void bdrv_detach_aio_context(BlockDriverState *bs)
      */
     bs->walking_aio_notifiers = false;
 
      */
     bs->walking_aio_notifiers = false;
 

-    if (bs->drv->bdrv_detach_aio_context) {
+    if (bs->drv && bs->drv->bdrv_detach_aio_context) {

         bs->drv->bdrv_detach_aio_context(bs);
     }
     QLIST_FOREACH(child, &bs->children, next) {
         bs->drv->bdrv_detach_aio_context(bs);
     }
     QLIST_FOREACH(child, &bs->children, next) {


@@ -5709,10 +5705,6 @@ void bdrv_attach_aio_context(BlockDriverState *bs,
     BdrvAioNotifier *ban, *ban_tmp;
     BdrvChild *child;
 
     BdrvAioNotifier *ban, *ban_tmp;
     BdrvChild *child;
 

-    if (!bs->drv) {
-        return;
-    }
-

     if (bs->quiesce_counter) {
         aio_disable_external(new_context);
     }
     if (bs->quiesce_counter) {
         aio_disable_external(new_context);
     }


@@ -5722,7 +5714,7 @@ void bdrv_attach_aio_context(BlockDriverState *bs,
     QLIST_FOREACH(child, &bs->children, next) {
         bdrv_attach_aio_context(child->bs, new_context);
     }
     QLIST_FOREACH(child, &bs->children, next) {
         bdrv_attach_aio_context(child->bs, new_context);
     }

-    if (bs->drv->bdrv_attach_aio_context) {
+    if (bs->drv && bs->drv->bdrv_attach_aio_context) {

         bs->drv->bdrv_attach_aio_context(bs, new_context);
     }
 
         bs->drv->bdrv_attach_aio_context(bs, new_context);
     }