falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: query kernel-irqchip property 

Running
    x86_64-softmmu/qemu-system-x86_64 -machine pc,kernel_irqchip=on -enable-kvm
leads to crash:
    qemu-system-x86_64: qemu/util/qemu-option.c:387: qemu_opt_get_bool_helper:
    Assertion `opt->desc && opt->desc->type == QEMU_OPT_BOOL' failed.  Aborted
    (core dumped)

This happens because the commit e79d5a6 ("machine: remove qemu_machine_opts
global list") removed the global option descriptions and moved them to
MachineState's QOM properties.

Fix this by querying machine properties through designated wrappers.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-03-10 18:59:54 +02:00 committed by Michael S. Tsirkin
parent d8870d0217
commit 446f16a690
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ppc/e500.c
View File

@ -734,8 +734,8 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params *params,
return dev; return dev;
} }
static qemu_irq *ppce500_init_mpic(PPCE500Params *params, MemoryRegion *ccsr, static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params,
qemu_irq **irqs) MemoryRegion *ccsr, qemu_irq **irqs)
{ {
qemu_irq *mpic; qemu_irq *mpic;
DeviceState *dev = NULL; DeviceState *dev = NULL;
@ -745,17 +745,12 @@ static qemu_irq *ppce500_init_mpic(PPCE500Params *params, MemoryRegion *ccsr,
mpic = g_new0(qemu_irq, 256); mpic = g_new0(qemu_irq, 256);
if (kvm_enabled()) { if (kvm_enabled()) {
QemuOpts *machine_opts = qemu_get_machine_opts();
bool irqchip_allowed = qemu_opt_get_bool(machine_opts,
"kernel_irqchip", true);
bool irqchip_required = qemu_opt_get_bool(machine_opts,
"kernel_irqchip", false);
Error *err = NULL; Error *err = NULL;
if (irqchip_allowed) { if (machine_kernel_irqchip_allowed(machine)) {
dev = ppce500_init_mpic_kvm(params, irqs, &err); dev = ppce500_init_mpic_kvm(params, irqs, &err);
} }
if (irqchip_required && !dev) { if (machine_kernel_irqchip_required(machine) && !dev) {
error_report("kernel_irqchip requested but unavailable: %s", error_report("kernel_irqchip requested but unavailable: %s",
error_get_pretty(err)); error_get_pretty(err));
exit(1); exit(1);
@ -879,7 +874,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
memory_region_add_subregion(address_space_mem, params->ccsrbar_base, memory_region_add_subregion(address_space_mem, params->ccsrbar_base,
ccsr_addr_space); ccsr_addr_space);
mpic = ppce500_init_mpic(params, ccsr_addr_space, irqs); mpic = ppce500_init_mpic(machine, params, ccsr_addr_space, irqs);
/* Serial */ /* Serial */
if (serial_hds[0]) { if (serial_hds[0]) {

15
hw/ppc/spapr.c
View File

@ -127,22 +127,18 @@ static XICSState *try_create_xics(const char *type, int nr_servers,
return XICS_COMMON(dev); return XICS_COMMON(dev);
} }
static XICSState *xics_system_init(int nr_servers, int nr_irqs) static XICSState *xics_system_init(MachineState *machine,
int nr_servers, int nr_irqs)
{ {
XICSState *icp = NULL; XICSState *icp = NULL;
if (kvm_enabled()) { if (kvm_enabled()) {
QemuOpts *machine_opts = qemu_get_machine_opts();
bool irqchip_allowed = qemu_opt_get_bool(machine_opts,
"kernel_irqchip", true);
bool irqchip_required = qemu_opt_get_bool(machine_opts,
"kernel_irqchip", false);
Error *err = NULL; Error *err = NULL;
if (irqchip_allowed) { if (machine_kernel_irqchip_allowed(machine)) {
icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err);
} }
if (irqchip_required && !icp) { if (machine_kernel_irqchip_required(machine) && !icp) {
error_report("kernel_irqchip requested but unavailable: %s", error_report("kernel_irqchip requested but unavailable: %s",
error_get_pretty(err)); error_get_pretty(err));
} }
@ -1455,7 +1451,8 @@ static void ppc_spapr_init(MachineState *machine)
} }
/* Set up Interrupt Controller before we create the VCPUs */ /* Set up Interrupt Controller before we create the VCPUs */
spapr->icp = xics_system_init(smp_cpus * kvmppc_smt_threads() / smp_threads, spapr->icp = xics_system_init(machine,
smp_cpus * kvmppc_smt_threads() / smp_threads,
XICS_IRQS); XICS_IRQS);
/* init CPUs */ /* init CPUs */

6
kvm-all.c
View File

@ -1360,11 +1360,11 @@ int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq)
false); false);
} }
static int kvm_irqchip_create(KVMState *s) static int kvm_irqchip_create(MachineState *machine, KVMState *s)
{ {
int ret; int ret;
if (!qemu_opt_get_bool(qemu_get_machine_opts(), "kernel_irqchip", true) || if (!machine_kernel_irqchip_allowed(machine) ||
(!kvm_check_extension(s, KVM_CAP_IRQCHIP) && (!kvm_check_extension(s, KVM_CAP_IRQCHIP) &&
(kvm_vm_enable_cap(s, KVM_CAP_S390_IRQCHIP, 0) < 0))) { (kvm_vm_enable_cap(s, KVM_CAP_S390_IRQCHIP, 0) < 0))) {
return 0; return 0;
@ -1603,7 +1603,7 @@ static int kvm_init(MachineState *ms)
goto err; goto err;
} }
ret = kvm_irqchip_create(s); ret = kvm_irqchip_create(ms, s);
if (ret < 0) { if (ret < 0) {
goto err; goto err;
} }