From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/target-s390x/arch_dump.c | 249 ------------------------------------------ 1 file changed, 249 deletions(-) delete mode 100644 qemu/target-s390x/arch_dump.c (limited to 'qemu/target-s390x/arch_dump.c') diff --git a/qemu/target-s390x/arch_dump.c b/qemu/target-s390x/arch_dump.c deleted file mode 100644 index 4731869f6..000000000 --- a/qemu/target-s390x/arch_dump.c +++ /dev/null @@ -1,249 +0,0 @@ -/* - * writing ELF notes for s390x arch - * - * - * Copyright IBM Corp. 2012, 2013 - * - * Ekaterina Tumanova - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "elf.h" -#include "exec/cpu-all.h" -#include "sysemu/dump.h" -#include "sysemu/kvm.h" - - -struct S390xUserRegsStruct { - uint64_t psw[2]; - uint64_t gprs[16]; - uint32_t acrs[16]; -} QEMU_PACKED; - -typedef struct S390xUserRegsStruct S390xUserRegs; - -struct S390xElfPrstatusStruct { - uint8_t pad1[32]; - uint32_t pid; - uint8_t pad2[76]; - S390xUserRegs regs; - uint8_t pad3[16]; -} QEMU_PACKED; - -typedef struct S390xElfPrstatusStruct S390xElfPrstatus; - -struct S390xElfFpregsetStruct { - uint32_t fpc; - uint32_t pad; - uint64_t fprs[16]; -} QEMU_PACKED; - -typedef struct S390xElfFpregsetStruct S390xElfFpregset; - -struct S390xElfVregsLoStruct { - uint64_t vregs[16]; -} QEMU_PACKED; - -typedef struct S390xElfVregsLoStruct S390xElfVregsLo; - -struct S390xElfVregsHiStruct { - uint64_t vregs[16][2]; -} QEMU_PACKED; - -typedef struct S390xElfVregsHiStruct S390xElfVregsHi; - -typedef struct noteStruct { - Elf64_Nhdr hdr; - char name[5]; - char pad3[3]; - union { - S390xElfPrstatus prstatus; - S390xElfFpregset fpregset; - S390xElfVregsLo vregslo; - S390xElfVregsHi vregshi; - uint32_t prefix; - uint64_t timer; - uint64_t todcmp; - uint32_t todpreg; - uint64_t ctrs[16]; - } contents; -} QEMU_PACKED Note; - -static void s390x_write_elf64_prstatus(Note *note, S390CPU *cpu) -{ - int i; - S390xUserRegs *regs; - - note->hdr.n_type = cpu_to_be32(NT_PRSTATUS); - - regs = &(note->contents.prstatus.regs); - regs->psw[0] = cpu_to_be64(cpu->env.psw.mask); - regs->psw[1] = cpu_to_be64(cpu->env.psw.addr); - for (i = 0; i <= 15; i++) { - regs->acrs[i] = cpu_to_be32(cpu->env.aregs[i]); - regs->gprs[i] = cpu_to_be64(cpu->env.regs[i]); - } -} - -static void s390x_write_elf64_fpregset(Note *note, S390CPU *cpu) -{ - int i; - CPUS390XState *cs = &cpu->env; - - note->hdr.n_type = cpu_to_be32(NT_FPREGSET); - note->contents.fpregset.fpc = cpu_to_be32(cpu->env.fpc); - for (i = 0; i <= 15; i++) { - note->contents.fpregset.fprs[i] = cpu_to_be64(get_freg(cs, i)->ll); - } -} - -static void s390x_write_elf64_vregslo(Note *note, S390CPU *cpu) -{ - int i; - - note->hdr.n_type = cpu_to_be32(NT_S390_VXRS_LOW); - for (i = 0; i <= 15; i++) { - note->contents.vregslo.vregs[i] = cpu_to_be64(cpu->env.vregs[i][1].ll); - } -} - -static void s390x_write_elf64_vregshi(Note *note, S390CPU *cpu) -{ - int i; - S390xElfVregsHi *temp_vregshi; - - temp_vregshi = ¬e->contents.vregshi; - - note->hdr.n_type = cpu_to_be32(NT_S390_VXRS_HIGH); - for (i = 0; i <= 15; i++) { - temp_vregshi->vregs[i][0] = cpu_to_be64(cpu->env.vregs[i + 16][0].ll); - temp_vregshi->vregs[i][1] = cpu_to_be64(cpu->env.vregs[i + 16][1].ll); - } -} - -static void s390x_write_elf64_timer(Note *note, S390CPU *cpu) -{ - note->hdr.n_type = cpu_to_be32(NT_S390_TIMER); - note->contents.timer = cpu_to_be64((uint64_t)(cpu->env.cputm)); -} - -static void s390x_write_elf64_todcmp(Note *note, S390CPU *cpu) -{ - note->hdr.n_type = cpu_to_be32(NT_S390_TODCMP); - note->contents.todcmp = cpu_to_be64((uint64_t)(cpu->env.ckc)); -} - -static void s390x_write_elf64_todpreg(Note *note, S390CPU *cpu) -{ - note->hdr.n_type = cpu_to_be32(NT_S390_TODPREG); - note->contents.todpreg = cpu_to_be32((uint32_t)(cpu->env.todpr)); -} - -static void s390x_write_elf64_ctrs(Note *note, S390CPU *cpu) -{ - int i; - - note->hdr.n_type = cpu_to_be32(NT_S390_CTRS); - - for (i = 0; i <= 15; i++) { - note->contents.ctrs[i] = cpu_to_be64(cpu->env.cregs[i]); - } -} - -static void s390x_write_elf64_prefix(Note *note, S390CPU *cpu) -{ - note->hdr.n_type = cpu_to_be32(NT_S390_PREFIX); - note->contents.prefix = cpu_to_be32((uint32_t)(cpu->env.psa)); -} - - -static const struct NoteFuncDescStruct { - int contents_size; - void (*note_contents_func)(Note *note, S390CPU *cpu); -} note_func[] = { - {sizeof(((Note *)0)->contents.prstatus), s390x_write_elf64_prstatus}, - {sizeof(((Note *)0)->contents.prefix), s390x_write_elf64_prefix}, - {sizeof(((Note *)0)->contents.fpregset), s390x_write_elf64_fpregset}, - {sizeof(((Note *)0)->contents.ctrs), s390x_write_elf64_ctrs}, - {sizeof(((Note *)0)->contents.timer), s390x_write_elf64_timer}, - {sizeof(((Note *)0)->contents.todcmp), s390x_write_elf64_todcmp}, - {sizeof(((Note *)0)->contents.todpreg), s390x_write_elf64_todpreg}, - {sizeof(((Note *)0)->contents.vregslo), s390x_write_elf64_vregslo}, - {sizeof(((Note *)0)->contents.vregshi), s390x_write_elf64_vregshi}, - { 0, NULL} -}; - -typedef struct NoteFuncDescStruct NoteFuncDesc; - - -static int s390x_write_all_elf64_notes(const char *note_name, - WriteCoreDumpFunction f, - S390CPU *cpu, int id, - void *opaque) -{ - Note note; - const NoteFuncDesc *nf; - int note_size; - int ret = -1; - - for (nf = note_func; nf->note_contents_func; nf++) { - memset(¬e, 0, sizeof(note)); - note.hdr.n_namesz = cpu_to_be32(sizeof(note.name)); - note.hdr.n_descsz = cpu_to_be32(nf->contents_size); - strncpy(note.name, note_name, sizeof(note.name)); - (*nf->note_contents_func)(¬e, cpu); - - note_size = sizeof(note) - sizeof(note.contents) + nf->contents_size; - ret = f(¬e, note_size, opaque); - - if (ret < 0) { - return -1; - } - - } - - return 0; -} - - -int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, - int cpuid, void *opaque) -{ - S390CPU *cpu = S390_CPU(cs); - return s390x_write_all_elf64_notes("CORE", f, cpu, cpuid, opaque); -} - -int cpu_get_dump_info(ArchDumpInfo *info, - const struct GuestPhysBlockList *guest_phys_blocks) -{ - info->d_machine = EM_S390; - info->d_endian = ELFDATA2MSB; - info->d_class = ELFCLASS64; - - return 0; -} - -ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) -{ - int name_size = 8; /* "CORE" or "QEMU" rounded */ - size_t elf_note_size = 0; - int note_head_size; - const NoteFuncDesc *nf; - - assert(class == ELFCLASS64); - assert(machine == EM_S390); - - note_head_size = sizeof(Elf64_Nhdr); - - for (nf = note_func; nf->note_contents_func; nf++) { - elf_note_size = elf_note_size + note_head_size + name_size + - nf->contents_size; - } - - return (elf_note_size) * nr_cpus; -} -- cgit 1.2.3-korg