xen/vm_event: fix rc check for uninitialized ring
PATCH v2 1/1 xen/vm_event: fix rc check for uninitialized ring
vm_event_claim_slot() returns -EOPNOTSUPP for an uninitialized ring since commit 15e4dd5e866b43bbc ("common/vm_event: Initialize vm_event lists on domain creation"), but the callers test for -ENOSYS.
Correct the callers.
---
V2: add blank line (Jan Beulich)
replace two further ENOSYS returns with EOPNOTSUPP (Razvan Cojocaru)
--- xen/arch/x86/mm/p2m.c | 3 ++- xen/common/monitor.c | 2 +- xen/common/vm_event.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-)
xen/arch/x86/mm/p2m.c +2 -1
@@ -1705,7 +1705,8 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l)/* We're paging. There should be a ring */ int rc =vm_event_claim_slot (d, d->vm_event_paging); -if ( rc == -ENOSYS ) + +if ( rc == -EOPNOTSUPP ) {gdprintk (XENLOG_ERR ,"Domain %hu paging gfn %lx yet no ring " "in place\n" , d->domain_id, gfn_l);
xen/common/monitor.c +1 -1
@@ -98,7 +98,7 @@ int monitor_traps(struct vcpu *v, bool sync, vm_event_request_t *req) {case 0 :break ; -case -ENOSYS : +case -EOPNOTSUPP :/* * If there was no ring to handle the event, then * simply continue executing normally.
xen/common/vm_event.c +3 -3
@@ -64,7 +64,7 @@ static int vm_event_enable(/* The parameter defaults to zero, and it should be * set to something */ if ( ring_gfn ==0 ) -return -ENOSYS ; +return -EOPNOTSUPP ;vm_event_ring_lock_init (*ved);vm_event_ring_lock (*ved);
@@ -465,7 +465,7 @@ static int vm_event_grab_slot(struct vm_event_domain *ved, int foreign)unsigned int avail_req;if ( !ved->ring_page ) -return -ENOSYS ; +return -EOPNOTSUPP ;vm_event_ring_lock (ved);
@@ -513,7 +513,7 @@ bool vm_event_check_ring(struct vm_event_domain *ved)* this function will always return 0 for a guest. For a non-guest, we check * for space and return -EBUSY if the ring is not available. * -* Return codes: -ENOSYS: the ring is not yet configured +* Return codes: -EOPNOTSUPP: the ring is not yet configured * -EBUSY: the ring is busy * 0: a spot has been reserved *
Signature · 7 lines
2.16.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 10 lines · Juergen Gross
vm_event_claim_slot()returns-EOPNOTSUPPfor an uninitialized ring since commit15e4dd5e866b43bbc("common/vm_event: Initializevm_eventlists on domain creation"), but the callers test for-ENOSYS.Correct the callers.
Signed-off-by Juergen Gross <[email protected]>---
V2: add blank line (Jan Beulich)
replace two further ENOSYS returns with EOPNOTSUPP (Razvan Cojocaru)
Thanks,
Razvan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines · Juergen Gross
vm_event_claim_slot()returns-EOPNOTSUPPfor an uninitialized ring since commit15e4dd5e866b43bbc("common/vm_event: Initializevm_eventlists on domain creation"), but the callers test for-ENOSYS.Correct the callers.
Signed-off-by Juergen Gross <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel