Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.4:Update
xen
61eaaa23-x86-get-set-reg-infra-build.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 61eaaa23-x86-get-set-reg-infra-build.patch of Package xen
# Commit 13caa585791234fe3e3719c8376f7ea731012451 # Date 2022-01-21 12:42:11 +0000 # Author Andrew Cooper <andrew.cooper3@citrix.com> # Committer Andrew Cooper <andrew.cooper3@citrix.com> x86: Fix build with the get/set_reg() infrastructure I clearly messed up concluding that the stubs were safe to drop. The is_{pv,hvm}_domain() predicates are not symmetrical with both CONFIG_PV and CONFIG_HVM. As a result logic of the form `if ( pv/hvm ) ... else ...` will always have one side which can't be DCE'd. While technically only the hvm stubs are needed, due to the use of the is_pv_domain() predicate in guest_{rd,wr}msr(), sort out the pv stubs too to avoid leaving a bear trap for future users. Fixes: 88d3ff7ab15d ("x86/guest: Introduce {get,set}_reg() infrastructure") Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com> --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -865,6 +865,16 @@ static inline int hvm_vmtrace_get_option return -EOPNOTSUPP; } +static inline uint64_t hvm_get_reg(struct vcpu *v, unsigned int reg) +{ + ASSERT_UNREACHABLE(); + return 0; +} +static inline void hvm_set_reg(struct vcpu *v, unsigned int reg, uint64_t val) +{ + ASSERT_UNREACHABLE(); +} + #define is_viridian_domain(d) ((void)(d), false) #define is_viridian_vcpu(v) ((void)(v), false) #define has_viridian_time_ref_count(d) ((void)(d), false) --- a/xen/include/asm-x86/pv/domain.h +++ b/xen/include/asm-x86/pv/domain.h @@ -65,10 +65,6 @@ static inline unsigned long get_pcid_bit #endif } -/* See hvm_{get,set}_reg() for description. */ -uint64_t pv_get_reg(struct vcpu *v, unsigned int reg); -void pv_set_reg(struct vcpu *v, unsigned int reg, uint64_t val); - #ifdef CONFIG_PV void pv_vcpu_destroy(struct vcpu *v); @@ -93,6 +89,10 @@ unsigned long pv_fixup_guest_cr4(const s /* Create a cr4 value to load into hardware, based on vcpu settings. */ unsigned long pv_make_cr4(const struct vcpu *v); +/* See hvm_{get,set}_reg() for description. */ +uint64_t pv_get_reg(struct vcpu *v, unsigned int reg); +void pv_set_reg(struct vcpu *v, unsigned int reg, uint64_t val); + bool xpti_pcid_enabled(void); #else /* !CONFIG_PV */ @@ -106,6 +106,16 @@ static inline int pv_domain_initialise(s static inline unsigned long pv_make_cr4(const struct vcpu *v) { return ~0ul; } +static inline uint64_t pv_get_reg(struct vcpu *v, unsigned int reg) +{ + ASSERT_UNREACHABLE(); + return 0; +} +static inline void pv_set_reg(struct vcpu *v, unsigned int reg, uint64_t val) +{ + ASSERT_UNREACHABLE(); +} + #endif /* CONFIG_PV */ void paravirt_ctxt_switch_from(struct vcpu *v);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor