| Message ID | 20210219173847.2054123-6-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/accel: Exit gracefully when accelerator is invalid | expand |
Reviewed-by: Huacai Chen <chenhuacai@kernel.org> On Sat, Feb 20, 2021 at 12:56 PM Jiaxun Yang <jiaxun.yang@flygoat.com> wrote: > > 在 2021/2/20 上午1:38, Philippe Mathieu-Daudé 写道: > > Restrit KVM to the following MIPS machines: > > - malta > > - loongson3-virt > > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > > > --- > > hw/mips/loongson3_virt.c | 5 +++++ > > hw/mips/malta.c | 5 +++++ > > 2 files changed, 10 insertions(+) > > > > diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c > > index d4a82fa5367..c3679dff043 100644 > > --- a/hw/mips/loongson3_virt.c > > +++ b/hw/mips/loongson3_virt.c > > @@ -612,6 +612,10 @@ static void mips_loongson3_virt_init(MachineState *machine) > > loongson3_virt_devices_init(machine, liointc); > > } > > > > +static const char *const valid_accels[] = { > > + "tcg", "kvm", NULL > > +}; > > + > > static void loongson3v_machine_class_init(ObjectClass *oc, void *data) > > { > > MachineClass *mc = MACHINE_CLASS(oc); > > @@ -622,6 +626,7 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) > > mc->max_cpus = LOONGSON_MAX_VCPUS; > > mc->default_ram_id = "loongson3.highram"; > > mc->default_ram_size = 1600 * MiB; > > + mc->valid_accelerators = valid_accels; > > mc->kvm_type = mips_kvm_type; > > mc->minimum_page_bits = 14; > > } > > diff --git a/hw/mips/malta.c b/hw/mips/malta.c > > index 9afc0b427bf..0212048dc63 100644 > > --- a/hw/mips/malta.c > > +++ b/hw/mips/malta.c > > @@ -1443,6 +1443,10 @@ static const TypeInfo mips_malta_device = { > > .instance_init = mips_malta_instance_init, > > }; > > > > +static const char *const valid_accels[] = { > > + "tcg", "kvm", NULL > > +}; > > + > > static void mips_malta_machine_init(MachineClass *mc) > > { > > mc->desc = "MIPS Malta Core LV"; > > @@ -1456,6 +1460,7 @@ static void mips_malta_machine_init(MachineClass *mc) > > mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); > > #endif > > mc->default_ram_id = "mips_malta.ram"; > > + mc->valid_accelerators = valid_accels; > > } > > > > DEFINE_MACHINE("malta", mips_malta_machine_init) >
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index d4a82fa5367..c3679dff043 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -612,6 +612,10 @@ static void mips_loongson3_virt_init(MachineState *machine) loongson3_virt_devices_init(machine, liointc); } +static const char *const valid_accels[] = { + "tcg", "kvm", NULL +}; + static void loongson3v_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -622,6 +626,7 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = LOONGSON_MAX_VCPUS; mc->default_ram_id = "loongson3.highram"; mc->default_ram_size = 1600 * MiB; + mc->valid_accelerators = valid_accels; mc->kvm_type = mips_kvm_type; mc->minimum_page_bits = 14; } diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 9afc0b427bf..0212048dc63 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1443,6 +1443,10 @@ static const TypeInfo mips_malta_device = { .instance_init = mips_malta_instance_init, }; +static const char *const valid_accels[] = { + "tcg", "kvm", NULL +}; + static void mips_malta_machine_init(MachineClass *mc) { mc->desc = "MIPS Malta Core LV"; @@ -1456,6 +1460,7 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); #endif mc->default_ram_id = "mips_malta.ram"; + mc->valid_accelerators = valid_accels; } DEFINE_MACHINE("malta", mips_malta_machine_init)
Restrit KVM to the following MIPS machines: - malta - loongson3-virt Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/mips/loongson3_virt.c | 5 +++++ hw/mips/malta.c | 5 +++++ 2 files changed, 10 insertions(+)