On 6 October 2015 at 15:37, Andrew Jones <drjo...@redhat.com> wrote: > I'm not sure if arm_gic_common.h is supposed to be common, not > only between tcg and kvm, but also v2 and v3, but it currently > is (arm_gicv3_common.h includes it, and it's the only gic header > included by hw/arm/virt.c).
I don't think it should be included. We're doing completely separate implementations of the GICv3 from the old GICv1/2 code. It looks like the only thing in the gicv3 code that is using a define from the arm_gic_common.h file is "GIC_INTERNAL", so we can just put a suitable define of that into the v3 header (maybe giving it a better name in the process). > If it should be the super-common > header, then it's unfortunate that the define names are too > generic. This patch doesn't help much, as it doesn't rename > anything, but it does start heading down the right path. With > it, code including the super-common header can start using more > appropriate names for a couple very gic-version-specific defines. All the things in this header should be GICv2 only, really. It's unfortunate that all our naming (including the source files and the device names) uses just "gic", but a mass renaming doesn't seem like a great idea to me. Given that, perhaps having a few symbols with a "GICV2" prefix is going to be more confusing than helpful. thanks -- PMM
