Re: [Qemu-devel] [PATCH v3 05/29] hd-geometry: Move disk geometry guessing back from block.c

[Kevin Wolf]

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 <address@hidden>
> ---
>  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