From: Jan Kiszka <[email protected]> ARRAY_SIZE is now part of cell-config.h, and the IOMMUs should declare their type. Cosmetic changes.
Signed-off-by: Jan Kiszka <[email protected]> --- recipes-jailhouse/jailhouse/files/linux-nuc6cay-demo.c | 2 -- recipes-jailhouse/jailhouse/files/nuc6cay.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-jailhouse/jailhouse/files/linux-nuc6cay-demo.c b/recipes-jailhouse/jailhouse/files/linux-nuc6cay-demo.c index 8366d6b..bfd3aac 100644 --- a/recipes-jailhouse/jailhouse/files/linux-nuc6cay-demo.c +++ b/recipes-jailhouse/jailhouse/files/linux-nuc6cay-demo.c @@ -15,8 +15,6 @@ #include <jailhouse/types.h> #include <jailhouse/cell-config.h> -#define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) - struct { struct jailhouse_cell_desc cell; __u64 cpus[1]; diff --git a/recipes-jailhouse/jailhouse/files/nuc6cay.c b/recipes-jailhouse/jailhouse/files/nuc6cay.c index 7600745..c3b489c 100644 --- a/recipes-jailhouse/jailhouse/files/nuc6cay.c +++ b/recipes-jailhouse/jailhouse/files/nuc6cay.c @@ -36,8 +36,6 @@ #include <jailhouse/types.h> #include <jailhouse/cell-config.h> -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) - struct { struct jailhouse_system header; __u64 cpus[1]; @@ -70,10 +68,12 @@ struct { .vtd_interrupt_limit = 256, .iommu_units = { { + .type = JAILHOUSE_IOMMU_INTEL, .base = 0xfed64000, .size = 0x1000, }, { + .type = JAILHOUSE_IOMMU_INTEL, .base = 0xfed65000, .size = 0x1000, }, -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/3e2becf0cae127a8d87af01489fda95e258cc6dc.1586760835.git.jan.kiszka%40web.de.
