From mboxrd@z Thu Jan 1 00:00:00 1970 From: aq Subject: Re: [PATCH] fix broken ACM Date: Thu, 23 Jun 2005 16:56:52 +0900 Message-ID: <9cde8bff0506230056a11146a@mail.gmail.com> References: <9cde8bff050622205635e60050@mail.gmail.com> Reply-To: aq Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_3081_1821861.1119513412788" Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Stefan Berger Cc: xen-devel List-Id: xen-devel@lists.xenproject.org ------=_Part_3081_1821861.1119513412788 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On 6/23/05, Stefan Berger wrote: > aq wrote on 06/22/2005 11:56:07 PM: >=20 > > On 6/23/05, Stefan Berger wrote: > > > xen-devel-bounces@lists.xensource.com wrote on 06/22/2005 01:40:16 PM= : > > > > > > > The latest change to ACM makes it fail to compile. This patch fixes > the > > > problem. > > > > > > > > Signed-off-by: Nguyen Anh Quynh > > > > > > > > $ diffstat acm.patch > > > > acm/acm_core.c | 61 --------------------- > > > > include/acm/acm_hooks.h | 135 > > > ++++++++++++++++++++++++++++++++++-------------- > > > > 2 files changed, 96 insertions(+), 100 deletions(-) > > > > [attachment "acm.patch" deleted by Stefan Berger/Watson/IBM] > > > > > > This patch seems to work for gcc 4.0.0 (FC4), but the resulting sourc= e > > > does not compile with gcc 3.4.3 (FC3). I will try to find a common > > > solution. I think the problem is related to gcc 3.4.3 having a limit > on > > > inline functions. > > > > it builds fine for me on gcc 3.3.5 > > > > $ gcc -v > > Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.5/specs > > Configured with: ../src/configure -v > > --enable-languages=3Dc,c++,java,f77,pascal,objc,ada,treelang > > --prefix=3D/usr --mandir=3D/usr/share/man --infodir=3D/usr/share/info > > --with-gxx-include-dir=3D/usr/include/c++/3.3 --enable-shared > > --with-system-zlib --enable-nls --without-included-gettext > > --enable-__cxa_atexit --enable-clocale=3Dgnu --enable-debug > > --enable-java-gc=3Dboehm --enable-java-awt=3Dxlib --enable-objc-gc > > i486-linux > > Thread model: posix > > gcc version 3.3.5 (Debian 1:3.3.5-8ubuntu2) >=20 > It seems to be missing a couple of prototypes. >=20 > In file included from dom0_ops.c:22: > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h: In function `acm_init'= : > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:359: warning: implicit > declaration of function `acm_set_endian' > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:364: warning: implicit > declaration of function `acm_init_chwall_policy' > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:366: error: > `acm_chinesewall_ops' undeclared (first use in this function) > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:366: error: (Each > undeclared identifier is reported only once > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:366: error: for each > function it appears in.) > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:368: error: > `acm_null_ops' undeclared (first use in this function) > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:372: warning: implicit > declaration of function `acm_init_ste_policy' > /xen/xeno-unstable.bk/xen/include/acm/acm_hooks.h:374: error: > `acm_simple_type_enforcement_ops' undeclared (first use in this function) > make[2]: *** [dom0_ops.o] Error 1 > make[2]: Leaving directory `/xen/xeno-unstable.bk/xen/common' > make[1]: *** [/xen/xeno-unstable.bk/xen/xen] Error 2 > make[1]: Leaving directory `/xen/xeno-unstable.bk/xen' > make: *** [xen] Error 2 >=20 >=20 > Once those are fixed the following happens: >=20 > ld -m elf_i386 -T x86_32/xen.lds -N \ > boot/x86_32.o /xen/xeno-unstable.bk/xen/common/common.o > /xen/xeno-unstable.bk/xen/drivers/char/driver.o > /xen/xeno-unstable.bk/xen/drivers/acpi/driver.o > /xen/xeno-unstable.bk/xen/arch/x86/arch.o -o > /xen/xeno-unstable.bk/xen/xen-syms > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x121a): In function > `do_dom0_op': > : undefined reference to `acm_primary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x1246): In function > `do_dom0_op': > : undefined reference to `acm_secondary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x126b): In function > `do_dom0_op': > : undefined reference to `acm_primary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x1288): In function > `do_dom0_op': > : undefined reference to `acm_secondary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x12b0): In function > `do_dom0_op': > : undefined reference to `acm_primary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x12c0): In function > `do_dom0_op': > : undefined reference to `acm_secondary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x12d7): In function > `do_dom0_op': > : undefined reference to `acm_free_domain_ssid' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x134e): In function > `do_dom0_op': > : undefined reference to `acm_primary_ops' > /xen/xeno-unstable.bk/xen/common/common.o(.text+0x1376): In function > `do_dom0_op': > : undefined reference to `acm_init_domain_ssid' > [...] >=20 ok, i see the point. the problem is because i moved some codes (acm_init() and acm_init_binary_policy()) to acm_hooks.h. now it seems better to move them back. but it is weird that i got no problem with gcc 3.3.5 could you please try again with the new patch below?=20 Signed-off-by: Nguyen Anh Quynh # diffstat acm3.patch=20 acm/acm_core.c | 3 + include/acm/acm_hooks.h | 76 ++++++++++++++++++++++++-------------------= ----- 2 files changed, 41 insertions(+), 38 deletions(-) ------=_Part_3081_1821861.1119513412788 Content-Type: text/x-patch; name="acm3.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="acm3.patch" PT09PT0geGVuL2FjbS9hY21fY29yZS5jIDEuMSB2cyBlZGl0ZWQgPT09PT0KLS0tIDEuMS94ZW4v YWNtL2FjbV9jb3JlLmMJMjAwNS0wNi0yMSAwNzoyODowNiArMDk6MDAKKysrIGVkaXRlZC94ZW4v YWNtL2FjbV9jb3JlLmMJMjAwNS0wNi0yMyAxNjo1MzoxNyArMDk6MDAKQEAgLTc5LDYgKzc5LDgg QEAKIAlhY21fYmluX3BvbC5zZWNvbmRhcnlfYmluYXJ5X3BvbGljeSA9IHNlY29uZGFyeTsKIH0K IAorI2lmIChBQ01fVVNFX1NFQ1VSSVRZX1BPTElDWSAhPSBBQ01fTlVMTF9QT0xJQ1kpCisKIGlu dAogYWNtX2luaXQodm9pZCkKIHsKQEAgLTEyOSw2ICsxMzEsNyBAQAogCXJldHVybiBBQ01fT0s7 CiB9CiAKKyNlbmRpZgogCiBpbnQKIGFjbV9pbml0X2RvbWFpbl9zc2lkKGRvbWlkX3QgaWQsIHNz aWRyZWZfdCBzc2lkcmVmKQo9PT09PSB4ZW4vaW5jbHVkZS9hY20vYWNtX2hvb2tzLmggMS4yIHZz IGVkaXRlZCA9PT09PQotLS0gMS4yL3hlbi9pbmNsdWRlL2FjbS9hY21faG9va3MuaAkyMDA1LTA2 LTIyIDIzOjE4OjExICswOTowMAorKysgZWRpdGVkL3hlbi9pbmNsdWRlL2FjbS9hY21faG9va3Mu aAkyMDA1LTA2LTIzIDE2OjMwOjQ4ICswOTowMApAQCAtMzAsNiArMzAsNDQgQEAKICNpbmNsdWRl IDxwdWJsaWMvZXZlbnRfY2hhbm5lbC5oPgogI2luY2x1ZGUgPGFzbS9jdXJyZW50Lmg+CiAKK3N0 cnVjdCBhY21fb3BlcmF0aW9ucyB7CisgICAgLyogcG9saWN5IG1hbmFnZW1lbnQgZnVuY3Rpb25z IChtdXN0IGFsd2F5cyBiZSBkZWZpbmVkISkgKi8KKyAgICBpbnQgICgqaW5pdF9kb21haW5fc3Np ZCkgICAgICAgICAgICh2b2lkICoqc3NpZCwgc3NpZHJlZl90IHNzaWRyZWYpOworICAgIHZvaWQg KCpmcmVlX2RvbWFpbl9zc2lkKSAgICAgICAgICAgKHZvaWQgKnNzaWQpOworICAgIGludCAgKCpk dW1wX2JpbmFyeV9wb2xpY3kpICAgICAgICAgKHU4ICpidWZmZXIsIHUxNiBidWZfc2l6ZSk7Cisg ICAgaW50ICAoKnNldF9iaW5hcnlfcG9saWN5KSAgICAgICAgICAodTggKmJ1ZmZlciwgdTE2IGJ1 Zl9zaXplKTsKKyAgICBpbnQgICgqZHVtcF9zdGF0aXN0aWNzKSAgICAgICAgICAgICh1OCAqYnVm ZmVyLCB1MTYgYnVmX3NpemUpOworICAgIC8qIGRvbWFpbiBtYW5hZ2VtZW50IGNvbnRyb2wgaG9v a3MgKGNhbiBiZSBOVUxMKSAqLworICAgIGludCAgKCpwcmVfZG9tYWluX2NyZWF0ZSkgICAgICAg ICAgKHZvaWQgKnN1YmplY3Rfc3NpZCwgc3NpZHJlZl90IHNzaWRyZWYpOworICAgIHZvaWQgKCpw b3N0X2RvbWFpbl9jcmVhdGUpICAgICAgICAgKGRvbWlkX3QgZG9taWQsIHNzaWRyZWZfdCBzc2lk cmVmKTsKKyAgICB2b2lkICgqZmFpbF9kb21haW5fY3JlYXRlKSAgICAgICAgICh2b2lkICpzdWJq ZWN0X3NzaWQsIHNzaWRyZWZfdCBzc2lkcmVmKTsKKyAgICB2b2lkICgqcG9zdF9kb21haW5fZGVz dHJveSkgICAgICAgICh2b2lkICpvYmplY3Rfc3NpZCwgZG9taWRfdCBpZCk7CisgICAgLyogZXZl bnQgY2hhbm5lbCBjb250cm9sIGhvb2tzICAoY2FuIGJlIE5VTEwpICovCisgICAgaW50ICAoKnBy ZV9ldmVudGNoYW5uZWxfdW5ib3VuZCkgICAgICAoZG9taWRfdCBpZCk7CisgICAgdm9pZCAoKmZh aWxfZXZlbnRjaGFubmVsX3VuYm91bmQpICAgICAoZG9taWRfdCBpZCk7CisgICAgaW50ICAoKnBy ZV9ldmVudGNoYW5uZWxfaW50ZXJkb21haW4pICAoZG9taWRfdCBpZDEsIGRvbWlkX3QgaWQyKTsK KyAgICBpbnQgICgqZmFpbF9ldmVudGNoYW5uZWxfaW50ZXJkb21haW4pIChkb21pZF90IGlkMSwg ZG9taWRfdCBpZDIpOworICAgIC8qIGdyYW50IHRhYmxlIGNvbnRyb2wgaG9va3MgKGNhbiBiZSBO VUxMKSAgKi8KKyAgICBpbnQgICgqcHJlX2dyYW50X21hcF9yZWYpICAgICAgICAgIChkb21pZF90 IGlkKTsKKyAgICB2b2lkICgqZmFpbF9ncmFudF9tYXBfcmVmKSAgICAgICAgIChkb21pZF90IGlk KTsKKyAgICBpbnQgICgqcHJlX2dyYW50X3NldHVwKSAgICAgICAgICAgIChkb21pZF90IGlkKTsK KyAgICB2b2lkICgqZmFpbF9ncmFudF9zZXR1cCkgICAgICAgICAgIChkb21pZF90IGlkKTsKK307 CisKKy8qIGdsb2JhbCB2YXJpYWJsZXMgKi8KK2V4dGVybiBzdHJ1Y3QgYWNtX29wZXJhdGlvbnMg KmFjbV9wcmltYXJ5X29wczsKK2V4dGVybiBzdHJ1Y3QgYWNtX29wZXJhdGlvbnMgKmFjbV9zZWNv bmRhcnlfb3BzOworCisvKiBpZiBBQ01fVFJBQ0VfTU9ERSBkZWZpbmVkLCBhbGwgaG9va3Mgc2hv dWxkCisgKiBwcmludCBhIHNob3J0IHRyYWNlIG1lc3NhZ2UgKi8KKy8qICNkZWZpbmUgQUNNX1RS QUNFX01PREUgKi8KKworI2lmZGVmIEFDTV9UUkFDRV9NT0RFCisjIGRlZmluZSB0cmFjZXByaW50 ayhmbXQsIGFyZ3MuLi4pIHByaW50ayhmbXQsIyMgYXJncykKKyNlbHNlCisjIGRlZmluZSB0cmFj ZXByaW50ayhmbXQsIGFyZ3MuLi4pCisjZW5kaWYKKwogI2lmIChBQ01fVVNFX1NFQ1VSSVRZX1BP TElDWSA9PSBBQ01fTlVMTF9QT0xJQ1kpCiAKIHN0YXRpYyBpbmxpbmUgaW50IGFjbV9wcmVfZG9t MF9vcChkb20wX29wX3QgKm9wLCB2b2lkICoqc3NpZCkgCkBAIC01MSwyMCArODksNiBAQAogCiAj ZWxzZQogCi0vKiBpZiBBQ01fVFJBQ0VfTU9ERSBkZWZpbmVkLCBhbGwgaG9va3Mgc2hvdWxkCi0g KiBwcmludCBhIHNob3J0IHRyYWNlIG1lc3NhZ2UgKi8KLS8qICNkZWZpbmUgQUNNX1RSQUNFX01P REUgKi8KLQotI2lmZGVmIEFDTV9UUkFDRV9NT0RFCi0jIGRlZmluZSB0cmFjZXByaW50ayhmbXQs IGFyZ3MuLi4pIHByaW50ayhmbXQsIyMgYXJncykKLSNlbHNlCi0jIGRlZmluZSB0cmFjZXByaW50 ayhmbXQsIGFyZ3MuLi4pCi0jZW5kaWYKLQotLyogZ2xvYmFsIHZhcmlhYmxlcyAqLwotZXh0ZXJu IHN0cnVjdCBhY21fb3BlcmF0aW9ucyAqYWNtX3ByaW1hcnlfb3BzOwotZXh0ZXJuIHN0cnVjdCBh Y21fb3BlcmF0aW9ucyAqYWNtX3NlY29uZGFyeV9vcHM7Ci0KIC8qKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICAqIEhP T0sgc3RydWN0dXJlIGFuZCBtZWFuaW5nIChqdXN0aWZpZXMgYSBmZXcgd29yZHMgYWJvdXQgb3Vy IG1vZGVsKToKICAqIApAQCAtMTIzLDMwICsxNDcsNiBAQAogICogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHN5cy1vcHMgZXJyb3IKICAqCiAgKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov Ci0KLXN0cnVjdCBhY21fb3BlcmF0aW9ucyB7Ci0gICAgLyogcG9saWN5IG1hbmFnZW1lbnQgZnVu Y3Rpb25zIChtdXN0IGFsd2F5cyBiZSBkZWZpbmVkISkgKi8KLSAgICBpbnQgICgqaW5pdF9kb21h aW5fc3NpZCkgICAgICAgICAgICh2b2lkICoqc3NpZCwgc3NpZHJlZl90IHNzaWRyZWYpOwotICAg IHZvaWQgKCpmcmVlX2RvbWFpbl9zc2lkKSAgICAgICAgICAgKHZvaWQgKnNzaWQpOwotICAgIGlu dCAgKCpkdW1wX2JpbmFyeV9wb2xpY3kpICAgICAgICAgKHU4ICpidWZmZXIsIHUxNiBidWZfc2l6 ZSk7Ci0gICAgaW50ICAoKnNldF9iaW5hcnlfcG9saWN5KSAgICAgICAgICAodTggKmJ1ZmZlciwg dTE2IGJ1Zl9zaXplKTsKLSAgICBpbnQgICgqZHVtcF9zdGF0aXN0aWNzKSAgICAgICAgICAgICh1 OCAqYnVmZmVyLCB1MTYgYnVmX3NpemUpOwotICAgIC8qIGRvbWFpbiBtYW5hZ2VtZW50IGNvbnRy b2wgaG9va3MgKGNhbiBiZSBOVUxMKSAqLwotICAgIGludCAgKCpwcmVfZG9tYWluX2NyZWF0ZSkg ICAgICAgICAgKHZvaWQgKnN1YmplY3Rfc3NpZCwgc3NpZHJlZl90IHNzaWRyZWYpOwotICAgIHZv aWQgKCpwb3N0X2RvbWFpbl9jcmVhdGUpICAgICAgICAgKGRvbWlkX3QgZG9taWQsIHNzaWRyZWZf dCBzc2lkcmVmKTsKLSAgICB2b2lkICgqZmFpbF9kb21haW5fY3JlYXRlKSAgICAgICAgICh2b2lk ICpzdWJqZWN0X3NzaWQsIHNzaWRyZWZfdCBzc2lkcmVmKTsKLSAgICB2b2lkICgqcG9zdF9kb21h aW5fZGVzdHJveSkgICAgICAgICh2b2lkICpvYmplY3Rfc3NpZCwgZG9taWRfdCBpZCk7Ci0gICAg LyogZXZlbnQgY2hhbm5lbCBjb250cm9sIGhvb2tzICAoY2FuIGJlIE5VTEwpICovCi0gICAgaW50 ICAoKnByZV9ldmVudGNoYW5uZWxfdW5ib3VuZCkgICAgICAoZG9taWRfdCBpZCk7Ci0gICAgdm9p ZCAoKmZhaWxfZXZlbnRjaGFubmVsX3VuYm91bmQpICAgICAoZG9taWRfdCBpZCk7Ci0gICAgaW50 ICAoKnByZV9ldmVudGNoYW5uZWxfaW50ZXJkb21haW4pICAoZG9taWRfdCBpZDEsIGRvbWlkX3Qg aWQyKTsKLSAgICBpbnQgICgqZmFpbF9ldmVudGNoYW5uZWxfaW50ZXJkb21haW4pIChkb21pZF90 IGlkMSwgZG9taWRfdCBpZDIpOwotICAgIC8qIGdyYW50IHRhYmxlIGNvbnRyb2wgaG9va3MgKGNh biBiZSBOVUxMKSAgKi8KLSAgICBpbnQgICgqcHJlX2dyYW50X21hcF9yZWYpICAgICAgICAgIChk b21pZF90IGlkKTsKLSAgICB2b2lkICgqZmFpbF9ncmFudF9tYXBfcmVmKSAgICAgICAgIChkb21p ZF90IGlkKTsKLSAgICBpbnQgICgqcHJlX2dyYW50X3NldHVwKSAgICAgICAgICAgIChkb21pZF90 IGlkKTsKLSAgICB2b2lkICgqZmFpbF9ncmFudF9zZXR1cCkgICAgICAgICAgIChkb21pZF90IGlk KTsKLX07CiAKIHN0YXRpYyBpbmxpbmUgaW50IGFjbV9wcmVfZG9tYWluX2NyZWF0ZSh2b2lkICpz dWJqZWN0X3NzaWQsIHNzaWRyZWZfdCBzc2lkcmVmKQogewo= ------=_Part_3081_1821861.1119513412788 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------=_Part_3081_1821861.1119513412788--