2013-01-24 10:08:56 +04:00
|
|
|
/*
|
|
|
|
* virtio ccw machine
|
|
|
|
*
|
|
|
|
* Copyright 2012 IBM Corp.
|
|
|
|
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
|
|
* directory.
|
|
|
|
*/
|
|
|
|
|
2016-01-26 21:17:00 +03:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 23:51:44 +03:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-01-24 10:08:56 +04:00
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "exec/address-spaces.h"
|
|
|
|
#include "s390-virtio.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/s390x/sclp.h"
|
2013-07-16 11:04:04 +04:00
|
|
|
#include "hw/s390x/s390_flic.h"
|
2015-12-04 14:06:26 +03:00
|
|
|
#include "hw/s390x/ioinst.h"
|
|
|
|
#include "hw/s390x/css.h"
|
2013-01-24 10:08:56 +04:00
|
|
|
#include "virtio-ccw.h"
|
2014-08-28 19:25:33 +04:00
|
|
|
#include "qemu/config-file.h"
|
2015-01-09 11:04:38 +03:00
|
|
|
#include "s390-pci-bus.h"
|
2015-06-26 21:01:00 +03:00
|
|
|
#include "hw/s390x/storage-keys.h"
|
2015-10-16 13:25:52 +03:00
|
|
|
#include "hw/compat.h"
|
2015-07-13 15:04:36 +03:00
|
|
|
#include "ipl.h"
|
2016-03-07 11:04:21 +03:00
|
|
|
#include "hw/s390x/s390-virtio-ccw.h"
|
2015-03-12 15:53:51 +03:00
|
|
|
|
2015-07-21 11:58:38 +03:00
|
|
|
static const char *const reset_dev_types[] = {
|
|
|
|
"virtual-css-bridge",
|
|
|
|
"s390-sclp-event-facility",
|
|
|
|
"s390-flic",
|
|
|
|
"diag288",
|
|
|
|
};
|
|
|
|
|
2015-10-01 11:49:47 +03:00
|
|
|
void subsystem_reset(void)
|
2013-07-25 18:37:37 +04:00
|
|
|
{
|
2015-07-21 11:58:38 +03:00
|
|
|
DeviceState *dev;
|
|
|
|
int i;
|
2013-07-25 18:37:37 +04:00
|
|
|
|
2015-07-21 11:58:38 +03:00
|
|
|
for (i = 0; i < ARRAY_SIZE(reset_dev_types); i++) {
|
|
|
|
dev = DEVICE(object_resolve_path_type("", reset_dev_types[i], NULL));
|
|
|
|
if (dev) {
|
|
|
|
qdev_reset_all(dev);
|
|
|
|
}
|
2015-06-29 09:21:10 +03:00
|
|
|
}
|
2013-07-25 18:37:37 +04:00
|
|
|
}
|
|
|
|
|
2013-01-24 10:08:56 +04:00
|
|
|
static int virtio_ccw_hcall_notify(const uint64_t *args)
|
|
|
|
{
|
|
|
|
uint64_t subch_id = args[0];
|
|
|
|
uint64_t queue = args[1];
|
|
|
|
SubchDev *sch;
|
|
|
|
int cssid, ssid, schid, m;
|
|
|
|
|
|
|
|
if (ioinst_disassemble_sch_ident(subch_id, &m, &cssid, &ssid, &schid)) {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
sch = css_find_subch(m, cssid, ssid, schid);
|
|
|
|
if (!sch || !css_subch_visible(sch)) {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2015-05-29 09:15:27 +03:00
|
|
|
if (queue >= VIRTIO_CCW_QUEUE_MAX) {
|
2013-03-26 20:32:44 +04:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2013-01-24 10:08:56 +04:00
|
|
|
virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int virtio_ccw_hcall_early_printk(const uint64_t *args)
|
|
|
|
{
|
|
|
|
uint64_t mem = args[0];
|
|
|
|
|
|
|
|
if (mem < ram_size) {
|
|
|
|
/* Early printk */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_ccw_register_hcalls(void)
|
|
|
|
{
|
|
|
|
s390_register_virtio_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY,
|
|
|
|
virtio_ccw_hcall_notify);
|
|
|
|
/* Tolerate early printk. */
|
|
|
|
s390_register_virtio_hypercall(KVM_S390_VIRTIO_NOTIFY,
|
|
|
|
virtio_ccw_hcall_early_printk);
|
|
|
|
}
|
|
|
|
|
2015-05-29 16:01:55 +03:00
|
|
|
void s390_memory_init(ram_addr_t mem_size)
|
2013-01-24 10:08:56 +04:00
|
|
|
{
|
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
2015-05-29 16:01:55 +03:00
|
|
|
|
|
|
|
/* allocate RAM for core */
|
2015-05-12 14:21:30 +03:00
|
|
|
memory_region_allocate_system_memory(ram, NULL, "s390.ram", mem_size);
|
2015-05-29 16:01:55 +03:00
|
|
|
memory_region_add_subregion(sysmem, 0, ram);
|
|
|
|
|
|
|
|
/* Initialize storage key device */
|
|
|
|
s390_skeys_init();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ccw_init(MachineState *machine)
|
|
|
|
{
|
2013-01-24 10:08:56 +04:00
|
|
|
int ret;
|
|
|
|
VirtualCssBus *css_bus;
|
2015-01-09 11:04:38 +03:00
|
|
|
DeviceState *dev;
|
2014-08-28 19:25:33 +04:00
|
|
|
|
2015-05-29 14:53:08 +03:00
|
|
|
s390_sclp_init();
|
2015-05-29 16:01:55 +03:00
|
|
|
s390_memory_init(machine->ram_size);
|
2013-01-24 10:08:56 +04:00
|
|
|
|
|
|
|
/* get a BUS */
|
|
|
|
css_bus = virtual_css_bus_init();
|
2014-05-07 18:42:57 +04:00
|
|
|
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
|
2015-02-12 20:02:13 +03:00
|
|
|
machine->initrd_filename, "s390-ccw.img", true);
|
2013-07-16 11:04:04 +04:00
|
|
|
s390_flic_init();
|
2013-01-24 10:08:56 +04:00
|
|
|
|
2015-01-09 11:04:38 +03:00
|
|
|
dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
|
|
|
|
object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,
|
|
|
|
OBJECT(dev), NULL);
|
|
|
|
qdev_init_nofail(dev);
|
|
|
|
|
2013-01-24 10:08:56 +04:00
|
|
|
/* register hypercalls */
|
|
|
|
virtio_ccw_register_hcalls();
|
|
|
|
|
|
|
|
/* init CPUs */
|
2016-03-04 20:34:29 +03:00
|
|
|
s390_init_cpus(machine);
|
2013-01-24 10:08:56 +04:00
|
|
|
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_s390_enable_css_support(s390_cpu_addr2state(0));
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Create virtual css and set it as default so that non mcss-e
|
|
|
|
* enabled guests only see virtio devices.
|
|
|
|
*/
|
|
|
|
ret = css_create_css_image(VIRTUAL_CSSID, true);
|
|
|
|
assert(ret == 0);
|
|
|
|
|
|
|
|
/* Create VirtIO network adapters */
|
|
|
|
s390_create_virtio_net(BUS(css_bus), "virtio-net-ccw");
|
2015-03-09 17:56:08 +03:00
|
|
|
|
|
|
|
/* Register savevm handler for guest TOD clock */
|
|
|
|
register_savevm(NULL, "todclock", 0, 1,
|
|
|
|
gtod_save, gtod_load, kvm_state);
|
2013-01-24 10:08:56 +04:00
|
|
|
}
|
|
|
|
|
2016-03-04 20:34:33 +03:00
|
|
|
static void s390_cpu_plug(HotplugHandler *hotplug_dev,
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
S390CPU *cpu = S390_CPU(dev);
|
|
|
|
CPUState *cs = CPU(dev);
|
|
|
|
|
|
|
|
name = g_strdup_printf("cpu[%i]", cpu->env.cpu_num);
|
|
|
|
object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,
|
|
|
|
errp);
|
|
|
|
g_free(name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_machine_device_plug(HotplugHandler *hotplug_dev,
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
|
|
s390_cpu_plug(hotplug_dev, dev, errp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
|
|
|
|
DeviceState *dev)
|
|
|
|
{
|
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
|
|
return HOTPLUG_HANDLER(machine);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-03-04 20:34:35 +03:00
|
|
|
static void s390_hot_add_cpu(const int64_t id, Error **errp)
|
|
|
|
{
|
|
|
|
MachineState *machine = MACHINE(qdev_get_machine());
|
|
|
|
Error *err = NULL;
|
|
|
|
|
|
|
|
s390x_new_cpu(machine->cpu_model, id, &err);
|
|
|
|
error_propagate(errp, err);
|
|
|
|
}
|
|
|
|
|
2014-08-20 16:16:34 +04:00
|
|
|
static void ccw_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2014-08-20 16:16:35 +04:00
|
|
|
NMIClass *nc = NMI_CLASS(oc);
|
2016-03-04 20:34:33 +03:00
|
|
|
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
2016-03-09 15:11:17 +03:00
|
|
|
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
|
2014-08-20 16:16:34 +04:00
|
|
|
|
2016-03-09 15:11:17 +03:00
|
|
|
s390mc->ri_allowed = true;
|
2014-08-20 16:16:34 +04:00
|
|
|
mc->init = ccw_init;
|
2015-07-21 14:47:32 +03:00
|
|
|
mc->reset = s390_machine_reset;
|
2016-03-04 20:34:35 +03:00
|
|
|
mc->hot_add_cpu = s390_hot_add_cpu;
|
2014-08-20 16:16:34 +04:00
|
|
|
mc->block_default_type = IF_VIRTIO;
|
|
|
|
mc->no_cdrom = 1;
|
|
|
|
mc->no_floppy = 1;
|
|
|
|
mc->no_serial = 1;
|
|
|
|
mc->no_parallel = 1;
|
|
|
|
mc->no_sdcard = 1;
|
2014-12-03 17:38:28 +03:00
|
|
|
mc->use_sclp = 1;
|
2014-08-20 16:16:34 +04:00
|
|
|
mc->max_cpus = 255;
|
2016-03-04 20:34:33 +03:00
|
|
|
mc->get_hotplug_handler = s390_get_hotplug_handler;
|
|
|
|
hc->plug = s390_machine_device_plug;
|
2014-08-20 16:16:35 +04:00
|
|
|
nc->nmi_monitor_handler = s390_nmi;
|
2014-08-20 16:16:34 +04:00
|
|
|
}
|
|
|
|
|
2015-03-12 15:53:51 +03:00
|
|
|
static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
|
|
|
|
return ms->aes_key_wrap;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void machine_set_aes_key_wrap(Object *obj, bool value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
|
|
|
|
ms->aes_key_wrap = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool machine_get_dea_key_wrap(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
|
|
|
|
return ms->dea_key_wrap;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void machine_set_dea_key_wrap(Object *obj, bool value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
|
|
|
|
ms->dea_key_wrap = value;
|
|
|
|
}
|
|
|
|
|
2016-03-09 15:11:17 +03:00
|
|
|
bool ri_allowed(void)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
|
|
|
if (object_class_dynamic_cast(OBJECT_CLASS(mc),
|
|
|
|
TYPE_S390_CCW_MACHINE)) {
|
|
|
|
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
|
|
|
|
|
|
|
|
return s390mc->ri_allowed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-12 15:53:51 +03:00
|
|
|
static inline void s390_machine_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
object_property_add_bool(obj, "aes-key-wrap",
|
|
|
|
machine_get_aes_key_wrap,
|
|
|
|
machine_set_aes_key_wrap, NULL);
|
|
|
|
object_property_set_description(obj, "aes-key-wrap",
|
|
|
|
"enable/disable AES key wrapping using the CPACF wrapping key",
|
|
|
|
NULL);
|
|
|
|
object_property_set_bool(obj, true, "aes-key-wrap", NULL);
|
|
|
|
|
|
|
|
object_property_add_bool(obj, "dea-key-wrap",
|
|
|
|
machine_get_dea_key_wrap,
|
|
|
|
machine_set_dea_key_wrap, NULL);
|
|
|
|
object_property_set_description(obj, "dea-key-wrap",
|
|
|
|
"enable/disable DEA key wrapping using the CPACF wrapping key",
|
|
|
|
NULL);
|
|
|
|
object_property_set_bool(obj, true, "dea-key-wrap", NULL);
|
|
|
|
}
|
|
|
|
|
2014-08-20 16:16:34 +04:00
|
|
|
static const TypeInfo ccw_machine_info = {
|
|
|
|
.name = TYPE_S390_CCW_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
2015-07-01 12:16:57 +03:00
|
|
|
.abstract = true,
|
2015-03-12 15:53:51 +03:00
|
|
|
.instance_size = sizeof(S390CcwMachineState),
|
|
|
|
.instance_init = s390_machine_initfn,
|
2016-03-09 15:11:17 +03:00
|
|
|
.class_size = sizeof(S390CcwMachineClass),
|
2014-08-20 16:16:34 +04:00
|
|
|
.class_init = ccw_machine_class_init,
|
2014-08-20 16:16:35 +04:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_NMI },
|
2016-03-04 20:34:33 +03:00
|
|
|
{ TYPE_HOTPLUG_HANDLER},
|
2014-08-20 16:16:35 +04:00
|
|
|
{ }
|
|
|
|
},
|
2013-01-24 10:08:56 +04:00
|
|
|
};
|
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
#define DEFINE_CCW_MACHINE(suffix, verstr, latest) \
|
|
|
|
static void ccw_machine_##suffix##_class_init(ObjectClass *oc, \
|
|
|
|
void *data) \
|
|
|
|
{ \
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc); \
|
|
|
|
ccw_machine_##suffix##_class_options(mc); \
|
|
|
|
mc->desc = "VirtIO-ccw based S390 machine v" verstr; \
|
|
|
|
if (latest) { \
|
|
|
|
mc->alias = "s390-ccw-virtio"; \
|
|
|
|
mc->is_default = 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
static void ccw_machine_##suffix##_instance_init(Object *obj) \
|
|
|
|
{ \
|
|
|
|
MachineState *machine = MACHINE(obj); \
|
|
|
|
ccw_machine_##suffix##_instance_options(machine); \
|
|
|
|
} \
|
|
|
|
static const TypeInfo ccw_machine_##suffix##_info = { \
|
|
|
|
.name = MACHINE_TYPE_NAME("s390-ccw-virtio-" verstr), \
|
|
|
|
.parent = TYPE_S390_CCW_MACHINE, \
|
|
|
|
.class_init = ccw_machine_##suffix##_class_init, \
|
|
|
|
.instance_init = ccw_machine_##suffix##_instance_init, \
|
|
|
|
}; \
|
|
|
|
static void ccw_machine_register_##suffix(void) \
|
|
|
|
{ \
|
|
|
|
type_register_static(&ccw_machine_##suffix##_info); \
|
|
|
|
} \
|
2016-02-16 23:59:04 +03:00
|
|
|
type_init(ccw_machine_register_##suffix)
|
2016-03-03 14:48:34 +03:00
|
|
|
|
2016-04-25 11:37:23 +03:00
|
|
|
#define CCW_COMPAT_2_6 \
|
2015-07-13 15:04:36 +03:00
|
|
|
HW_COMPAT_2_6 \
|
|
|
|
{\
|
|
|
|
.driver = TYPE_S390_IPL,\
|
|
|
|
.property = "iplbext_migration",\
|
|
|
|
.value = "off",\
|
|
|
|
},
|
2016-04-25 11:37:23 +03:00
|
|
|
|
2015-12-23 22:42:11 +03:00
|
|
|
#define CCW_COMPAT_2_5 \
|
2016-04-25 11:37:23 +03:00
|
|
|
CCW_COMPAT_2_6 \
|
2015-12-23 22:42:11 +03:00
|
|
|
HW_COMPAT_2_5
|
|
|
|
|
2015-07-09 20:56:44 +03:00
|
|
|
#define CCW_COMPAT_2_4 \
|
2015-10-16 13:25:52 +03:00
|
|
|
HW_COMPAT_2_4 \
|
2015-07-09 20:56:44 +03:00
|
|
|
{\
|
|
|
|
.driver = TYPE_S390_SKEYS,\
|
|
|
|
.property = "migration-enabled",\
|
|
|
|
.value = "off",\
|
2015-09-11 16:16:44 +03:00
|
|
|
},{\
|
|
|
|
.driver = "virtio-blk-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-balloon-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-serial-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-9p-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-rng-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
2015-10-08 16:11:34 +03:00
|
|
|
},{\
|
|
|
|
.driver = "virtio-net-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-scsi-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
|
|
|
},{\
|
|
|
|
.driver = "vhost-scsi-ccw",\
|
|
|
|
.property = "max_revision",\
|
|
|
|
.value = "0",\
|
2015-07-09 20:56:44 +03:00
|
|
|
},
|
|
|
|
|
2016-04-25 11:37:23 +03:00
|
|
|
static void ccw_machine_2_7_instance_options(MachineState *machine)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ccw_machine_2_7_class_options(MachineClass *mc)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
DEFINE_CCW_MACHINE(2_7, "2.7", true);
|
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_6_instance_options(MachineState *machine)
|
2015-07-01 12:16:57 +03:00
|
|
|
{
|
2016-04-25 11:37:23 +03:00
|
|
|
ccw_machine_2_7_instance_options(machine);
|
2015-07-01 12:16:57 +03:00
|
|
|
}
|
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_6_class_options(MachineClass *mc)
|
2015-07-17 14:16:52 +03:00
|
|
|
{
|
2016-03-09 15:11:17 +03:00
|
|
|
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
|
|
|
|
|
|
|
|
s390mc->ri_allowed = false;
|
2016-04-25 11:37:23 +03:00
|
|
|
ccw_machine_2_7_class_options(mc);
|
|
|
|
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_6);
|
2015-07-17 14:16:52 +03:00
|
|
|
}
|
2016-04-25 11:37:23 +03:00
|
|
|
DEFINE_CCW_MACHINE(2_6, "2.6", false);
|
2015-07-17 14:16:52 +03:00
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_5_instance_options(MachineState *machine)
|
|
|
|
{
|
2016-04-25 11:37:23 +03:00
|
|
|
ccw_machine_2_6_instance_options(machine);
|
2016-03-03 14:48:34 +03:00
|
|
|
}
|
2015-07-17 14:16:52 +03:00
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_5_class_options(MachineClass *mc)
|
2015-11-30 12:45:41 +03:00
|
|
|
{
|
2016-04-25 11:37:23 +03:00
|
|
|
ccw_machine_2_6_class_options(mc);
|
2016-03-03 14:48:34 +03:00
|
|
|
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_5);
|
|
|
|
}
|
|
|
|
DEFINE_CCW_MACHINE(2_5, "2.5", false);
|
2015-11-30 12:45:41 +03:00
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_4_instance_options(MachineState *machine)
|
|
|
|
{
|
|
|
|
ccw_machine_2_5_instance_options(machine);
|
2015-11-30 12:45:41 +03:00
|
|
|
}
|
|
|
|
|
2016-03-03 14:48:34 +03:00
|
|
|
static void ccw_machine_2_4_class_options(MachineClass *mc)
|
|
|
|
{
|
2016-04-25 11:37:23 +03:00
|
|
|
ccw_machine_2_5_class_options(mc);
|
2016-03-03 14:48:34 +03:00
|
|
|
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_4);
|
|
|
|
}
|
|
|
|
DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
2015-11-30 12:45:41 +03:00
|
|
|
|
2014-08-20 16:16:34 +04:00
|
|
|
static void ccw_machine_register_types(void)
|
2013-01-24 10:08:56 +04:00
|
|
|
{
|
2014-08-20 16:16:34 +04:00
|
|
|
type_register_static(&ccw_machine_info);
|
2013-01-24 10:08:56 +04:00
|
|
|
}
|
|
|
|
|
2014-08-20 16:16:34 +04:00
|
|
|
type_init(ccw_machine_register_types)
|