Commit a86ab19d authored by David Gibson's avatar David Gibson Committed by Paolo Bonzini
Browse files

target/i386: sev: Move local structure definitions into .c file 



Neither QSevGuestInfo nor SEVState (not to be confused with SevState) is
used anywhere outside target/i386/sev.c, so they might as well live in
there rather than in a (somewhat) exposed header.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200604064219.436242-3-david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b5b9b1ad

target/i386/sev.c

+44 −0
Original line number Diff line number Diff line
@@ -29,6 +29,50 @@ 
#include "trace.h"

#include "migration/blocker.h"



#define TYPE_QSEV_GUEST_INFO "sev-guest"

#define QSEV_GUEST_INFO(obj)                  \

    OBJECT_CHECK(QSevGuestInfo, (obj), TYPE_QSEV_GUEST_INFO)



typedef struct QSevGuestInfo QSevGuestInfo;



/**

 * QSevGuestInfo:

 *

 * The QSevGuestInfo object is used for creating a SEV guest.

 *

 * # $QEMU \

 *         -object sev-guest,id=sev0 \

 *         -machine ...,memory-encryption=sev0

 */

struct QSevGuestInfo {

    Object parent_obj;



    char *sev_device;

    uint32_t policy;

    uint32_t handle;

    char *dh_cert_file;

    char *session_file;

    uint32_t cbitpos;

    uint32_t reduced_phys_bits;

};



struct SEVState {

    QSevGuestInfo *sev_info;

    uint8_t api_major;

    uint8_t api_minor;

    uint8_t build_id;

    uint32_t policy;

    uint64_t me_mask;

    uint32_t cbitpos;

    uint32_t reduced_phys_bits;

    uint32_t handle;

    int sev_fd;

    SevState state;

    gchar *measurement;

};



typedef struct SEVState SEVState;



#define DEFAULT_GUEST_POLICY    0x1 /* disable debug */

#define DEFAULT_SEV_DEVICE      "/dev/sev"

target/i386/sev_i386.h

+0 −44
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 
#define SEV_POLICY_DOMAIN       0x10

#define SEV_POLICY_SEV          0x20



#define TYPE_QSEV_GUEST_INFO "sev-guest"

#define QSEV_GUEST_INFO(obj)                  \

    OBJECT_CHECK(QSevGuestInfo, (obj), TYPE_QSEV_GUEST_INFO)



extern bool sev_enabled(void);

extern uint64_t sev_get_me_mask(void);

extern SevInfo *sev_get_info(void);
@@ -40,44 +36,4 @@ extern uint32_t sev_get_reduced_phys_bits(void); 
extern char *sev_get_launch_measurement(void);

extern SevCapability *sev_get_capabilities(void);



typedef struct QSevGuestInfo QSevGuestInfo;



/**

 * QSevGuestInfo:

 *

 * The QSevGuestInfo object is used for creating a SEV guest.

 *

 * # $QEMU \

 *         -object sev-guest,id=sev0 \

 *         -machine ...,memory-encryption=sev0

 */

struct QSevGuestInfo {

    Object parent_obj;



    char *sev_device;

    uint32_t policy;

    uint32_t handle;

    char *dh_cert_file;

    char *session_file;

    uint32_t cbitpos;

    uint32_t reduced_phys_bits;

};



struct SEVState {

    QSevGuestInfo *sev_info;

    uint8_t api_major;

    uint8_t api_minor;

    uint8_t build_id;

    uint32_t policy;

    uint64_t me_mask;

    uint32_t cbitpos;

    uint32_t reduced_phys_bits;

    uint32_t handle;

    int sev_fd;

    SevState state;

    gchar *measurement;

};



typedef struct SEVState SEVState;



#endif