mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
bitkeeper revision 1.1159.146.1 (41865618vMDBaanL8_33U65ovb9fHw)
rename pt_regs to xen_regs
This commit is contained in:
1 parent
1b354ce174
commit
34a4642e33
31 files changed
+94
-94
No files matched your search
@@ -711,7 +711,7 @@
|
||||
404f1bb41Yl-5ZjIWnG66HDCj6OIWA xen/include/asm-x86/pda.h
|
||||
4022a73diKn2Ax4-R4gzk59lm1YdDg xen/include/asm-x86/pdb.h
|
||||
3ddb79c2QF5-pZGzuX4QukPCDAl59A xen/include/asm-x86/processor.h
|
||||
40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/ptrace.h
|
||||
40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/regs.h
|
||||
3ddb79c2plf7ciNgoNjU-RsbUzawsw xen/include/asm-x86/rwlock.h
|
||||
405b8599BsDsDwKEJLS0XipaiQW3TA xen/include/asm-x86/shadow.h
|
||||
3ddb79c3Hgbb2g8CyWLMCK-6_ZVQSQ xen/include/asm-x86/smp.h
|
||||
@@ -722,13 +722,13 @@
|
||||
3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen/include/asm-x86/types.h
|
||||
40cf1596saFaHD5DC5zvrSn7CDCWGQ xen/include/asm-x86/uaccess.h
|
||||
3ddb79c2ADvRmdexd9y3AYK9_NTx-Q xen/include/asm-x86/x86_32/current.h
|
||||
3ddb79c3mbqEM7QQr3zVq7NiBNhouA xen/include/asm-x86/x86_32/ptrace.h
|
||||
3ddb79c3mbqEM7QQr3zVq7NiBNhouA xen/include/asm-x86/x86_32/regs.h
|
||||
3e7f358aG11EvMI9VJ4_9hD4LUO7rQ xen/include/asm-x86/x86_32/string.h
|
||||
3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen/include/asm-x86/x86_32/uaccess.h
|
||||
404f1b9ceJeGVaPNIENm2FkK0AgEOQ xen/include/asm-x86/x86_64/current.h
|
||||
404f1b9fl6AQ_a-T1TDK3fuwTPXmHw xen/include/asm-x86/x86_64/desc.h
|
||||
404f1badfXZJZ2sU8sh9PS2EZvd19Q xen/include/asm-x86/x86_64/ldt.h
|
||||
404f1bb86rAXB3aLS1vYdcqpJiEcyg xen/include/asm-x86/x86_64/ptrace.h
|
||||
404f1bb86rAXB3aLS1vYdcqpJiEcyg xen/include/asm-x86/x86_64/regs.h
|
||||
40e1966azOJZfNI6Ilthe6Q-T3Hewg xen/include/asm-x86/x86_64/string.h
|
||||
404f1bc4tWkB9Qr8RkKtZGW5eMQzhw xen/include/asm-x86/x86_64/uaccess.h
|
||||
400304fcmRQmDdFYEzDh0wcBba9alg xen/include/public/COPYING
|
||||
|
||||
+1
-1
@@ -724,7 +724,7 @@ int reprogram_ac_timer(s_time_t timeout)
|
||||
|
||||
unsigned int apic_timer_irqs [NR_CPUS];
|
||||
|
||||
void smp_apic_timer_interrupt(struct pt_regs * regs)
|
||||
void smp_apic_timer_interrupt(struct xen_regs * regs)
|
||||
{
|
||||
ack_APIC_irq();
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <xen/smp.h>
|
||||
#include <xen/delay.h>
|
||||
#include <xen/softirq.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <asm/mc146818rtc.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <xen/config.h>
|
||||
#include <xen/init.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <xen/errno.h>
|
||||
#include <xen/sched.h>
|
||||
#include <xen/irq.h>
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@ irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned;
|
||||
|
||||
static void __do_IRQ_guest(int irq);
|
||||
|
||||
void no_action(int cpl, void *dev_id, struct pt_regs *regs) { }
|
||||
void no_action(int cpl, void *dev_id, struct xen_regs *regs) { }
|
||||
|
||||
static void enable_none(unsigned int irq) { }
|
||||
static unsigned int startup_none(unsigned int irq) { return 0; }
|
||||
@@ -87,7 +87,7 @@ void enable_irq(unsigned int irq)
|
||||
spin_unlock_irqrestore(&desc->lock, flags);
|
||||
}
|
||||
|
||||
asmlinkage void do_IRQ(struct pt_regs regs)
|
||||
asmlinkage void do_IRQ(struct xen_regs regs)
|
||||
{
|
||||
#if defined(__i386__)
|
||||
unsigned int irq = regs.orig_eax;
|
||||
|
||||
@@ -2262,7 +2262,7 @@ void audit_domains(void)
|
||||
}
|
||||
|
||||
void audit_domains_key(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
struct xen_regs *regs)
|
||||
{
|
||||
open_softirq(MEMAUDIT_SOFTIRQ, audit_domains);
|
||||
raise_softirq(MEMAUDIT_SOFTIRQ);
|
||||
|
||||
+3
-3
@@ -30,7 +30,7 @@ unsigned int nmi_watchdog = NMI_NONE;
|
||||
unsigned int watchdog_on = 0;
|
||||
static unsigned int nmi_hz = HZ;
|
||||
unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */
|
||||
extern void show_registers(struct pt_regs *regs);
|
||||
extern void show_registers(struct xen_regs *regs);
|
||||
|
||||
extern int logical_proc_id[];
|
||||
|
||||
@@ -270,9 +270,9 @@ void touch_nmi_watchdog (void)
|
||||
alert_counter[i] = 0;
|
||||
}
|
||||
|
||||
void nmi_watchdog_tick (struct pt_regs * regs)
|
||||
void nmi_watchdog_tick (struct xen_regs * regs)
|
||||
{
|
||||
extern void die(const char * str, struct pt_regs * regs, long err);
|
||||
extern void die(const char * str, struct xen_regs * regs, long err);
|
||||
|
||||
int sum, cpu = smp_processor_id();
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ pdb_linux_clr_bkpt (unsigned long addr, unsigned char value)
|
||||
}
|
||||
|
||||
void
|
||||
pdb_linux_syscall_enter_bkpt (struct pt_regs *regs, long error_code,
|
||||
pdb_linux_syscall_enter_bkpt (struct xen_regs *regs, long error_code,
|
||||
trap_info_t *ti)
|
||||
{
|
||||
/* set at breakpoint at the beginning of the
|
||||
@@ -49,7 +49,7 @@ pdb_linux_syscall_enter_bkpt (struct pt_regs *regs, long error_code,
|
||||
}
|
||||
|
||||
void
|
||||
pdb_linux_syscall_exit_bkpt (struct pt_regs *regs, struct pdb_context *pdb_ctx)
|
||||
pdb_linux_syscall_exit_bkpt (struct xen_regs *regs, struct pdb_context *pdb_ctx)
|
||||
{
|
||||
/*
|
||||
we've hit an int 0x80 in a user's program, jumped into xen
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <xen/lib.h>
|
||||
#include <xen/sched.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <xen/keyhandler.h>
|
||||
#include <asm/apic.h>
|
||||
#include <asm/domain_page.h> /* [un]map_domain_mem */
|
||||
@@ -234,7 +234,7 @@ pdb_process_query (char *ptr)
|
||||
}
|
||||
|
||||
void
|
||||
pdb_x86_to_gdb_regs (char *buffer, struct pt_regs *regs)
|
||||
pdb_x86_to_gdb_regs (char *buffer, struct xen_regs *regs)
|
||||
{
|
||||
int idx = 0;
|
||||
|
||||
@@ -273,7 +273,7 @@ pdb_x86_to_gdb_regs (char *buffer, struct pt_regs *regs)
|
||||
|
||||
/* at this point we allow any register to be changed, caveat emptor */
|
||||
void
|
||||
pdb_gdb_to_x86_regs (struct pt_regs *regs, char *buffer)
|
||||
pdb_gdb_to_x86_regs (struct xen_regs *regs, char *buffer)
|
||||
{
|
||||
hex2mem(buffer, (char *)®s->eax, sizeof(regs->eax));
|
||||
buffer += sizeof(regs->eax) * 2;
|
||||
@@ -309,7 +309,7 @@ pdb_gdb_to_x86_regs (struct pt_regs *regs, char *buffer)
|
||||
}
|
||||
|
||||
int
|
||||
pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3,
|
||||
pdb_process_command (char *ptr, struct xen_regs *regs, unsigned long cr3,
|
||||
int sigval)
|
||||
{
|
||||
int length;
|
||||
@@ -1081,7 +1081,7 @@ void pdb_get_packet(char *buffer)
|
||||
*/
|
||||
|
||||
int pdb_handle_exception(int exceptionVector,
|
||||
struct pt_regs *xen_regs)
|
||||
struct xen_regs *xen_regs)
|
||||
{
|
||||
int signal = 0;
|
||||
struct pdb_breakpoint* bkpt;
|
||||
@@ -1215,11 +1215,11 @@ int pdb_handle_exception(int exceptionVector,
|
||||
|
||||
void __pdb_key_pressed(void)
|
||||
{
|
||||
struct pt_regs *regs = (struct pt_regs *)get_execution_context();
|
||||
struct xen_regs *regs = (struct xen_regs *)get_execution_context();
|
||||
pdb_handle_exception(KEYPRESS_EXCEPTION, regs);
|
||||
}
|
||||
|
||||
void pdb_key_pressed(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void pdb_key_pressed(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
raise_softirq(DEBUGGER_SOFTIRQ);
|
||||
}
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ static s_time_t stime_irq; /* System time at last 'time update' */
|
||||
static unsigned long wc_sec, wc_usec; /* UTC time at last 'time update'. */
|
||||
static rwlock_t time_lock = RW_LOCK_UNLOCKED;
|
||||
|
||||
static void timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static void timer_interrupt(int irq, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
write_lock_irq(&time_lock);
|
||||
|
||||
|
||||
+17
-17
@@ -32,7 +32,7 @@
|
||||
#include <xen/errno.h>
|
||||
#include <xen/mm.h>
|
||||
#include <xen/console.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <xen/delay.h>
|
||||
#include <xen/event.h>
|
||||
#include <xen/spinlock.h>
|
||||
@@ -163,7 +163,7 @@ void show_stack(unsigned long *esp)
|
||||
show_trace( esp );
|
||||
}
|
||||
|
||||
void show_registers(struct pt_regs *regs)
|
||||
void show_registers(struct xen_regs *regs)
|
||||
{
|
||||
unsigned long esp;
|
||||
unsigned short ss;
|
||||
@@ -192,7 +192,7 @@ void show_registers(struct pt_regs *regs)
|
||||
|
||||
spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
|
||||
|
||||
void die(const char *str, struct pt_regs * regs, long err)
|
||||
void die(const char *str, struct xen_regs * regs, long err)
|
||||
{
|
||||
unsigned long flags;
|
||||
spin_lock_irqsave(&die_lock, flags);
|
||||
@@ -204,7 +204,7 @@ void die(const char *str, struct pt_regs * regs, long err)
|
||||
|
||||
|
||||
static inline void do_trap(int trapnr, char *str,
|
||||
struct pt_regs *regs,
|
||||
struct xen_regs *regs,
|
||||
long error_code, int use_error_code)
|
||||
{
|
||||
struct domain *p = current;
|
||||
@@ -241,13 +241,13 @@ static inline void do_trap(int trapnr, char *str,
|
||||
}
|
||||
|
||||
#define DO_ERROR_NOCODE(trapnr, str, name) \
|
||||
asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
|
||||
asmlinkage void do_##name(struct xen_regs * regs, long error_code) \
|
||||
{ \
|
||||
do_trap(trapnr, str, regs, error_code, 0); \
|
||||
}
|
||||
|
||||
#define DO_ERROR(trapnr, str, name) \
|
||||
asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
|
||||
asmlinkage void do_##name(struct xen_regs * regs, long error_code) \
|
||||
{ \
|
||||
do_trap(trapnr, str, regs, error_code, 1); \
|
||||
}
|
||||
@@ -265,7 +265,7 @@ DO_ERROR(17, "alignment check", alignment_check)
|
||||
DO_ERROR_NOCODE(18, "machine check", machine_check)
|
||||
DO_ERROR_NOCODE(19, "simd error", simd_coprocessor_error)
|
||||
|
||||
asmlinkage void do_int3(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void do_int3(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
struct domain *p = current;
|
||||
struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
|
||||
@@ -327,7 +327,7 @@ asmlinkage void do_double_fault(void)
|
||||
for ( ; ; ) ;
|
||||
}
|
||||
|
||||
asmlinkage void do_page_fault(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void do_page_fault(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
|
||||
trap_info_t *ti;
|
||||
@@ -433,7 +433,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, long error_code)
|
||||
smp_processor_id(), error_code, addr);
|
||||
}
|
||||
|
||||
asmlinkage void do_general_protection(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void do_general_protection(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
struct domain *d = current;
|
||||
struct guest_trap_bounce *gtb = guest_trap_bounce+smp_processor_id();
|
||||
@@ -516,7 +516,7 @@ asmlinkage void do_general_protection(struct pt_regs *regs, long error_code)
|
||||
die("general protection fault", regs, error_code);
|
||||
}
|
||||
|
||||
asmlinkage void mem_parity_error(struct pt_regs *regs)
|
||||
asmlinkage void mem_parity_error(struct xen_regs *regs)
|
||||
{
|
||||
console_force_unlock();
|
||||
|
||||
@@ -536,7 +536,7 @@ asmlinkage void mem_parity_error(struct pt_regs *regs)
|
||||
for ( ; ; ) ;
|
||||
}
|
||||
|
||||
asmlinkage void io_check_error(struct pt_regs *regs)
|
||||
asmlinkage void io_check_error(struct xen_regs *regs)
|
||||
{
|
||||
console_force_unlock();
|
||||
|
||||
@@ -556,14 +556,14 @@ asmlinkage void io_check_error(struct pt_regs *regs)
|
||||
for ( ; ; ) ;
|
||||
}
|
||||
|
||||
static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
|
||||
static void unknown_nmi_error(unsigned char reason, struct xen_regs * regs)
|
||||
{
|
||||
printk("Uhhuh. NMI received for unknown reason %02x.\n", reason);
|
||||
printk("Dazed and confused, but trying to continue\n");
|
||||
printk("Do you have a strange power saving mode enabled?\n");
|
||||
}
|
||||
|
||||
asmlinkage void do_nmi(struct pt_regs * regs, unsigned long reason)
|
||||
asmlinkage void do_nmi(struct xen_regs * regs, unsigned long reason)
|
||||
{
|
||||
++nmi_count(smp_processor_id());
|
||||
|
||||
@@ -592,7 +592,7 @@ static void nmi_softirq(void)
|
||||
put_domain(d);
|
||||
}
|
||||
|
||||
asmlinkage void math_state_restore(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void math_state_restore(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
/* Prevent recursion. */
|
||||
clts();
|
||||
@@ -616,7 +616,7 @@ asmlinkage void math_state_restore(struct pt_regs *regs, long error_code)
|
||||
}
|
||||
|
||||
#ifdef XEN_DEBUGGER
|
||||
asmlinkage void do_pdb_debug(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void do_pdb_debug(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
unsigned int condition;
|
||||
struct domain *tsk = current;
|
||||
@@ -638,7 +638,7 @@ asmlinkage void do_pdb_debug(struct pt_regs *regs, long error_code)
|
||||
}
|
||||
#endif
|
||||
|
||||
asmlinkage void do_debug(struct pt_regs *regs, long error_code)
|
||||
asmlinkage void do_debug(struct xen_regs *regs, long error_code)
|
||||
{
|
||||
unsigned int condition;
|
||||
struct domain *tsk = current;
|
||||
@@ -681,7 +681,7 @@ asmlinkage void do_debug(struct pt_regs *regs, long error_code)
|
||||
}
|
||||
|
||||
|
||||
asmlinkage void do_spurious_interrupt_bug(struct pt_regs * regs,
|
||||
asmlinkage void do_spurious_interrupt_bug(struct xen_regs * regs,
|
||||
long error_code)
|
||||
{ /* nothing */ }
|
||||
|
||||
|
||||
@@ -519,7 +519,7 @@ error_code:
|
||||
movl %edx,%gs
|
||||
movl %esp,%edx
|
||||
pushl %esi # push the error code
|
||||
pushl %edx # push the pt_regs pointer
|
||||
pushl %edx # push the xen_regs pointer
|
||||
GET_CURRENT(%ebx)
|
||||
call *%edi
|
||||
addl $8,%esp
|
||||
|
||||
@@ -259,7 +259,7 @@ int fixup_seg(u16 seg, int positive_access)
|
||||
}
|
||||
|
||||
/* Decode Reg field of a ModRM byte: return a pointer into a register block. */
|
||||
void *decode_reg(struct pt_regs *regs, u8 b)
|
||||
void *decode_reg(struct xen_regs *regs, u8 b)
|
||||
{
|
||||
switch ( b & 7 )
|
||||
{
|
||||
@@ -282,7 +282,7 @@ void *decode_reg(struct pt_regs *regs, u8 b)
|
||||
* we assume that the instruction itself is paged into memory (the CPU
|
||||
* must have triggered this in order to decode the instruction itself).
|
||||
*/
|
||||
int gpf_emulate_4gb(struct pt_regs *regs)
|
||||
int gpf_emulate_4gb(struct xen_regs *regs)
|
||||
{
|
||||
struct domain *d = current;
|
||||
trap_info_t *ti;
|
||||
|
||||
@@ -244,7 +244,7 @@ static void ac_timer_softirq_action(void)
|
||||
}
|
||||
|
||||
|
||||
static void dump_timerq(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
static void dump_timerq(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
struct ac_timer *t;
|
||||
unsigned long flags;
|
||||
|
||||
+11
-11
@@ -27,7 +27,7 @@ key_handler *get_key_handler(unsigned char key)
|
||||
}
|
||||
|
||||
static void show_handlers(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
struct xen_regs *regs)
|
||||
{
|
||||
int i;
|
||||
printk("'%c' pressed -> showing installed handlers\n", key);
|
||||
@@ -40,22 +40,22 @@ static void show_handlers(unsigned char key, void *dev_id,
|
||||
|
||||
|
||||
static void dump_registers(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
struct xen_regs *regs)
|
||||
{
|
||||
extern void show_registers(struct pt_regs *regs);
|
||||
extern void show_registers(struct xen_regs *regs);
|
||||
printk("'%c' pressed -> dumping registers\n", key);
|
||||
show_registers(regs);
|
||||
}
|
||||
|
||||
static void halt_machine(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
struct xen_regs *regs)
|
||||
{
|
||||
printk("'%c' pressed -> rebooting machine\n", key);
|
||||
machine_restart(NULL);
|
||||
}
|
||||
|
||||
void do_task_queues(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
struct xen_regs *regs)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct domain *d;
|
||||
@@ -103,21 +103,21 @@ void do_task_queues(unsigned char key, void *dev_id,
|
||||
}
|
||||
|
||||
extern void dump_runq(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
extern void print_sched_histo(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
extern void reset_sched_histo(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
#ifndef NDEBUG
|
||||
extern void audit_domains_key(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
#endif
|
||||
|
||||
#ifdef PERF_COUNTERS
|
||||
extern void perfc_printall(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
extern void perfc_reset(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
#endif
|
||||
|
||||
void initialize_keytable(void)
|
||||
|
||||
+2
-2
@@ -31,7 +31,7 @@ static struct {
|
||||
|
||||
struct perfcounter_t perfcounters;
|
||||
|
||||
void perfc_printall(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void perfc_printall(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
int i, j, sum;
|
||||
s_time_t now = NOW();
|
||||
@@ -73,7 +73,7 @@ void perfc_printall(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
}
|
||||
}
|
||||
|
||||
void perfc_reset(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void perfc_reset(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
int i, j, sum;
|
||||
s_time_t now = NOW();
|
||||
|
||||
@@ -544,7 +544,7 @@ void schedulers_start(void)
|
||||
}
|
||||
|
||||
|
||||
void dump_runq(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void dump_runq(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
s_time_t now = NOW();
|
||||
int i;
|
||||
@@ -568,7 +568,7 @@ void dump_runq(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
}
|
||||
|
||||
#if defined(WAKE_HISTO) || defined(BLOCKTIME_HISTO)
|
||||
void print_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void print_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
int i, j, k;
|
||||
for ( k = 0; k < smp_num_cpus; k++ )
|
||||
@@ -591,7 +591,7 @@ void print_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
}
|
||||
|
||||
}
|
||||
void reset_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void reset_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
int i, j;
|
||||
for ( j = 0; j < smp_num_cpus; j++ )
|
||||
@@ -599,10 +599,10 @@ void reset_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
schedule_data[j].hist[i] = 0;
|
||||
}
|
||||
#else
|
||||
void print_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void print_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
}
|
||||
void reset_sched_histo(u_char key, void *dev_id, struct pt_regs *regs)
|
||||
void reset_sched_histo(u_char key, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
@@ -243,7 +243,7 @@ static void switch_serial_input(void)
|
||||
input_str[xen_rx], opt_conswitch[0], input_str[!xen_rx]);
|
||||
}
|
||||
|
||||
static void __serial_rx(unsigned char c, struct pt_regs *regs)
|
||||
static void __serial_rx(unsigned char c, struct xen_regs *regs)
|
||||
{
|
||||
key_handler *handler;
|
||||
struct domain *p;
|
||||
@@ -265,7 +265,7 @@ static void __serial_rx(unsigned char c, struct pt_regs *regs)
|
||||
}
|
||||
}
|
||||
|
||||
static void serial_rx(unsigned char c, struct pt_regs *regs)
|
||||
static void serial_rx(unsigned char c, struct xen_regs *regs)
|
||||
{
|
||||
static int switch_code_count = 0;
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ static uart_t com[2] = {
|
||||
* PRIVATE FUNCTIONS
|
||||
*/
|
||||
|
||||
static void uart_rx(uart_t *uart, struct pt_regs *regs)
|
||||
static void uart_rx(uart_t *uart, struct xen_regs *regs)
|
||||
{
|
||||
unsigned char c;
|
||||
|
||||
@@ -125,7 +125,7 @@ static void uart_rx(uart_t *uart, struct pt_regs *regs)
|
||||
}
|
||||
}
|
||||
|
||||
static void serial_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static void serial_interrupt(int irq, void *dev_id, struct xen_regs *regs)
|
||||
{
|
||||
uart_rx((uart_t *)dev_id, regs);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define __ASM_APIC_H
|
||||
|
||||
#include <xen/config.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <asm/apicdef.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
@@ -74,10 +74,10 @@ extern void sync_Arb_IDs (void);
|
||||
extern void init_bsp_APIC (void);
|
||||
extern void setup_local_APIC (void);
|
||||
extern void init_apic_mappings (void);
|
||||
extern void smp_local_timer_interrupt (struct pt_regs * regs);
|
||||
extern void smp_local_timer_interrupt (struct xen_regs * regs);
|
||||
extern void setup_APIC_clocks (void);
|
||||
extern void setup_apic_nmi_watchdog (void);
|
||||
extern inline void nmi_watchdog_tick (struct pt_regs * regs);
|
||||
extern inline void nmi_watchdog_tick (struct xen_regs * regs);
|
||||
extern int APIC_init_uniprocessor (void);
|
||||
extern void disable_APIC_timer(void);
|
||||
extern void enable_APIC_timer(void);
|
||||
|
||||
@@ -128,7 +128,7 @@ SYMBOL_NAME_STR(x) ":\n\t" \
|
||||
|
||||
#define BUILD_SMP_TIMER_INTERRUPT(x,v) XBUILD_SMP_TIMER_INTERRUPT(x,v)
|
||||
#define XBUILD_SMP_TIMER_INTERRUPT(x,v) \
|
||||
asmlinkage void x(struct pt_regs * regs); \
|
||||
asmlinkage void x(struct xen_regs * regs); \
|
||||
asmlinkage void call_##x(void); \
|
||||
__asm__( \
|
||||
"\n"__ALIGN_STR"\n" \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#ifndef __PDB_H__
|
||||
#define __PDB_H__
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <xen/list.h>
|
||||
#include <public/dom0_ops.h>
|
||||
#include <public/xen.h> /* for domain id */
|
||||
@@ -34,7 +34,7 @@ extern int pdb_get_values(u_char *buffer, int length,
|
||||
|
||||
/* External entry points. */
|
||||
extern int pdb_handle_exception(int exceptionVector,
|
||||
struct pt_regs *xen_regs);
|
||||
struct xen_regs *xen_regs);
|
||||
extern void pdb_do_debug(dom0_op_t *op);
|
||||
|
||||
/* PDB Context. */
|
||||
@@ -79,9 +79,9 @@ void pdb_linux_get_values(char *buffer, int length, unsigned long address,
|
||||
int pid, unsigned long cr3);
|
||||
void pdb_linux_set_values(char *buffer, int length, unsigned long address,
|
||||
int pid, unsigned long cr3);
|
||||
void pdb_linux_syscall_enter_bkpt (struct pt_regs *regs, long error_code,
|
||||
void pdb_linux_syscall_enter_bkpt (struct xen_regs *regs, long error_code,
|
||||
trap_info_t *ti);
|
||||
void pdb_linux_syscall_exit_bkpt (struct pt_regs *regs,
|
||||
void pdb_linux_syscall_exit_bkpt (struct xen_regs *regs,
|
||||
struct pdb_context *pdb_ctx);
|
||||
|
||||
#endif /* __PDB_H__ */
|
||||
@@ -356,7 +356,7 @@ struct guest_trap_bounce {
|
||||
};
|
||||
extern struct guest_trap_bounce guest_trap_bounce[];
|
||||
|
||||
extern int gpf_emulate_4gb(struct pt_regs *regs);
|
||||
extern int gpf_emulate_4gb(struct xen_regs *regs);
|
||||
|
||||
struct mm_struct {
|
||||
/*
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
|
||||
#ifdef __x86_64__
|
||||
#include <asm/x86_64/ptrace.h>
|
||||
#else
|
||||
#include <asm/x86_32/ptrace.h>
|
||||
#endif
|
||||
@@ -0,0 +1,6 @@
|
||||
|
||||
#ifdef __x86_64__
|
||||
#include <asm/x86_64/regs.h>
|
||||
#else
|
||||
#include <asm/x86_32/regs.h>
|
||||
#endif
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _I386_PTRACE_H
|
||||
#define _I386_PTRACE_H
|
||||
#ifndef _I386_REGS_H
|
||||
#define _I386_REGS_H
|
||||
|
||||
struct pt_regs {
|
||||
struct xen_regs {
|
||||
long ebx;
|
||||
long ecx;
|
||||
long edx;
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef _X86_64_PTRACE_H
|
||||
#define _X86_64_PTRACE_H
|
||||
#ifndef _X86_64_REGS_H
|
||||
#define _X86_64_REGS_H
|
||||
|
||||
#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS)
|
||||
#define R15 0
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
struct pt_regs {
|
||||
struct xen_regs {
|
||||
unsigned long r15;
|
||||
unsigned long r14;
|
||||
unsigned long r13;
|
||||
@@ -84,7 +84,7 @@ struct pt_regs {
|
||||
#if !defined(__ASSEMBLY__)
|
||||
|
||||
#define instruction_pointer(regs) ((regs)->rip)
|
||||
extern void show_regs(struct pt_regs *);
|
||||
extern void show_regs(struct xen_regs *);
|
||||
|
||||
enum {
|
||||
EF_CF = 0x00000001,
|
||||
@@ -3,12 +3,12 @@
|
||||
|
||||
#include <xen/config.h>
|
||||
#include <xen/spinlock.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <asm/hardirq.h>
|
||||
|
||||
struct irqaction
|
||||
{
|
||||
void (*handler)(int, void *, struct pt_regs *);
|
||||
void (*handler)(int, void *, struct xen_regs *);
|
||||
const char *name;
|
||||
void *dev_id;
|
||||
};
|
||||
@@ -62,7 +62,7 @@ extern int setup_irq(unsigned int, struct irqaction *);
|
||||
extern void free_irq(unsigned int);
|
||||
|
||||
extern hw_irq_controller no_irq_type;
|
||||
extern void no_action(int cpl, void *dev_id, struct pt_regs *regs);
|
||||
extern void no_action(int cpl, void *dev_id, struct xen_regs *regs);
|
||||
|
||||
struct domain;
|
||||
extern int pirq_guest_unmask(struct domain *p);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <xen/sched.h>
|
||||
|
||||
typedef void key_handler(unsigned char key, void *dev_id,
|
||||
struct pt_regs *regs);
|
||||
struct xen_regs *regs);
|
||||
|
||||
extern void add_key_handler(unsigned char key,
|
||||
key_handler *handler, char *desc);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <xen/config.h>
|
||||
#include <xen/types.h>
|
||||
#include <xen/spinlock.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
#include <xen/smp.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#ifndef __XEN_SERIAL_H__
|
||||
#define __XEN_SERIAL_H__
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/regs.h>
|
||||
|
||||
/* 'Serial handles' are comprise the following fields. */
|
||||
#define SERHND_IDX (1<<0) /* COM1 or COM2? */
|
||||
@@ -27,7 +27,7 @@ void serial_init_stage2(void);
|
||||
int parse_serial_handle(char *conf);
|
||||
|
||||
/* Register a character-receive hook on the specified COM port. */
|
||||
typedef void (*serial_rx_fn)(unsigned char, struct pt_regs *);
|
||||
typedef void (*serial_rx_fn)(unsigned char, struct xen_regs *);
|
||||
void serial_set_rx_handler(int handle, serial_rx_fn fn);
|
||||
|
||||
/* Transmit a single character via the specified COM port. */
|
||||
|
||||