Re: [PATCH v3 2/6] hw/arm/virt: Introduce VirtGICType enum type

[Philippe Mathieu-Daudé]

On 3/2/20 11:55 AM, Eric Auger wrote:
> We plan to introduce yet another value for the gic version (nosel).
> As we already use exotic values such as 0 and -1, let's introduce
> a dedicated enum type and let vms->gic_version take this
> type.
>
> Signed-off-by: Eric Auger <address@hidden>
>
> ---
>
> v2 -> v3:
> - replaced defines by enum VirtGICType
> - use that new type for vms->gic_version
> ---
>   hw/arm/virt.c         | 30 +++++++++++++++---------------
>   include/hw/arm/virt.h | 11 +++++++++--

Please have a look at scripts/git.orderfile, it helps making review 
easier/quicker.

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

>   2 files changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index c093f0ab85..b449a445de 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -298,7 +298,7 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms)
>           irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;
>       }
>   
> -    if (vms->gic_version == 2) {
> +    if (vms->gic_version == VIRT_GIC_VERSION_2) {
>           irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
>                                GIC_FDT_IRQ_PPI_CPU_WIDTH,
>                                (1 << vms->smp_cpus) - 1);
> @@ -439,7 +439,7 @@ static void fdt_add_gic_node(VirtMachineState *vms)
>       qemu_fdt_setprop_cell(vms->fdt, nodename, "#address-cells", 0x2);
>       qemu_fdt_setprop_cell(vms->fdt, nodename, "#size-cells", 0x2);
>       qemu_fdt_setprop(vms->fdt, nodename, "ranges", NULL, 0);
> -    if (vms->gic_version == 3) {
> +    if (vms->gic_version == VIRT_GIC_VERSION_3) {
>           int nb_redist_regions = virt_gicv3_redist_region_count(vms);
>   
>           qemu_fdt_setprop_string(vms->fdt, nodename, "compatible",
> @@ -518,7 +518,7 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
>           }
>       }
>   
> -    if (vms->gic_version == 2) {
> +    if (vms->gic_version == VIRT_GIC_VERSION_2) {
>           irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
>                                GIC_FDT_IRQ_PPI_CPU_WIDTH,
>                                (1 << vms->smp_cpus) - 1);
> @@ -1469,7 +1469,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState 
> *vms, int idx)
>            * purposes are to make TCG consistent (with 64-bit KVM hosts)
>            * and to improve SGI efficiency.
>            */
> -        if (vms->gic_version == 3) {
> +        if (vms->gic_version == VIRT_GIC_VERSION_3) {
>               clustersz = GICV3_TARGETLIST_BITS;
>           } else {
>               clustersz = GIC_TARGETLIST_BITS;
> @@ -1560,15 +1560,15 @@ static void machvirt_init(MachineState *machine)
>       /* We can probe only here because during property set
>        * KVM is not available yet
>        */
> -    if (vms->gic_version <= 0) {
> -        /* "host" or "max" */
> +    if (vms->gic_version == VIRT_GIC_VERSION_HOST ||
> +        vms->gic_version == VIRT_GIC_VERSION_MAX) {
>           if (!kvm_enabled()) {
> -            if (vms->gic_version == 0) {
> +            if (vms->gic_version == VIRT_GIC_VERSION_HOST) {
>                   error_report("gic-version=host requires KVM");
>                   exit(1);
>               } else {
>                   /* "max": currently means 3 for TCG */
> -                vms->gic_version = 3;
> +                vms->gic_version = VIRT_GIC_VERSION_3;
>               }
>           } else {
>               vms->gic_version = kvm_arm_vgic_probe();
> @@ -1627,7 +1627,7 @@ static void machvirt_init(MachineState *machine)
>       /* The maximum number of CPUs depends on the GIC version, or on how
>        * many redistributors we can fit into the memory map.
>        */
> -    if (vms->gic_version == 3) {
> +    if (vms->gic_version == VIRT_GIC_VERSION_3) {
>           virt_max_cpus =
>               vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE;
>           virt_max_cpus +=
> @@ -1855,7 +1855,7 @@ static void virt_set_its(Object *obj, bool value, Error 
> **errp)
>   static char *virt_get_gic_version(Object *obj, Error **errp)
>   {
>       VirtMachineState *vms = VIRT_MACHINE(obj);
> -    const char *val = vms->gic_version == 3 ? "3" : "2";
> +    const char *val = vms->gic_version == VIRT_GIC_VERSION_3 ? "3" : "2";
>   
>       return g_strdup(val);
>   }
> @@ -1865,13 +1865,13 @@ static void virt_set_gic_version(Object *obj, const 
> char *value, Error **errp)
>       VirtMachineState *vms = VIRT_MACHINE(obj);
>   
>       if (!strcmp(value, "3")) {
> -        vms->gic_version = 3;
> +        vms->gic_version = VIRT_GIC_VERSION_3;
>       } else if (!strcmp(value, "2")) {
> -        vms->gic_version = 2;
> +        vms->gic_version = VIRT_GIC_VERSION_2;
>       } else if (!strcmp(value, "host")) {
> -        vms->gic_version = 0; /* Will probe later */
> +        vms->gic_version = VIRT_GIC_VERSION_HOST; /* Will probe later */
>       } else if (!strcmp(value, "max")) {
> -        vms->gic_version = -1; /* Will probe later */
> +        vms->gic_version = VIRT_GIC_VERSION_MAX; /* Will probe later */
>       } else {
>           error_setg(errp, "Invalid gic-version value");
>           error_append_hint(errp, "Valid values are 3, 2, host, max.\n");
> @@ -2139,7 +2139,7 @@ static void virt_instance_init(Object *obj)
>                                       "physical address space above 32 bits",
>                                       NULL);
>       /* Default GIC type is v2 */
> -    vms->gic_version = 2;
> +    vms->gic_version = VIRT_GIC_VERSION_2;
>       object_property_add_str(obj, "gic-version", virt_get_gic_version,
>                           virt_set_gic_version, NULL);
>       object_property_set_description(obj, "gic-version",
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 02f500cb8e..c0827cacdf 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -95,6 +95,13 @@ typedef enum VirtIOMMUType {
>       VIRT_IOMMU_VIRTIO,
>   } VirtIOMMUType;
>   
> +typedef enum VirtGICType {
> +    VIRT_GIC_VERSION_MAX,
> +    VIRT_GIC_VERSION_HOST,
> +    VIRT_GIC_VERSION_2,
> +    VIRT_GIC_VERSION_3,
> +} VirtGICType;
> +
>   typedef struct MemMapEntry {
>       hwaddr base;
>       hwaddr size;
> @@ -123,7 +130,7 @@ typedef struct {
>       bool highmem_ecam;
>       bool its;
>       bool virt;
> -    int32_t gic_version;
> +    VirtGICType gic_version;
>       VirtIOMMUType iommu;
>       uint16_t virtio_iommu_bdf;
>       struct arm_boot_info bootinfo;
> @@ -162,7 +169,7 @@ static inline int 
> virt_gicv3_redist_region_count(VirtMachineState *vms)
>       uint32_t redist0_capacity =
>                   vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE;
>   
> -    assert(vms->gic_version == 3);
> +    assert(vms->gic_version == VIRT_GIC_VERSION_3);
>   
>       return vms->smp_cpus > redist0_capacity ? 2 : 1;
>   }