[rtems-libbsd commit] Add namespace support for kvm
Sebastian Huber
sebh at rtems.org
Fri May 6 19:46:48 UTC 2016
Module: rtems-libbsd
Branch: master
Commit: 5b4394f3c828f41d17dfa2ebdda697f0021e87dc
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=5b4394f3c828f41d17dfa2ebdda697f0021e87dc
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri May 6 21:40:49 2016 +0200
Add namespace support for kvm
---
libbsd.py | 2 +-
libbsd_waf.py | 4 ++--
rtemsbsd/rtems/generate_kvm_symbols | 7 ++++---
rtemsbsd/rtems/kvm_private.h | 2 +-
rtemsbsd/rtems/rtems-kvm.c | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/libbsd.py b/libbsd.py
index 194662c..a6a0ff0 100755
--- a/libbsd.py
+++ b/libbsd.py
@@ -141,7 +141,7 @@ def rtems(mm):
],
mm.generator['source']()
)
- mod.addFile(mm.generator['file']('rtems/rtems-kvm-symbols.c',
+ mod.addFile(mm.generator['file']('rtems/rtems-kernel-kvm-symbols.c',
mm.generator['rtems-path'](),
mm.generator['no-convert'](),
mm.generator['no-convert'](),
diff --git a/libbsd_waf.py b/libbsd_waf.py
index 3f6fa12..df7a9ea 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -111,7 +111,7 @@ def build(bld):
update_outputs = True)
# KVM Symbols
- bld(target = "rtemsbsd/rtems/rtems-kvm-symbols.c",
+ bld(target = "rtemsbsd/rtems/rtems-kernel-kvm-symbols.c",
source = "rtemsbsd/rtems/generate_kvm_symbols",
rule = "./${SRC} > ${TGT}",
update_outputs = True)
@@ -119,7 +119,7 @@ def build(bld):
features = "c",
cflags = cflags,
includes = ['rtemsbsd/rtems'] + includes,
- source = "rtemsbsd/rtems/rtems-kvm-symbols.c")
+ source = "rtemsbsd/rtems/rtems-kernel-kvm-symbols.c")
libbsd_use += ["kvmsymbols"]
bld.add_group()
diff --git a/rtemsbsd/rtems/generate_kvm_symbols b/rtemsbsd/rtems/generate_kvm_symbols
index 6aa7dd6..8097c51 100755
--- a/rtemsbsd/rtems/generate_kvm_symbols
+++ b/rtemsbsd/rtems/generate_kvm_symbols
@@ -73,8 +73,9 @@ cat <<EOF
* This file contains the known list of symbols for the kvm subsystem.
*/
+#include <machine/rtems-bsd-kernel-space.h>
+
#include "kvm_private.h"
-#include "stdio.h"
/*
* The following is the known list of symbols that may be passed
@@ -94,7 +95,7 @@ cat <<EOF
* to the kvm family of calls.
*/
-kvm_symval_t rtems_kvm_symbols[] = {
+const kvm_symval_t rtems_kvm_symbols[] = {
EOF
for sym in ${symbols}
do
@@ -103,6 +104,6 @@ do
done
cat <<EOF
- { "", (uintptr_t) NULL }
+ { "", 0 }
};
EOF
diff --git a/rtemsbsd/rtems/kvm_private.h b/rtemsbsd/rtems/kvm_private.h
index 5b9c9b0..b73fbae 100644
--- a/rtemsbsd/rtems/kvm_private.h
+++ b/rtemsbsd/rtems/kvm_private.h
@@ -8,6 +8,6 @@ typedef struct {
uintptr_t value;
} kvm_symval_t;
-extern kvm_symval_t rtems_kvm_symbols[];
+extern const kvm_symval_t rtems_kvm_symbols[];
#endif
diff --git a/rtemsbsd/rtems/rtems-kvm.c b/rtemsbsd/rtems/rtems-kvm.c
index 27cfdd2..bda2b60 100644
--- a/rtemsbsd/rtems/rtems-kvm.c
+++ b/rtemsbsd/rtems/rtems-kvm.c
@@ -34,7 +34,7 @@ kvm_nlist(kvm_t *kd, struct nlist *nl)
struct nlist *p;
int nvalid;
int error;
- kvm_symval_t *kvm;
+ const kvm_symval_t *kvm;
assert( kd != NULL );
assert( nl != NULL );
More information about the vc
mailing list