|
 |
4a2fec |
From 11098ad708cd535e4d79bf82c07ef78ca16b647c Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Auger Eric <eric.auger@redhat.com>
|
|
|
4a2fec |
Date: Tue, 28 Nov 2017 15:14:02 +0100
|
|
|
4a2fec |
Subject: [PATCH 1/9] gicv3: Convert to DEFINE_PROP_LINK
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Auger Eric <eric.auger@redhat.com>
|
|
|
4a2fec |
Message-id: <1511882048-11256-2-git-send-email-eric.auger@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77939
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH 1/7] gicv3: Convert to DEFINE_PROP_LINK
|
|
|
4a2fec |
Bugzilla: 1513323
|
|
|
4a2fec |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Message-id: 20170905131149.10669-4-famz@redhat.com
|
|
|
4a2fec |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
4a2fec |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
4a2fec |
(cherry picked from commit 9ea26c70498cde1887746222c3cada968e46ec23)
|
|
|
4a2fec |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
|
|
|
4a2fec |
1 file changed, 7 insertions(+), 12 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
4a2fec |
index 1f8991b..39903d5 100644
|
|
|
4a2fec |
--- a/hw/intc/arm_gicv3_its_kvm.c
|
|
|
4a2fec |
+++ b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
4a2fec |
@@ -120,17 +120,6 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
qemu_add_vm_change_state_handler(vm_change_state_handler, s);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
-static void kvm_arm_its_init(Object *obj)
|
|
|
4a2fec |
-{
|
|
|
4a2fec |
- GICv3ITSState *s = KVM_ARM_ITS(obj);
|
|
|
4a2fec |
-
|
|
|
4a2fec |
- object_property_add_link(obj, "parent-gicv3",
|
|
|
4a2fec |
- "kvm-arm-gicv3", (Object **)&s->gicv3,
|
|
|
4a2fec |
- object_property_allow_set_link,
|
|
|
4a2fec |
- OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
|
|
4a2fec |
- &error_abort);
|
|
|
4a2fec |
-}
|
|
|
4a2fec |
-
|
|
|
4a2fec |
/**
|
|
|
4a2fec |
* kvm_arm_its_pre_save - handles the saving of ITS registers.
|
|
|
4a2fec |
* ITS tables are flushed into guest RAM separately and earlier,
|
|
|
4a2fec |
@@ -205,12 +194,19 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
|
|
|
4a2fec |
GITS_CTLR, &s->ctlr, true, &error_abort);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+static Property kvm_arm_its_props[] = {
|
|
|
4a2fec |
+ DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "kvm-arm-gicv3",
|
|
|
4a2fec |
+ GICv3State *),
|
|
|
4a2fec |
+ DEFINE_PROP_END_OF_LIST(),
|
|
|
4a2fec |
+};
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
4a2fec |
GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
|
|
|
4a2fec |
|
|
|
4a2fec |
dc->realize = kvm_arm_its_realize;
|
|
|
4a2fec |
+ dc->props = kvm_arm_its_props;
|
|
|
4a2fec |
icc->send_msi = kvm_its_send_msi;
|
|
|
4a2fec |
icc->pre_save = kvm_arm_its_pre_save;
|
|
|
4a2fec |
icc->post_load = kvm_arm_its_post_load;
|
|
|
4a2fec |
@@ -220,7 +216,6 @@ static const TypeInfo kvm_arm_its_info = {
|
|
|
4a2fec |
.name = TYPE_KVM_ARM_ITS,
|
|
|
4a2fec |
.parent = TYPE_ARM_GICV3_ITS_COMMON,
|
|
|
4a2fec |
.instance_size = sizeof(GICv3ITSState),
|
|
|
4a2fec |
- .instance_init = kvm_arm_its_init,
|
|
|
4a2fec |
.class_init = kvm_arm_its_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|