From: Eric Blake Date: Fri, 2 Dec 2016 19:48:53 +0000 (-0600) Subject: block: Rename raw_bsd to raw-format.c X-Git-Tag: v2.9.0-rc0~165^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6fc7eb1a4af1b127df5f07b8bb28af891946fa;p=thirdparty%2Fqemu.git block: Rename raw_bsd to raw-format.c Given that we have raw-win32.c and raw-posix.c, my initial guess at raw_bsd.c was that it was for dealing with raw files using code specific to the BSD operating system (beyond what raw-posix could do). Not so - this name was chosen back in commit e1c66c6 to distinguish that it was a BSD licensed file, in contrast to the then-existing raw.c with an unclear and potentially unusable license. But since it has been more than three years since the rewrite, it's time to pick a more useful name for this file to avoid this type of confusion to future contributors that don't know the backstory, as none of our other files are named solely by the license they use. In reality, this file deals with the raw format, which is useful with any number of protocols, while raw-{win32,posix} deal with the file protocol (and in turn, that protocol is not limited to use with the raw format). So rename raw_bsd to raw-format.c. We could have also used the shorter name raw.c, except that collides with the earlier use of that filename for a different license, and it's better to be safe than risk license pollution. The next patch will also rename raw-win32.c and raw-posix.c to further distinguish the difference in roles. It doesn't hurt that this gets rid of an underscore in the filename, thereby making tab-completion on 'ra' easier (now I don't have to type the shift key, which slows things down :) Suggested-by: Daniel P. Berrange Signed-off-by: Eric Blake Reviewed-by: Laszlo Ersek Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- diff --git a/MAINTAINERS b/MAINTAINERS index 585cd5abd70..044a32488d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1722,7 +1722,7 @@ F: block/linux-aio.c F: include/block/raw-aio.h F: block/raw-posix.c F: block/raw-win32.c -F: block/raw_bsd.c +F: block/raw-format.c F: block/win32-aio.c qcow2 diff --git a/block/Makefile.objs b/block/Makefile.objs index 67a036a1df0..bde742f5196 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,4 +1,4 @@ -block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o +block-obj-y += raw-format.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-y += qed-check.o diff --git a/block/raw_bsd.c b/block/raw-format.c similarity index 99% rename from block/raw_bsd.c rename to block/raw-format.c index 8a5b9b04245..8404a82e0c3 100644 --- a/block/raw_bsd.c +++ b/block/raw-format.c @@ -1,4 +1,4 @@ -/* BlockDriver implementation for "raw" +/* BlockDriver implementation for "raw" format driver * * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright (C) 2010, Blue Swirl