From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 15 Nov 2013 10:01:49 +0000 (+0100)
Subject: x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2)
X-Git-Tag: 4.4.0-rc1~215
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1e521eddeb51a9f1bf0e4dd1d17efc873eafae41;p=xen.git

x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2)

Just spotted a counterpart of what commit 9d89100b (same title) dealt
with.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c
index deb7b92fdc..15e0b4c0ae 100644
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -290,8 +290,10 @@ void hvm_io_assist(ioreq_t *p)
         (void)handle_mmio();
         break;
     case HVMIO_handle_pio_awaiting_completion:
-        memcpy(&guest_cpu_user_regs()->eax,
-               &p->data, vio->io_size);
+        if ( vio->io_size == 4 ) /* Needs zero extension. */
+            guest_cpu_user_regs()->rax = (uint32_t)p->data;
+        else
+            memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size);
         break;
     default:
         break;