Message ID | 20210219173847.2054123-8-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw/accel: Exit gracefully when accelerator is invalid | expand |
On Fri, 19 Feb 2021 18:38:43 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: I'd lose the 'Explicit' in $SUBJECT. > All s390-ccw-virtio machines support TCG and KVM. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/s390x/s390-virtio-ccw.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 2972b607f36..1f168485066 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -586,6 +586,10 @@ static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) > return newsz; > } > > +static const char *const valid_accels[] = { > + "tcg", "kvm", NULL > +}; > + > static void ccw_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -612,6 +616,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) > mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids; > /* it is overridden with 'host' cpu *in kvm_arch_init* */ > mc->default_cpu_type = S390_CPU_TYPE_NAME("qemu"); > + mc->valid_accelerators = valid_accels; > hc->plug = s390_machine_device_plug; > hc->unplug_request = s390_machine_device_unplug_request; > nc->nmi_monitor_handler = s390_nmi; Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 2972b607f36..1f168485066 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -586,6 +586,10 @@ static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) return newsz; } +static const char *const valid_accels[] = { + "tcg", "kvm", NULL +}; + static void ccw_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -612,6 +616,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids; /* it is overridden with 'host' cpu *in kvm_arch_init* */ mc->default_cpu_type = S390_CPU_TYPE_NAME("qemu"); + mc->valid_accelerators = valid_accels; hc->plug = s390_machine_device_plug; hc->unplug_request = s390_machine_device_unplug_request; nc->nmi_monitor_handler = s390_nmi;
All s390-ccw-virtio machines support TCG and KVM. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/s390x/s390-virtio-ccw.c | 5 +++++ 1 file changed, 5 insertions(+)