mirror of https://gitee.com/openkylin/qemu.git
qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386
Move rtc-reset-reinjection and SEV in target.json and make them conditional on TARGET_I386. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190214152251.2073-10-armbru@redhat.com>
This commit is contained in:
Marc-André Lureau
Markus Armbruster
parent
61eb9e80d5
commit
a6c7040fb0
|
|
@ -31,7 +31,7 @@
|
|||
#include "sysemu/replay.h"
|
||||
#include "hw/timer/mc146818rtc.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc.h"
|
||||
#include "qapi/qapi-commands-target.h"
|
||||
#include "qapi/qapi-events-misc.h"
|
||||
#include "qapi/visitor.h"
|
||||
#include "exec/address-spaces.h"
|
||||
|
|
|
|||
31
monitor.c
31
monitor.c
|
|
@ -1145,12 +1145,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
|
|||
*/
|
||||
static void qmp_unregister_commands_hack(void)
|
||||
{
|
||||
#ifndef TARGET_I386
|
||||
qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection");
|
||||
qmp_unregister_command(&qmp_commands, "query-sev");
|
||||
qmp_unregister_command(&qmp_commands, "query-sev-launch-measure");
|
||||
qmp_unregister_command(&qmp_commands, "query-sev-capabilities");
|
||||
#endif
|
||||
#ifndef TARGET_S390X
|
||||
qmp_unregister_command(&qmp_commands, "dump-skeys");
|
||||
#endif
|
||||
|
|
@ -4670,31 +4664,6 @@ QemuOptsList qemu_mon_opts = {
|
|||
},
|
||||
};
|
||||
|
||||
#ifndef TARGET_I386
|
||||
void qmp_rtc_reset_reinjection(Error **errp)
|
||||
{
|
||||
error_setg(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection");
|
||||
}
|
||||
|
||||
SevInfo *qmp_query_sev(Error **errp)
|
||||
{
|
||||
error_setg(errp, QERR_FEATURE_DISABLED, "query-sev");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
|
||||
{
|
||||
error_setg(errp, QERR_FEATURE_DISABLED, "query-sev-launch-measure");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
SevCapability *qmp_query_sev_capabilities(Error **errp)
|
||||
{
|
||||
error_setg(errp, QERR_FEATURE_DISABLED, "query-sev-capabilities");
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef TARGET_S390X
|
||||
void qmp_dump_skeys(const char *filename, Error **errp)
|
||||
{
|
||||
|
|
|
|||
166
qapi/misc.json
166
qapi/misc.json
|
|
@ -3119,24 +3119,6 @@
|
|||
{ 'event': 'ACPI_DEVICE_OST',
|
||||
'data': { 'info': 'ACPIOSTInfo' } }
|
||||
|
||||
##
|
||||
# @rtc-reset-reinjection:
|
||||
#
|
||||
# This command will reset the RTC interrupt reinjection backlog.
|
||||
# Can be used if another mechanism to synchronize guest time
|
||||
# is in effect, for example QEMU guest agent's guest-set-time
|
||||
# command.
|
||||
#
|
||||
# Since: 2.1
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "rtc-reset-reinjection" }
|
||||
# <- { "return": {} }
|
||||
#
|
||||
##
|
||||
{ 'command': 'rtc-reset-reinjection' }
|
||||
|
||||
##
|
||||
# @RTC_CHANGE:
|
||||
#
|
||||
|
|
@ -3365,154 +3347,6 @@
|
|||
##
|
||||
{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
|
||||
|
||||
|
||||
##
|
||||
# @SevState:
|
||||
#
|
||||
# An enumeration of SEV state information used during @query-sev.
|
||||
#
|
||||
# @uninit: The guest is uninitialized.
|
||||
#
|
||||
# @launch-update: The guest is currently being launched; plaintext data and
|
||||
# register state is being imported.
|
||||
#
|
||||
# @launch-secret: The guest is currently being launched; ciphertext data
|
||||
# is being imported.
|
||||
#
|
||||
# @running: The guest is fully launched or migrated in.
|
||||
#
|
||||
# @send-update: The guest is currently being migrated out to another machine.
|
||||
#
|
||||
# @receive-update: The guest is currently being migrated from another machine.
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'enum': 'SevState',
|
||||
'data': ['uninit', 'launch-update', 'launch-secret', 'running',
|
||||
'send-update', 'receive-update' ] }
|
||||
|
||||
##
|
||||
# @SevInfo:
|
||||
#
|
||||
# Information about Secure Encrypted Virtualization (SEV) support
|
||||
#
|
||||
# @enabled: true if SEV is active
|
||||
#
|
||||
# @api-major: SEV API major version
|
||||
#
|
||||
# @api-minor: SEV API minor version
|
||||
#
|
||||
# @build-id: SEV FW build id
|
||||
#
|
||||
# @policy: SEV policy value
|
||||
#
|
||||
# @state: SEV guest state
|
||||
#
|
||||
# @handle: SEV firmware handle
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'struct': 'SevInfo',
|
||||
'data': { 'enabled': 'bool',
|
||||
'api-major': 'uint8',
|
||||
'api-minor' : 'uint8',
|
||||
'build-id' : 'uint8',
|
||||
'policy' : 'uint32',
|
||||
'state' : 'SevState',
|
||||
'handle' : 'uint32'
|
||||
}
|
||||
}
|
||||
|
||||
##
|
||||
# @query-sev:
|
||||
#
|
||||
# Returns information about SEV
|
||||
#
|
||||
# Returns: @SevInfo
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev" }
|
||||
# <- { "return": { "enabled": true, "api-major" : 0, "api-minor" : 0,
|
||||
# "build-id" : 0, "policy" : 0, "state" : "running",
|
||||
# "handle" : 1 } }
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev', 'returns': 'SevInfo' }
|
||||
|
||||
##
|
||||
# @SevLaunchMeasureInfo:
|
||||
#
|
||||
# SEV Guest Launch measurement information
|
||||
#
|
||||
# @data: the measurement value encoded in base64
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
##
|
||||
{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'} }
|
||||
|
||||
##
|
||||
# @query-sev-launch-measure:
|
||||
#
|
||||
# Query the SEV guest launch information.
|
||||
#
|
||||
# Returns: The @SevLaunchMeasureInfo for the guest
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev-launch-measure" }
|
||||
# <- { "return": { "data": "4l8LXeNlSPUDlXPJG5966/8%YZ" } }
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo' }
|
||||
|
||||
##
|
||||
# @SevCapability:
|
||||
#
|
||||
# The struct describes capability for a Secure Encrypted Virtualization
|
||||
# feature.
|
||||
#
|
||||
# @pdh: Platform Diffie-Hellman key (base64 encoded)
|
||||
#
|
||||
# @cert-chain: PDH certificate chain (base64 encoded)
|
||||
#
|
||||
# @cbitpos: C-bit location in page table entry
|
||||
#
|
||||
# @reduced-phys-bits: Number of physical Address bit reduction when SEV is
|
||||
# enabled
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'struct': 'SevCapability',
|
||||
'data': { 'pdh': 'str',
|
||||
'cert-chain': 'str',
|
||||
'cbitpos': 'int',
|
||||
'reduced-phys-bits': 'int'} }
|
||||
|
||||
##
|
||||
# @query-sev-capabilities:
|
||||
#
|
||||
# This command is used to get the SEV capabilities, and is supported on AMD
|
||||
# X86 platforms only.
|
||||
#
|
||||
# Returns: SevCapability objects.
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev-capabilities" }
|
||||
# <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE",
|
||||
# "cbitpos": 47, "reduced-phys-bits": 5}}
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev-capabilities', 'returns': 'SevCapability' }
|
||||
|
||||
##
|
||||
# @set-numa-node:
|
||||
#
|
||||
|
|
|
|||
177
qapi/target.json
177
qapi/target.json
|
|
@ -6,8 +6,177 @@
|
|||
##
|
||||
|
||||
##
|
||||
# @TARGET-TEMPORARY-DUMMY:
|
||||
# Will go away in the next commit. Needed in this one because empty
|
||||
# modules don't generate anything, defeating this commit's purpose.
|
||||
# @rtc-reset-reinjection:
|
||||
#
|
||||
# This command will reset the RTC interrupt reinjection backlog.
|
||||
# Can be used if another mechanism to synchronize guest time
|
||||
# is in effect, for example QEMU guest agent's guest-set-time
|
||||
# command.
|
||||
#
|
||||
# Since: 2.1
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "rtc-reset-reinjection" }
|
||||
# <- { "return": {} }
|
||||
#
|
||||
##
|
||||
{ 'event': 'TARGET-TEMPORARY-DUMMY' }
|
||||
{ 'command': 'rtc-reset-reinjection',
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
|
||||
##
|
||||
# @SevState:
|
||||
#
|
||||
# An enumeration of SEV state information used during @query-sev.
|
||||
#
|
||||
# @uninit: The guest is uninitialized.
|
||||
#
|
||||
# @launch-update: The guest is currently being launched; plaintext data and
|
||||
# register state is being imported.
|
||||
#
|
||||
# @launch-secret: The guest is currently being launched; ciphertext data
|
||||
# is being imported.
|
||||
#
|
||||
# @running: The guest is fully launched or migrated in.
|
||||
#
|
||||
# @send-update: The guest is currently being migrated out to another machine.
|
||||
#
|
||||
# @receive-update: The guest is currently being migrated from another machine.
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'enum': 'SevState',
|
||||
'data': ['uninit', 'launch-update', 'launch-secret', 'running',
|
||||
'send-update', 'receive-update' ],
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
##
|
||||
# @SevInfo:
|
||||
#
|
||||
# Information about Secure Encrypted Virtualization (SEV) support
|
||||
#
|
||||
# @enabled: true if SEV is active
|
||||
#
|
||||
# @api-major: SEV API major version
|
||||
#
|
||||
# @api-minor: SEV API minor version
|
||||
#
|
||||
# @build-id: SEV FW build id
|
||||
#
|
||||
# @policy: SEV policy value
|
||||
#
|
||||
# @state: SEV guest state
|
||||
#
|
||||
# @handle: SEV firmware handle
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'struct': 'SevInfo',
|
||||
'data': { 'enabled': 'bool',
|
||||
'api-major': 'uint8',
|
||||
'api-minor' : 'uint8',
|
||||
'build-id' : 'uint8',
|
||||
'policy' : 'uint32',
|
||||
'state' : 'SevState',
|
||||
'handle' : 'uint32'
|
||||
},
|
||||
'if': 'defined(TARGET_I386)'
|
||||
}
|
||||
|
||||
##
|
||||
# @query-sev:
|
||||
#
|
||||
# Returns information about SEV
|
||||
#
|
||||
# Returns: @SevInfo
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev" }
|
||||
# <- { "return": { "enabled": true, "api-major" : 0, "api-minor" : 0,
|
||||
# "build-id" : 0, "policy" : 0, "state" : "running",
|
||||
# "handle" : 1 } }
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev', 'returns': 'SevInfo',
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
|
||||
##
|
||||
# @SevLaunchMeasureInfo:
|
||||
#
|
||||
# SEV Guest Launch measurement information
|
||||
#
|
||||
# @data: the measurement value encoded in base64
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
##
|
||||
{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'},
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
##
|
||||
# @query-sev-launch-measure:
|
||||
#
|
||||
# Query the SEV guest launch information.
|
||||
#
|
||||
# Returns: The @SevLaunchMeasureInfo for the guest
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev-launch-measure" }
|
||||
# <- { "return": { "data": "4l8LXeNlSPUDlXPJG5966/8%YZ" } }
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo',
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
|
||||
##
|
||||
# @SevCapability:
|
||||
#
|
||||
# The struct describes capability for a Secure Encrypted Virtualization
|
||||
# feature.
|
||||
#
|
||||
# @pdh: Platform Diffie-Hellman key (base64 encoded)
|
||||
#
|
||||
# @cert-chain: PDH certificate chain (base64 encoded)
|
||||
#
|
||||
# @cbitpos: C-bit location in page table entry
|
||||
#
|
||||
# @reduced-phys-bits: Number of physical Address bit reduction when SEV is
|
||||
# enabled
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
{ 'struct': 'SevCapability',
|
||||
'data': { 'pdh': 'str',
|
||||
'cert-chain': 'str',
|
||||
'cbitpos': 'int',
|
||||
'reduced-phys-bits': 'int'},
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
||||
##
|
||||
# @query-sev-capabilities:
|
||||
#
|
||||
# This command is used to get the SEV capabilities, and is supported on AMD
|
||||
# X86 platforms only.
|
||||
#
|
||||
# Returns: SevCapability objects.
|
||||
#
|
||||
# Since: 2.12
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "query-sev-capabilities" }
|
||||
# <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE",
|
||||
# "cbitpos": 47, "reduced-phys-bits": 5}}
|
||||
#
|
||||
##
|
||||
{ 'command': 'query-sev-capabilities', 'returns': 'SevCapability',
|
||||
'if': 'defined(TARGET_I386)' }
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include "sysemu/kvm.h"
|
||||
#include "sysemu/sev.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/qapi-commands-misc.h"
|
||||
#include "qapi/qapi-commands-target.h"
|
||||
|
||||
#define SEV_POLICY_NODBG 0x1
|
||||
#define SEV_POLICY_NOKS 0x2
|
||||
|
|
|
|||
Loading…
Reference in New Issue