]> code.ossystems Code Review - meta-freescale.git/commitdiff
hypervisor: fix sizeof-pointer-memaccess error
authorTing Liu <b28495@freescale.com>
Wed, 10 Jul 2013 03:45:00 +0000 (03:45 +0000)
committerZhenhua Luo <zhenhua.luo@freescale.com>
Thu, 11 Jul 2013 08:48:28 +0000 (16:48 +0800)
Fix the below build error:
| build: src/livetree.c
| .../hypervisor/git-r3/git/src/devtree.c: In function 'read_intmap':
| .../hypervisor/git-r3/git/src/devtree.c:1513:25: error: argument to
| 'sizeof' in 'memset' call is the same expression as the destination;
| did you mean to dereference it? [-Werror=sizeof-pointer-memaccess]
|        memset(ent, 0, sizeof(ent));
|                             ^
|  cc1: all warnings being treated as errors
|  build: src/ipi_doorbell.c
|  make[1]: *** [bin/devtree.o] Error 1
|  make[1]: *** Waiting for unfinished jobs....
|  make[1]: Leaving directory `.../hypervisor/git-r3/git/output'
|  make: *** [all] Error 2
|  ERROR: oe_runmake failed

Signed-off-by: Ting Liu <b28495@freescale.com>
meta-fsl-ppc/recipes-virtualization/hypervisor/files/0001-fix-sizeof-pointer-memaccess-error.patch [new file with mode: 0644]
meta-fsl-ppc/recipes-virtualization/hypervisor/hypervisor_git.bb

diff --git a/meta-fsl-ppc/recipes-virtualization/hypervisor/files/0001-fix-sizeof-pointer-memaccess-error.patch b/meta-fsl-ppc/recipes-virtualization/hypervisor/files/0001-fix-sizeof-pointer-memaccess-error.patch
new file mode 100644 (file)
index 0000000..a562273
--- /dev/null
@@ -0,0 +1,39 @@
+From 59e68351114a65a1f315ded1ee92f4370b8547e2 Mon Sep 17 00:00:00 2001
+From: Ting Liu <b28495@freescale.com>
+Date: Mon, 8 Jul 2013 17:03:43 +0800
+Subject: [PATCH] fix sizeof-pointer-memaccess error
+
+build: src/livetree.c
+.../hypervisor/git-r3/git/src/devtree.c: In function 'read_intmap':
+.../hypervisor/git-r3/git/src/devtree.c:1513:25: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Werror=sizeof-pointer-memaccess]
+    memset(ent, 0, sizeof(ent));
+                         ^
+cc1: all warnings being treated as errors
+build: src/ipi_doorbell.c
+make[1]: *** [bin/devtree.o] Error 1
+make[1]: *** Waiting for unfinished jobs....
+make[1]: Leaving directory `.../hypervisor/git-r3/git/output'
+make: *** [all] Error 2
+ERROR: oe_runmake failed
+
+Signed-off-by: Ting Liu <b28495@freescale.com>
+---
+ src/devtree.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/devtree.c b/src/devtree.c
+index f3710e4..3295e20 100644
+--- a/src/devtree.c
++++ b/src/devtree.c
+@@ -1510,7 +1510,7 @@ static void read_intmap(dt_node_t *node)
+               }
+               if (imap + ent->parent_naddr + ent->parent_nint > imap_end) {
+-                      memset(ent, 0, sizeof(ent));
++                      memset(ent, 0, sizeof(intmap_entry_t));
+                       break;
+               }
+-- 
+1.7.5.4
+
index dc864066e890b2599bbad4e76b17da68d53647a7..ff89bfa2f95c0ed799c1ca01484ad3d66723088d 100644 (file)
@@ -18,6 +18,7 @@ SRC_URI = " \
        git://git.freescale.com/ppc/sdk/hypervisor/libos.git;name=libos;destsuffix=git/libos \
        git://www.jdl.com/software/dtc.git;name=dtc;destsuffix=dtc \
        git://git.freescale.com/ppc/sdk/hypertrk.git;name=hypertrk;destsuffix=git/hypertrk \
+       file://0001-fix-sizeof-pointer-memaccess-error.patch \
        file://81-fsl-embedded-hv.rules \
          "