| Message ID | 20191111014048.21296-2-zhengxiang9@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add ARMv8 RAS virtualization support in QEMU | expand |
On Mon, 11 Nov 2019 at 01:44, Xiang Zheng <zhengxiang9@huawei.com> wrote: > > From: Dongjiu Geng <gengdongjiu@huawei.com> > > RAS Virtualization feature is not supported now, so add a RAS machine > option and disable it by default. > > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com> > --- > hw/arm/virt.c | 23 +++++++++++++++++++++++ > include/hw/arm/virt.h | 1 + > 2 files changed, 24 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d4bedc2607..ea0fbf82be 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1819,6 +1819,20 @@ static void virt_set_its(Object *obj, bool value, Error **errp) > vms->its = value; > } > > +static bool virt_get_ras(Object *obj, Error **errp) > +{ > + VirtMachineState *vms = VIRT_MACHINE(obj); > + > + return vms->ras; > +} > + > +static void virt_set_ras(Object *obj, bool value, Error **errp) > +{ > + VirtMachineState *vms = VIRT_MACHINE(obj); > + > + vms->ras = value; > +} > + > static char *virt_get_gic_version(Object *obj, Error **errp) > { > VirtMachineState *vms = VIRT_MACHINE(obj); > @@ -2122,6 +2136,15 @@ static void virt_instance_init(Object *obj) > "Valid values are none and smmuv3", > NULL); > > + /* Default disallows RAS instantiation */ > + vms->ras = false; > + object_property_add_bool(obj, "ras", virt_get_ras, > + virt_set_ras, NULL); > + object_property_set_description(obj, "ras", > + "Set on/off to enable/disable " > + "RAS instantiation", > + NULL); I think we could make the user-facing description of the option a little clearer: something like "Set on/off to enable/disable reporting host memory errors to a KVM guest using ACPI and guest external abort exceptions" ? Otherwise Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
> > I think we could make the user-facing description of > the option a little clearer: something like > "Set on/off to enable/disable reporting host memory errors > to a KVM guest using ACPI and guest external abort exceptions" > > ? Peter, sorry for the late response. sure, we have already updated it, and will send PATCH V22. > > Otherwise > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM > . >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d4bedc2607..ea0fbf82be 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1819,6 +1819,20 @@ static void virt_set_its(Object *obj, bool value, Error **errp) vms->its = value; } +static bool virt_get_ras(Object *obj, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + return vms->ras; +} + +static void virt_set_ras(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + vms->ras = value; +} + static char *virt_get_gic_version(Object *obj, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -2122,6 +2136,15 @@ static void virt_instance_init(Object *obj) "Valid values are none and smmuv3", NULL); + /* Default disallows RAS instantiation */ + vms->ras = false; + object_property_add_bool(obj, "ras", virt_get_ras, + virt_set_ras, NULL); + object_property_set_description(obj, "ras", + "Set on/off to enable/disable " + "RAS instantiation", + NULL); + vms->irqmap = a15irqmap; virt_flash_create(vms); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 0b41083e9d..989785f2f7 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -122,6 +122,7 @@ typedef struct { bool highmem_ecam; bool its; bool virt; + bool ras; int32_t gic_version; VirtIOMMUType iommu; struct arm_boot_info bootinfo;