# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 58a3ed82eee4683fba0c8e9d010030cbb138ea3b
# Parent 815758308556e9140428907f739cffc69f43a676
[IA64] Removed warning messages
This patch removed warning messages in vcpu.c, xentime.c and xensetup.c.
I tested compilation, booting dom0, and creation/destruction domU.
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
diff -r 815758308556 -r 58a3ed82eee4 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c Mon Mar 20 16:04:51 2006
+++ b/xen/arch/ia64/xen/vcpu.c Mon Mar 20 16:19:36 2006
@@ -74,6 +74,7 @@
{
REGS *regs = vcpu_regs(vcpu);
UINT64 val;
+
if (!reg) return 0;
getreg(reg,&val,0,regs); // FIXME: handle NATs later
return val;
@@ -82,10 +83,11 @@
vcpu_get_gr_nat(VCPU *vcpu, unsigned long reg, UINT64 *val)
{
REGS *regs = vcpu_regs(vcpu);
- int nat;
+ int nat;
+
getreg(reg,val,&nat,regs); // FIXME: handle NATs later
- if(nat)
- return IA64_NAT_CONSUMPTION_VECTOR;
+ if (nat)
+ return IA64_NAT_CONSUMPTION_VECTOR;
return 0;
}
@@ -96,8 +98,10 @@
vcpu_set_gr(VCPU *vcpu, unsigned long reg, UINT64 value, int nat)
{
REGS *regs = vcpu_regs(vcpu);
+ long sof;
+
if (!reg) return IA64_ILLOP_FAULT;
- long sof = (regs->cr_ifs) & 0x7f;
+ sof = (regs->cr_ifs) & 0x7f;
if (reg >= sof + 32) return IA64_ILLOP_FAULT;
setreg(reg,value,nat,regs); // FIXME: handle NATs later
return IA64_NO_FAULT;
@@ -1247,7 +1251,7 @@
UINT64 VHPT_addr2a =
((pta_base >> 15) & 0x3fffffffffff) & compMask_60_15;
UINT64 VHPT_addr2b =
- ((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;;
+ ((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;
UINT64 VHPT_addr3 = VHPT_offset & 0x7fff;
UINT64 VHPT_addr = VHPT_addr1 | ((VHPT_addr2a | VHPT_addr2b) << 15) |
VHPT_addr3;
diff -r 815758308556 -r 58a3ed82eee4 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c Mon Mar 20 16:04:51 2006
+++ b/xen/arch/ia64/xen/xensetup.c Mon Mar 20 16:19:36 2006
@@ -168,6 +168,9 @@
unsigned long dom0_initrd_start, dom0_initrd_size;
unsigned long initial_images_start, initial_images_end;
struct domain *idle_domain;
+#ifdef CONFIG_SMP
+ int i;
+#endif
running_on_sim = is_platform_hp_ski();
/* Kernel may be relocated by EFI loader */
@@ -311,8 +314,6 @@
#endif
#ifdef CONFIG_SMP
- int i;
-
if ( opt_nosmp )
{
max_cpus = 0;
diff -r 815758308556 -r 58a3ed82eee4 xen/arch/ia64/xen/xentime.c
--- a/xen/arch/ia64/xen/xentime.c Mon Mar 20 16:04:51 2006
+++ b/xen/arch/ia64/xen/xentime.c Mon Mar 20 16:19:36 2006
@@ -29,6 +29,7 @@
#include <asm/vcpu.h>
#include <linux/jiffies.h> // not included by xen/sched.h
#include <xen/softirq.h>
+#include <xen/event.h>
/* FIXME: where these declarations should be there ? */
extern void ia64_init_itm(void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home