Commit b3b5299d authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Cancel job in bdrv_close_all() callers 



Now that we cancel all jobs and not only block jobs on shutdown, doing
that in bdrv_close_all() isn't really appropriate any more. Move the
job_cancel_sync_all() call to the callers, and only assert that there
are no job running in bdrv_close_all().

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3d70ff53

block.c

+1 −3
Original line number Diff line number Diff line
@@ -3362,9 +3362,7 @@ static void bdrv_close(BlockDriverState *bs) 


void bdrv_close_all(void)

{

    /* TODO We do want to cancel all jobs instead of just block jobs on

     * shutdown, but bdrv_close_all() isn't the right place any more. */

    job_cancel_sync_all();

    assert(job_next(NULL) == NULL);

    nbd_export_close_all();



    /* Drop references from requests still in flight, such as canceled block

qemu-nbd.c

+7 −1
Original line number Diff line number Diff line
@@ -482,6 +482,12 @@ static const char *socket_activation_validate_opts(const char *device, 
    return NULL;

}



static void qemu_nbd_shutdown(void)

{

    job_cancel_sync_all();

    bdrv_close_all();

}



int main(int argc, char **argv)

{

    BlockBackend *blk;
@@ -928,7 +934,7 @@ int main(int argc, char **argv) 
        exit(EXIT_FAILURE);

    }

    bdrv_init();

    atexit(bdrv_close_all);

    atexit(qemu_nbd_shutdown);



    srcpath = argv[optind];

    if (imageOpts) {

vl.c

+1 −0
Original line number Diff line number Diff line
@@ -4683,6 +4683,7 @@ int main(int argc, char **argv, char **envp) 
    /* No more vcpu or device emulation activity beyond this point */

    vm_shutdown();



    job_cancel_sync_all();

    bdrv_close_all();



    res_free();