From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49898 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTbRZ-0005bV-JA for qemu-devel@nongnu.org; Fri, 17 Dec 2010 09:38:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTbRS-0000az-RJ for qemu-devel@nongnu.org; Fri, 17 Dec 2010 09:38:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTbRS-0000ah-JN for qemu-devel@nongnu.org; Fri, 17 Dec 2010 09:37:54 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBHEbrbO020419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Dec 2010 09:37:53 -0500 Message-ID: <4D0B75BF.1080001@redhat.com> Date: Fri, 17 Dec 2010 15:37:51 +0100 From: Jes Sorensen MIME-Version: 1.0 References: <1292515532-24198-1-git-send-email-Jes.Sorensen@redhat.com> <1292515532-24198-2-git-send-email-Jes.Sorensen@redhat.com> <4D0B719C.8010008@redhat.com> In-Reply-To: <4D0B719C.8010008@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 1/2] block/qcow2.c: rename qcow_ functions to qcow2_ List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org On 12/17/10 15:20, Kevin Wolf wrote: >> offset = start_offset; >> while (offset < end_offset) { >> @@ -88,13 +88,13 @@ static int qcow_read_extensions(BlockDriverState *bs, uint64_t start_offset, >> #ifdef DEBUG_EXT >> /* Sanity check */ >> if (offset > s->cluster_size) >> - printf("qcow_handle_extension: suspicious offset %lu\n", offset); >> + printf("qcow_read_extension: suspicious offset %lu\n", offset); > > It's now qcow2_read_extensions Fixed >> @@ -313,7 +313,7 @@ static int qcow_is_allocated(BlockDriverState *bs, int64_t sector_num, >> >> /* handle reading after the end of the backing file */ >> int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov, >> - int64_t sector_num, int nb_sectors) >> + int64_t sector_num, int nb_sectors) > > This isn't related to renaming functions. Please don't include pure > formatting changes, all they do is making git blame work worse. No it makes the formatting consistent with the rest of the functions in the file. I can leave it out, but then we just have more ugliness in the file. >> @@ -399,10 +399,11 @@ static void qcow_aio_read_cb(void *opaque, int ret) >> } else { >> if (s->crypt_method) { >> qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data, >> - acb->cluster_data, acb->cur_nr_sectors, 0, &s->aes_decrypt_key); >> + acb->cluster_data, acb->cur_nr_sectors, >> + 0, &s->aes_decrypt_key); > > Same here, plus the old version wasn't obviously indented wrong, but > just not according to your personal style. Sorry it's broken formatting. But sure, I'll put it back to being unreadable. > The following changes include more lines that need not be changed for > the rename and just change the coding style (even though CODING_STYLE > doesn't make a statement on this, so the old version isn't wrong). > Please leave them out. Actually that is in the patch, I did a pure search replace, no formatting. But I've fixed it. Jes