* [PATCH] qemu-kvm: x86: Remove duplicate MSR_VM_HSAVE_PA from kvm_get_msrs
@ 2011-01-02 19:33 Jan Kiszka
2011-01-04 20:58 ` Marcelo Tosatti
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2011-01-02 19:33 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm
From: Jan Kiszka <jan.kiszka@siemens.com>
Obviously a merge artifact.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
target-i386/kvm.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 9a5620c..1b50a6b 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1157,7 +1157,6 @@ static int kvm_get_msrs(CPUState *env)
msrs[n++].index = MSR_VM_HSAVE_PA;
}
msrs[n++].index = MSR_IA32_TSC;
- msrs[n++].index = MSR_VM_HSAVE_PA;
#ifdef TARGET_X86_64
if (lm_capable_kernel) {
msrs[n++].index = MSR_CSTAR;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] qemu-kvm: x86: Remove duplicate MSR_VM_HSAVE_PA from kvm_get_msrs
2011-01-02 19:33 [PATCH] qemu-kvm: x86: Remove duplicate MSR_VM_HSAVE_PA from kvm_get_msrs Jan Kiszka
@ 2011-01-04 20:58 ` Marcelo Tosatti
0 siblings, 0 replies; 2+ messages in thread
From: Marcelo Tosatti @ 2011-01-04 20:58 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, kvm
On Sun, Jan 02, 2011 at 08:33:13PM +0100, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Obviously a merge artifact.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> target-i386/kvm.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-04 22:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-02 19:33 [PATCH] qemu-kvm: x86: Remove duplicate MSR_VM_HSAVE_PA from kvm_get_msrs Jan Kiszka
2011-01-04 20:58 ` Marcelo Tosatti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox