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

Commit 625efab1 authored by Jes Sorensen's avatar Jes Sorensen Committed by Rusty Russell
Browse files

Move i386 part of core.c to x86/core.c. 



Separate i386 architecture specific from core.c and move it to
x86/core.c and add x86/lguest.h header file to match.

Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 56adbe9d

arch/x86/lguest/boot.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include <asm/e820.h>

#include <asm/mce.h>

#include <asm/io.h>

#include <asm/i387.h>



/*G:010 Welcome to the Guest!

 *

drivers/lguest/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_LGUEST) += lg.o 
lg-y = core.o hypercalls.o page_tables.o interrupts_and_traps.o \

	segments.o io.o lguest_user.o



lg-$(CONFIG_X86_32) += x86/switcher_32.o

lg-$(CONFIG_X86_32) += x86/switcher_32.o x86/core.o



Preparation Preparation!: PREFIX=P

Guest: PREFIX=G

drivers/lguest/core.c

+13 −446

File changed.

Preview size limit exceeded, changes collapsed.

drivers/lguest/interrupts_and_traps.c

+9 −9
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void maybe_do_interrupt(struct lguest *lg) 
	/* Look at the IDT entry the Guest gave us for this interrupt.  The

	 * first 32 (FIRST_EXTERNAL_VECTOR) entries are for traps, so we skip

	 * over them. */

	idt = &lg->idt[FIRST_EXTERNAL_VECTOR+irq];

	idt = &lg->arch.idt[FIRST_EXTERNAL_VECTOR+irq];

	/* If they don't have a handler (yet?), we just ignore it */

	if (idt_present(idt->a, idt->b)) {

		/* OK, mark it no longer pending and deliver it. */
@@ -197,14 +197,14 @@ int deliver_trap(struct lguest *lg, unsigned int num) 
{

	/* Trap numbers are always 8 bit, but we set an impossible trap number

	 * for traps inside the Switcher, so check that here. */

	if (num >= ARRAY_SIZE(lg->idt))

	if (num >= ARRAY_SIZE(lg->arch.idt))

		return 0;



	/* Early on the Guest hasn't set the IDT entries (or maybe it put a

	 * bogus one in): if we fail here, the Guest will be killed. */

	if (!idt_present(lg->idt[num].a, lg->idt[num].b))

	if (!idt_present(lg->arch.idt[num].a, lg->arch.idt[num].b))

		return 0;

	set_guest_interrupt(lg, lg->idt[num].a, lg->idt[num].b, has_err(num));

	set_guest_interrupt(lg, lg->arch.idt[num].a, lg->arch.idt[num].b, has_err(num));

	return 1;

}
@@ -341,10 +341,10 @@ void load_guest_idt_entry(struct lguest *lg, unsigned int num, u32 lo, u32 hi) 
	lg->changed |= CHANGED_IDT;



	/* Check that the Guest doesn't try to step outside the bounds. */

	if (num >= ARRAY_SIZE(lg->idt))

	if (num >= ARRAY_SIZE(lg->arch.idt))

		kill_guest(lg, "Setting idt entry %u", num);

	else

		set_trap(lg, &lg->idt[num], num, lo, hi);

		set_trap(lg, &lg->arch.idt[num], num, lo, hi);

}



/* The default entry for each interrupt points into the Switcher routines which
@@ -387,7 +387,7 @@ void copy_traps(const struct lguest *lg, struct desc_struct *idt, 


	/* We can simply copy the direct traps, otherwise we use the default

	 * ones in the Switcher: they will return to the Host. */

	for (i = 0; i < ARRAY_SIZE(lg->idt); i++) {

	for (i = 0; i < ARRAY_SIZE(lg->arch.idt); i++) {

		/* If no Guest can ever override this trap, leave it alone. */

		if (!direct_trap(i))

			continue;
@@ -396,8 +396,8 @@ void copy_traps(const struct lguest *lg, struct desc_struct *idt, 
		 * Interrupt gates (type 14) disable interrupts as they are

		 * entered, which we never let the Guest do.  Not present

		 * entries (type 0x0) also can't go direct, of course. */

		if (idt_type(lg->idt[i].a, lg->idt[i].b) == 0xF)

			idt[i] = lg->idt[i];

		if (idt_type(lg->arch.idt[i].a, lg->arch.idt[i].b) == 0xF)

			idt[i] = lg->arch.idt[i];

		else

			/* Reset it to the default. */

			default_idt_entry(&idt[i], i, def[i]);

drivers/lguest/lg.h

+11 −52
Original line number Diff line number Diff line 
#ifndef _LGUEST_H

#define _LGUEST_H



#include <asm/desc.h>



#define GDT_ENTRY_LGUEST_CS	10

#define GDT_ENTRY_LGUEST_DS	11

#define LGUEST_CS		(GDT_ENTRY_LGUEST_CS * 8)

#define LGUEST_DS		(GDT_ENTRY_LGUEST_DS * 8)



#ifndef __ASSEMBLY__

#include <linux/types.h>

#include <linux/init.h>
@@ -18,34 +11,12 @@ 
#include <linux/wait.h>

#include <linux/err.h>

#include <asm/semaphore.h>

#include "irq_vectors.h"



#define GUEST_PL 1



struct lguest_regs

{

	/* Manually saved part. */

	unsigned long ebx, ecx, edx;

	unsigned long esi, edi, ebp;

	unsigned long gs;

	unsigned long eax;

	unsigned long fs, ds, es;

	unsigned long trapnum, errcode;

	/* Trap pushed part */

	unsigned long eip;

	unsigned long cs;

	unsigned long eflags;

	unsigned long esp;

	unsigned long ss;

};

#include <asm/lguest.h>



void free_pagetables(void);

int init_pagetables(struct page **switcher_page, unsigned int pages);



/* Full 4G segment descriptors, suitable for CS and DS. */

#define FULL_EXEC_SEGMENT ((struct desc_struct){0x0000ffff, 0x00cf9b00})

#define FULL_SEGMENT ((struct desc_struct){0x0000ffff, 0x00cf9300})



struct lguest_dma_info

{

	struct list_head list;
@@ -98,23 +69,6 @@ struct pgdir 
	spgd_t *pgdir;

};



/* This is a guest-specific page (mapped ro) into the guest. */

struct lguest_ro_state

{

	/* Host information we need to restore when we switch back. */

	u32 host_cr3;

	struct Xgt_desc_struct host_idt_desc;

	struct Xgt_desc_struct host_gdt_desc;

	u32 host_sp;



	/* Fields which are used when guest is running. */

	struct Xgt_desc_struct guest_idt_desc;

	struct Xgt_desc_struct guest_gdt_desc;

	struct i386_hw_tss guest_tss;

	struct desc_struct guest_idt[IDT_ENTRIES];

	struct desc_struct guest_gdt[GDT_ENTRIES];

};



/* We have two pages shared with guests, per cpu.  */

struct lguest_pages

{
@@ -180,11 +134,7 @@ struct lguest 
	/* Dead? */

	const char *dead;



	/* The GDT entries copied into lguest_ro_state when running. */

	struct desc_struct gdt[GDT_ENTRIES];



	/* The IDT entries: some copied into lguest_ro_state when running. */

	struct desc_struct idt[IDT_ENTRIES];

	struct lguest_arch arch;



	/* Virtual clock device */

	struct hrtimer hrt;
@@ -239,6 +189,15 @@ void map_switcher_in_guest(struct lguest *lg, struct lguest_pages *pages); 
int demand_page(struct lguest *info, unsigned long cr2, int errcode);

void pin_page(struct lguest *lg, unsigned long vaddr);



/* <arch>/core.c: */

void lguest_arch_host_init(void);

void lguest_arch_host_fini(void);

void lguest_arch_run_guest(struct lguest *lg);

void lguest_arch_handle_trap(struct lguest *lg);



/* <arch>/switcher.S: */

extern char start_switcher_text[], end_switcher_text[], switch_to_guest[];



/* lguest_user.c: */

int lguest_device_init(void);

void lguest_device_remove(void);