mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Revert "x86/hvm: allow guest_request vm_events coming from userspace"
This reverts commit 38f2176097,
which breaks the build on ARM.
This commit is contained in:
Jan Beulich committed
1 parent
a16e826da9
commit
bfd19435bc
6 files changed
+11
-20
No files matched your search
@@ -2021,7 +2021,7 @@ int xc_monitor_software_breakpoint(xc_interface *xch, domid_t domain_id,
|
||||
int xc_monitor_descriptor_access(xc_interface *xch, domid_t domain_id,
|
||||
bool enable);
|
||||
int xc_monitor_guest_request(xc_interface *xch, domid_t domain_id,
|
||||
bool enable, bool sync, bool allow_userspace);
|
||||
bool enable, bool sync);
|
||||
int xc_monitor_debug_exceptions(xc_interface *xch, domid_t domain_id,
|
||||
bool enable, bool sync);
|
||||
int xc_monitor_cpuid(xc_interface *xch, domid_t domain_id, bool enable);
|
||||
|
||||
@@ -147,7 +147,7 @@ int xc_monitor_descriptor_access(xc_interface *xch, domid_t domain_id,
|
||||
}
|
||||
|
||||
int xc_monitor_guest_request(xc_interface *xch, domid_t domain_id, bool enable,
|
||||
bool sync, bool allow_userspace)
|
||||
bool sync)
|
||||
{
|
||||
DECLARE_DOMCTL;
|
||||
|
||||
@@ -157,7 +157,6 @@ int xc_monitor_guest_request(xc_interface *xch, domid_t domain_id, bool enable,
|
||||
: XEN_DOMCTL_MONITOR_OP_DISABLE;
|
||||
domctl.u.monitor_op.event = XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST;
|
||||
domctl.u.monitor_op.u.guest_request.sync = sync;
|
||||
domctl.u.monitor_op.u.guest_request.allow_userspace = enable ? allow_userspace : false;
|
||||
|
||||
return do_domctl(xch, &domctl);
|
||||
}
|
||||
|
||||
@@ -155,11 +155,6 @@ int hvm_hypercall(struct cpu_user_regs *regs)
|
||||
/* Fallthrough to permission check. */
|
||||
case 4:
|
||||
case 2:
|
||||
if ( currd->arch.monitor.guest_request_userspace_enabled &&
|
||||
eax == __HYPERVISOR_hvm_op &&
|
||||
(mode == 8 ? regs->rdi : regs->ebx) == HVMOP_guest_request_vm_event )
|
||||
break;
|
||||
|
||||
if ( unlikely(hvm_get_cpl(curr)) )
|
||||
{
|
||||
default:
|
||||
|
||||
@@ -75,7 +75,6 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop)
|
||||
domain_pause(d);
|
||||
d->monitor.guest_request_sync = mop->u.guest_request.sync;
|
||||
d->monitor.guest_request_enabled = requested_status;
|
||||
d->arch.monitor.guest_request_userspace_enabled = mop->u.guest_request.allow_userspace;
|
||||
domain_unpause(d);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -396,16 +396,15 @@ struct arch_domain
|
||||
|
||||
/* Arch-specific monitor options */
|
||||
struct {
|
||||
unsigned int write_ctrlreg_enabled : 4;
|
||||
unsigned int write_ctrlreg_sync : 4;
|
||||
unsigned int write_ctrlreg_onchangeonly : 4;
|
||||
unsigned int singlestep_enabled : 1;
|
||||
unsigned int software_breakpoint_enabled : 1;
|
||||
unsigned int debug_exception_enabled : 1;
|
||||
unsigned int debug_exception_sync : 1;
|
||||
unsigned int cpuid_enabled : 1;
|
||||
unsigned int descriptor_access_enabled : 1;
|
||||
unsigned int guest_request_userspace_enabled : 1;
|
||||
unsigned int write_ctrlreg_enabled : 4;
|
||||
unsigned int write_ctrlreg_sync : 4;
|
||||
unsigned int write_ctrlreg_onchangeonly : 4;
|
||||
unsigned int singlestep_enabled : 1;
|
||||
unsigned int software_breakpoint_enabled : 1;
|
||||
unsigned int debug_exception_enabled : 1;
|
||||
unsigned int debug_exception_sync : 1;
|
||||
unsigned int cpuid_enabled : 1;
|
||||
unsigned int descriptor_access_enabled : 1;
|
||||
struct monitor_msr_bitmap *msr_bitmap;
|
||||
uint64_t write_ctrlreg_mask[4];
|
||||
} monitor;
|
||||
|
||||
@@ -1124,7 +1124,6 @@ struct xen_domctl_monitor_op {
|
||||
struct {
|
||||
/* Pause vCPU until response */
|
||||
uint8_t sync;
|
||||
uint8_t allow_userspace;
|
||||
} guest_request;
|
||||
|
||||
struct {
|
||||
|
||||