From: David Gibson <da...@gibson.dropbear.id.au>
SEVState::policy is set from the final value of the policy field in the
parameter structure for the KVM_SEV_LAUNCH_START ioctl(). But, AFAICT
that ioctl() won't ever change it from the original supplied value which
comes from SevGuestState::policy.
So, remove this field and just use SevGuestState::policy directly.
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Message-Id: <20200604064219.436242-8-da...@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
target/i386/sev.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index d25af37136..4b261beaa7 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -39,7 +39,6 @@ struct SEVState {
uint8_t api_major;
uint8_t api_minor;
uint8_t build_id;
- uint32_t policy;
uint64_t me_mask;
uint32_t handle;
int sev_fd;
@@ -397,7 +396,7 @@ sev_get_info(void)
info->api_major = sev_guest->state.api_major;
info->api_minor = sev_guest->state.api_minor;
info->build_id = sev_guest->state.build_id;
- info->policy = sev_guest->state.policy;
+ info->policy = sev_guest->policy;
info->state = sev_guest->state.state;
info->handle = sev_guest->state.handle;
}
@@ -520,8 +519,7 @@ sev_launch_start(SevGuestState *sev)
start->handle = object_property_get_int(OBJECT(sev), "handle",
&error_abort);
- start->policy = object_property_get_int(OBJECT(sev), "policy",
- &error_abort);
+ start->policy = sev->policy;
if (sev->session_file) {
if (sev_read_file_base64(sev->session_file, &session, &sz) < 0) {
goto out;
@@ -550,7 +548,6 @@ sev_launch_start(SevGuestState *sev)
&error_abort);
sev_set_guest_state(sev, SEV_STATE_LAUNCH_UPDATE);
s->handle = start->handle;
- s->policy = start->policy;
ret = 0;
out:
--
2.26.2
