Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f61300 authored by Avi Kivity's avatar Avi Kivity
Browse files

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



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

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent ef2979bd

arch/x86/kvm/segment_descriptor.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#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

arch/x86/kvm/vmx.c

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#include "irq.h"

#include "vmx.h"

#include "segment_descriptor.h"

#include "mmu.h"



#include <linux/kvm_host.h>
@@ -388,7 +387,7 @@ static void reload_tss(void) 
	 * VT restores TR but not its size.  Useless.

	 */

	struct descriptor_table gdt;

	struct segment_descriptor *descs;

	struct desc_struct *descs;



	get_gdt(&gdt);

	descs = (void *)gdt.base;

arch/x86/kvm/x86.c

+7 −8
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <linux/kvm_host.h>

#include "segment_descriptor.h"

#include "irq.h"

#include "mmu.h"
@@ -29,6 +28,7 @@ 


#include <asm/uaccess.h>

#include <asm/msr.h>

#include <asm/desc.h>



#define MAX_IO_MSRS 256

#define CR0_RESERVED_BITS						\
@@ -94,7 +94,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
unsigned long segment_base(u16 selector)

{

	struct descriptor_table gdt;

	struct segment_descriptor *d;

	struct desc_struct *d;

	unsigned long table_base;

	unsigned long v;
@@ -110,13 +110,12 @@ unsigned long segment_base(u16 selector) 
		asm("sldt %0" : "=g"(ldt_selector));

		table_base = segment_base(ldt_selector);

	}

	d = (struct segment_descriptor *)(table_base + (selector & ~7));

	v = d->base_low | ((unsigned long)d->base_mid << 16) |

		((unsigned long)d->base_high << 24);

	d = (struct desc_struct *)(table_base + (selector & ~7));

	v = d->base0 | ((unsigned long)d->base1 << 16) |

		((unsigned long)d->base2 << 24);

#ifdef CONFIG_X86_64

	if (d->system == 0 && (d->type == 2 || d->type == 9 || d->type == 11))

		v |= ((unsigned long) \

		      ((struct segment_descriptor_64 *)d)->base_higher) << 32;

	if (d->s == 0 && (d->type == 2 || d->type == 9 || d->type == 11))

		v |= ((unsigned long)((struct ldttss_desc64 *)d)->base3) << 32;

#endif

	return v;

}