Re: [PATCH ARM v6 00/14] mini-os: initial ARM support

[Thomas Leonard <talex5@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1956 bytes --]

On 18 July 2014 13:45, Ian Campbell <Ian.Campbell@citrix.com> wrote:
>
> On Wed, 2014-07-16 at 12:07 +0100, Thomas Leonard wrote:
>
> I tried to apply:
> mini-os: x86_64: make thread stacks 16-byte aligned
> mini-os: don't include lib.h from mm.h (the second, attached, version)
> mini-os: added HYPERVISOR_xsm_op
> mini-os: use generic local_irq_enable function
>
> but got:
>         vtpm_cmd_handler.c: In function ‘tm_dhkx_gen’:
>         vtpm_cmd_handler.c:486:3: error: implicit declaration of function ‘ARRAY_SIZE’ [-Werror=implicit-function-declaration]
>         cc1: all warnings being treated as errors
>         make[2]: *** [vtpm_cmd_handler.o] Error 1
>         make[2]: *** Waiting for unfinished jobs....
>         disk_tpm.c: In function ‘TPM_disk_seal’:
>         disk_tpm.c:84:2: error: implicit declaration of function ‘printk’ [-Werror=implicit-function-declaration]
>         cc1: all warnings being treated as errors
>         make[2]: *** [disk_tpm.o] Error 1
>         make[2]: Entering directory `/local/scratch/ianc/devel/committer-amd64.git/stubdom/libxc-x86_64'
>         make libs
>
> Which I think was the mm.h one.

Oops. The attached updated patch fixes compiling the stubdoms for me.

> Then I got:
>         In file included from /local/scratch/ianc/devel/committer-amd64.git/stubdom/../extras/mini-os/include/mini-os/gntmap.h:4:0,
>                          from /local/scratch/ianc/devel/committer-amd64.git/stubdom/../extras/mini-os/include/mini-os/lib.h:55,
>                          from /local/scratch/ianc/devel/committer-amd64.git/stubdom/../extras/mini-os/include/mini-os/mm.h:36,

I guess this is just due to skipping the previous patch, since after
that mm.h will no longer inlcude lib.h.


-- 
Dr Thomas Leonard        http://0install.net/
GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1
GPG: DA98 25AE CAD0 8975 7CDA  BD8E 0713 3F96 CA74 D8BA

[-- Attachment #2: 0001-mini-os-don-t-include-lib.h-from-mm.h.patch --]
[-- Type: text/x-patch, Size: 3262 bytes --]

From b102c8ad50db789e850e482770c3809e60167375 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Mon, 7 Jul 2014 13:20:43 +0100
Subject: [PATCH] mini-os: don't include lib.h from mm.h

This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h
-> lib.h -> gntmap.h -> os.h -> hypervisor.h.

Signed-off-by: Thomas Leonard <talex5@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

---

Added missing includes in stubdom code.
---
 extras/mini-os/include/mm.h        | 3 +--
 extras/mini-os/lock.c              | 1 +
 extras/mini-os/main.c              | 1 +
 extras/mini-os/tpm_tis.c           | 1 +
 extras/mini-os/tpmfront.c          | 1 +
 stubdom/vtpmmgr/disk_tpm.c         | 1 +
 stubdom/vtpmmgr/vtpm_cmd_handler.c | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h
index a94cd6d..a177251 100644
--- a/extras/mini-os/include/mm.h
+++ b/extras/mini-os/include/mm.h
@@ -32,8 +32,7 @@
 #else
 #error "Unsupported architecture"
 #endif
-
-#include <mini-os/lib.h>
+#include <xen/xen.h>
 
 #include <mini-os/arch_limits.h>
 #include <mini-os/arch_mm.h>
diff --git a/extras/mini-os/lock.c b/extras/mini-os/lock.c
index 71a4971..61194e5 100644
--- a/extras/mini-os/lock.c
+++ b/extras/mini-os/lock.c
@@ -9,6 +9,7 @@
 #include <sys/lock.h>
 #include <sched.h>
 #include <wait.h>
+#include <mini-os/lib.h>
 
 int ___lock_init(_LOCK_T *lock)
 {
diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c
index aec0586..4ec40b5 100644
--- a/extras/mini-os/main.c
+++ b/extras/mini-os/main.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <xenbus.h>
 #include <events.h>
+#include <mini-os/lib.h>
 
 extern int main(int argc, char *argv[], char *envp[]);
 extern void __libc_init_array(void);
diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c
index dc4134a..b067cb7 100644
--- a/extras/mini-os/tpm_tis.c
+++ b/extras/mini-os/tpm_tis.c
@@ -26,6 +26,7 @@
 #include <mini-os/events.h>
 #include <mini-os/wait.h>
 #include <mini-os/xmalloc.h>
+#include <mini-os/lib.h>
 #include <errno.h>
 #include <stdbool.h>
 
diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c
index ce5b3e1..6049244 100644
--- a/extras/mini-os/tpmfront.c
+++ b/extras/mini-os/tpmfront.c
@@ -31,6 +31,7 @@
 #include <xen/io/xenbus.h>
 #include <xen/io/tpmif.h>
 #include <mini-os/tpmfront.h>
+#include <mini-os/lib.h>
 #include <fcntl.h>
 
 //#define TPMFRONT_PRINT_DEBUG
diff --git a/stubdom/vtpmmgr/disk_tpm.c b/stubdom/vtpmmgr/disk_tpm.c
index a9f4552..d650fbc 100644
--- a/stubdom/vtpmmgr/disk_tpm.c
+++ b/stubdom/vtpmmgr/disk_tpm.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <mini-os/byteorder.h>
+#include <mini-os/lib.h>
 #include <polarssl/aes.h>
 #include <polarssl/sha1.h>
 
diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c b/stubdom/vtpmmgr/vtpm_cmd_handler.c
index 8a42790..13ead93 100644
--- a/stubdom/vtpmmgr/vtpm_cmd_handler.c
+++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <mini-os/console.h>
+#include <mini-os/lib.h>
 #include <polarssl/sha1.h>
 #include <polarssl/sha2.h>
 
-- 
2.0.3


[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel