From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoxNL-0004So-RL for qemu-devel@nongnu.org; Wed, 11 Jul 2012 09:54:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoxNE-0002aM-Qy for qemu-devel@nongnu.org; Wed, 11 Jul 2012 09:54:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoxNE-0002Zx-Ij for qemu-devel@nongnu.org; Wed, 11 Jul 2012 09:54:36 -0400 Message-ID: <4FFD8595.1060505@redhat.com> Date: Wed, 11 Jul 2012 15:54:29 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <1341911575-7306-1-git-send-email-armbru@redhat.com> <1341911575-7306-6-git-send-email-armbru@redhat.com> In-Reply-To: <1341911575-7306-6-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 05/29] hd-geometry: Move disk geometry guessing back from block.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: blauwirbel@gmail.com, pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com Am 10.07.2012 11:12, schrieb Markus Armbruster: > Commit f3d54fc4 factored it out of hw/ide.c for reuse. Sensible, > except it was put into block.c. Device-specific functionality should > be kept in device code, not the block layer. Move it to > hw/hd-geometry.c, and make stylistic changes required to keep > checkpatch.pl happy. > > Signed-off-by: Markus Armbruster > --- > block.c | 121 --------------------------------------- > block.h | 1 - > blockdev.h | 1 + > hw/Makefile.objs | 2 +- > hw/block-common.h | 21 +++++++ > hw/hd-geometry.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/ide/core.c | 3 +- > hw/scsi-disk.c | 5 +- > hw/virtio-blk.c | 3 +- > 9 files changed, 192 insertions(+), 127 deletions(-) > create mode 100644 hw/block-common.h > create mode 100644 hw/hd-geometry.c > diff --git a/blockdev.h b/blockdev.h > index 260e16b..26454c9 100644 > --- a/blockdev.h > +++ b/blockdev.h > @@ -62,4 +62,5 @@ void qmp_change_blockdev(const char *device, const char *filename, > bool has_format, const char *format, Error **errp); > void do_commit(Monitor *mon, const QDict *qdict); > int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data); > + > #endif Any objections against dropping this hunk before applying? Kevin