Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
25c47bb3
Commit
25c47bb3
authored
17 years ago
by
Rusty Russell
Browse files
Options
Downloads
Patches
Plain Diff
lguest: use defines from x86 headers instead of magic numbers
Signed-off-by:
Rusty Russell
<
rusty@rustcorp.com.au
>
parent
db24e8c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/x86/lguest/boot.c
+2
-3
2 additions, 3 deletions
arch/x86/lguest/boot.c
drivers/lguest/x86/core.c
+1
-1
1 addition, 1 deletion
drivers/lguest/x86/core.c
with
3 additions
and
4 deletions
arch/x86/lguest/boot.c
+
2
−
3
View file @
25c47bb3
...
@@ -371,8 +371,7 @@ static void lguest_cpuid(unsigned int *eax, unsigned int *ebx,
...
@@ -371,8 +371,7 @@ static void lguest_cpuid(unsigned int *eax, unsigned int *ebx,
static
unsigned
long
current_cr0
,
current_cr3
;
static
unsigned
long
current_cr0
,
current_cr3
;
static
void
lguest_write_cr0
(
unsigned
long
val
)
static
void
lguest_write_cr0
(
unsigned
long
val
)
{
{
/* 8 == TS bit. */
lazy_hcall
(
LHCALL_TS
,
val
&
X86_CR0_TS
,
0
,
0
);
lazy_hcall
(
LHCALL_TS
,
val
&
8
,
0
,
0
);
current_cr0
=
val
;
current_cr0
=
val
;
}
}
...
@@ -387,7 +386,7 @@ static unsigned long lguest_read_cr0(void)
...
@@ -387,7 +386,7 @@ static unsigned long lguest_read_cr0(void)
static
void
lguest_clts
(
void
)
static
void
lguest_clts
(
void
)
{
{
lazy_hcall
(
LHCALL_TS
,
0
,
0
,
0
);
lazy_hcall
(
LHCALL_TS
,
0
,
0
,
0
);
current_cr0
&=
~
8U
;
current_cr0
&=
~
X86_CR0_TS
;
}
}
/* CR2 is the virtual address of the last page fault, which the Guest only ever
/* CR2 is the virtual address of the last page fault, which the Guest only ever
...
...
This diff is collapsed.
Click to expand it.
drivers/lguest/x86/core.c
+
1
−
1
View file @
25c47bb3
...
@@ -562,7 +562,7 @@ void lguest_arch_setup_regs(struct lguest *lg, unsigned long start)
...
@@ -562,7 +562,7 @@ void lguest_arch_setup_regs(struct lguest *lg, unsigned long start)
* is supposed to always be "1". Bit 9 (0x200) controls whether
* is supposed to always be "1". Bit 9 (0x200) controls whether
* interrupts are enabled. We always leave interrupts enabled while
* interrupts are enabled. We always leave interrupts enabled while
* running the Guest. */
* running the Guest. */
regs
->
eflags
=
0x
20
2
;
regs
->
eflags
=
X86_EFLAGS_IF
|
0x2
;
/* The "Extended Instruction Pointer" register says where the Guest is
/* The "Extended Instruction Pointer" register says where the Guest is
* running. */
* running. */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment