Commit c1bb86cd authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

block: Rename raw-{posix,win32} to file-*.c 



These files deal with the file protocol, not the raw format (the
file protocol is often used with other formats, and the raw
format is not forced to use the file protocol).  Rename things
to make it a bit easier to follow.

Suggested-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2e6fc7eb

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1720,9 +1720,9 @@ L: qemu-block@nongnu.org 
S: Supported

F: block/linux-aio.c

F: include/block/raw-aio.h

F: block/raw-posix.c

F: block/raw-win32.c

F: block/raw-format.c

F: block/file-posix.c

F: block/file-win32.c

F: block/win32-aio.c



qcow2

block/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o 
block-obj-y += quorum.o

block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o

block-obj-y += block-backend.o snapshot.o qapi.o

block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o

block-obj-$(CONFIG_POSIX) += raw-posix.o

block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o

block-obj-$(CONFIG_POSIX) += file-posix.o

block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

block-obj-y += null.o mirror.o commit.o io.o

block-obj-y += throttle-groups.o

block/raw-posix.c→block/file-posix.c

+0 −0

File moved.

View file

block/raw-win32.c→block/file-win32.c

+0 −0

File moved.

View file

block/gluster.c

+2 −2
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ static int qemu_gluster_has_zero_init(BlockDriverState *bs) 
 * If @start is in a trailing hole or beyond EOF, return -ENXIO.

 * If we can't find out, return a negative errno other than -ENXIO.

 *

 * (Shamefully copied from raw-posix.c, only miniscule adaptions.)

 * (Shamefully copied from file-posix.c, only miniscule adaptions.)

 */

static int find_allocation(BlockDriverState *bs, off_t start,

                           off_t *data, off_t *hole)
@@ -1349,7 +1349,7 @@ exit: 
 * 'nb_sectors' is the max value 'pnum' should be set to.  If nb_sectors goes

 * beyond the end of the disk image it will be clamped.

 *

 * (Based on raw_co_get_block_status() from raw-posix.c.)

 * (Based on raw_co_get_block_status() from file-posix.c.)

 */

static int64_t coroutine_fn qemu_gluster_co_get_block_status(

        BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,