On 10/24/2012 05:13 AM, David Gibson wrote: > On Wed, Oct 24, 2012 at 12:47:34AM +0200, Alexander Graf wrote: >> >> On 24.10.2012, at 00:43, David Gibson wrote: >> >>> On Tue, Oct 23, 2012 at 12:20:08PM +0200, Alexander Graf wrote: >>>> >>>> On 23.10.2012, at 12:09, Avik Sil wrote: >>>> >>>>> This patch makes default boot order machine specific instead of >>>>> set globally. The default boot order can be set per machine in >>>>> QEMUMachine default_machine_opts, or by the command line using >>>>> -machine <machine_name>,boot=<boot_devices>, or by standard -boot >>>>> option. This allows a machine to receive a NULL boot order when >>>>> -boot isn't used and take an appropriate action accordingly. This >>>>> helps machine boots from the devices as set in guest's non-volatile >>>>> memory location in case no boot order is provided by the user. >>>>> >>>>> Signed-off-by: Avik Sil <avik...@linux.vnet.ibm.com> >>>>> --- >>>>> hw/nseries.c | 2 ++ >>>>> hw/pc_piix.c | 13 ++++++++++++- >>>>> hw/ppc_newworld.c | 1 + >>>>> hw/ppc_oldworld.c | 1 + >>>>> hw/ppc_prep.c | 1 + >>>>> hw/sun4m.c | 10 ++++++++++ >>>>> hw/sun4u.c | 3 +++ >>>> >>>> That feels like too much magic for my taste. Can't we have some >>>> default macro (or even the explicit "cad" thing) that we push to >>>> _every_ machine description out there? The next patch to implement >>>> boot= for pseries would then remove this default value for the >>>> pseries machine. >>> >>> I'm not 100% clear on what you mean here. Do you just mean: >>> #define DEFAULT_BOOT_ORDER "boot=cad" >>> and then we use >>> .default_machine_opts = DEFAULT_BOOT_ORDER, >>> >>> or something else? >> >> I mean that this patch only patches 7 files. Check this out: > > Oh, yes, oops. Saw the big pile of hunks changing machines and > assumed that was all, but in fact half of them were just the PC > variants. > > Avik, this will need to be fixed. > Sure, will do. Actually I patched the machines that do care for boot order like in pc_piix.c and other machines do not care for the order. But in next series I'll do it for every machine.
Regards, Avik
