|
 |
218e99 |
From 1cec05857c5aaa0eebe75e7c2e6c6116fb9759cd Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
218e99 |
Date: Mon, 23 Sep 2013 20:00:13 +0200
|
|
|
218e99 |
Subject: [PATCH 29/29] fix steal time MSR vmsd callback to proper opaque type
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
218e99 |
Message-id: <20130923200013.GA20765@amt.cnet>
|
|
|
218e99 |
Patchwork-id: 54498
|
|
|
218e99 |
O-Subject: [RHEL7 qemu-kvm PATCH] fix steal time MSR vmsd callback to proper opaque type
|
|
|
218e99 |
Bugzilla: 903889
|
|
|
218e99 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
BZ: 903889
|
|
|
218e99 |
|
|
|
218e99 |
commit 0e5035776df31380a44a1a851850d110b551ecb6 of uq/master branch of qemu-kvm.git repo
|
|
|
218e99 |
|
|
|
218e99 |
Convert steal time MSR vmsd callback pointer to proper X86CPU type.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
218e99 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
target-i386/machine.c | 6 +++---
|
|
|
218e99 |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/target-i386/machine.c b/target-i386/machine.c
|
|
|
218e99 |
index 3659db9..ecf1617 100644
|
|
|
218e99 |
--- a/target-i386/machine.c
|
|
|
218e99 |
+++ b/target-i386/machine.c
|
|
|
218e99 |
@@ -294,9 +294,9 @@ static bool pv_eoi_msr_needed(void *opaque)
|
|
|
218e99 |
|
|
|
218e99 |
static bool steal_time_msr_needed(void *opaque)
|
|
|
218e99 |
{
|
|
|
218e99 |
- CPUX86State *cpu = opaque;
|
|
|
218e99 |
+ X86CPU *cpu = opaque;
|
|
|
218e99 |
|
|
|
218e99 |
- return cpu->steal_time_msr != 0;
|
|
|
218e99 |
+ return cpu->env.steal_time_msr != 0;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
static const VMStateDescription vmstate_steal_time_msr = {
|
|
|
218e99 |
@@ -305,7 +305,7 @@ static const VMStateDescription vmstate_steal_time_msr = {
|
|
|
218e99 |
.minimum_version_id = 1,
|
|
|
218e99 |
.minimum_version_id_old = 1,
|
|
|
218e99 |
.fields = (VMStateField []) {
|
|
|
218e99 |
- VMSTATE_UINT64(steal_time_msr, CPUX86State),
|
|
|
218e99 |
+ VMSTATE_UINT64(env.steal_time_msr, X86CPU),
|
|
|
218e99 |
VMSTATE_END_OF_LIST()
|
|
|
218e99 |
}
|
|
|
218e99 |
};
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|