direct-io.hg

changeset 10370:83e4d44e8aec

[IA64] Add carriage return to printk/printf

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Sat Jun 03 14:33:08 2006 -0600 (2006-06-03)
parents 4533f6c9fa11
children 47151f27e623
files xen/arch/ia64/xen/acpi.c xen/arch/ia64/xen/dom_fw.c xen/arch/ia64/xen/efi_emul.c xen/arch/ia64/xen/hypercall.c xen/arch/ia64/xen/process.c xen/arch/ia64/xen/vcpu.c
line diff
     1.1 --- a/xen/arch/ia64/xen/acpi.c	Sat Jun 03 14:31:27 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/acpi.c	Sat Jun 03 14:33:08 2006 -0600
     1.3 @@ -629,7 +629,7 @@ acpi_boot_init (void)
     1.4  #ifdef CONFIG_SMP
     1.5  	if (available_cpus == 0) {
     1.6  		printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");
     1.7 -		printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());
     1.8 +		printk(KERN_INFO "CPU 0 (0x%04x)\n", hard_smp_processor_id());
     1.9  		smp_boot_data.cpu_phys_id[available_cpus] = hard_smp_processor_id();
    1.10  		available_cpus = 1; /* We've got at least one of these, no? */
    1.11  	}
     2.1 --- a/xen/arch/ia64/xen/dom_fw.c	Sat Jun 03 14:31:27 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Sat Jun 03 14:33:08 2006 -0600
     2.3 @@ -943,6 +943,7 @@ dom_fw_init (struct domain *d, const cha
     2.4  		}
     2.5  		printf("\n");
     2.6  	} else {
     2.7 +		printf("DomainU EFI build up:");
     2.8  		i = 1;
     2.9  
    2.10  		if ((unsigned long)fw_mem + fw_mem_size - (unsigned long)cp >=
    2.11 @@ -958,6 +959,7 @@ dom_fw_init (struct domain *d, const cha
    2.12  			printf(" ACPI 2.0=0x%lx",efi_tables[i].table);
    2.13  			i++;
    2.14  		}
    2.15 +		printf("\n");
    2.16  	}
    2.17  
    2.18  	/* fill in the SAL system table: */
     3.1 --- a/xen/arch/ia64/xen/efi_emul.c	Sat Jun 03 14:31:27 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/efi_emul.c	Sat Jun 03 14:33:08 2006 -0600
     3.3 @@ -149,9 +149,10 @@ efi_emulator (struct pt_regs *regs, IA64
     3.4  		if (current->domain == dom0) {
     3.5  			printf("(by dom0)\n ");
     3.6  			(*efi.reset_system)(EFI_RESET_WARM,0,0,NULL);
     3.7 +		} else {
     3.8 +			printf("\n");
     3.9 +			domain_shutdown (current->domain, SHUTDOWN_reboot);
    3.10  		}
    3.11 -		else
    3.12 -			domain_shutdown (current->domain, SHUTDOWN_reboot);
    3.13  		status = EFI_UNSUPPORTED;
    3.14  		break;
    3.15  	    case FW_HYPERCALL_EFI_GET_TIME:
     4.1 --- a/xen/arch/ia64/xen/hypercall.c	Sat Jun 03 14:31:27 2006 -0600
     4.2 +++ b/xen/arch/ia64/xen/hypercall.c	Sat Jun 03 14:33:08 2006 -0600
     4.3 @@ -168,7 +168,7 @@ fw_hypercall_ipi (struct pt_regs *regs)
     4.4  				targ->vcpu_id, targ_regs->cr_iip);
     4.5  		}
     4.6  		else
     4.7 -			printf ("arch_boot_vcpu: huu, already awaken!");
     4.8 +			printf ("arch_boot_vcpu: huu, already awaken!\n");
     4.9  	}
    4.10  	else {
    4.11  		int running = test_bit(_VCPUF_running,
     5.1 --- a/xen/arch/ia64/xen/process.c	Sat Jun 03 14:31:27 2006 -0600
     5.2 +++ b/xen/arch/ia64/xen/process.c	Sat Jun 03 14:33:08 2006 -0600
     5.3 @@ -494,7 +494,6 @@ ia64_fault (unsigned long vector, unsign
     5.4  {
     5.5  	struct pt_regs *regs = (struct pt_regs *) &stack;
     5.6  	unsigned long code;
     5.7 -	char buf[128];
     5.8  	static const char *reason[] = {
     5.9  		"IA-64 Illegal Operation fault",
    5.10  		"IA-64 Privileged Operation fault",
    5.11 @@ -555,7 +554,7 @@ ia64_fault (unsigned long vector, unsign
    5.12  
    5.13  	    case 24: /* General Exception */
    5.14  		code = (isr >> 4) & 0xf;
    5.15 -		sprintf(buf, "General Exception: %s%s", reason[code],
    5.16 +		printk("General Exception: %s%s.\n", reason[code],
    5.17  		        (code == 3) ? ((isr & (1UL << 37)) ? " (RSE access)" :
    5.18  		                       " (data access)") : "");
    5.19  		if (code == 8) {
    5.20 @@ -841,7 +840,7 @@ ia64_handle_reflection (unsigned long if
    5.21  	    case 26:
    5.22  		if (((isr >> 4L) & 0xfL) == 1) {
    5.23  			//regs->eml_unat = 0;  FIXME: DO WE NEED THIS??
    5.24 -			printf("ia64_handle_reflection: handling regNaT fault");
    5.25 +			printf("ia64_handle_reflection: handling regNaT fault\n");
    5.26  			vector = IA64_NAT_CONSUMPTION_VECTOR; break;
    5.27  		}
    5.28  #if 1
    5.29 @@ -878,13 +877,13 @@ ia64_handle_reflection (unsigned long if
    5.30  		printf("ia64_handle_reflection: handling FP trap\n");
    5.31  		vector = IA64_FP_TRAP_VECTOR; break;
    5.32  	    case 34:
    5.33 -		printf("ia64_handle_reflection: handling lowerpriv trap");
    5.34 +		printf("ia64_handle_reflection: handling lowerpriv trap\n");
    5.35  		vector = IA64_LOWERPRIV_TRANSFER_TRAP_VECTOR; break;
    5.36  	    case 35:
    5.37 -		printf("ia64_handle_reflection: handling taken branch trap");
    5.38 +		printf("ia64_handle_reflection: handling taken branch trap\n");
    5.39  		vector = IA64_TAKEN_BRANCH_TRAP_VECTOR; break;
    5.40  	    case 36:
    5.41 -		printf("ia64_handle_reflection: handling single step trap");
    5.42 +		printf("ia64_handle_reflection: handling single step trap\n");
    5.43  		vector = IA64_SINGLE_STEP_TRAP_VECTOR; break;
    5.44  
    5.45  	    default:
     6.1 --- a/xen/arch/ia64/xen/vcpu.c	Sat Jun 03 14:31:27 2006 -0600
     6.2 +++ b/xen/arch/ia64/xen/vcpu.c	Sat Jun 03 14:33:08 2006 -0600
     6.3 @@ -284,7 +284,7 @@ IA64FAULT vcpu_set_psr_sm(VCPU *vcpu, UI
     6.4  	if (imm.sp) { ipsr->sp = 1; psr.sp = 1; }
     6.5  	if (imm.i) {
     6.6  		if (vcpu->vcpu_info->evtchn_upcall_mask) {
     6.7 -//printf("vcpu_set_psr_sm: psr.ic 0->1 ");
     6.8 +//printf("vcpu_set_psr_sm: psr.ic 0->1\n");
     6.9  			enabling_interrupts = 1;
    6.10  		}
    6.11  		vcpu->vcpu_info->evtchn_upcall_mask = 0;
    6.12 @@ -390,7 +390,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcp
    6.13  	UINT64 dcr = PSCBX(vcpu,dcr);
    6.14  	PSR psr;
    6.15  
    6.16 -	//printf("*** vcpu_get_ipsr_int_state (0x%016lx)...",prevpsr);
    6.17 +	//printf("*** vcpu_get_ipsr_int_state (0x%016lx)...\n",prevpsr);
    6.18  	psr.i64 = prevpsr;
    6.19  	psr.ia64_psr.be = 0; if (dcr & IA64_DCR_BE) psr.ia64_psr.be = 1;
    6.20  	psr.ia64_psr.pp = 0; if (dcr & IA64_DCR_PP) psr.ia64_psr.pp = 1;
    6.21 @@ -400,7 +400,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcp
    6.22  	psr.ia64_psr.dt = 1; psr.ia64_psr.it = 1; psr.ia64_psr.rt = 1;
    6.23  	if (psr.ia64_psr.cpl == 2) psr.ia64_psr.cpl = 0; // !!!! fool domain
    6.24  	// psr.pk = 1;
    6.25 -	//printf("returns 0x%016lx...",psr.i64);
    6.26 +	//printf("returns 0x%016lx...\n",psr.i64);
    6.27  	return psr.i64;
    6.28  }
    6.29  
    6.30 @@ -709,7 +709,7 @@ check_start:
    6.31  	}
    6.32  	// have a pending,deliverable interrupt... see if it is masked
    6.33  	bitnum = ia64_fls(bits);
    6.34 -//printf("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...",bitnum);
    6.35 +//printf("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...\n",bitnum);
    6.36  	vector = bitnum+(i*64);
    6.37  	mask = 1L << bitnum;
    6.38  	/* sanity check for guest timer interrupt */
    6.39 @@ -721,7 +721,7 @@ check_start:
    6.40  			goto check_start;
    6.41  		}
    6.42  	}
    6.43 -//printf("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...",vector);
    6.44 +//printf("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...\n",vector);
    6.45  	if (*r >= mask) {
    6.46  		// masked by equal inservice
    6.47  //printf("but masked by equal inservice\n");