On 02/11/2014 11:33 PM, Chunyan Liu wrote: > Rename the new driver callback bdrv_create2 to the old name bdrv_create. > > Signed-off-by: Dong Xu Wang > Signed-off-by: Chunyan Liu > --- > block.c | 4 ++-- > block/cow.c | 2 +- > block/gluster.c | 8 ++++---- > block/iscsi.c | 2 +- > block/qcow.c | 2 +- > block/qcow2.c | 2 +- > block/qed.c | 2 +- > block/raw-posix.c | 10 +++++----- > block/raw-win32.c | 2 +- > block/raw_bsd.c | 2 +- > block/rbd.c | 2 +- > block/sheepdog.c | 6 +++--- > block/ssh.c | 2 +- > block/vdi.c | 2 +- > block/vhdx.c | 2 +- > block/vmdk.c | 2 +- > block/vpc.c | 2 +- > include/block/block_int.h | 2 +- > 18 files changed, 28 insertions(+), 28 deletions(-) I would squash this in to the previous patch. > +++ b/block/gluster.c > @@ -620,7 +620,7 @@ static BlockDriver bdrv_gluster = { > .bdrv_needs_filename = true, > .bdrv_file_open = qemu_gluster_open, > .bdrv_close = qemu_gluster_close, > - .bdrv_create2 = qemu_gluster_create, > + .bdrv_create = qemu_gluster_create, Don't mess up indentation. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org