s390x: split flic into kvm and non-kvm parts

Introduce a common parent class for both cases, where kvm and non-kvm
can hook up callbacks. This will be used by follow-on patches for
adapter registration and mapping.

We now always have a flic, regardless of whether we use kvm; the
non-kvm implementation just doesn't do anything.

Reviewed-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Cornelia Huck 2014-04-17 15:59:48 +02:00
parent 61c7bbd236
commit 7b35d0c44c
5 changed files with 404 additions and 304 deletions

View file

@ -1,33 +1,62 @@
/*
* QEMU S390x KVM floating interrupt controller (flic)
* QEMU S390x floating interrupt controller (flic)
*
* Copyright 2014 IBM Corp.
* Author(s): Jens Freimann <jfrei@linux.vnet.ibm.com>
* 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.
*/
#ifndef __KVM_S390_FLIC_H
#define __KVM_S390_FLIC_H
#ifndef __HW_S390_FLIC_H
#define __HW_S390_FLIC_H
#include "hw/sysbus.h"
#define TYPE_KVM_S390_FLIC "s390-flic"
#define TYPE_S390_FLIC_COMMON "s390-flic"
#define S390_FLIC_COMMON(obj) \
OBJECT_CHECK(S390FLICState, (obj), TYPE_S390_FLIC_COMMON)
typedef struct S390FLICState {
SysBusDevice parent_obj;
} S390FLICState;
#define S390_FLIC_COMMON_CLASS(klass) \
OBJECT_CLASS_CHECK(S390FLICStateClass, (klass), TYPE_S390_FLIC_COMMON)
#define S390_FLIC_COMMON_GET_CLASS(obj) \
OBJECT_GET_CLASS(S390FLICStateClass, (obj), TYPE_S390_FLIC_COMMON)
typedef struct S390FLICStateClass {
DeviceClass parent_class;
} S390FLICStateClass;
#define TYPE_KVM_S390_FLIC "s390-flic-kvm"
#define KVM_S390_FLIC(obj) \
OBJECT_CHECK(KVMS390FLICState, (obj), TYPE_KVM_S390_FLIC)
typedef struct KVMS390FLICState {
SysBusDevice parent_obj;
#define TYPE_QEMU_S390_FLIC "s390-flic-qemu"
#define QEMU_S390_FLIC(obj) \
OBJECT_CHECK(QEMUS390FLICState, (obj), TYPE_QEMU_S390_FLIC)
uint32_t fd;
} KVMS390FLICState;
typedef struct QEMUS390FLICState {
S390FLICState parent_obj;
} QEMUS390FLICState;
void s390_flic_init(void);
S390FLICState *s390_get_flic(void);
#ifdef CONFIG_KVM
void s390_flic_init(void);
DeviceState *s390_flic_kvm_create(void);
#else
static inline void s390_flic_init(void) { }
static inline DeviceState *s390_flic_kvm_create(void)
{
return NULL;
}
#endif
#endif /* __KVM_S390_FLIC_H */
#endif /* __HW_S390_FLIC_H */