On 10/20/16 03:11, Eric Blake wrote: > These files deal with the file protocol, not the raw format (the > file protocol is often used with other formats, and the raw > protocol
s/raw protocol/raw format/ > is not forced to use the file format). s/file format/file protocol/ I think. Thanks! Laszlo > Rename things > to make it a bit easier to follow. > > Suggested-by: Daniel P. Berrange <berra...@redhat.com> > Signed-off-by: Eric Blake <ebl...@redhat.com> > --- > include/block/block_int.h | 2 +- > block/{raw-posix.c => file-posix.c} | 0 > block/{raw-win32.c => file-win32.c} | 0 > block/gluster.c | 4 ++-- > MAINTAINERS | 4 ++-- > block/Makefile.objs | 4 ++-- > block/trace-events | 4 ++-- > configure | 2 +- > 8 files changed, 10 insertions(+), 10 deletions(-) > rename block/{raw-posix.c => file-posix.c} (100%) > rename block/{raw-win32.c => file-win32.c} (100%) > > diff --git a/include/block/block_int.h b/include/block/block_int.h > index 3e79228..36d26cc 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -186,7 +186,7 @@ struct BlockDriver { > > /* > * Flushes all data that was already written to the OS all the way down > to > - * the disk (for example raw-posix calls fsync()). > + * the disk (for example file-posix.c calls fsync()). > */ > int coroutine_fn (*bdrv_co_flush_to_disk)(BlockDriverState *bs); > > diff --git a/block/raw-posix.c b/block/file-posix.c > similarity index 100% > rename from block/raw-posix.c > rename to block/file-posix.c > diff --git a/block/raw-win32.c b/block/file-win32.c > similarity index 100% > rename from block/raw-win32.c > rename to block/file-win32.c > diff --git a/block/gluster.c b/block/gluster.c > index af76d7d5..257ade5 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -1172,7 +1172,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) > @@ -1262,7 +1262,7 @@ static int find_allocation(BlockDriverState *bs, off_t > start, > * '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, > diff --git a/MAINTAINERS b/MAINTAINERS > index 6f984c3..950ebea 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1675,8 +1675,8 @@ L: qemu-bl...@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/file-posix.c > +F: block/file-win32.c > F: block/raw.c > F: block/win32-aio.c > > diff --git a/block/Makefile.objs b/block/Makefile.objs > index c10941e..3fe8910 100644 > --- a/block/Makefile.objs > +++ b/block/Makefile.objs > @@ -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 > diff --git a/block/trace-events b/block/trace-events > index 05fa13c..627214b 100644 > --- a/block/trace-events > +++ b/block/trace-events > @@ -55,8 +55,8 @@ qmp_block_job_complete(void *job) "job %p" > block_job_cb(void *bs, void *job, int ret) "bs %p job %p ret %d" > qmp_block_stream(void *bs, void *job) "bs %p job %p" > > -# block/raw-win32.c > -# block/raw-posix.c > +# block/file-win32.c > +# block/file-posix.c > paio_submit_co(int64_t offset, int count, int type) "offset %"PRId64" count > %d type %d" > paio_submit(void *acb, void *opaque, int64_t offset, int count, int type) > "acb %p opaque %p offset %"PRId64" count %d type %d" > > diff --git a/configure b/configure > index dd9e679..e2b169f 100755 > --- a/configure > +++ b/configure > @@ -2727,7 +2727,7 @@ if compile_prog "" "" ; then > fi > > ########################################## > -# xfsctl() probe, used for raw-posix > +# xfsctl() probe, used for file-posix.c > if test "$xfs" != "no" ; then > cat > $TMPC << EOF > #include <stddef.h> /* NULL */ >