Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186049
b: refs/heads/master
c: 16fbb5e
h: refs/heads/master
i:
  186047: 0840ed9
v: v3
  • Loading branch information
Joe Perches authored and Marcelo Tosatti committed Mar 1, 2010
1 parent 5714f6a commit e59c307
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebcbab4c034db2ec25abe702d788936b29a49b24
refs/heads/master: 16fbb5eecc4ab8d4eb4d2a683d7fd74ccacc890b
4 changes: 2 additions & 2 deletions trunk/arch/ia64/kvm/mmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma)
return;
} else {
inst_type = -1;
panic_vm(vcpu, "Unsupported MMIO access instruction! \
Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
panic_vm(vcpu, "Unsupported MMIO access instruction! "
"Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
bundle.i64[0], bundle.i64[1]);
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/ia64/kvm/vcpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1639,8 +1639,8 @@ void vcpu_set_psr(struct kvm_vcpu *vcpu, unsigned long val)
* Otherwise panic
*/
if (val & (IA64_PSR_PK | IA64_PSR_IS | IA64_PSR_VM))
panic_vm(vcpu, "Only support guests with vpsr.pk =0 \
& vpsr.is=0\n");
panic_vm(vcpu, "Only support guests with vpsr.pk =0 "
"& vpsr.is=0\n");

/*
* For those IA64_PSR bits: id/da/dd/ss/ed/ia
Expand Down

0 comments on commit e59c307

Please sign in to comment.