lkml.org 
[lkml]   [2012]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/8] KVM: VMX: constify lookup tables
    Date
    We use vmcs_field_to_offset_table[], kvm_vmx_segment_fields[] and
    kvm_vmx_exit_handlers[] as lookup tables only -- make them r/o.

    Signed-off-by: Mathias Krause <minipli@googlemail.com>
    ---
    arch/x86/kvm/vmx.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 248c2b4..d62b413 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -450,7 +450,7 @@ static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu)
    #define FIELD64(number, name) [number] = VMCS12_OFFSET(name), \
    [number##_HIGH] = VMCS12_OFFSET(name)+4

    -static unsigned short vmcs_field_to_offset_table[] = {
    +static const unsigned short vmcs_field_to_offset_table[] = {
    FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id),
    FIELD(GUEST_ES_SELECTOR, guest_es_selector),
    FIELD(GUEST_CS_SELECTOR, guest_cs_selector),
    @@ -666,7 +666,7 @@ static struct vmx_capability {
    .ar_bytes = GUEST_##seg##_AR_BYTES, \
    }

    -static struct kvm_vmx_segment_field {
    +static const struct kvm_vmx_segment_field {
    unsigned selector;
    unsigned base;
    unsigned limit;
    @@ -2695,7 +2695,7 @@ static __exit void hardware_unsetup(void)

    static void fix_pmode_dataseg(struct kvm_vcpu *vcpu, int seg, struct kvm_segment *save)
    {
    - struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    + const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    struct kvm_segment tmp = *save;

    if (!(vmcs_readl(sf->base) == tmp.base && tmp.s)) {
    @@ -2764,7 +2764,7 @@ static gva_t rmode_tss_base(struct kvm *kvm)

    static void fix_rmode_seg(int seg, struct kvm_segment *save)
    {
    - struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    + const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];

    vmcs_write16(sf->selector, save->base >> 4);
    vmcs_write32(sf->base, save->base & 0xffff0);
    @@ -3202,7 +3202,7 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
    struct kvm_segment *var, int seg)
    {
    struct vcpu_vmx *vmx = to_vmx(vcpu);
    - struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    + const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    u32 ar;

    vmx_segment_cache_clear(vmx);
    @@ -3572,7 +3572,7 @@ out:

    static void seg_setup(int seg)
    {
    - struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    + const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
    unsigned int ar;

    vmcs_write16(sf->selector, 0);
    @@ -5655,7 +5655,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
    * may resume. Otherwise they set the kvm_run parameter to indicate what needs
    * to be done to userspace and return 0.
    */
    -static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
    +static int (*const kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
    [EXIT_REASON_EXCEPTION_NMI] = handle_exception,
    [EXIT_REASON_EXTERNAL_INTERRUPT] = handle_external_interrupt,
    [EXIT_REASON_TRIPLE_FAULT] = handle_triple_fault,
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-08-30 02:21    [W:3.221 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site