The presence of the bdrv_file_open callback is used in some parts of the code to distinguish protocol and format drivers. Use the existing .protocol_name field instead, and unify .bdrv_open with .bdrv_file_open.
Paolo Paolo Bonzini (3): block: apply assertion more widely block: do not check bdrv_file_open block: remove separate bdrv_file_open callback block.c | 17 +++++++---------- block/blkdebug.c | 2 +- block/blkio.c | 2 +- block/blkverify.c | 2 +- block/curl.c | 8 ++++---- block/file-posix.c | 8 ++++---- block/file-win32.c | 4 ++-- block/gluster.c | 8 ++++---- block/iscsi.c | 4 ++-- block/nbd.c | 6 +++--- block/nfs.c | 2 +- block/null.c | 4 ++-- block/nvme.c | 2 +- block/rbd.c | 3 ++- block/ssh.c | 2 +- block/vvfat.c | 2 +- include/block/block_int-common.h | 3 --- 17 files changed, 37 insertions(+), 42 deletions(-) -- 2.38.1