Attachment 157015 Details for Bug 243118 – 64bit bits

[patch] 64bit bits

more-xen-bits-64.diff (text/plain), 1.72 KB, created by Gerd Hoffmann on 2007-06-14 16:01:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Hoffmann

Created: 2007-06-14 16:01:18 UTC

Size: 1.72 KB

patch

obsolete

>--- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.xen64	2007-06-14 17:18:17.000000000 +0200
>+++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c	2007-06-14 17:23:15.000000000 +0200
>@@ -295,6 +295,13 @@
> 	return 0;
> }
> 
>+static int get_crash_notes(int cpu, uint64_t *addr, uint64_t *size)
>+{
>+	*size = MAX_NOTE_BYTES;
>+	return get_crash_notes_per_cpu(cpu, addr);
>+}
>+
>+
> /* Removes crash reserve region from list of memory chunks for whom elf program
>  * headers have to be created. Assuming crash reserve region to be a single
>  * continuous area fully contained inside one of the memory chunks */
>@@ -620,7 +627,10 @@
> 	int i;
> 	char *bufp;
> 	long int nr_cpus = 0;
>+
>+	int (*get_note)(int cpu, uint64_t *addr, uint64_t *len);
> 	uint64_t notes_addr;
>+	uint64_t notes_size;
> 
> 	bufp = (char*) buf;
> 
>@@ -648,15 +658,20 @@
> 	elf->e_shstrndx = 0;
> 
> 	/* PT_NOTE program headers. One per cpu*/
>-	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+	if (xen_present()) {
>+		nr_cpus = xen_get_nr_phys_cpus();
>+		get_note = xen_get_note;
>+	} else {
>+		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+		get_note = get_crash_notes;
>+	}
> 	if (nr_cpus < 0) {
> 		return -1;
> 	}
> 
> 	/* Need to find a better way to determine per cpu notes section size. */
>-#define MAX_NOTE_BYTES	1024
> 	for (i = 0; i < nr_cpus; i++) {
>-		if (get_crash_notes_per_cpu(i, &notes_addr) < 0) {
>+		if (get_note(i, &notes_addr, &notes_size) < 0) {
> 			/* This cpu is not present. Skip it. */
> 			continue;
> 		}
>@@ -667,7 +682,7 @@
> 		phdr->p_flags	= 0;
> 		phdr->p_offset  = phdr->p_paddr = notes_addr;
> 		phdr->p_vaddr   = 0;
>-		phdr->p_filesz	= phdr->p_memsz	= MAX_NOTE_BYTES;
>+		phdr->p_filesz	= phdr->p_memsz	= notes_size;
> 		/* Do we need any alignment of segments? */
> 		phdr->p_align	= 0;
>

Actions: View | Diff

Attachments on bug 243118: 156504 | 156565 | 156570 | 157006 | 157015