From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbWMk-0006Mi-6v for qemu-devel@nongnu.org; Thu, 22 Nov 2012 07:58:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbWMj-0004sv-3d for qemu-devel@nongnu.org; Thu, 22 Nov 2012 07:58:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbWMi-0004so-R3 for qemu-devel@nongnu.org; Thu, 22 Nov 2012 07:58:49 -0500 Date: Thu, 22 Nov 2012 13:58:40 +0100 From: Stefan Hajnoczi Message-ID: <20121122125840.GC17156@stefanha-thinkpad.redhat.com> References: <1353421834-44687-1-git-send-email-borntraeger@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1353421834-44687-1-git-send-email-borntraeger@de.ibm.com> Subject: Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Igor Mitsyanko , Markus Armbruster , qemu-devel , Alexander Graf , Jens Freimann , Cornelia Huck , Andreas Faerber , Einar Lueck On Tue, Nov 20, 2012 at 03:30:34PM +0100, Christian Borntraeger wrote: > There are QEMUMachines that have neither IF_IDE nor IF_SCSI as a > default/standard interface to their block devices / drives. Therefore, > this patch introduces a new field default_block_type per QEMUMachine > struct. The prior use_scsi field becomes thereby obsolete and is > replaced through .default_block_type = IF_SCSI. > > This patch also changes the default for s390x to IF_VIRTIO and > removes an early hack that converts IF_IDE drives. > Other parties have already claimed interest (e.g. IF_SD for exynos) > > To create a sane default, for machines that dont specify a > default_block_type, this patch makes IF_IDE = 0 and IF_NONE = 1. > I checked all users of IF_NONE (blockdev.c and ww/device-hotplug.c) > as well as IF_IDE and it seems that it is ok to change the defines - > in other words, I found no obvious (to me) assumption in the code > regarding IF_NONE==0. IF_NONE is only set if there is an > explicit if=none. Without if=* the interface becomes IF_DEFAULT. > > I would suggest to have some additional care, e.g. by letting > this patch sit some days in the block tree. > > Based on an initial patch from Einar Lueck > > Signed-off-by: Christian Borntraeger > CC: Igor Mitsyanko > CC: Markus Armbruster > CC: Kevin Wolf > --- > blockdev.c | 4 ++-- > blockdev.h | 5 +++-- > hw/boards.h | 3 ++- > hw/device-hotplug.c | 2 +- > hw/highbank.c | 2 +- > hw/leon3.c | 1 - > hw/mips_jazz.c | 4 ++-- > hw/pc_sysfw.c | 2 +- > hw/puv3.c | 1 - > hw/realview.c | 7 ++++--- > hw/s390-virtio.c | 17 ++--------------- > hw/spapr.c | 2 +- > hw/sun4m.c | 24 ++++++++++++------------ > hw/versatilepb.c | 4 ++-- > hw/vexpress.c | 4 ++-- > hw/xilinx_zynq.c | 2 +- > vl.c | 21 ++++++++++++--------- > 17 files changed, 48 insertions(+), 57 deletions(-) Thanks, applied to my block-next tree: https://github.com/stefanha/qemu/commits/block-next This will be part of QEMU 1.4. Stefan