dump: qemunotes aren't commonly needed
Only one of three architectures implementing qmp-dump-guest-memory write qemu notes. And, another architecture (arm/aarch64) is coming, which won't use them either. Make the common implementation truly common. (No functional change.) Signed-off-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1452542185-10914-3-git-send-email-drjones@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
		
							parent
							
								
									f1cd483004
								
							
						
					
					
						commit
						b09afd58e4
					
				| 
						 | 
				
			
			@ -130,7 +130,7 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
 | 
			
		|||
static int cpu_common_write_elf32_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                           CPUState *cpu, void *opaque)
 | 
			
		||||
{
 | 
			
		||||
    return -1;
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu,
 | 
			
		||||
| 
						 | 
				
			
			@ -159,7 +159,7 @@ int cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
 | 
			
		|||
static int cpu_common_write_elf64_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                           CPUState *cpu, void *opaque)
 | 
			
		||||
{
 | 
			
		||||
    return -1;
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -278,9 +278,3 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
 | 
			
		|||
    PowerPCCPU *cpu = POWERPC_CPU(cs);
 | 
			
		||||
    return ppc64_write_all_elf64_notes("CORE", f, cpu, cpuid, opaque);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int ppc64_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                   CPUState *cpu, void *opaque)
 | 
			
		||||
{
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -125,8 +125,6 @@ int ppc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
 | 
			
		|||
int ppc_cpu_gdb_read_register_apple(CPUState *cpu, uint8_t *buf, int reg);
 | 
			
		||||
int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
 | 
			
		||||
int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);
 | 
			
		||||
int ppc64_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                   CPUState *cpu, void *opaque);
 | 
			
		||||
int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
 | 
			
		||||
                               int cpuid, void *opaque);
 | 
			
		||||
#ifndef CONFIG_USER_ONLY
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9712,7 +9712,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
 | 
			
		|||
    cc->vmsd = &vmstate_ppc_cpu;
 | 
			
		||||
#if defined(TARGET_PPC64)
 | 
			
		||||
    cc->write_elf64_note = ppc64_cpu_write_elf64_note;
 | 
			
		||||
    cc->write_elf64_qemunote = ppc64_cpu_write_elf64_qemunote;
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
    cc->cpu_exec_enter = ppc_cpu_exec_enter;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -246,9 +246,3 @@ ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)
 | 
			
		|||
 | 
			
		||||
    return (elf_note_size) * nr_cpus;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int s390_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                  CPUState *cpu, void *opaque)
 | 
			
		||||
{
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,8 +91,6 @@ void s390_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
 | 
			
		|||
int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
 | 
			
		||||
                              int cpuid, void *opaque);
 | 
			
		||||
 | 
			
		||||
int s390_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
 | 
			
		||||
                                  CPUState *cpu, void *opaque);
 | 
			
		||||
hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
 | 
			
		||||
hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);
 | 
			
		||||
int s390_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -353,7 +353,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
 | 
			
		|||
    cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
 | 
			
		||||
    cc->vmsd = &vmstate_s390_cpu;
 | 
			
		||||
    cc->write_elf64_note = s390_cpu_write_elf64_note;
 | 
			
		||||
    cc->write_elf64_qemunote = s390_cpu_write_elf64_qemunote;
 | 
			
		||||
    cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;
 | 
			
		||||
    cc->debug_excp_handler = s390x_cpu_debug_excp_handler;
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue