From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 09/28] nVMX: Add VMCS fields to the vmcs12 Date: Thu, 09 Dec 2010 14:43:08 +0200 Message-ID: <4D00CEDC.7050007@redhat.com> References: <1291827596-nyh@il.ibm.com> <201012081704.oB8H4YH7008642@rice.haifa.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, gleb@redhat.com To: "Nadav Har'El" Return-path: Received: from mx1.redhat.com ([209.132.183.28]:27519 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755411Ab0LIMnN (ORCPT ); Thu, 9 Dec 2010 07:43:13 -0500 In-Reply-To: <201012081704.oB8H4YH7008642@rice.haifa.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On 12/08/2010 07:04 PM, Nadav Har'El wrote: > In this patch we add to vmcs12 (the VMCS that L1 keeps for L2) all the > standard VMCS fields. These fields are encapsulated in a struct vmcs_fields. > > Later patches will enable L1 to read and write these fields using VMREAD/ > VMWRITE, and they will be used during a VMLAUNCH/VMRESUME in preparing vmcs02, > a hardware VMCS for running L2. > > Signed-off-by: Nadav Har'El > --- > arch/x86/kvm/vmx.c | 295 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 295 insertions(+) > > --- .before/arch/x86/kvm/vmx.c 2010-12-08 18:56:49.000000000 +0200 > +++ .after/arch/x86/kvm/vmx.c 2010-12-08 18:56:49.000000000 +0200 > @@ -128,6 +128,137 @@ struct shared_msr_entry { > }; > > /* > + * vmcs_fields is a structure used in nested VMX for holding a copy of all > + * standard VMCS fields. It is used for emulating a VMCS for L1 (see struct > + * vmcs12), and also for easier access to VMCS data (see vmcs01_fields). > + */ > +struct __packed vmcs_fields { > + u16 virtual_processor_id; > + u16 guest_es_selector; > + u16 guest_cs_selector; > + u16 guest_ss_selector; > + u16 guest_ds_selector; > + u16 guest_fs_selector; > + u16 guest_gs_selector; > + u16 guest_ldtr_selector; > + u16 guest_tr_selector; > + u16 host_es_selector; > + u16 host_cs_selector; > + u16 host_ss_selector; > + u16 host_ds_selector; > + u16 host_fs_selector; > + u16 host_gs_selector; > + u16 host_tr_selector; > + u64 io_bitmap_a; > + u64 io_bitmap_b; > + u64 msr_bitmap; > + u64 vm_exit_msr_store_addr; > + u64 vm_exit_msr_load_addr; > + u64 vm_entry_msr_load_addr; > + u64 tsc_offset; > + u64 virtual_apic_page_addr; > + u64 apic_access_addr; > + u64 ept_pointer; > + u64 guest_physical_address; > + u64 vmcs_link_pointer; > + u64 guest_ia32_debugctl; > + u64 guest_ia32_pat; > + u64 guest_pdptr0; > + u64 guest_pdptr1; > + u64 guest_pdptr2; > + u64 guest_pdptr3; > + u64 host_ia32_pat; > + u32 pin_based_vm_exec_control; > + u32 cpu_based_vm_exec_control; > + u32 exception_bitmap; > + u32 page_fault_error_code_mask; > + u32 page_fault_error_code_match; > + u32 cr3_target_count; > + u32 vm_exit_controls; > + u32 vm_exit_msr_store_count; > + u32 vm_exit_msr_load_count; > + u32 vm_entry_controls; > + u32 vm_entry_msr_load_count; > + u32 vm_entry_intr_info_field; > + u32 vm_entry_exception_error_code; > + u32 vm_entry_instruction_len; > + u32 tpr_threshold; > + u32 secondary_vm_exec_control; > + u32 vm_instruction_error; > + u32 vm_exit_reason; > + u32 vm_exit_intr_info; > + u32 vm_exit_intr_error_code; > + u32 idt_vectoring_info_field; > + u32 idt_vectoring_error_code; > + u32 vm_exit_instruction_len; > + u32 vmx_instruction_info; > + u32 guest_es_limit; > + u32 guest_cs_limit; > + u32 guest_ss_limit; > + u32 guest_ds_limit; > + u32 guest_fs_limit; > + u32 guest_gs_limit; > + u32 guest_ldtr_limit; > + u32 guest_tr_limit; > + u32 guest_gdtr_limit; > + u32 guest_idtr_limit; > + u32 guest_es_ar_bytes; > + u32 guest_cs_ar_bytes; > + u32 guest_ss_ar_bytes; > + u32 guest_ds_ar_bytes; > + u32 guest_fs_ar_bytes; > + u32 guest_gs_ar_bytes; > + u32 guest_ldtr_ar_bytes; > + u32 guest_tr_ar_bytes; > + u32 guest_interruptibility_info; > + u32 guest_activity_state; > + u32 guest_sysenter_cs; > + u32 host_ia32_sysenter_cs; > + unsigned long cr0_guest_host_mask; > + unsigned long cr4_guest_host_mask; > + unsigned long cr0_read_shadow; > + unsigned long cr4_read_shadow; > + unsigned long cr3_target_value0; > + unsigned long cr3_target_value1; > + unsigned long cr3_target_value2; > + unsigned long cr3_target_value3; > + unsigned long exit_qualification; > + unsigned long guest_linear_address; > + unsigned long guest_cr0; > + unsigned long guest_cr3; > + unsigned long guest_cr4; > + unsigned long guest_es_base; > + unsigned long guest_cs_base; > + unsigned long guest_ss_base; > + unsigned long guest_ds_base; > + unsigned long guest_fs_base; > + unsigned long guest_gs_base; > + unsigned long guest_ldtr_base; > + unsigned long guest_tr_base; > + unsigned long guest_gdtr_base; > + unsigned long guest_idtr_base; > + unsigned long guest_dr7; > + unsigned long guest_rsp; > + unsigned long guest_rip; > + unsigned long guest_rflags; > + unsigned long guest_pending_dbg_exceptions; > + unsigned long guest_sysenter_esp; > + unsigned long guest_sysenter_eip; > + unsigned long host_cr0; > + unsigned long host_cr3; > + unsigned long host_cr4; > + unsigned long host_fs_base; > + unsigned long host_gs_base; > + unsigned long host_tr_base; > + unsigned long host_gdtr_base; > + unsigned long host_idtr_base; > + unsigned long host_ia32_sysenter_esp; > + unsigned long host_ia32_sysenter_eip; > + unsigned long host_rsp; > + unsigned long host_rip; > +}; > + Those ulongs aren't portable. Please use u64. And please address all my earlier comments, there's no point in me reviewing the same thing again and again. -- error compiling committee.c: too many arguments to function