Message ID | 20211002125317.3418648-9-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | target/i386/sev: Housekeeping SEV + measured Linux SEV guest | expand |
On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: > Unused dead code makes review harder, so remove it. > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Connor Kuehl <ckuehl@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/i386/sev_i386.h | 1 - > target/i386/sev-stub.c | 5 ----- > target/i386/sev.c | 9 --------- > 3 files changed, 15 deletions(-) > > diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h > index f4223f1febf..afa19a0a161 100644 > --- a/target/i386/sev_i386.h > +++ b/target/i386/sev_i386.h > @@ -25,7 +25,6 @@ > #define SEV_POLICY_SEV 0x20 > > extern bool sev_es_enabled(void); > -extern uint64_t sev_get_me_mask(void); > extern SevInfo *sev_get_info(void); > extern uint32_t sev_get_cbit_position(void); > extern uint32_t sev_get_reduced_phys_bits(void); > diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c > index d91c2ece784..eb0c89bf2be 100644 > --- a/target/i386/sev-stub.c > +++ b/target/i386/sev-stub.c > @@ -25,11 +25,6 @@ bool sev_enabled(void) > return false; > } > > -uint64_t sev_get_me_mask(void) > -{ > - return ~0; > -} > - > uint32_t sev_get_cbit_position(void) > { > return 0; > diff --git a/target/i386/sev.c b/target/i386/sev.c > index fa7210473a6..c88cd808410 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -64,7 +64,6 @@ struct SevGuestState { > uint8_t api_major; > uint8_t api_minor; > uint8_t build_id; > - uint64_t me_mask; > int sev_fd; > SevState state; > gchar *measurement; > @@ -362,12 +361,6 @@ sev_es_enabled(void) > return sev_enabled() && (sev_guest->policy & SEV_POLICY_ES); > } > > -uint64_t > -sev_get_me_mask(void) > -{ > - return sev_guest ? sev_guest->me_mask : ~0; > -} > - > uint32_t > sev_get_cbit_position(void) > { > @@ -804,8 +797,6 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) > goto err; > } > > - sev->me_mask = ~(1UL << sev->cbitpos); > - > devname = object_property_get_str(OBJECT(sev), "sev-device", NULL); > sev->sev_fd = open(devname, O_RDWR); > if (sev->sev_fd < 0) { > RB
On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: > Unused dead code makes review harder, so remove it. > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Connor Kuehl <ckuehl@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/i386/sev_i386.h | 1 - > target/i386/sev-stub.c | 5 ----- > target/i386/sev.c | 9 --------- > 3 files changed, 15 deletions(-) > > diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h > index f4223f1febf..afa19a0a161 100644 > --- a/target/i386/sev_i386.h > +++ b/target/i386/sev_i386.h > @@ -25,7 +25,6 @@ > #define SEV_POLICY_SEV 0x20 > > extern bool sev_es_enabled(void); > -extern uint64_t sev_get_me_mask(void); > extern SevInfo *sev_get_info(void); > extern uint32_t sev_get_cbit_position(void); > extern uint32_t sev_get_reduced_phys_bits(void); > diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c > index d91c2ece784..eb0c89bf2be 100644 > --- a/target/i386/sev-stub.c > +++ b/target/i386/sev-stub.c > @@ -25,11 +25,6 @@ bool sev_enabled(void) > return false; > } > > -uint64_t sev_get_me_mask(void) > -{ > - return ~0; > -} > - > uint32_t sev_get_cbit_position(void) > { > return 0; > diff --git a/target/i386/sev.c b/target/i386/sev.c > index fa7210473a6..c88cd808410 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -64,7 +64,6 @@ struct SevGuestState { > uint8_t api_major; > uint8_t api_minor; > uint8_t build_id; > - uint64_t me_mask; > int sev_fd; > SevState state; > gchar *measurement; > @@ -362,12 +361,6 @@ sev_es_enabled(void) > return sev_enabled() && (sev_guest->policy & SEV_POLICY_ES); > } > > -uint64_t > -sev_get_me_mask(void) > -{ > - return sev_guest ? sev_guest->me_mask : ~0; > -} > - > uint32_t > sev_get_cbit_position(void) > { > @@ -804,8 +797,6 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) > goto err; > } > > - sev->me_mask = ~(1UL << sev->cbitpos); > - > devname = object_property_get_str(OBJECT(sev), "sev-device", NULL); > sev->sev_fd = open(devname, O_RDWR); > if (sev->sev_fd < 0) { > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index f4223f1febf..afa19a0a161 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -25,7 +25,6 @@ #define SEV_POLICY_SEV 0x20 extern bool sev_es_enabled(void); -extern uint64_t sev_get_me_mask(void); extern SevInfo *sev_get_info(void); extern uint32_t sev_get_cbit_position(void); extern uint32_t sev_get_reduced_phys_bits(void); diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c index d91c2ece784..eb0c89bf2be 100644 --- a/target/i386/sev-stub.c +++ b/target/i386/sev-stub.c @@ -25,11 +25,6 @@ bool sev_enabled(void) return false; } -uint64_t sev_get_me_mask(void) -{ - return ~0; -} - uint32_t sev_get_cbit_position(void) { return 0; diff --git a/target/i386/sev.c b/target/i386/sev.c index fa7210473a6..c88cd808410 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -64,7 +64,6 @@ struct SevGuestState { uint8_t api_major; uint8_t api_minor; uint8_t build_id; - uint64_t me_mask; int sev_fd; SevState state; gchar *measurement; @@ -362,12 +361,6 @@ sev_es_enabled(void) return sev_enabled() && (sev_guest->policy & SEV_POLICY_ES); } -uint64_t -sev_get_me_mask(void) -{ - return sev_guest ? sev_guest->me_mask : ~0; -} - uint32_t sev_get_cbit_position(void) { @@ -804,8 +797,6 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) goto err; } - sev->me_mask = ~(1UL << sev->cbitpos); - devname = object_property_get_str(OBJECT(sev), "sev-device", NULL); sev->sev_fd = open(devname, O_RDWR); if (sev->sev_fd < 0) {