From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZa-0006aO-OM for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDbZW-0003QD-MX for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:14 -0400 Received: from hub021-nj-2.exch021.serverdata.net ([206.225.164.217]:43848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZW-0003Pp-Hf for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:10 -0400 From: Don Slutz Date: Mon, 17 Sep 2012 09:39:46 -0400 Message-ID: <1347889189-9199-23-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> References: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v3 14/17] target-i386: Add cpu object access routines for Hypervisor leaf extra. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mtosatti@redhat.com, ehabkost@redhat.com, imammedo@redhat.com, avi@redhat.com, afaerber@suse.de, peter.maydell@linaro.org, kvm@vger.kernel.org, anthony@codemonkey.ws Cc: Don Slutz Signed-off-by: Don Slutz --- target-i386/cpu.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9ac3076..34d2291 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1265,6 +1265,63 @@ static void x86_cpuid_set_hv_vendor(Object *obj, const char *value, } } +static void x86_cpuid_get_hv_extra(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_extra, name, errp); +} + +static void x86_cpuid_set_hv_extra(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + uint32_t value; + + visit_type_uint32(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + + if ((value != 0) && (value < 0x40000000)) { + value += 0x40000000; + } + cpu->env.cpuid_hv_extra = value; +} + +static void x86_cpuid_get_hv_extra_a(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_extra_a, name, errp); +} + +static void x86_cpuid_set_hv_extra_a(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_extra_a, name, errp); +} + +static void x86_cpuid_get_hv_extra_b(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_extra_b, name, errp); +} + +static void x86_cpuid_set_hv_extra_b(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_extra_b, name, errp); +} + #if !defined(CONFIG_USER_ONLY) static void x86_set_hyperv(Object *obj, Error **errp) { @@ -2199,6 +2256,15 @@ static void x86_cpu_initfn(Object *obj) object_property_add_str(obj, "hypervisor-vendor", x86_cpuid_get_hv_vendor, x86_cpuid_set_hv_vendor, NULL); + object_property_add(obj, "hypervisor-extra", "int", + x86_cpuid_get_hv_extra, + x86_cpuid_set_hv_extra, NULL, NULL, NULL); + object_property_add(obj, "hypervisor-extra-a", "int", + x86_cpuid_get_hv_extra_a, + x86_cpuid_set_hv_extra_a, NULL, NULL, NULL); + object_property_add(obj, "hypervisor-extra-b", "int", + x86_cpuid_get_hv_extra_b, + x86_cpuid_set_hv_extra_b, NULL, NULL, NULL); #if !defined(CONFIG_USER_ONLY) object_property_add(obj, "hv_spinlocks", "int", x86_get_hv_spinlocks, -- 1.7.1