c165473269
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 <armbru@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
54 lines
1.3 KiB
C
54 lines
1.3 KiB
C
/* Declarations for use by board files for creating devices. */
|
|
|
|
#ifndef HW_BOARDS_H
|
|
#define HW_BOARDS_H
|
|
|
|
#include "sysemu/blockdev.h"
|
|
#include "hw/qdev.h"
|
|
|
|
typedef struct QEMUMachineInitArgs {
|
|
ram_addr_t ram_size;
|
|
const char *boot_order;
|
|
const char *kernel_filename;
|
|
const char *kernel_cmdline;
|
|
const char *initrd_filename;
|
|
const char *cpu_model;
|
|
} QEMUMachineInitArgs;
|
|
|
|
typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args);
|
|
|
|
typedef void QEMUMachineResetFunc(void);
|
|
|
|
typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp);
|
|
|
|
typedef struct QEMUMachine {
|
|
const char *name;
|
|
const char *alias;
|
|
const char *desc;
|
|
QEMUMachineInitFunc *init;
|
|
QEMUMachineResetFunc *reset;
|
|
QEMUMachineHotAddCPUFunc *hot_add_cpu;
|
|
BlockInterfaceType block_default_type;
|
|
int max_cpus;
|
|
unsigned int no_serial:1,
|
|
no_parallel:1,
|
|
use_virtcon:1,
|
|
use_sclp:1,
|
|
no_floppy:1,
|
|
no_cdrom:1,
|
|
no_sdcard:1;
|
|
int is_default;
|
|
const char *default_machine_opts;
|
|
const char *default_boot_order;
|
|
GlobalProperty *compat_props;
|
|
struct QEMUMachine *next;
|
|
const char *hw_version;
|
|
} QEMUMachine;
|
|
|
|
int qemu_register_machine(QEMUMachine *m);
|
|
QEMUMachine *find_default_machine(void);
|
|
|
|
extern QEMUMachine *current_machine;
|
|
|
|
#endif
|