Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
bff98d3b
Commit
bff98d3b
authored
Oct 14, 2015
by
Paolo Bonzini
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'kvm-master' into HEAD
Merge more important SMM fixes.
parents
58f800d5
b10d92a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
arch/x86/kvm/emulate.c
arch/x86/kvm/emulate.c
+7
-3
arch/x86/kvm/x86.c
arch/x86/kvm/x86.c
+1
-1
No files found.
arch/x86/kvm/emulate.c
View file @
bff98d3b
...
@@ -2418,7 +2418,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)
...
@@ -2418,7 +2418,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)
u64
val
,
cr0
,
cr4
;
u64
val
,
cr0
,
cr4
;
u32
base3
;
u32
base3
;
u16
selector
;
u16
selector
;
int
i
;
int
i
,
r
;
for
(
i
=
0
;
i
<
16
;
i
++
)
for
(
i
=
0
;
i
<
16
;
i
++
)
*
reg_write
(
ctxt
,
i
)
=
GET_SMSTATE
(
u64
,
smbase
,
0x7ff8
-
i
*
8
);
*
reg_write
(
ctxt
,
i
)
=
GET_SMSTATE
(
u64
,
smbase
,
0x7ff8
-
i
*
8
);
...
@@ -2460,13 +2460,17 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)
...
@@ -2460,13 +2460,17 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)
dt
.
address
=
GET_SMSTATE
(
u64
,
smbase
,
0x7e68
);
dt
.
address
=
GET_SMSTATE
(
u64
,
smbase
,
0x7e68
);
ctxt
->
ops
->
set_gdt
(
ctxt
,
&
dt
);
ctxt
->
ops
->
set_gdt
(
ctxt
,
&
dt
);
r
=
rsm_enter_protected_mode
(
ctxt
,
cr0
,
cr4
);
if
(
r
!=
X86EMUL_CONTINUE
)
return
r
;
for
(
i
=
0
;
i
<
6
;
i
++
)
{
for
(
i
=
0
;
i
<
6
;
i
++
)
{
int
r
=
rsm_load_seg_64
(
ctxt
,
smbase
,
i
);
r
=
rsm_load_seg_64
(
ctxt
,
smbase
,
i
);
if
(
r
!=
X86EMUL_CONTINUE
)
if
(
r
!=
X86EMUL_CONTINUE
)
return
r
;
return
r
;
}
}
return
rsm_enter_protected_mode
(
ctxt
,
cr0
,
cr4
)
;
return
X86EMUL_CONTINUE
;
}
}
static
int
em_rsm
(
struct
x86_emulate_ctxt
*
ctxt
)
static
int
em_rsm
(
struct
x86_emulate_ctxt
*
ctxt
)
...
...
arch/x86/kvm/x86.c
View file @
bff98d3b
...
@@ -7564,7 +7564,7 @@ void kvm_arch_sync_events(struct kvm *kvm)
...
@@ -7564,7 +7564,7 @@ void kvm_arch_sync_events(struct kvm *kvm)
int
__x86_set_memory_region
(
struct
kvm
*
kvm
,
int
id
,
gpa_t
gpa
,
u32
size
)
int
__x86_set_memory_region
(
struct
kvm
*
kvm
,
int
id
,
gpa_t
gpa
,
u32
size
)
{
{
int
i
,
r
;
int
i
,
r
;
u
64
hva
;
u
nsigned
long
hva
;
struct
kvm_memslots
*
slots
=
kvm_memslots
(
kvm
);
struct
kvm_memslots
*
slots
=
kvm_memslots
(
kvm
);
struct
kvm_memory_slot
*
slot
,
old
;
struct
kvm_memory_slot
*
slot
,
old
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment