Commit 8b8a61ad authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: Introduce S390MachineClass 



As we now have the new machine definitions, that let us disable/enable
machine options more easily, we need a way to save them and make them
publicly available.

The new s390-virtio-ccw.h header exports the s390 ccw machine state
and class, so they can be easily used in other C files.

Signed-off-by: default avatarJanosch Frank <frankja@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 4fca6548

hw/s390x/s390-virtio-ccw.c

+1 −14
Original line number Diff line number Diff line
@@ -22,20 +22,7 @@ 
#include "s390-pci-bus.h"

#include "hw/s390x/storage-keys.h"

#include "hw/compat.h"



#define TYPE_S390_CCW_MACHINE               "s390-ccw-machine"



#define S390_CCW_MACHINE(obj) \

    OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE)



typedef struct S390CcwMachineState {

    /*< private >*/

    MachineState parent_obj;



    /*< public >*/

    bool aes_key_wrap;

    bool dea_key_wrap;

} S390CcwMachineState;

#include "hw/s390x/s390-virtio-ccw.h"



static const char *const reset_dev_types[] = {

    "virtual-css-bridge",

include/hw/s390x/s390-virtio-ccw.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * virtio ccw machine definitions

 *

 * Copyright 2012, 2016 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.

 */

#ifndef HW_S390X_S390_VIRTIO_CCW_H

#define HW_S390X_S390_VIRTIO_CCW_H



#include "hw/boards.h"



#define TYPE_S390_CCW_MACHINE               "s390-ccw-machine"



#define S390_CCW_MACHINE(obj) \

    OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE)



#define S390_MACHINE_CLASS(klass) \

    OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE)



typedef struct S390CcwMachineState {

    /*< private >*/

    MachineState parent_obj;



    /*< public >*/

    bool aes_key_wrap;

    bool dea_key_wrap;

} S390CcwMachineState;



typedef struct S390CcwMachineClass {

    /*< private >*/

    MachineClass parent_class;



    /*< public >*/

} S390CcwMachineClass;



#endif