@@ -5254,7 +5254,7 @@ static int ptwr_emulated_update(
{
unmap_domain_page(pl1e);
put_page_from_l1e(nl1e, d);
- return X86EMUL_CMPXCHG_FAILED;
+ return X86EMUL_RETRY;
}
}
else
@@ -4694,7 +4694,7 @@ sh_x86_emulate_cmpxchg(struct vcpu *v, unsigned long vaddr,
}
if ( prev != old )
- rv = X86EMUL_CMPXCHG_FAILED;
+ rv = X86EMUL_RETRY;
SHADOW_DEBUG(EMULATE, "va %#lx was %#lx expected %#lx"
" wanted %#lx now %#lx bytes %u\n",
@@ -109,8 +109,6 @@ struct __attribute__((__packed__)) segment_register {
#define X86EMUL_EXCEPTION 2
/* Retry the emulation for some reason. No state modified. */
#define X86EMUL_RETRY 3
- /* (cmpxchg accessor): CMPXCHG failed. Maps to X86EMUL_RETRY in caller. */
-#define X86EMUL_CMPXCHG_FAILED 3
/* FPU sub-types which may be requested via ->get_fpu(). */
enum x86_emulate_fpu_type {