From patchwork Thu Oct 27 19:48:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9400315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5CD94600BA for ; Thu, 27 Oct 2016 19:49:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4147F2A39A for ; Thu, 27 Oct 2016 19:49:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 331202A39C; Thu, 27 Oct 2016 19:49:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0EC4B2A39A for ; Thu, 27 Oct 2016 19:49:11 +0000 (UTC) Received: from localhost ([::1]:44205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzqfm-0002Uw-C1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 27 Oct 2016 15:49:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzqfF-0002QB-27 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 15:48:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzqfE-00071V-4z for qemu-devel@nongnu.org; Thu, 27 Oct 2016 15:48:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzqfB-00070R-SJ; Thu, 27 Oct 2016 15:48:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 022747AE81; Thu, 27 Oct 2016 19:48:33 +0000 (UTC) Received: from red.redhat.com (ovpn-116-106.phx2.redhat.com [10.3.116.106]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9RJmSAm014346; Thu, 27 Oct 2016 15:48:32 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2016 14:48:27 -0500 Message-Id: <1477597708-3423-2-git-send-email-eblake@redhat.com> In-Reply-To: <1477597708-3423-1-git-send-email-eblake@redhat.com> References: <1477597708-3423-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 27 Oct 2016 19:48:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/2] block: Rename raw_bsd to raw-format.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, lersek@redhat.com, qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2: rename to raw-format.c, rather than plain raw.c. --- block/{raw_bsd.c => raw-format.c} | 2 +- MAINTAINERS | 2 +- block/Makefile.objs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename block/{raw_bsd.c => raw-format.c} (99%) 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 fc16ec1..de837df 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 diff --git a/MAINTAINERS b/MAINTAINERS index b01fec0..a58cb76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1677,7 +1677,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 67a036a..bde742f 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