From f5172b7d517928193f411b7f2a55e8d6a5a52525 Mon Sep 17 00:00:00 2001 From: Joao Martins Date: Mon, 18 Jun 2018 12:26:44 -0400 Subject: [PATCH] i386/xen: implement HYPERVISOR_vcpu_op This is simply when guest tries to register a vcpu_info and since vcpu_info placement is optional in the minimum ABI therefore we can just fail with -ENOSYS Signed-off-by: Joao Martins --- target/i386/xen.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/target/i386/xen.c b/target/i386/xen.c index 11ae9107b4..5b02b5f666 100644 --- a/target/i386/xen.c +++ b/target/i386/xen.c @@ -20,6 +20,7 @@ #include "standard-headers/xen/version.h" #include "standard-headers/xen/memory.h" #include "standard-headers/xen/hvm/hvm_op.h" +#include "standard-headers/xen/vcpu.h" #define PAGE_OFFSET 0xffffffff80000000UL #define PAGE_SHIFT 12 @@ -211,11 +212,29 @@ static int kvm_xen_hcall_hvm_op(struct kvm_xen_exit *exit, return HCALL_ERR; } +static int kvm_xen_hcall_vcpu_op(struct kvm_xen_exit *exit, + int cmd, uint64_t arg) +{ + switch (cmd) { + case VCPUOP_register_vcpu_info: { + /* no vcpu info placement for now */ + exit->u.hcall.result = -ENOSYS; + return 0; + } + } + + exit->u.hcall.result = -ENOSYS; + return HCALL_ERR; +} + static int __kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit) { uint16_t code = exit->u.hcall.input; switch (code) { + case __HYPERVISOR_vcpu_op: + return kvm_xen_hcall_vcpu_op(exit, exit->u.hcall.params[0], + exit->u.hcall.params[1]); case __HYPERVISOR_hvm_op: return kvm_xen_hcall_hvm_op(exit, exit->u.hcall.params[0], exit->u.hcall.params[1]); -- 2.50.1