lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Use x86's segment descriptor struct instead of private definition

Browse Source 
The x86 desc_struct unification allows us to remove segment_descriptor.h.

Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity
2008-02-20 17:57:21 +02:00
parent ef2979bd98
commit a5f61300c4
3 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/x86/kvm/segment_descriptor.h
View File

@@ -1,29 +0,0 @@
#ifndef __SEGMENT_DESCRIPTOR_H
#define __SEGMENT_DESCRIPTOR_H
struct segment_descriptor {
u16 limit_low;
u16 base_low;
u8 base_mid;
u8 type : 4;
u8 system : 1;
u8 dpl : 2;
u8 present : 1;
u8 limit_high : 4;
u8 avl : 1;
u8 long_mode : 1;
u8 default_op : 1;
u8 granularity : 1;
u8 base_high;
} __attribute__((packed));
#ifdef CONFIG_X86_64
/* LDT or TSS descriptor in the GDT. 16 bytes. */
struct segment_descriptor_64 {
struct segment_descriptor s;
u32 base_higher;
u32 pad_zero;
};
#endif
#endif

3
arch/x86/kvm/vmx.c
View File

@@ -17,7 +17,6 @@
#include "irq.h" #include "irq.h"
#include "vmx.h" #include "vmx.h"
#include "segment_descriptor.h"
#include "mmu.h" #include "mmu.h"
#include <linux/kvm_host.h> #include <linux/kvm_host.h>
@@ -388,7 +387,7 @@ static void reload_tss(void)
* VT restores TR but not its size. Useless. * VT restores TR but not its size. Useless.
*/ */
struct descriptor_table gdt; struct descriptor_table gdt;
struct segment_descriptor *descs; struct desc_struct *descs;
get_gdt(&gdt); get_gdt(&gdt);
descs = (void *)gdt.base; descs = (void *)gdt.base;

15
arch/x86/kvm/x86.c
View File

@@ -15,7 +15,6 @@
*/ */
#include <linux/kvm_host.h> #include <linux/kvm_host.h>
#include "segment_descriptor.h"
#include "irq.h" #include "irq.h"
#include "mmu.h" #include "mmu.h"
@@ -29,6 +28,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/desc.h>
#define MAX_IO_MSRS 256 #define MAX_IO_MSRS 256
#define CR0_RESERVED_BITS \ #define CR0_RESERVED_BITS \
@@ -94,7 +94,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
unsigned long segment_base(u16 selector) unsigned long segment_base(u16 selector)
{ {
struct descriptor_table gdt; struct descriptor_table gdt;
struct segment_descriptor *d; struct desc_struct *d;
unsigned long table_base; unsigned long table_base;
unsigned long v; unsigned long v;
@@ -110,13 +110,12 @@ unsigned long segment_base(u16 selector)
asm("sldt %0" : "=g"(ldt_selector)); asm("sldt %0" : "=g"(ldt_selector));
table_base = segment_base(ldt_selector); table_base = segment_base(ldt_selector);
} }
d = (struct segment_descriptor *)(table_base + (selector & ~7)); d = (struct desc_struct *)(table_base + (selector & ~7));
v = d->base_low | ((unsigned long)d->base_mid << 16) | v = d->base0 | ((unsigned long)d->base1 << 16) |
((unsigned long)d->base_high << 24); ((unsigned long)d->base2 << 24);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
if (d->system == 0 && (d->type == 2 || d->type == 9 || d->type == 11)) if (d->s == 0 && (d->type == 2 || d->type == 9 || d->type == 11))
v |= ((unsigned long) \ v |= ((unsigned long)((struct ldttss_desc64 *)d)->base3) << 32;
((struct segment_descriptor_64 *)d)->base_higher) << 32;
#endif #endif
return v; return v;
} }