Skip to contentSkip to conversation

KVM: x86: Fix 32-bit host build warning

PATCH Applied Jan Kiszka 2 participants 3 messages Oct 20, 2009 – Oct 22, 2009

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 KVM: x86: Fix 32-bit host build warning

Fixes "cast to pointer from integer of different size" on 32-bit hosts and applies a micro-refactoring.

Signed-off-by Jan Kiszka <[email protected]>
---
 x86.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/x86.c +6 -5
index 3270b3b..5bfda89 100644
@@ -841,11 +841,12 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 
 static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
 {
+	struct kvm *kvm = vcpu->kvm;
 	int lm = is_long_mode(vcpu);
-	u8 *blob_addr = lm ? (u8 *)vcpu->kvm->arch.xen_hvm_config.blob_addr_64
-		: (u8 *)vcpu->kvm->arch.xen_hvm_config.blob_addr_32;
-	u8 blob_size = lm ? vcpu->kvm->arch.xen_hvm_config.blob_size_64
-		: vcpu->kvm->arch.xen_hvm_config.blob_size_32;
+	u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
+		: (u8 *)kvm->arch.xen_hvm_config.blob_addr_32;
+	u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
+		: kvm->arch.xen_hvm_config.blob_size_32;
 	u32 page_num = data & ~PAGE_MASK;
 	u64 page_addr = data & PAGE_MASK;
 	u8 *page;

@@ -861,7 +862,7 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
 	r = -EFAULT;
 	if (copy_from_user(page, blob_addr + (page_num * PAGE_SIZE), PAGE_SIZE))
 		goto out_free;
-	if (kvm_write_guest(vcpu->kvm, page_addr, page, PAGE_SIZE))
+	if (kvm_write_guest(kvm, page_addr, page, PAGE_SIZE))
 		goto out_free;
 	r = 0;
 out_free:
author
#2 lore raw
Quoted 7 lines · Marcelo Tosatti
Quoted 4 lines · Jan Kiszka

Fixes "cast to pointer from integer of different size" on 32-bit hosts and applies a micro-refactoring.

Signed-off-by Jan Kiszka <[email protected]>

Applied, thanks.

Mmpf, sorry, please replace that patch (provided it is still only in -next) with the actually tested version below. There was one further typecast missing.

Jan

----------->

Fixes "cast to pointer from integer of different size" on 32-bit hosts and applies a micro-refactoring.

Signed-off-by Jan Kiszka <[email protected]>

---

 arch/x86/kvm/x86.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/x86.c +6 -5
index 3270b3b..5ad65b4 100644
@@ -841,11 +841,12 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 
 static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
 {
+	struct kvm *kvm = vcpu->kvm;
 	int lm = is_long_mode(vcpu);
-	u8 *blob_addr = lm ? (u8 *)vcpu->kvm->arch.xen_hvm_config.blob_addr_64
-		: (u8 *)vcpu->kvm->arch.xen_hvm_config.blob_addr_32;
-	u8 blob_size = lm ? vcpu->kvm->arch.xen_hvm_config.blob_size_64
-		: vcpu->kvm->arch.xen_hvm_config.blob_size_32;
+	u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
+		: (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
+	u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
+		: kvm->arch.xen_hvm_config.blob_size_32;
 	u32 page_num = data & ~PAGE_MASK;
 	u64 page_addr = data & PAGE_MASK;
 	u8 *page;

@@ -861,7 +862,7 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
 	r = -EFAULT;
 	if (copy_from_user(page, blob_addr + (page_num * PAGE_SIZE), PAGE_SIZE))
 		goto out_free;
-	if (kvm_write_guest(vcpu->kvm, page_addr, page, PAGE_SIZE))
+	if (kvm_write_guest(kvm, page_addr, page, PAGE_SIZE))
 		goto out_free;
 	r = 0;
 out_free: