From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAf7w-0000wA-1c for qemu-devel@nongnu.org; Sat, 17 Aug 2013 07:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAf7q-0002kU-17 for qemu-devel@nongnu.org; Sat, 17 Aug 2013 07:57:03 -0400 Message-ID: <520F6596.4070606@redhat.com> Date: Sat, 17 Aug 2013 13:59:18 +0200 From: Laszlo Ersek MIME-Version: 1.0 References: <1376651630-9151-1-git-send-email-armbru@redhat.com> <1376651630-9151-7-git-send-email-armbru@redhat.com> In-Reply-To: <1376651630-9151-7-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 6/6] hw: Clean up bogus default boot order List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: armbru@redhat.com Cc: aliguori@us.ibm.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, agraf@suse.de, blauwirbel@gmail.com, qemu-ppc@nongnu.org, aviksil@linux.vnet.ibm.com On 08/16/13 13:13, armbru@redhat.com wrote: > From: Markus Armbruster > > We set default boot order "cad" in every single machine definition > except "pseries" and "moxiesim", even though very few boards actually > care for boot order, and "cad" makes sense for even fewer. > > Machines that care: > > * pc and its variants > > Accept up to three letters 'a', 'b' (undocumented alias for 'a'), > 'c', 'd' and 'n'. Reject all others (fatal with -boot). > > * nseries (n800, n810) > > Check whether order starts with 'n'. Silently ignored otherwise. > > * prep, g3beige, mac99 > > Extract the first character the machine understands (subset of > 'a'..'f'). Silently ignored otherwise. > > * spapr > > Accept an arbitrary string (vl.c restricts it to contain only > 'a'..'p', no duplicates). > > * sun4[mdc] > > Use the first character. Silently ignored otherwise. > > Strip characters these machines ignore from their default boot order. > > For all other machines, remove the unused default boot order > alltogether. > > Note that my rename of QEMUMachine member boot_order to > default_boot_order and QEMUMachineInitArgs member boot_device to > boot_order has a welcome side effect: it makes every use of boot > orders visible in this patch, for easy review. > > Signed-off-by: Markus Armbruster > --- > hw/alpha/dp264.c | 1 - > hw/arm/collie.c | 1 - > hw/arm/exynos4_boards.c | 2 -- > hw/arm/gumstix.c | 2 -- > hw/arm/highbank.c | 2 -- > hw/arm/integratorcp.c | 1 - > hw/arm/kzm.c | 1 - > hw/arm/mainstone.c | 1 - > hw/arm/musicpal.c | 1 - > hw/arm/nseries.c | 6 +++--- > hw/arm/omap_sx1.c | 2 -- > hw/arm/palm.c | 1 - > hw/arm/realview.c | 4 ---- > hw/arm/spitz.c | 4 ---- > hw/arm/stellaris.c | 2 -- > hw/arm/tosa.c | 1 - > hw/arm/versatilepb.c | 2 -- > hw/arm/vexpress.c | 2 -- > hw/arm/xilinx_zynq.c | 1 - > hw/arm/z2.c | 1 - > hw/core/null-machine.c | 1 - > hw/cris/axis_dev88.c | 1 - > hw/i386/pc_piix.c | 32 ++++++++++++++++---------------- > hw/i386/pc_q35.c | 8 ++++---- > hw/i386/xen_machine_pv.c | 1 - > hw/lm32/lm32_boards.c | 2 -- > hw/lm32/milkymist.c | 1 - > hw/m68k/an5206.c | 1 - > hw/m68k/dummy_m68k.c | 1 - > hw/m68k/mcf5208.c | 1 - > hw/microblaze/petalogix_ml605_mmu.c | 1 - > hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 - > hw/mips/mips_fulong2e.c | 1 - > hw/mips/mips_jazz.c | 2 -- > hw/mips/mips_malta.c | 1 - > hw/mips/mips_mipssim.c | 1 - > hw/mips/mips_r4k.c | 1 - > hw/openrisc/openrisc_sim.c | 1 - > hw/ppc/e500plat.c | 1 - > hw/ppc/mac_newworld.c | 4 ++-- > hw/ppc/mac_oldworld.c | 4 ++-- > hw/ppc/mpc8544ds.c | 1 - > hw/ppc/ppc405_boards.c | 2 -- > hw/ppc/ppc440_bamboo.c | 1 - > hw/ppc/prep.c | 4 ++-- > hw/ppc/spapr.c | 4 ++-- > hw/ppc/virtex_ml507.c | 1 - > hw/s390x/s390-virtio-ccw.c | 1 - > hw/s390x/s390-virtio.c | 1 - > hw/sh4/r2d.c | 1 - > hw/sh4/shix.c | 1 - > hw/sparc/leon3.c | 1 - > hw/sparc/sun4m.c | 22 +++++++++++----------- > hw/sparc64/sun4u.c | 10 +++++----- > hw/unicore32/puv3.c | 1 - > hw/xtensa/xtensa_lx60.c | 2 -- > hw/xtensa/xtensa_sim.c | 1 - > include/hw/boards.h | 7 ++----- > vl.c | 4 ++-- > 59 files changed, 51 insertions(+), 119 deletions(-) This patch wasn't easy to verify. I hope I haven't missed anything. Reviewed-by: Laszlo Ersek