ia64/xen-unstable

changeset 12245:044c6617e2be

Merge
author Alastair Tse <atse@xensource.com>
date Fri Nov 03 11:43:27 2006 +0000 (2006-11-03)
parents 665a28dffb7d 6191a06b6ed6
children dcdf02fde4cb
files
line diff
     1.1 --- a/xen/arch/x86/hvm/hvm.c	Fri Nov 03 11:42:57 2006 +0000
     1.2 +++ b/xen/arch/x86/hvm/hvm.c	Fri Nov 03 11:43:27 2006 +0000
     1.3 @@ -371,7 +371,7 @@ void hvm_do_hypercall(struct cpu_user_re
     1.4  
     1.5      if ( (pregs->eax >= NR_hypercalls) || !hvm_hypercall_table[pregs->eax] )
     1.6      {
     1.7 -        gdprintk(XENLOG_INFO, "HVM vcpu %d:%d did a bad hypercall %d.\n",
     1.8 +        gdprintk(XENLOG_WARNING, "HVM vcpu %d:%d did a bad hypercall %d.\n",
     1.9                  current->domain->domain_id, current->vcpu_id,
    1.10                  pregs->eax);
    1.11          pregs->eax = -ENOSYS;
    1.12 @@ -417,7 +417,7 @@ static long do_memory_op_compat32(int cm
    1.13      }
    1.14  
    1.15      default:
    1.16 -        gdprintk(XENLOG_INFO, "memory_op %d.\n", cmd);
    1.17 +        gdprintk(XENLOG_WARNING, "memory_op %d.\n", cmd);
    1.18          rc = -ENOSYS;
    1.19          break;
    1.20      }
    1.21 @@ -450,7 +450,7 @@ void hvm_do_hypercall(struct cpu_user_re
    1.22      pregs->rax = (uint32_t)pregs->eax; /* mask in case compat32 caller */
    1.23      if ( (pregs->rax >= NR_hypercalls) || !hvm_hypercall64_table[pregs->rax] )
    1.24      {
    1.25 -        gdprintk(XENLOG_INFO, "HVM vcpu %d:%d did a bad hypercall %ld.\n",
    1.26 +        gdprintk(XENLOG_WARNING, "HVM vcpu %d:%d did a bad hypercall %ld.\n",
    1.27                  current->domain->domain_id, current->vcpu_id,
    1.28                  pregs->rax);
    1.29          pregs->rax = -ENOSYS;
    1.30 @@ -510,7 +510,7 @@ int hvm_bringup_ap(int vcpuid, int tramp
    1.31  
    1.32      if ( (ctxt = xmalloc(struct vcpu_guest_context)) == NULL )
    1.33      {
    1.34 -        gdprintk(XENLOG_INFO,
    1.35 +        gdprintk(XENLOG_ERR,
    1.36                  "Failed to allocate memory in hvm_bringup_ap.\n");
    1.37          return -ENOMEM;
    1.38      }
    1.39 @@ -525,7 +525,7 @@ int hvm_bringup_ap(int vcpuid, int tramp
    1.40  
    1.41      if ( rc != 0 )
    1.42      {
    1.43 -        gdprintk(XENLOG_INFO,
    1.44 +        gdprintk(XENLOG_ERR,
    1.45                 "AP %d bringup failed in boot_vcpu %x.\n", vcpuid, rc);
    1.46          goto out;
    1.47      }
    1.48 @@ -628,7 +628,7 @@ long do_hvm_op(unsigned long op, XEN_GUE
    1.49  
    1.50      default:
    1.51      {
    1.52 -        gdprintk(XENLOG_INFO, "Bad HVM op %ld.\n", op);
    1.53 +        gdprintk(XENLOG_WARNING, "Bad HVM op %ld.\n", op);
    1.54          rc = -ENOSYS;
    1.55          break;
    1.56      }