From: Xiang Zheng <zhengxiang9@huawei.com> To: <pbonzini@redhat.com>, <mst@redhat.com>, <imammedo@redhat.com>, <shannon.zhaosl@gmail.com>, <peter.maydell@linaro.org>, <lersek@redhat.com>, <james.morse@arm.com>, <gengdongjiu@huawei.com>, <mtosatti@redhat.com>, <rth@twiddle.net>, <ehabkost@redhat.com>, <jonathan.cameron@huawei.com>, <xuwei5@huawei.com>, <kvm@vger.kernel.org>, <qemu-devel@nongnu.org>, <qemu-arm@nongnu.org>, <linuxarm@huawei.com> Cc: <zhengxiang9@huawei.com>, <wanghaibin.wang@huawei.com> Subject: [PATCH v21 1/6] hw/arm/virt: Introduce a RAS machine option Date: Mon, 4 Nov 2019 20:14:53 +0800 [thread overview] Message-ID: <20191104121458.29208-2-zhengxiang9@huawei.com> (raw) In-Reply-To: <20191104121458.29208-1-zhengxiang9@huawei.com> 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); + 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; -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiang Zheng <zhengxiang9@huawei.com> To: <pbonzini@redhat.com>, <mst@redhat.com>, <imammedo@redhat.com>, <shannon.zhaosl@gmail.com>, <peter.maydell@linaro.org>, <lersek@redhat.com>, <james.morse@arm.com>, <gengdongjiu@huawei.com>, <mtosatti@redhat.com>, <rth@twiddle.net>, <ehabkost@redhat.com>, <jonathan.cameron@huawei.com>, <xuwei5@huawei.com>, <kvm@vger.kernel.org>, <qemu-devel@nongnu.org>, <qemu-arm@nongnu.org>, <linuxarm@huawei.com> Cc: wanghaibin.wang@huawei.com, zhengxiang9@huawei.com Subject: [PATCH v21 1/6] hw/arm/virt: Introduce a RAS machine option Date: Mon, 4 Nov 2019 20:14:53 +0800 [thread overview] Message-ID: <20191104121458.29208-2-zhengxiang9@huawei.com> (raw) In-Reply-To: <20191104121458.29208-1-zhengxiang9@huawei.com> 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); + 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; -- 2.19.1
next prev parent reply other threads:[~2019-11-04 12:16 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-04 12:14 [PATCH v21 0/6] Add ARMv8 RAS virtualization support in QEMU Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng [this message] 2019-11-04 12:14 ` [PATCH v21 1/6] hw/arm/virt: Introduce a RAS machine option Xiang Zheng 2019-11-04 12:14 ` [PATCH v21 2/6] docs: APEI GHES generation and CPER record description Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-04 12:14 ` [PATCH v21 3/6] ACPI: Add APEI GHES table generation support Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-08 8:11 ` gengdongjiu 2019-11-08 8:11 ` gengdongjiu 2019-11-11 1:23 ` Xiang Zheng 2019-11-11 1:23 ` Xiang Zheng 2019-11-04 12:14 ` [PATCH v21 4/6] KVM: Move hwpoison page related functions into kvm-all.c Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-04 12:14 ` [PATCH v21 5/6] target-arm: kvm64: handle SIGBUS signal from kernel or KVM Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-04 12:14 ` [PATCH v21 6/6] MAINTAINERS: Add APCI/APEI/GHES entries Xiang Zheng 2019-11-04 12:14 ` Xiang Zheng 2019-11-04 12:43 ` [PATCH v21 0/6] Add ARMv8 RAS virtualization support in QEMU no-reply 2019-11-04 12:43 ` no-reply
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191104121458.29208-2-zhengxiang9@huawei.com \ --to=zhengxiang9@huawei.com \ --cc=ehabkost@redhat.com \ --cc=gengdongjiu@huawei.com \ --cc=imammedo@redhat.com \ --cc=james.morse@arm.com \ --cc=jonathan.cameron@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=lersek@redhat.com \ --cc=linuxarm@huawei.com \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=shannon.zhaosl@gmail.com \ --cc=wanghaibin.wang@huawei.com \ --cc=xuwei5@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.