Commit 374f63f6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-07-02-v2' into staging 



Monitor patches for 2019-07-02

# gpg: Signature made Tue 02 Jul 2019 12:37:57 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2019-07-02-v2:
  dump: Move HMP command handlers to dump/
  MAINTAINERS: Add Windows dump to section "Dump"
  dump: Move the code to dump/
  qapi: Split dump.json off misc.json
  qapi: Rename target.json to misc-target.json
  qapi: Split machine-target.json off target.json and misc.json
  hw/core: Collect HMP command handlers in hw/core/
  hw/core: Collect QMP command handlers in hw/core/
  hw/core: Move numa.c to hw/core/
  qapi: Split machine.json off misc.json
  MAINTAINERS: Merge sections CPU, NUMA into Machine core
  qom: Move HMP command handlers to qom/
  qom: Move QMP command handlers to qom/
  qapi: Split qom.json and qdev.json off misc.json
  hmp: Move hmp.h to include/monitor/
  Makefile: Don't add monitor/ twice to common-obj-y
  MAINTAINERS: Make section "QOM" cover qdev as well
  MAINTAINERS: new maintainers for QOM

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 506179e4 2608b3df

MAINTAINERS

+21 −15
Original line number Diff line number Diff line
@@ -1274,11 +1274,18 @@ Machine core 
M: Eduardo Habkost <ehabkost@redhat.com>

M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

S: Supported

F: hw/core/machine-qmp-cmds.c

F: hw/core/machine.c

F: hw/core/null-machine.c

F: hw/core/numa.c

F: hw/cpu/cluster.c

F: qapi/machine.json

F: qapi/machine-target.json

F: qom/cpu.c

F: include/hw/boards.h

F: include/hw/cpu/cluster.h

F: include/qom/cpu.h

F: include/sysemu/numa.h

T: git https://github.com/ehabkost/qemu.git machine-next



Xtensa Machines
@@ -1843,11 +1850,6 @@ M: Markus Armbruster <armbru@redhat.com> 
S: Supported

F: scripts/coverity-model.c



CPU

S: Supported

F: qom/cpu.c

F: include/qom/cpu.h



Device Tree

M: Alistair Francis <alistair.francis@wdc.com>

R: David Gibson <david@gibson.dropbear.id.au>
@@ -1858,11 +1860,13 @@ F: include/sysemu/device_tree.h 
Dump

S: Supported

M: Marc-André Lureau <marcandre.lureau@redhat.com>

F: dump.c

F: dump/

F: hw/misc/vmcoreinfo.c

F: include/hw/misc/vmcoreinfo.h

F: include/qemu/win_dump_defs

F: include/sysemu/dump-arch.h

F: include/sysemu/dump.h

F: qapi/dump.json

F: scripts/dump-guest-memory.py

F: stubs/dump.c
@@ -1956,13 +1960,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/ 
S: Maintained

F: net/netmap.c



NUMA

M: Eduardo Habkost <ehabkost@redhat.com>

S: Maintained

F: numa.c

F: include/sysemu/numa.h

T: git https://github.com/ehabkost/qemu.git machine-next



Host Memory Backends

M: Eduardo Habkost <ehabkost@redhat.com>

M: Igor Mammedov <imammedo@redhat.com>
@@ -2040,15 +2037,24 @@ F: docs/interop/qemu-ga-ref.texi 
T: git https://github.com/mdroth/qemu.git qga



QOM

M: Andreas Färber <afaerber@suse.de>

M: Paolo Bonzini <pbonzini@redhat.com>

R: Daniel P. Berrange <berrange@redhat.com>

R: Eduardo Habkost <ehabkost@redhat.com>

S: Supported

T: git https://github.com/afaerber/qemu-cpu.git qom-next

F: docs/qdev-device-use.txt

F: hw/core/qdev*

F: include/hw/qdev*

F: include/monitor/qdev.h

F: include/qom/

X: include/qom/cpu.h

F: qapi/qom.json

F: qapi/qdev.json

F: qdev-monitor.c

F: qom/

X: qom/cpu.c

F: tests/check-qom-interface.c

F: tests/check-qom-proplist.c

F: tests/test-qdev-global-props.c



QMP

M: Markus Armbruster <armbru@redhat.com>

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ io-obj-y = io/ 
ifeq ($(CONFIG_SOFTMMU),y)

common-obj-y = blockdev.o blockdev-nbd.o block/

common-obj-y += bootdevice.o iothread.o

common-obj-y += dump/

common-obj-y += job-qmp.o

common-obj-y += monitor/

common-obj-y += net/
@@ -85,7 +86,6 @@ common-obj-$(CONFIG_FDT) += device_tree.o 
# qapi



common-obj-y += qapi/

common-obj-y += monitor/

endif



#######################################################################

Makefile.target

+2 −3
Original line number Diff line number Diff line
@@ -148,15 +148,14 @@ endif #CONFIG_BSD_USER 
#########################################################

# System emulator target

ifdef CONFIG_SOFTMMU

obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o numa.o

obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o

obj-y += qtest.o

obj-y += dump/

obj-y += hw/

obj-y += monitor/

obj-y += qapi/

obj-y += memory.o

obj-y += memory_mapping.o

obj-y += dump.o

obj-$(TARGET_X86_64) += win_dump.o

obj-y += migration/ram.o

LIBS := $(libs_softmmu) $(LIBS)

cpus.c

+0 −187
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/config-file.h"

#include "cpu.h"

#include "monitor/monitor.h"

#include "qapi/error.h"

#include "qapi/qapi-commands-misc.h"
@@ -33,7 +32,6 @@ 
#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

#include "qemu/qemu-print.h"

#include "sysemu/sysemu.h"

#include "sysemu/tcg.h"

#include "sysemu/block-backend.h"

#include "exec/gdbstub.h"
@@ -56,7 +54,6 @@ 
#include "tcg.h"

#include "hw/nmi.h"

#include "sysemu/replay.h"

#include "hw/boards.h"



#ifdef CONFIG_LINUX
@@ -2200,190 +2197,6 @@ void list_cpus(const char *optarg) 
#endif

}



CpuInfoList *qmp_query_cpus(Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    MachineClass *mc = MACHINE_GET_CLASS(ms);

    CpuInfoList *head = NULL, *cur_item = NULL;

    CPUState *cpu;



    CPU_FOREACH(cpu) {

        CpuInfoList *info;

#if defined(TARGET_I386)

        X86CPU *x86_cpu = X86_CPU(cpu);

        CPUX86State *env = &x86_cpu->env;

#elif defined(TARGET_PPC)

        PowerPCCPU *ppc_cpu = POWERPC_CPU(cpu);

        CPUPPCState *env = &ppc_cpu->env;

#elif defined(TARGET_SPARC)

        SPARCCPU *sparc_cpu = SPARC_CPU(cpu);

        CPUSPARCState *env = &sparc_cpu->env;

#elif defined(TARGET_RISCV)

        RISCVCPU *riscv_cpu = RISCV_CPU(cpu);

        CPURISCVState *env = &riscv_cpu->env;

#elif defined(TARGET_MIPS)

        MIPSCPU *mips_cpu = MIPS_CPU(cpu);

        CPUMIPSState *env = &mips_cpu->env;

#elif defined(TARGET_TRICORE)

        TriCoreCPU *tricore_cpu = TRICORE_CPU(cpu);

        CPUTriCoreState *env = &tricore_cpu->env;

#elif defined(TARGET_S390X)

        S390CPU *s390_cpu = S390_CPU(cpu);

        CPUS390XState *env = &s390_cpu->env;

#endif



        cpu_synchronize_state(cpu);



        info = g_malloc0(sizeof(*info));

        info->value = g_malloc0(sizeof(*info->value));

        info->value->CPU = cpu->cpu_index;

        info->value->current = (cpu == first_cpu);

        info->value->halted = cpu->halted;

        info->value->qom_path = object_get_canonical_path(OBJECT(cpu));

        info->value->thread_id = cpu->thread_id;

#if defined(TARGET_I386)

        info->value->arch = CPU_INFO_ARCH_X86;

        info->value->u.x86.pc = env->eip + env->segs[R_CS].base;

#elif defined(TARGET_PPC)

        info->value->arch = CPU_INFO_ARCH_PPC;

        info->value->u.ppc.nip = env->nip;

#elif defined(TARGET_SPARC)

        info->value->arch = CPU_INFO_ARCH_SPARC;

        info->value->u.q_sparc.pc = env->pc;

        info->value->u.q_sparc.npc = env->npc;

#elif defined(TARGET_MIPS)

        info->value->arch = CPU_INFO_ARCH_MIPS;

        info->value->u.q_mips.PC = env->active_tc.PC;

#elif defined(TARGET_TRICORE)

        info->value->arch = CPU_INFO_ARCH_TRICORE;

        info->value->u.tricore.PC = env->PC;

#elif defined(TARGET_S390X)

        info->value->arch = CPU_INFO_ARCH_S390;

        info->value->u.s390.cpu_state = env->cpu_state;

#elif defined(TARGET_RISCV)

        info->value->arch = CPU_INFO_ARCH_RISCV;

        info->value->u.riscv.pc = env->pc;

#else

        info->value->arch = CPU_INFO_ARCH_OTHER;

#endif

        info->value->has_props = !!mc->cpu_index_to_instance_props;

        if (info->value->has_props) {

            CpuInstanceProperties *props;

            props = g_malloc0(sizeof(*props));

            *props = mc->cpu_index_to_instance_props(ms, cpu->cpu_index);

            info->value->props = props;

        }



        /* XXX: waiting for the qapi to support GSList */

        if (!cur_item) {

            head = cur_item = info;

        } else {

            cur_item->next = info;

            cur_item = info;

        }

    }



    return head;

}



static CpuInfoArch sysemu_target_to_cpuinfo_arch(SysEmuTarget target)

{

    /*

     * The @SysEmuTarget -> @CpuInfoArch mapping below is based on the

     * TARGET_ARCH -> TARGET_BASE_ARCH mapping in the "configure" script.

     */

    switch (target) {

    case SYS_EMU_TARGET_I386:

    case SYS_EMU_TARGET_X86_64:

        return CPU_INFO_ARCH_X86;



    case SYS_EMU_TARGET_PPC:

    case SYS_EMU_TARGET_PPC64:

        return CPU_INFO_ARCH_PPC;



    case SYS_EMU_TARGET_SPARC:

    case SYS_EMU_TARGET_SPARC64:

        return CPU_INFO_ARCH_SPARC;



    case SYS_EMU_TARGET_MIPS:

    case SYS_EMU_TARGET_MIPSEL:

    case SYS_EMU_TARGET_MIPS64:

    case SYS_EMU_TARGET_MIPS64EL:

        return CPU_INFO_ARCH_MIPS;



    case SYS_EMU_TARGET_TRICORE:

        return CPU_INFO_ARCH_TRICORE;



    case SYS_EMU_TARGET_S390X:

        return CPU_INFO_ARCH_S390;



    case SYS_EMU_TARGET_RISCV32:

    case SYS_EMU_TARGET_RISCV64:

        return CPU_INFO_ARCH_RISCV;



    default:

        return CPU_INFO_ARCH_OTHER;

    }

}



static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu)

{

#ifdef TARGET_S390X

    S390CPU *s390_cpu = S390_CPU(cpu);

    CPUS390XState *env = &s390_cpu->env;



    info->cpu_state = env->cpu_state;

#else

    abort();

#endif

}



/*

 * fast means: we NEVER interrupt vCPU threads to retrieve

 * information from KVM.

 */

CpuInfoFastList *qmp_query_cpus_fast(Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    MachineClass *mc = MACHINE_GET_CLASS(ms);

    CpuInfoFastList *head = NULL, *cur_item = NULL;

    SysEmuTarget target = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME,

                                          -1, &error_abort);

    CPUState *cpu;



    CPU_FOREACH(cpu) {

        CpuInfoFastList *info = g_malloc0(sizeof(*info));

        info->value = g_malloc0(sizeof(*info->value));



        info->value->cpu_index = cpu->cpu_index;

        info->value->qom_path = object_get_canonical_path(OBJECT(cpu));

        info->value->thread_id = cpu->thread_id;



        info->value->has_props = !!mc->cpu_index_to_instance_props;

        if (info->value->has_props) {

            CpuInstanceProperties *props;

            props = g_malloc0(sizeof(*props));

            *props = mc->cpu_index_to_instance_props(ms, cpu->cpu_index);

            info->value->props = props;

        }



        info->value->arch = sysemu_target_to_cpuinfo_arch(target);

        info->value->target = target;

        if (target == SYS_EMU_TARGET_S390X) {

            cpustate_to_cpuinfo_s390(&info->value->u.s390x, cpu);

        }



        if (!cur_item) {

            head = cur_item = info;

        } else {

            cur_item->next = info;

            cur_item = info;

        }

    }



    return head;

}



void qmp_memsave(int64_t addr, int64_t size, const char *filename,

                 bool has_cpu, int64_t cpu_index, Error **errp)

{

dump/Makefile.objs

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-y += dump.o

common-obj-y += dump-hmp-cmds.o

obj-$(TARGET_X86_64) += win_dump.o