Re: [PATCH v3 21/30] target/ppc: Introduce PowerPCCPUClass::has_work()
bool ppc_pvr_match_power9(PowerPCCPUClass *pcc,
> uint32_t pvr)
> return false;
> }
>
> +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> static bool cpu_has_work_POWER9(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> @@ -7998,12 +8001,12 @@ static bool cpu_has_work_POWER9(CPUState *cs)
> return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
> }
> }
> +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
>
> POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -CPUClass *cc = CPU_CLASS(oc);
>
> dc->fw_name = "PowerPC,POWER9";
> dc->desc = "POWER9";
> @@ -8013,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> PCR_COMPAT_2_05;
> pcc->init_proc = init_proc_POWER9;
> pcc->check_pow = check_pow_nocheck;
> -cc->has_work = cpu_has_work_POWER9;
> pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
> PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
> PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -8062,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
> pcc->mmu_model = POWERPC_MMU_3_00;
> #if defined(CONFIG_SOFTMMU)
> +pcc->has_work = cpu_has_work_POWER9;
> /* segment page size remain the same */
> pcc->hash64_opts = _hash64_opts_POWER7;
> pcc->radix_page_info = _radix_page_info;
> @@ -8150,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pcc,
> uint32_t pvr)
> return false;
> }
>
> +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> static bool cpu_has_work_POWER10(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> @@ -8207,12 +8211,12 @@ static bool cpu_has_work_POWER10(CPUState *cs)
> return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
> }
> }
> +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
>
> POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -CPUClass *cc = CPU_CLASS(oc);
>
> dc->fw_name = "PowerPC,POWER10";
> dc->desc = "POWER10";
> @@ -8223,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
> PCR_COMPAT_2_06 | PCR_COMPAT_2_05;
> pcc->init_proc = init_proc_POWER10;
> pcc->check_pow = check_pow_nocheck;
> -cc->has_work = cpu_has_work_POWER10;
> pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
> PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
> PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -8275,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
> pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
> pcc->mmu_model = POWERPC_MMU_3_00;
> #if defined(CONFIG_SOFTMMU)
> +pcc->has_work = cpu_has_work_POWER10;
> /* segment page size remain the same */
> pcc->hash64_opts = _hash64_opts_POWER7;
> pcc->radix_page_info = _radix_page_info;
> @@ -8796,6 +8800,12 @@ static bool ppc_cpu_has_work(CPUState *cs)
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> CPUPPCState *env = >env;
>
> +if (cs->halted) {
> +PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> +
> +return pcc->has_work(cs);
> +}
> +
> return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
> }
> #endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH v3 20/30] target/ppc: Restrict has_work() handler to sysemu and TCG
On Thu, Sep 02, 2021 at 06:15:33PM +0200, Philippe Mathieu-Daudé wrote:
> Restrict has_work() to TCG sysemu.
>
> Signed-off-by: Philippe Mathieu-Daudé
Acked-by: David Gibson
> ---
> target/ppc/cpu_init.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 6aad01d1d3a..e2e721c2b81 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -8790,6 +8790,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value)
> cpu->env.nip = value;
> }
>
> +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> static bool ppc_cpu_has_work(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> @@ -8797,6 +8798,7 @@ static bool ppc_cpu_has_work(CPUState *cs)
>
> return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
> }
> +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
>
> static void ppc_cpu_reset(DeviceState *dev)
> {
> @@ -9017,6 +9019,7 @@ static const struct TCGCPUOps ppc_tcg_ops = {
>.tlb_fill = ppc_cpu_tlb_fill,
>
> #ifndef CONFIG_USER_ONLY
> + .has_work = ppc_cpu_has_work,
>.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
>.do_interrupt = ppc_cpu_do_interrupt,
>.cpu_exec_enter = ppc_cpu_exec_enter,
> @@ -9042,7 +9045,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void
> *data)
> device_class_set_parent_reset(dc, ppc_cpu_reset, >parent_reset);
>
> cc->class_by_name = ppc_cpu_class_by_name;
> -cc->has_work = ppc_cpu_has_work;
> cc->dump_state = ppc_cpu_dump_state;
> cc->set_pc = ppc_cpu_set_pc;
> cc->gdb_read_register = ppc_cpu_gdb_read_register;
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH v2 01/11] accel/kvm: Check MachineClass kvm_type() return value
On Mon, Feb 22, 2021 at 06:50:44PM +0100, Cornelia Huck wrote:
> On Mon, 22 Feb 2021 18:41:07 +0100
> Philippe Mathieu-Daudé wrote:
>
> > On 2/22/21 6:24 PM, Cornelia Huck wrote:
> > > On Fri, 19 Feb 2021 18:38:37 +0100
> > > Philippe Mathieu-Daudé wrote:
> > >
> > >> MachineClass::kvm_type() can return -1 on failure.
> > >> Document it, and add a check in kvm_init().
> > >>
> > >> Signed-off-by: Philippe Mathieu-Daudé
> > >> ---
> > >> include/hw/boards.h | 3 ++-
> > >> accel/kvm/kvm-all.c | 6 ++
> > >> 2 files changed, 8 insertions(+), 1 deletion(-)
> > >>
> > >> diff --git a/include/hw/boards.h b/include/hw/boards.h
> > >> index a46dfe5d1a6..68d3d10f6b0 100644
> > >> --- a/include/hw/boards.h
> > >> +++ b/include/hw/boards.h
> > >> @@ -127,7 +127,8 @@ typedef struct {
> > >> *implement and a stub device is required.
> > >> * @kvm_type:
> > >> *Return the type of KVM corresponding to the kvm-type string
> > >> option or
> > >> - *computed based on other criteria such as the host kernel
> > >> capabilities.
> > >> + *computed based on other criteria such as the host kernel
> > >> capabilities
> > >> + *(which can't be negative), or -1 on error.
> > >> * @numa_mem_supported:
> > >> *true if '--numa node.mem' option is supported and false otherwise
> > >> * @smp_parse:
> > >> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> > >> index 84c943fcdb2..b069938d881 100644
> > >> --- a/accel/kvm/kvm-all.c
> > >> +++ b/accel/kvm/kvm-all.c
> > >> @@ -2057,6 +2057,12 @@ static int kvm_init(MachineState *ms)
> > >> "kvm-type",
> > >>
> > >> _abort);
> > >> type = mc->kvm_type(ms, kvm_type);
> > >> +if (type < 0) {
> > >> +ret = -EINVAL;
> > >> +fprintf(stderr, "Failed to detect kvm-type for machine
> > >> '%s'\n",
> > >> +mc->name);
> > >> +goto err;
> > >> +}
> > >> }
> > >>
> > >> do {
> > >
> > > No objection to this patch; but I'm wondering why some non-pseries
> > > machines implement the kvm_type callback, when I see the kvm-type
> > > property only for pseries? Am I holding my git grep wrong?
> >
> > Can it be what David commented here?
> > https://www.mail-archive.com/qemu-devel@nongnu.org/msg784508.html
> >
>
> Ok, I might be confused about the other ppc machines; but I'm wondering
> about the kvm_type callback for mips and arm/virt. Maybe I'm just
> confused by the whole mechanism?
For ppc at least, not sure about in general, pseries is the only
machine type that can possibly work under more than one KVM flavour
(HV or PR). So, it's the only one where it's actually useful to be
able to configure this.
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH v2 01/11] accel/kvm: Check MachineClass kvm_type() return value
On Tue, Feb 23, 2021 at 10:33:55AM +1100, David Gibson wrote:
> On Mon, Feb 22, 2021 at 06:50:44PM +0100, Cornelia Huck wrote:
> > On Mon, 22 Feb 2021 18:41:07 +0100
> > Philippe Mathieu-Daudé wrote:
> >
> > > On 2/22/21 6:24 PM, Cornelia Huck wrote:
> > > > On Fri, 19 Feb 2021 18:38:37 +0100
> > > > Philippe Mathieu-Daudé wrote:
> > > >
> > > >> MachineClass::kvm_type() can return -1 on failure.
> > > >> Document it, and add a check in kvm_init().
> > > >>
> > > >> Signed-off-by: Philippe Mathieu-Daudé
> > > >> ---
> > > >> include/hw/boards.h | 3 ++-
> > > >> accel/kvm/kvm-all.c | 6 ++
> > > >> 2 files changed, 8 insertions(+), 1 deletion(-)
> > > >>
> > > >> diff --git a/include/hw/boards.h b/include/hw/boards.h
> > > >> index a46dfe5d1a6..68d3d10f6b0 100644
> > > >> --- a/include/hw/boards.h
> > > >> +++ b/include/hw/boards.h
> > > >> @@ -127,7 +127,8 @@ typedef struct {
> > > >> *implement and a stub device is required.
> > > >> * @kvm_type:
> > > >> *Return the type of KVM corresponding to the kvm-type string
> > > >> option or
> > > >> - *computed based on other criteria such as the host kernel
> > > >> capabilities.
> > > >> + *computed based on other criteria such as the host kernel
> > > >> capabilities
> > > >> + *(which can't be negative), or -1 on error.
> > > >> * @numa_mem_supported:
> > > >> *true if '--numa node.mem' option is supported and false
> > > >> otherwise
> > > >> * @smp_parse:
> > > >> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> > > >> index 84c943fcdb2..b069938d881 100644
> > > >> --- a/accel/kvm/kvm-all.c
> > > >> +++ b/accel/kvm/kvm-all.c
> > > >> @@ -2057,6 +2057,12 @@ static int kvm_init(MachineState *ms)
> > > >>
> > > >> "kvm-type",
> > > >>
> > > >> _abort);
> > > >> type = mc->kvm_type(ms, kvm_type);
> > > >> +if (type < 0) {
> > > >> +ret = -EINVAL;
> > > >> +fprintf(stderr, "Failed to detect kvm-type for machine
> > > >> '%s'\n",
> > > >> +mc->name);
> > > >> +goto err;
> > > >> +}
> > > >> }
> > > >>
> > > >> do {
> > > >
> > > > No objection to this patch; but I'm wondering why some non-pseries
> > > > machines implement the kvm_type callback, when I see the kvm-type
> > > > property only for pseries? Am I holding my git grep wrong?
> > >
> > > Can it be what David commented here?
> > > https://www.mail-archive.com/qemu-devel@nongnu.org/msg784508.html
> > >
> >
> > Ok, I might be confused about the other ppc machines; but I'm wondering
> > about the kvm_type callback for mips and arm/virt. Maybe I'm just
> > confused by the whole mechanism?
>
> For ppc at least, not sure about in general, pseries is the only
> machine type that can possibly work under more than one KVM flavour
> (HV or PR). So, it's the only one where it's actually useful to be
> able to configure this.
Wait... I'm not sure that's true. At least theoretically, some of the
Book3E platforms could work with either PR or the Book3E specific
KVM. Not sure if KVM PR supports all the BookE instructions it would
need to in practice.
Possibly pseries is just the platform where there's been enough people
interested in setting the KVM flavour so far.
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [RFC PATCH v2 06/11] hw/ppc: Restrict KVM to various PPC machines
plat_machine_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
> @@ -56,6 +60,7 @@ static void e500plat_machine_class_init(ObjectClass *oc,
> void *data)
> mc->max_cpus = 15;
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
> mc->default_ram_id = "mpc8544ds.ram";
> +mc->valid_accelerators = valid_accels;
> }
>
> #define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index b156bcb9990..02501f489e4 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -298,12 +298,17 @@ static void bamboo_init(MachineState *machine)
> }
> }
>
> +static const char *const valid_accels[] = {
> +"tcg", "kvm", NULL
> +};
> +
> static void bamboo_machine_init(MachineClass *mc)
> {
> mc->desc = "bamboo";
> mc->init = bamboo_init;
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440epb");
> mc->default_ram_id = "ppc4xx.sdram";
> +mc->valid_accelerators = valid_accels;
> }
>
> DEFINE_MACHINE("bamboo", bamboo_machine_init)
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 7e72f6e4a9b..90d884b0883 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -431,6 +431,10 @@ static void ibm_40p_init(MachineState *machine)
> }
> }
>
> +static const char *const valid_accels[] = {
> +"tcg", "kvm", NULL
> +};
> +
> static void ibm_40p_machine_init(MachineClass *mc)
> {
> mc->desc = "IBM RS/6000 7020 (40p)",
> @@ -441,6 +445,7 @@ static void ibm_40p_machine_init(MachineClass *mc)
> mc->default_boot_order = "c";
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
> mc->default_display = "std";
> +mc->valid_accelerators = valid_accels;
> }
>
> DEFINE_MACHINE("40p", ibm_40p_machine_init)
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index e459b43065b..79adb3352f0 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -506,6 +506,10 @@ static void sam460ex_init(MachineState *machine)
> boot_info->entry = entry;
> }
>
> +static const char *const valid_accels[] = {
> +"tcg", "kvm", NULL
> +};
> +
> static void sam460ex_machine_init(MachineClass *mc)
> {
> mc->desc = "aCube Sam460ex";
> @@ -513,6 +517,7 @@ static void sam460ex_machine_init(MachineClass *mc)
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("460exb");
> mc->default_ram_size = 512 * MiB;
> mc->default_ram_id = "ppc4xx.sdram";
> +mc->valid_accelerators = valid_accels;
> }
>
> DEFINE_MACHINE("sam460ex", sam460ex_machine_init)
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 85fe65f8947..c5f985f0187 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4397,6 +4397,10 @@ static void spapr_cpu_exec_exit(PPCVirtualHypervisor
> *vhyp, PowerPCCPU *cpu)
> }
> }
>
> +static const char *const valid_accels[] = {
> +"tcg", "kvm", NULL
> +};
> +
> static void spapr_machine_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
> @@ -4426,6 +4430,7 @@ static void spapr_machine_class_init(ObjectClass *oc,
> void *data)
> mc->default_ram_size = 512 * MiB;
> mc->default_ram_id = "ppc_spapr.ram";
> mc->default_display = "std";
> +mc->valid_accelerators = valid_accels;
> mc->kvm_type = spapr_kvm_type;
> machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
> mc->pci_allow_0_address = true;
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH v2 3/7] device_tree: add qemu_fdt_setprop_string_array helper
On Thu, Feb 11, 2021 at 05:19:41PM +, Alex Bennée wrote:
> A string array in device tree is simply a series of \0 terminated
> strings next to each other. As libfdt doesn't support that directly
> we need to build it ourselves.
Hm, that might not make a bad extension to libfdt...
>
> Signed-off-by: Alex Bennée
> Reviewed-by: Alistair Francis
> Message-Id: <20201105175153.30489-4-alex.ben...@linaro.org>
>
> ---
> v2
> - checkpatch long line fix
> ---
> include/sysemu/device_tree.h | 17 +
> softmmu/device_tree.c| 26 ++
> 2 files changed, 43 insertions(+)
>
> diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h
> index 982c89345f..8a2fe55622 100644
> --- a/include/sysemu/device_tree.h
> +++ b/include/sysemu/device_tree.h
> @@ -70,6 +70,23 @@ int qemu_fdt_setprop_u64(void *fdt, const char *node_path,
> const char *property, uint64_t val);
> int qemu_fdt_setprop_string(void *fdt, const char *node_path,
> const char *property, const char *string);
> +
> +/**
> + * qemu_fdt_setprop_string_array: set a string array property
> + *
> + * @fdt: pointer to the dt blob
> + * @name: node name
> + * @prop: property array
> + * @array: pointer to an array of string pointers
> + * @len: length of array
> + *
> + * assigns a string array to a property. This function converts and
> + * array of strings to a sequential string with \0 separators before
> + * setting the property.
> + */
> +int qemu_fdt_setprop_string_array(void *fdt, const char *node_path,
> + const char *prop, char **array, int len);
> +
> int qemu_fdt_setprop_phandle(void *fdt, const char *node_path,
> const char *property,
> const char *target_node_path);
> diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
> index b9a3ddc518..2691c58cf6 100644
> --- a/softmmu/device_tree.c
> +++ b/softmmu/device_tree.c
> @@ -21,6 +21,7 @@
> #include "qemu/error-report.h"
> #include "qemu/option.h"
> #include "qemu/bswap.h"
> +#include "qemu/cutils.h"
> #include "sysemu/device_tree.h"
> #include "sysemu/sysemu.h"
> #include "hw/loader.h"
> @@ -397,6 +398,31 @@ int qemu_fdt_setprop_string(void *fdt, const char
> *node_path,
> return r;
> }
>
> +/*
> + * libfdt doesn't allow us to add string arrays directly but they are
> + * test a series of null terminated strings with a length. We build
> + * the string up here so we can calculate the final length.
> + */
> +int qemu_fdt_setprop_string_array(void *fdt, const char *node_path,
> + const char *prop, char **array, int len)
> +{
> +int ret, i, total_len = 0;
> +char *str, *p;
> +for (i = 0; i < len; i++) {
> +total_len += strlen(array[i]) + 1;
> +}
> +p = str = g_malloc0(total_len);
> +for (i = 0; i < len; i++) {
> +int len = strlen(array[i]) + 1;
> +pstrcpy(p, len, array[i]);
> +p += len;
> +}
> +
> +ret = qemu_fdt_setprop(fdt, node_path, prop, str, total_len);
> +g_free(str);
> +return ret;
> +}
> +
> const void *qemu_fdt_getprop(void *fdt, const char *node_path,
> const char *property, int *lenp, Error **errp)
> {
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH 2/2] sysemu: Let VMChangeStateHandler take boolean 'running' argument
On Mon, Jan 11, 2021 at 04:20:20PM +0100, Philippe Mathieu-Daudé wrote:
> The 'running' argument from VMChangeStateHandler does not require
> other value than 0 / 1. Make it a plain boolean.
>
> Signed-off-by: Philippe Mathieu-Daudé
ppc parts
Acked-by: David Gibson
> ---
> include/sysemu/runstate.h | 10 --
> target/arm/kvm_arm.h| 2 +-
> target/ppc/cpu-qom.h| 2 +-
> accel/xen/xen-all.c | 2 +-
> audio/audio.c | 2 +-
> block/block-backend.c | 2 +-
> gdbstub.c | 2 +-
> hw/block/pflash_cfi01.c | 2 +-
> hw/block/virtio-blk.c | 2 +-
> hw/display/qxl.c| 2 +-
> hw/i386/kvm/clock.c | 2 +-
> hw/i386/kvm/i8254.c | 2 +-
> hw/i386/kvmvapic.c | 2 +-
> hw/i386/xen/xen-hvm.c | 2 +-
> hw/ide/core.c | 2 +-
> hw/intc/arm_gicv3_its_kvm.c | 2 +-
> hw/intc/arm_gicv3_kvm.c | 2 +-
> hw/intc/spapr_xive_kvm.c| 2 +-
> hw/misc/mac_via.c | 2 +-
> hw/net/e1000e_core.c| 2 +-
> hw/nvram/spapr_nvram.c | 2 +-
> hw/ppc/ppc.c| 2 +-
> hw/ppc/ppc_booke.c | 2 +-
> hw/s390x/tod-kvm.c | 2 +-
> hw/scsi/scsi-bus.c | 2 +-
> hw/usb/hcd-ehci.c | 2 +-
> hw/usb/host-libusb.c| 2 +-
> hw/usb/redirect.c | 2 +-
> hw/vfio/migration.c | 2 +-
> hw/virtio/virtio-rng.c | 2 +-
> hw/virtio/virtio.c | 2 +-
> net/net.c | 2 +-
> softmmu/memory.c| 2 +-
> softmmu/runstate.c | 2 +-
> target/arm/kvm.c| 2 +-
> target/i386/kvm/kvm.c | 2 +-
> target/i386/sev.c | 2 +-
> target/i386/whpx/whpx-all.c | 2 +-
> target/mips/kvm.c | 4 ++--
> ui/gtk.c| 2 +-
> ui/spice-core.c | 2 +-
> 41 files changed, 49 insertions(+), 43 deletions(-)
>
> diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
> index 3ab35a039a0..a5356915734 100644
> --- a/include/sysemu/runstate.h
> +++ b/include/sysemu/runstate.h
> @@ -10,7 +10,7 @@ bool runstate_is_running(void);
> bool runstate_needs_reset(void);
> bool runstate_store(char *str, size_t size);
>
> -typedef void VMChangeStateHandler(void *opaque, int running, RunState state);
> +typedef void VMChangeStateHandler(void *opaque, bool running, RunState
> state);
>
> VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler
> *cb,
> void *opaque);
> @@ -20,7 +20,13 @@ VMChangeStateEntry
> *qdev_add_vm_change_state_handler(DeviceState *dev,
> VMChangeStateHandler
> *cb,
> void *opaque);
> void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
> -void vm_state_notify(int running, RunState state);
> +/**
> + * vm_state_notify: Notify the state of the VM
> + *
> + * @running: whether the VM is running or not.
> + * @state: the #RunState of the VM.
> + */
> +void vm_state_notify(bool running, RunState state);
>
> static inline bool shutdown_caused_by_guest(ShutdownCause cause)
> {
> diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h
> index eb81b7059eb..68ec970c4f4 100644
> --- a/target/arm/kvm_arm.h
> +++ b/target/arm/kvm_arm.h
> @@ -352,7 +352,7 @@ void kvm_arm_get_virtual_time(CPUState *cs);
> */
> void kvm_arm_put_virtual_time(CPUState *cs);
>
> -void kvm_arm_vm_state_change(void *opaque, int running, RunState state);
> +void kvm_arm_vm_state_change(void *opaque, bool running, RunState state);
>
> int kvm_arm_vgic_probe(void);
>
> diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
> index 63b9e8632ca..118baf8d41f 100644
> --- a/target/ppc/cpu-qom.h
> +++ b/target/ppc/cpu-qom.h
> @@ -218,7 +218,7 @@ extern const VMStateDescription vmstate_ppc_timebase;
> .offset = vmstate_offset_value(_state, _field, PPCTimebase), \
> }
>
> -void cpu_ppc_clock_vm_state_change(void *opaque, int running,
> +void cpu_ppc_clock_vm_state_change(void *opaque, bool running,
> RunState state);
> #endif
>
> diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
> index 878a4089d97..3756aca27be 100644
> --- a/accel/xen/xen-all.c
> +++ b/accel/xen/xen-all.c
> @@ -122,7 +122,7 @@ static void xenstore_record_dm_state(struct xs_handle
> *xs, const char *state)
> }
>
>
> -static void xen_change_state_handler(void *opaque, int running,
> +static void xen_change_state_handler(void *opaque, bool
Re: [PATCH 6/8] gitlab-ci: Add KVM PPC cross-build jobs
On Sun, Dec 06, 2020 at 07:55:06PM +0100, Philippe Mathieu-Daudé wrote: > Cross-build PPC target with KVM and TCG accelerators enabled. > > Signed-off-by: Philippe Mathieu-Daudé > --- > later this job build KVM-only. > --- > .gitlab-ci.d/crossbuilds-kvm-ppc.yml | 5 + > .gitlab-ci.yml | 1 + > MAINTAINERS | 1 + > 3 files changed, 7 insertions(+) > create mode 100644 .gitlab-ci.d/crossbuilds-kvm-ppc.yml Acked-by: David Gibson > diff --git a/.gitlab-ci.d/crossbuilds-kvm-ppc.yml > b/.gitlab-ci.d/crossbuilds-kvm-ppc.yml > new file mode 100644 > index 000..9df8bcf5a73 > --- /dev/null > +++ b/.gitlab-ci.d/crossbuilds-kvm-ppc.yml > @@ -0,0 +1,5 @@ > +cross-ppc64el-kvm: > + extends: .cross_accel_build_job > + variables: > +IMAGE: debian-ppc64el-cross > +TARGETS: ppc64-softmmu > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index a69619d7319..024624908e8 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -15,6 +15,7 @@ include: >- local: '/.gitlab-ci.d/crossbuilds-kvm-x86.yml' >- local: '/.gitlab-ci.d/crossbuilds-kvm-arm.yml' >- local: '/.gitlab-ci.d/crossbuilds-kvm-s390x.yml' > + - local: '/.gitlab-ci.d/crossbuilds-kvm-ppc.yml' > > .native_build_job_template: _build_job_definition >stage: build > diff --git a/MAINTAINERS b/MAINTAINERS > index d41401f6683..c7766782174 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -397,6 +397,7 @@ PPC KVM CPUs > M: David Gibson > S: Maintained > F: target/ppc/kvm.c > +F: .gitlab-ci.d/crossbuilds-kvm-ppc.yml > > S390 KVM CPUs > M: Halil Pasic -- David Gibson| I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson signature.asc Description: PGP signature
Re: [PATCH 5/5] hw: Use the PCI_DEVFN() macro from 'hw/pci/pci.h'
On Mon, Oct 12, 2020 at 02:45:06PM +0200, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé > > We already have a generic PCI_DEVFN() macro in "hw/pci/pci.h" > to pack the PCI slot/function identifiers, use it. > > Signed-off-by: Philippe Mathieu-Daudé ppc part Acked-by: David Gibson > --- > hw/arm/virt.c | 3 ++- > hw/pci-host/uninorth.c | 6 ++ > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index e465a988d68..f601ef0798c 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1144,7 +1144,8 @@ static void create_pcie_irq_map(const VirtMachineState > *vms, > full_irq_map, sizeof(full_irq_map)); > > qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupt-map-mask", > - 0x1800, 0, 0, /* devfn (PCI_SLOT(3)) */ > + cpu_to_be16(PCI_DEVFN(3, 0)), /* Slot 3 */ > + 0, 0, > 0x7 /* PCI irq */); > } > > diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c > index c21de0ab805..f73d452bdce 100644 > --- a/hw/pci-host/uninorth.c > +++ b/hw/pci-host/uninorth.c > @@ -70,10 +70,8 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t > addr) > /* ... and then convert them to x86 format */ > /* config pointer */ > retval = (reg & (0xff - 7)) | (addr & 7); > -/* slot */ > -retval |= slot << 11; > -/* fn */ > -retval |= func << 8; > +/* slot, fn */ > +retval |= PCI_DEVFN(slot, func) << 8; > } > > trace_unin_get_config_reg(reg, addr, retval); -- David Gibson| I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson signature.asc Description: PGP signature
Re: [PATCH 3/5] hw/pci-host/uninorth: Use the PCI_FUNC() macro from 'hw/pci/pci.h'
On Mon, Oct 12, 2020 at 02:45:04PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé
>
> We already have a generic PCI_FUNC() macro in "hw/pci/pci.h" to
> extract the PCI function identifier, use it.
>
> Signed-off-by: Philippe Mathieu-Daudé
Acked-by: David Gibson
> ---
> hw/pci-host/uninorth.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> index 1ed1072eeb5..c21de0ab805 100644
> --- a/hw/pci-host/uninorth.c
> +++ b/hw/pci-host/uninorth.c
> @@ -65,7 +65,7 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t
> addr)
> if (slot == 32) {
> slot = -1; /* XXX: should this be 0? */
> }
> -func = (reg >> 8) & 7;
> +func = PCI_FUNC(reg >> 8);
>
> /* ... and then convert them to x86 format */
> /* config pointer */
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH 2/5] hw/pci-host: Use the PCI_BUILD_BDF() macro from 'hw/pci/pci.h'
On Mon, Oct 12, 2020 at 02:45:03PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé
>
> We already have a generic PCI_BUILD_BDF() macro in "hw/pci/pci.h"
> to pack these values, use it.
>
> Signed-off-by: Philippe Mathieu-Daudé
pnv part
Acked-by: David Gibson
> ---
> hw/pci-host/bonito.c | 3 +--
> hw/pci-host/pnv_phb4.c | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
> index abb3ee86769..b05295639a6 100644
> --- a/hw/pci-host/bonito.c
> +++ b/hw/pci-host/bonito.c
> @@ -196,8 +196,7 @@ FIELD(BONGENCFG, PCIQUEUE, 12, 1)
> #define PCI_IDSEL_VIA686B (1 << PCI_IDSEL_VIA686B_BIT)
>
> #define PCI_ADDR(busno , devno , funno , regno) \
> -busno) << 8) & 0xff00) + (((devno) << 3) & 0xf8) + \
> -(((funno) & 0x7) << 8) + (regno))
> +((PCI_BUILD_BDF(busno, PCI_DEVFN(devno , funno)) << 8) + (regno))
>
> typedef struct BonitoState BonitoState;
>
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 03daf40a237..6328e985f81 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -889,7 +889,7 @@ static bool pnv_phb4_resolve_pe(PnvPhb4DMASpace *ds)
> /* Read RTE */
> bus_num = pci_bus_num(ds->bus);
> addr = rtt & PHB_RTT_BASE_ADDRESS_MASK;
> -addr += 2 * ((bus_num << 8) | ds->devfn);
> +addr += 2 * PCI_BUILD_BDF(bus_num, ds->devfn);
> if (dma_memory_read(_space_memory, addr, , sizeof(rte))) {
> phb_error(ds->phb, "Failed to read RTT entry at 0x%"PRIx64, addr);
> /* Set error bits ? fence ? ... */
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH 4/5] hw: Use the PCI_SLOT() macro from 'hw/pci/pci.h'
On Mon, Oct 12, 2020 at 02:45:05PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé
>
> We already have a generic PCI_SLOT() macro in "hw/pci/pci.h"
> to extract the PCI slot identifier, use it.
>
> Signed-off-by: Philippe Mathieu-Daudé
ppc parts
Acked-by: David Gibson
> ---
> hw/hppa/dino.c| 2 +-
> hw/i386/xen/xen-hvm.c | 2 +-
> hw/isa/piix3.c| 2 +-
> hw/mips/gt64xxx_pci.c | 2 +-
> hw/pci-host/bonito.c | 2 +-
> hw/pci-host/ppce500.c | 2 +-
> hw/ppc/ppc4xx_pci.c | 2 +-
> hw/sh4/sh_pci.c | 2 +-
> 8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
> index 81053b5fb64..5b82c9440d1 100644
> --- a/hw/hppa/dino.c
> +++ b/hw/hppa/dino.c
> @@ -496,7 +496,7 @@ static void dino_set_irq(void *opaque, int irq, int level)
>
> static int dino_pci_map_irq(PCIDevice *d, int irq_num)
> {
> -int slot = d->devfn >> 3;
> +int slot = PCI_SLOT(d->devfn);
>
> assert(irq_num >= 0 && irq_num <= 3);
>
> diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
> index f3ababf33b6..276254e6ca9 100644
> --- a/hw/i386/xen/xen-hvm.c
> +++ b/hw/i386/xen/xen-hvm.c
> @@ -140,7 +140,7 @@ typedef struct XenIOState {
>
> int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
> {
> -return irq_num + ((pci_dev->devfn >> 3) << 2);
> +return irq_num + (PCI_SLOT(pci_dev->devfn) << 2);
> }
>
> void xen_piix3_set_irq(void *opaque, int irq_num, int level)
> diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
> index 587850b8881..f46ccae25cf 100644
> --- a/hw/isa/piix3.c
> +++ b/hw/isa/piix3.c
> @@ -361,7 +361,7 @@ type_init(piix3_register_types)
> static int pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx)
> {
> int slot_addend;
> -slot_addend = (pci_dev->devfn >> 3) - 1;
> +slot_addend = PCI_SLOT(pci_dev->devfn) - 1;
> return (pci_intx + slot_addend) & 3;
> }
>
> diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
> index e091bc4ed55..588e6f99301 100644
> --- a/hw/mips/gt64xxx_pci.c
> +++ b/hw/mips/gt64xxx_pci.c
> @@ -982,7 +982,7 @@ static int gt64120_pci_map_irq(PCIDevice *pci_dev, int
> irq_num)
> {
> int slot;
>
> -slot = (pci_dev->devfn >> 3);
> +slot = PCI_SLOT(pci_dev->devfn);
>
> switch (slot) {
> /* PIIX4 USB */
> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
> index b05295639a6..ee8b193e15b 100644
> --- a/hw/pci-host/bonito.c
> +++ b/hw/pci-host/bonito.c
> @@ -570,7 +570,7 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int
> irq_num)
> {
> int slot;
>
> -slot = (pci_dev->devfn >> 3);
> +slot = PCI_SLOT(pci_dev->devfn);
>
> switch (slot) {
> case 5: /* FULOONG2E_VIA_SLOT, SouthBridge, IDE, USB, ACPI, AC97, MC97
> */
> diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
> index 9517aab913e..5ad1424b31a 100644
> --- a/hw/pci-host/ppce500.c
> +++ b/hw/pci-host/ppce500.c
> @@ -342,7 +342,7 @@ static const MemoryRegionOps e500_pci_reg_ops = {
>
> static int mpc85xx_pci_map_irq(PCIDevice *pci_dev, int pin)
> {
> -int devno = pci_dev->devfn >> 3;
> +int devno = PCI_SLOT(pci_dev->devfn);
> int ret;
>
> ret = ppce500_pci_map_irq_slot(devno, pin);
> diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
> index 28724c06f88..e8789f64e80 100644
> --- a/hw/ppc/ppc4xx_pci.c
> +++ b/hw/ppc/ppc4xx_pci.c
> @@ -243,7 +243,7 @@ static void ppc4xx_pci_reset(void *opaque)
> * may need further refactoring for other boards. */
> static int ppc4xx_pci_map_irq(PCIDevice *pci_dev, int irq_num)
> {
> -int slot = pci_dev->devfn >> 3;
> +int slot = PCI_SLOT(pci_dev->devfn);
>
> trace_ppc4xx_pci_map_irq(pci_dev->devfn, irq_num, slot);
>
> diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
> index 73d2d0bccb0..734892f47c7 100644
> --- a/hw/sh4/sh_pci.c
> +++ b/hw/sh4/sh_pci.c
> @@ -109,7 +109,7 @@ static const MemoryRegionOps sh_pci_reg_ops = {
>
> static int sh_pci_map_irq(PCIDevice *d, int irq_num)
> {
> -return (d->devfn >> 3);
> +return PCI_SLOT(d->devfn);
> }
>
> static void sh_pci_set_irq(void *opaque, int irq_num, int level)
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH] trivial: Remove trailing whitespaces
On Mon, Jul 06, 2020 at 06:23:00PM +0200, Christophe de Dinechin wrote: > There are a number of unnecessary trailing whitespaces that have > accumulated over time in the source code. They cause stray changes > in patches if you use tools that automatically remove them. > > Tested by doing a `git diff -w` after the change. > > This could probably be turned into a pre-commit hook. > > Signed-off-by: Christophe de Dinechin ppc parts Acked-by: David Gibson > --- > block/iscsi.c | 2 +- > disas/cris.c | 2 +- > disas/microblaze.c| 80 +++--- > disas/nios2.c | 256 +- > hmp-commands.hx | 2 +- > hw/alpha/typhoon.c| 6 +- > hw/arm/gumstix.c | 6 +- > hw/arm/omap1.c| 2 +- > hw/arm/stellaris.c| 2 +- > hw/char/etraxfs_ser.c | 2 +- > hw/core/ptimer.c | 2 +- > hw/cris/axis_dev88.c | 2 +- > hw/cris/boot.c| 2 +- > hw/display/qxl.c | 2 +- > hw/dma/etraxfs_dma.c | 18 +- > hw/dma/i82374.c | 2 +- > hw/i2c/bitbang_i2c.c | 2 +- > hw/input/tsc2005.c| 2 +- > hw/input/tsc210x.c| 2 +- > hw/intc/etraxfs_pic.c | 8 +- > hw/intc/sh_intc.c | 10 +- > hw/intc/xilinx_intc.c | 2 +- > hw/misc/imx25_ccm.c | 6 +- > hw/misc/imx31_ccm.c | 2 +- > hw/net/vmxnet3.h | 2 +- > hw/net/xilinx_ethlite.c | 2 +- > hw/pci/pcie.c | 2 +- > hw/sd/omap_mmc.c | 2 +- > hw/sh4/shix.c | 2 +- > hw/sparc64/sun4u.c| 2 +- > hw/timer/etraxfs_timer.c | 2 +- > hw/timer/xilinx_timer.c | 4 +- > hw/usb/hcd-musb.c | 10 +- > hw/usb/hcd-ohci.c | 6 +- > hw/usb/hcd-uhci.c | 2 +- > hw/virtio/virtio-pci.c| 2 +- > include/hw/cris/etraxfs_dma.h | 4 +- > include/hw/net/lance.h| 2 +- > include/hw/ppc/spapr.h| 2 +- > include/hw/xen/interface/io/ring.h| 34 +-- > include/qemu/log.h| 2 +- > include/qom/object.h | 4 +- > linux-user/cris/cpu_loop.c| 16 +- > linux-user/microblaze/cpu_loop.c | 16 +- > linux-user/mmap.c | 8 +- > linux-user/sparc/signal.c | 4 +- > linux-user/syscall.c | 24 +- > linux-user/syscall_defs.h | 2 +- > linux-user/uaccess.c | 2 +- > os-posix.c| 2 +- > qapi/qapi-util.c | 2 +- > qemu-img.c| 2 +- > qemu-options.hx | 26 +- > qom/object.c | 2 +- > target/cris/translate.c | 28 +- > target/cris/translate_v10.inc.c | 6 +- > target/i386/hvf/hvf.c | 4 +- > target/i386/hvf/x86.c | 4 +- > target/i386/hvf/x86_decode.c | 20 +- > target/i386/hvf/x86_decode.h | 4 +- > target/i386/hvf/x86_descr.c | 2 +- > target/i386/hvf/x86_emu.c | 2 +- > target/i386/hvf/x86_mmu.c | 6 +- > target/i386/hvf/x86_task.c| 2 +- > target/i386/hvf/x86hvf.c | 42 +-- > target/i386/translate.c | 8 +- > target/microblaze/mmu.c | 2 +- > target/microblaze/translate.c | 2 +- > target/sh4/op_helper.c| 4 +- > target/xtensa/core-de212/core-isa.h | 6 +- > .../xtensa/core-sample_controller/core-isa.h | 6 +- > target/xtensa/core-test_kc705_be/core-isa.h | 2 +- > tcg/sparc/tcg-target.inc.c| 2 +- >
Re: [PATCH-for-5.1 1/3] target: Remove unnecessary CPU() cast
On Sun, Apr 12, 2020 at 11:09:52PM +0200, Philippe Mathieu-Daudé wrote:
> The CPU() macro is defined as:
>
> #define CPU(obj) ((CPUState *)(obj))
>
> Remove an unnecessary CPU() cast.
>
> Patch created mechanically using spatch with this script:
>
> @@
> typedef CPUState;
> CPUState *s;
> @@
> - CPU(s)
> + s
>
> Signed-off-by: Philippe Mathieu-Daudé
Acked-by: David Gibson
> ---
> target/ppc/mmu_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c
> index 86c667b094..8972714775 100644
> --- a/target/ppc/mmu_helper.c
> +++ b/target/ppc/mmu_helper.c
> @@ -1820,7 +1820,7 @@ static inline void do_invalidate_BAT(CPUPPCState *env,
> target_ulong BATu,
> if (((end - base) >> TARGET_PAGE_BITS) > 1024) {
> /* Flushing 1024 4K pages is slower than a complete flush */
> LOG_BATS("Flush all BATs\n");
> -tlb_flush(CPU(cs));
> +tlb_flush(cs);
> LOG_BATS("Flush done\n");
> return;
> }
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
Re: [PATCH-for-5.1 3/3] hw: Remove unnecessary DEVICE() cast
On Sun, Apr 12, 2020 at 11:09:54PM +0200, Philippe Mathieu-Daudé wrote:
> The DEVICE() macro is defined as:
>
> #define DEVICE(obj) OBJECT_CHECK(DeviceState, (obj), TYPE_DEVICE)
>
> Remove unnecessary DEVICE() casts.
>
> Patch created mechanically using spatch with this script:
>
> @@
> typedef DeviceState;
> DeviceState *s;
> @@
> - DEVICE(s)
> + s
>
> Signed-off-by: Philippe Mathieu-Daudé
ppc parts
Acked-by: David Gibson
> ---
> hw/display/artist.c | 2 +-
> hw/display/cg3.c| 2 +-
> hw/display/sm501.c | 2 +-
> hw/display/tcx.c| 4 ++--
> hw/display/vga-isa.c| 2 +-
> hw/i2c/imx_i2c.c| 2 +-
> hw/i2c/mpc_i2c.c| 2 +-
> hw/ide/piix.c | 2 +-
> hw/misc/macio/pmu.c | 2 +-
> hw/net/ftgmac100.c | 3 +--
> hw/net/imx_fec.c| 2 +-
> hw/nubus/nubus-device.c | 2 +-
> hw/pci-host/bonito.c| 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/sh4/sh_pci.c | 2 +-
> hw/xen/xen-legacy-backend.c | 2 +-
> 16 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 753dbb9a77..7e2a4556bd 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -1353,7 +1353,7 @@ static void artist_realizefn(DeviceState *dev, Error
> **errp)
> s->cursor_height = 32;
> s->cursor_width = 32;
>
> -s->con = graphic_console_init(DEVICE(dev), 0, _ops, s);
> +s->con = graphic_console_init(dev, 0, _ops, s);
> qemu_console_resize(s->con, s->width, s->height);
> }
>
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index a1ede10394..f7f1c199ce 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -321,7 +321,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp)
>
> sysbus_init_irq(sbd, >irq);
>
> -s->con = graphic_console_init(DEVICE(dev), 0, _ops, s);
> +s->con = graphic_console_init(dev, 0, _ops, s);
> qemu_console_resize(s->con, s->width, s->height);
> }
>
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index de0ab9d977..2a564889bd 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1839,7 +1839,7 @@ static void sm501_init(SM501State *s, DeviceState *dev,
> >twoD_engine_region);
>
> /* create qemu graphic console */
> -s->con = graphic_console_init(DEVICE(dev), 0, _ops, s);
> +s->con = graphic_console_init(dev, 0, _ops, s);
> }
>
> static const VMStateDescription vmstate_sm501_state = {
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index 76de16e8ea..1fb45b1aab 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -868,9 +868,9 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
> sysbus_init_irq(sbd, >irq);
>
> if (s->depth == 8) {
> -s->con = graphic_console_init(DEVICE(dev), 0, _ops, s);
> +s->con = graphic_console_init(dev, 0, _ops, s);
> } else {
> -s->con = graphic_console_init(DEVICE(dev), 0, _ops, s);
> +s->con = graphic_console_init(dev, 0, _ops, s);
> }
> s->thcmisc = 0;
>
> diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
> index 0633ed382c..3aaeeeca1e 100644
> --- a/hw/display/vga-isa.c
> +++ b/hw/display/vga-isa.c
> @@ -74,7 +74,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error
> **errp)
> 0x000a,
> vga_io_memory, 1);
> memory_region_set_coalescing(vga_io_memory);
> -s->con = graphic_console_init(DEVICE(dev), 0, s->hw_ops, s);
> +s->con = graphic_console_init(dev, 0, s->hw_ops, s);
>
> memory_region_add_subregion(isa_address_space(isadev),
> VBE_DISPI_LFB_PHYSICAL_ADDRESS,
> diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
> index 30b9aea247..2e02e1c4fa 100644
> --- a/hw/i2c/imx_i2c.c
> +++ b/hw/i2c/imx_i2c.c
> @@ -305,7 +305,7 @@ static void imx_i2c_realize(DeviceState *dev, Error
> **errp)
>IMX_I2C_MEM_SIZE);
> sysbus_init_mmio(SYS_BUS_DEVICE(dev), >iomem);
> sysbus_init_irq(SYS_BUS_DEVICE(dev), >irq);
> -s->bus = i2c_init_bus(DEVICE(dev), NULL);
> +s->bus = i2c_init_bus(dev, NULL);
> }
>
> static void imx_i2c_class_init(ObjectClass *klass, void *data)
> diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
> index 0aa1be3ce7..9a724f3a3e 100644
> --- a/hw/i2c/mpc_i2c.c
> +++ b/hw/i2c/mpc_i2c.c
> @@
Re: [Xen-devel] [PATCH v3 19/20] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
On Thu, Feb 20, 2020 at 02:05:47PM +0100, Philippe Mathieu-Daudé wrote:
> Use an explicit boolean type.
>
> This commit was produced with the included Coccinelle script
> scripts/coccinelle/exec_rw_const.
>
> Signed-off-by: Philippe Mathieu-Daudé
ppc parts
Acked-by: David Gibson
> ---
> scripts/coccinelle/exec_rw_const.cocci | 14 ++
> include/exec/cpu-common.h | 4 ++--
> hw/display/exynos4210_fimd.c | 3 ++-
> hw/display/milkymist-tmu2.c| 8
> hw/display/omap_dss.c | 2 +-
> hw/display/ramfb.c | 2 +-
> hw/misc/pc-testdev.c | 2 +-
> hw/nvram/spapr_nvram.c | 4 ++--
> hw/ppc/ppc440_uc.c | 6 --
> hw/ppc/spapr_hcall.c | 4 ++--
> hw/s390x/ipl.c | 2 +-
> hw/s390x/s390-pci-bus.c| 2 +-
> hw/s390x/virtio-ccw.c | 2 +-
> hw/xen/xen_pt_graphics.c | 2 +-
> target/i386/hax-all.c | 4 ++--
> target/s390x/excp_helper.c | 2 +-
> target/s390x/helper.c | 6 +++---
> 17 files changed, 43 insertions(+), 26 deletions(-)
>
> diff --git a/scripts/coccinelle/exec_rw_const.cocci
> b/scripts/coccinelle/exec_rw_const.cocci
> index ee98ce988e..54b1cab8cd 100644
> --- a/scripts/coccinelle/exec_rw_const.cocci
> +++ b/scripts/coccinelle/exec_rw_const.cocci
> @@ -11,6 +11,20 @@ expression E1, E2, E3, E4, E5;
> |
> - address_space_rw(E1, E2, E3, E4, E5, 1)
> + address_space_rw(E1, E2, E3, E4, E5, true)
> +|
> +
> +- cpu_physical_memory_rw(E1, E2, E3, 0)
> ++ cpu_physical_memory_rw(E1, E2, E3, false)
> +|
> +- cpu_physical_memory_rw(E1, E2, E3, 1)
> ++ cpu_physical_memory_rw(E1, E2, E3, true)
> +|
> +
> +- cpu_physical_memory_map(E1, E2, 0)
> ++ cpu_physical_memory_map(E1, E2, false)
> +|
> +- cpu_physical_memory_map(E1, E2, 1)
> ++ cpu_physical_memory_map(E1, E2, true)
> )
>
> // Use address_space_write instead of casting to non-const
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index 6bfe201779..e7fd5781ea 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -74,12 +74,12 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf,
> static inline void cpu_physical_memory_read(hwaddr addr,
> void *buf, hwaddr len)
> {
> -cpu_physical_memory_rw(addr, buf, len, 0);
> +cpu_physical_memory_rw(addr, buf, len, false);
> }
> static inline void cpu_physical_memory_write(hwaddr addr,
> const void *buf, hwaddr len)
> {
> -cpu_physical_memory_rw(addr, (void *)buf, len, 1);
> +cpu_physical_memory_rw(addr, (void *)buf, len, true);
> }
> void *cpu_physical_memory_map(hwaddr addr,
>hwaddr *plen,
> diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
> index c1071ecd46..ec6776680e 100644
> --- a/hw/display/exynos4210_fimd.c
> +++ b/hw/display/exynos4210_fimd.c
> @@ -1164,7 +1164,8 @@ static void
> fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)
> goto error_return;
> }
>
> -w->host_fb_addr = cpu_physical_memory_map(fb_start_addr, _mapped_len,
> 0);
> +w->host_fb_addr = cpu_physical_memory_map(fb_start_addr, _mapped_len,
> + false);
> if (!w->host_fb_addr) {
> DPRINT_ERROR("Failed to map window %u framebuffer\n", win);
> goto error_return;
> diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
> index 199f1227e7..513c0d5bab 100644
> --- a/hw/display/milkymist-tmu2.c
> +++ b/hw/display/milkymist-tmu2.c
> @@ -218,7 +218,7 @@ static void tmu2_start(MilkymistTMU2State *s)
> glGenTextures(1, );
> glBindTexture(GL_TEXTURE_2D, texture);
> fb_len = 2ULL * s->regs[R_TEXHRES] * s->regs[R_TEXVRES];
> -fb = cpu_physical_memory_map(s->regs[R_TEXFBUF], _len, 0);
> +fb = cpu_physical_memory_map(s->regs[R_TEXFBUF], _len, false);
> if (fb == NULL) {
> glDeleteTextures(1, );
> glXMakeContextCurrent(s->dpy, None, None, NULL);
> @@ -262,7 +262,7 @@ static void tmu2_start(MilkymistTMU2State *s)
>
> /* Read the QEMU dest. framebuffer into the OpenGL framebuffer */
> fb_len = 2ULL * s->regs[R_DSTHRES] * s->regs[R_DSTVRES];
> -fb = cpu_physical_memory_map(s->regs[R_DSTFBUF], _len, 0);
> +fb = cpu_physical_memory_map(s->regs[R_DSTFBUF], _len, false);
> if (fb == NULL) {
>
Re: [Xen-devel] [Qemu-devel] [PATCH v7 00/42] Invert Endian bit in SPARCv9 MMU TTE
On Fri, Aug 16, 2019 at 11:58:05AM +0200, Philippe Mathieu-Daudé wrote: > Hi Tony, > > On 8/16/19 8:28 AM, tony.ngu...@bt.com wrote: > > This patchset implements the IE (Invert Endian) bit in SPARCv9 MMU TTE. > > > > v7: > [...] > > - Re-declared many native endian devices as little or big endian. This is > > why > > v7 has +16 patches. > > Why are you doing that? What is the rational? > > Anyhow if this not required by your series, you should split it out of > it, and send it on your principal changes are merged. > I'm worried because this these new patches involve many subsystems (thus > maintainers) and reviewing them will now take a fair amount of time. > > > For each device declared with DEVICE_NATIVE_ENDIAN, find the set of > > targets from the set of target/hw/*/device.o. > > > > If the set of targets are all little or all big endian, re-declare > > the device endianness as DEVICE_LITTLE_ENDIAN or DEVICE_BIG_ENDIAN > > respectively. > > If only little endian targets use a device, that doesn't mean the device > is designed in little endian... > > Then if a big endian target plan to use this device, it will require > more work and you might have introduced regressions... Uh.. only if they make the version of the device on a big endian target big endian. Which is a terrible idea - if you know a hardware designer planning to do this, please slap them. -- David Gibson| I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson signature.asc Description: PGP signature ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 15/25] spapr-vty: Let vty_putchars() use size_t
On Wed, Feb 20, 2019 at 02:02:22AM +0100, Philippe Mathieu-Daudé wrote:
> Both callers (h_put_term_char and rtas_display_character) use
> an unsigned value.
>
> Signed-off-by: Philippe Mathieu-Daudé
Acked-by: David Gibson
> ---
> hw/char/spapr_vty.c| 2 +-
> include/hw/ppc/spapr_vio.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
> index 6748334ded..92b8c40410 100644
> --- a/hw/char/spapr_vty.c
> +++ b/hw/char/spapr_vty.c
> @@ -83,7 +83,7 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf,
> int max)
> return n;
> }
>
> -void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len)
> +void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, size_t len)
> {
> VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);
>
> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
> index e8b006d18f..ed79d2f380 100644
> --- a/include/hw/ppc/spapr_vio.h
> +++ b/include/hw/ppc/spapr_vio.h
> @@ -126,7 +126,7 @@ static inline int spapr_vio_dma_set(VIOsPAPRDevice *dev,
> uint64_t taddr,
> int spapr_vio_send_crq(VIOsPAPRDevice *dev, uint8_t *crq);
>
> VIOsPAPRDevice *vty_lookup(sPAPRMachineState *spapr, target_ulong reg);
> -void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len);
> +void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, size_t len);
> void spapr_vty_create(VIOsPAPRBus *bus, Chardev *chardev);
> void spapr_vlan_create(VIOsPAPRBus *bus, NICInfo *nd);
> void spapr_vscsi_create(VIOsPAPRBus *bus);
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/3] spapr: Eliminate SPAPR_PCI_2_7_MMIO_WIN_SIZE macro
On Mon, Jan 07, 2019 at 05:30:18PM -0200, Eduardo Habkost wrote:
> The macro is only used in one place, where the purpose of the
> value is obvious. Eliminate the macro so we don't need to rely
> on stringify().
>
> Signed-off-by: Eduardo Habkost
Acked-by: David Gibson
> ---
> include/hw/pci-host/spapr.h | 1 -
> hw/ppc/spapr.c | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 7c66c3872f..a85a995b6c 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -99,7 +99,6 @@ struct sPAPRPHBState {
> #define SPAPR_PCI_BASE (1ULL << 45) /* 32 TiB */
> #define SPAPR_PCI_LIMIT (1ULL << 46) /* 64 TiB */
>
> -#define SPAPR_PCI_2_7_MMIO_WIN_SIZE 0xf8000
> #define SPAPR_PCI_IO_WIN_SIZE0x1
>
> #define SPAPR_PCI_MSI_WINDOW 0x400ULL
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 5671608cea..bff42f0adb 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4225,7 +4225,7 @@ static void
> spapr_machine_2_7_class_options(MachineClass *mc)
> {
> .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
> .property = "mem_win_size",
> -.value= stringify(SPAPR_PCI_2_7_MMIO_WIN_SIZE),
> + .value= "0xf8000",
> },
> {
> .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 2/2] avoid TABs in files that only contain a few
On Thu, Dec 13, 2018 at 11:37:37PM +0100, Paolo Bonzini wrote: > Most files that have TABs only contain a handful of them. Change > them to spaces so that we don't confuse people. > > disas, standard-headers, linux-headers and libdecnumber are imported > from other projects and probably should be exempted from the check. > Outside those, after this patch the following files still contain both > 8-space and TAB sequences at the beginning of the line. Many of them > have a majority of TABs, or were initially committed with all tabs. > > bsd-user/i386/target_syscall.h > bsd-user/x86_64/target_syscall.h > crypto/aes.c > hw/audio/fmopl.c > hw/audio/fmopl.h > hw/block/tc58128.c > hw/display/cirrus_vga.c > hw/display/xenfb.c > hw/dma/etraxfs_dma.c > hw/intc/sh_intc.c > hw/misc/mst_fpga.c > hw/net/pcnet.c > hw/sh4/sh7750.c > hw/timer/m48t59.c > hw/timer/sh_timer.c > include/crypto/aes.h > include/disas/bfd.h > include/hw/sh4/sh.h > libdecnumber/decNumber.c > linux-headers/asm-generic/unistd.h > linux-headers/linux/kvm.h > linux-user/alpha/target_syscall.h > linux-user/arm/nwfpe/double_cpdo.c > linux-user/arm/nwfpe/fpa11_cpdt.c > linux-user/arm/nwfpe/fpa11_cprt.c > linux-user/arm/nwfpe/fpa11.h > linux-user/flat.h > linux-user/flatload.c > linux-user/i386/target_syscall.h > linux-user/ppc/target_syscall.h > linux-user/sparc/target_syscall.h > linux-user/syscall.c > linux-user/syscall_defs.h > linux-user/x86_64/target_syscall.h > slirp/cksum.c > slirp/if.c > slirp/ip.h > slirp/ip_icmp.c > slirp/ip_icmp.h > slirp/ip_input.c > slirp/ip_output.c > slirp/mbuf.c > slirp/misc.c > slirp/sbuf.c > slirp/socket.c > slirp/socket.h > slirp/tcp_input.c > slirp/tcpip.h > slirp/tcp_output.c > slirp/tcp_subr.c > slirp/tcp_timer.c > slirp/tftp.c > slirp/udp.c > slirp/udp.h > target/cris/cpu.h > target/cris/mmu.c > target/cris/op_helper.c > target/sh4/helper.c > target/sh4/op_helper.c > target/sh4/translate.c > tcg/sparc/tcg-target.inc.c > tests/tcg/cris/check_addo.c > tests/tcg/cris/check_moveq.c > tests/tcg/cris/check_swap.c > tests/tcg/multiarch/test-mmap.c > ui/vnc-enc-hextile-template.h > ui/vnc-enc-zywrle.h > util/envlist.c > util/readline.c > > The following have only TABs: > > bsd-user/i386/target_signal.h > bsd-user/sparc64/target_signal.h > bsd-user/sparc64/target_syscall.h > bsd-user/sparc/target_signal.h > bsd-user/sparc/target_syscall.h > bsd-user/x86_64/target_signal.h > crypto/desrfb.c > hw/audio/intel-hda-defs.h > hw/core/uboot_image.h > hw/sh4/sh7750_regnames.c > hw/sh4/sh7750_regs.h > include/hw/cris/etraxfs_dma.h > linux-user/alpha/termbits.h > linux-user/arm/nwfpe/fpopcode.h > linux-user/arm/nwfpe/fpsr.h > linux-user/arm/syscall_nr.h > linux-user/arm/target_signal.h > linux-user/cris/target_signal.h > linux-user/i386/target_signal.h > linux-user/linux_loop.h > linux-user/m68k/target_signal.h > linux-user/microblaze/target_signal.h > linux-user/mips64/target_signal.h > linux-user/mips/target_signal.h > linux-user/mips/target_syscall.h > linux-user/mips/termbits.h > linux-user/ppc/target_signal.h > linux-user/sh4/target_signal.h > linux-user/sh4/termbits.h > linux-user/sparc64/target_syscall.h > linux-user/sparc/target_signal.h > linux-user/x86_64/target_signal.h > linux-user/x86_64/termbits.h > pc-bios/optionrom/optionrom.h > slirp/mbuf.h > slirp/misc.h > slirp/sbuf.h > slirp/tcp.h > slirp/tcp_timer.h > slirp/tcp_var.h > target/i386/svm.h > target/sparc/asi.h > target/xtensa/core-dc232b/xtensa-modules.inc.c > target/xtensa/core-dc233c/xtensa-modules.inc.c > target/xtensa/core-de212/core-isa.h > target/xtensa/core-de212/xtensa-modules.inc.c > target/xtensa/core-fsf/xtensa-modules.inc.c > target/xtensa/core-sample_controller/core-isa.h > target/xtensa/core-sample_controller/xtensa-modules.inc.c > target/xtensa/core-test_kc705_be/core-isa.h > target/xtensa/core-test_kc705_be/xtensa-modules.inc.c > tests/tcg/cris/check_abs.c > tests/tcg/cris/check_addc.c > tests/tcg/cris/check_addcm.c > tests/tcg/cris/check_addoq.c > tests/tcg/cris/check_bound.c > tests/tcg/cris/check_ftag.c > tests/tcg/cris/check_
