From 7de0078fd52252eb05bb3e09c1842210f4b9b232 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 27 Nov 2008 18:00:28 +0200 Subject: [PATCH] --- yaml --- r: 125263 b: refs/heads/master c: 781d0edc5fc5cfe7491a0c5081734e62f6dc66ee h: refs/heads/master i: 125261: 6cf5f3e8df25cdb6288cc80b43fdc6da6269c5bc 125259: ec0076c24d71b38c4fd37cef7fab052d4ea8aa78 125255: 6a9b40454c5cfe84402419808b6ecac5f51f46d8 125247: 6903fcfca81efaa911380178cd04ef8245c9741b v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86_emulate.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3d06b5981f6..9e151e394f59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faa5a3ae39483aefc46a78299c811194f953af27 +refs/heads/master: 781d0edc5fc5cfe7491a0c5081734e62f6dc66ee diff --git a/trunk/arch/x86/kvm/x86_emulate.c b/trunk/arch/x86/kvm/x86_emulate.c index 2555762f4b42..70242f5f0964 100644 --- a/trunk/arch/x86/kvm/x86_emulate.c +++ b/trunk/arch/x86/kvm/x86_emulate.c @@ -1063,9 +1063,9 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt, struct decode_cache *c = &ctxt->decode; int rc; - rc = ops->read_std(register_address(c, ss_base(ctxt), - c->regs[VCPU_REGS_RSP]), - &c->src.val, c->src.bytes, ctxt->vcpu); + rc = ops->read_emulated(register_address(c, ss_base(ctxt), + c->regs[VCPU_REGS_RSP]), + &c->src.val, c->src.bytes, ctxt->vcpu); if (rc != 0) return rc;