haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields

Browse source 
The SEVState structure has cbitpos and reduced_phys_bits fields which are
simply copied from the SevGuestState structure and never changed.  Now that
SEVState is embedded in SevGuestState we can just access the original copy
directly.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200604064219.436242-7-david@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
David Gibson 2020-06-04 16:42:16 +10:00 committed by Paolo Bonzini
parent 8673dee354
commit a06d2bad05
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
target/i386/sev.c
View file

@ -41,8 +41,6 @@ struct SEVState {
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;
@ -378,13 +376,13 @@ sev_get_me_mask(void)
uint32_t
sev_get_cbit_position(void)
{
return sev_guest ? sev_guest->state.cbitpos : 0;
return sev_guest ? sev_guest->cbitpos : 0;
}
uint32_t
sev_get_reduced_phys_bits(void)
{
return sev_guest ? sev_guest->state.reduced_phys_bits : 0;
return sev_guest ? sev_guest->reduced_phys_bits : 0;
}
SevInfo *
@ -713,22 +711,19 @@ sev_guest_init(const char *id)
host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL);
host_cbitpos = ebx & 0x3f;
s->cbitpos = object_property_get_int(OBJECT(sev), "cbitpos", NULL);
if (host_cbitpos != s->cbitpos) {
if (host_cbitpos != sev->cbitpos) {
error_report("%s: cbitpos check failed, host '%d' requested '%d'",
__func__, host_cbitpos, s->cbitpos);
__func__, host_cbitpos, sev->cbitpos);
goto err;
}
s->reduced_phys_bits = object_property_get_int(OBJECT(sev),
"reduced-phys-bits", NULL);
if (s->reduced_phys_bits < 1) {
if (sev->reduced_phys_bits < 1) {
error_report("%s: reduced_phys_bits check failed, it should be >=1,"
" requested '%d'", __func__, s->reduced_phys_bits);
" requested '%d'", __func__, sev->reduced_phys_bits);
goto err;
}
s->me_mask = ~(1UL << s->cbitpos);
s->me_mask = ~(1UL << sev->cbitpos);
devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
s->sev_fd = open(devname, O_RDWR);