- Devel - libvirt List Archives

[Libvir] 4/8 Enable the <config.h>-requiring test; fix violations
by Jim Meyering 29 Jan '08

29 Jan '08

Enable the <config.h>-requiring test; fix violations Use <config.h>, not "config.h", per autoconf documentation. * Makefile.cfg (local-checks-to-skip) [sc_require_config_h]: Enable. * .x-sc_require_config_h: New file, to list exempted files. * Makefile.am (EXTRA_DIST): Add .x-sc_require_config_h. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_require_config_h | 5 +++++ ChangeLog | 8 ++++---- Makefile.am | 3 ++- Makefile.cfg | 1 - proxy/libvirt_proxy.c | 2 +- python/libvir.c | 2 +- python/types.c | 2 +- qemud/event.c | 2 +- qemud/qemud.c | 2 +- src/bridge.h | 2 +- src/buf.c | 2 +- src/conf.c | 2 +- src/console.c | 2 +- src/event.c | 2 +- src/gnutls_1_0_compat.h | 2 +- src/hash.c | 2 +- src/iptables.c | 2 +- src/libvirt.c | 2 +- src/nodeinfo.c | 2 +- src/openvz_conf.c | 2 +- src/proxy_internal.c | 2 +- src/qemu_conf.c | 2 +- src/qemu_conf.h | 2 +- src/qemu_driver.c | 2 +- src/qemu_driver.h | 2 +- src/remote_internal.c | 2 +- src/sexpr.c | 2 +- src/stats_linux.c | 2 +- src/test.c | 2 +- src/util.c | 2 +- src/uuid.c | 2 +- src/virsh.c | 2 +- src/virterror.c | 2 +- src/xen_internal.c | 2 +- src/xen_unified.c | 2 +- src/xend_internal.c | 2 +- src/xm_internal.c | 2 +- src/xml.c | 2 +- src/xmlrpc.c | 2 +- src/xs_internal.c | 2 +- tests/conftest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/reconnect.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 2 +- tests/virshtest.c | 2 +- tests/xencapstest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xmlrpctest.c | 2 +- 52 files changed, 59 insertions(+), 54 deletions(-) create mode 100644 .x-sc_require_config_h diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h new file mode 100644 index 0000000..e0903ac --- /dev/null +++ b/.x-sc_require_config_h @@ -0,0 +1,5 @@ +^docs/examples/info1\.c$ +^docs/examples/suspend\.c$ +^gnulib/lib/dummy\.c$ +^gnulib/tests/dummy\.c$ +^qemud/remote_protocol\.c$ diff --git a/ChangeLog b/ChangeLog index 5493e51..7d5e058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -555,7 +555,7 @@ Fri Dec 7 14:27:00 UTC 2007 Richard W.M. Jones <rjones(a)redhat.com> Fri Dec 7 11:06:58 CET 2007 Jim Meyering <meyering(a)redhat.com> - Include "config.h" in remaining non-generated files. + Include <config.h> in remaining non-generated files. * proxy/libvirt_proxy.c: Likewise. * python/libvir.c: Likewise. * python/types.c: Likewise. @@ -619,7 +619,7 @@ Wed Dec 5 23:57:53 CET 2007 Jim Meyering <meyering(a)redhat.com> Wed Dec 5 22:38:18 CET 2007 Jim Meyering <meyering(a)redhat.com> - Include "config.h". + Include <config.h>. * qemud/event.c: Likewise. * src/buf.c: Likewise. * src/hash.c: Likewise. @@ -673,10 +673,10 @@ Wed Dec 5 22:30:03 CET 2007 Jim Meyering <meyering(a)redhat.com> * tests/nodeinfodata/linux-nodeinfo-5.txt: * tests/nodeinfodata/linux-nodeinfo-6.txt: * src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that - would conflict with the one now in "config.h". + would conflict with the one now in <config.h>. * autogen.sh: Add -I gnulib/m4. * src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE. - Instead, include "config.h". + Instead, include <config.h>. * qemud/qemud.c: Remove definition of _GNU_SOURCE. * src/openvz_driver.c: Likewise. * src/qemu_driver.c: Likewise. diff --git a/Makefile.am b/Makefile.am index 5154203..e32033a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ EXTRA_DIST = \ libvirt.spec libvirt.spec.in \ libvirt.pc libvirt.pc.in \ $(man_MANS) autobuild.sh \ - .x-sc_avoid_if_before_free + .x-sc_avoid_if_before_free \ + .x-sc_require_config_h man_MANS = virsh.1 diff --git a/Makefile.cfg b/Makefile.cfg index ba59f29..2c1c9e7 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -49,7 +49,6 @@ local-checks-to-skip = \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_strcmp \ - sc_require_config_h \ sc_root_tests \ sc_space_tab \ sc_sun_os_names \ diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index 5ccf855..83cf39d 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_XEN diff --git a/python/libvir.c b/python/libvir.c index 0fe11f2..e2f7c5b 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <Python.h> #include "libvirt/libvirt.h" diff --git a/python/types.c b/python/types.c index 146bb24..c91d8da 100644 --- a/python/types.c +++ b/python/types.c @@ -7,7 +7,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt_wrap.h" diff --git a/qemud/event.c b/qemud/event.c index b7d75a0..ca7dc11 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <stdlib.h> #include <string.h> diff --git a/qemud/qemud.c b/qemud/qemud.c index 5f3c875..77a2352 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/bridge.h b/src/bridge.h index 52f805b..5dcca00 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -22,7 +22,7 @@ #ifndef __QEMUD_BRIDGE_H__ #define __QEMUD_BRIDGE_H__ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/buf.c b/src/buf.c index 188d040..5bb2bd4 100644 --- a/src/buf.c +++ b/src/buf.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" diff --git a/src/conf.c b/src/conf.c index 8e66d84..8b3aae5 100644 --- a/src/conf.c +++ b/src/conf.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <string.h> diff --git a/src/console.c b/src/console.c index 6b336d9..02a9c7f 100644 --- a/src/console.c +++ b/src/console.c @@ -20,7 +20,7 @@ * Daniel Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifndef __MINGW32__ diff --git a/src/event.c b/src/event.c index 7dcbf32..274db9d 100644 --- a/src/event.c +++ b/src/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "event.h" diff --git a/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h index 7ec8b63..38f6954 100644 --- a/src/gnutls_1_0_compat.h +++ b/src/gnutls_1_0_compat.h @@ -22,7 +22,7 @@ #ifndef LIBVIRT_GNUTLS_1_0_COMPAT_H__ -#include "config.h" +#include <config.h> #ifdef GNUTLS_1_0_COMPAT #define gnutls_session_t gnutls_session diff --git a/src/hash.c b/src/hash.c index 4e4ce60..d92c92c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -18,7 +18,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <string.h> #include <stdlib.h> diff --git a/src/iptables.c b/src/iptables.c index b59faa4..1486411 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -19,7 +19,7 @@ * Mark McLoughlin <markmc(a)redhat.com> */ -#include "config.h" +#include <config.h> #if WITH_QEMU diff --git a/src/libvirt.c b/src/libvirt.c index f4ee2e0..defadc1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9,7 +9,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" #include <stdio.h> diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1b0191b..65a2cf1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 4e4019c..9084184 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -27,7 +27,7 @@ #ifdef WITH_OPENVZ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/proxy_internal.c b/src/proxy_internal.c index e0e5631..a8a7962 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 0de641d..9886300 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 7b242f7..9f09ec1 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -24,7 +24,7 @@ #ifndef __QEMUD_CONF_H #define __QEMUD_CONF_H -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 71a3125..f80a121 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/qemu_driver.h b/src/qemu_driver.h index 66b60b7..72b397c 100644 --- a/src/qemu_driver.h +++ b/src/qemu_driver.h @@ -25,7 +25,7 @@ #ifndef QEMUD_DRIVER_H #define QEMUD_DRIVER_H -#include "config.h" +#include <config.h> #ifdef WITH_QEMU diff --git a/src/remote_internal.c b/src/remote_internal.c index 4d855ab..aa6bb5c 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -21,7 +21,7 @@ * Author: Richard Jones <rjones(a)redhat.com> */ -#include "config.h" +#include <config.h> /* Windows socket compatibility functions. */ #include "socketcompat.h" diff --git a/src/sexpr.c b/src/sexpr.c index bbf0791..e7ea6c8 100644 --- a/src/sexpr.c +++ b/src/sexpr.c @@ -10,7 +10,7 @@ * archive for more details. */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/stats_linux.c b/src/stats_linux.c index de73cef..d2dda88 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -8,7 +8,7 @@ * Richard W.M. Jones <rjones(a)redhat.com> */ -#include "config.h" +#include <config.h> /* This file only applies on Linux. */ #ifdef __linux__ diff --git a/src/test.c b/src/test.c index d39207f..2afd86f 100644 --- a/src/test.c +++ b/src/test.c @@ -21,7 +21,7 @@ * Daniel Berrange <berrange(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_TEST diff --git a/src/util.c b/src/util.c index f16aaf4..0c42124 100644 --- a/src/util.c +++ b/src/util.c @@ -24,7 +24,7 @@ * File created Jul 18, 2007 - Shuveb Hussain <shuveb(a)binarykarma.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdarg.h> diff --git a/src/uuid.c b/src/uuid.c index b2022c4..ae30217 100644 --- a/src/uuid.c +++ b/src/uuid.c @@ -19,7 +19,7 @@ * Mark McLoughlin <markmc(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "uuid.h" diff --git a/src/virsh.c b/src/virsh.c index d081008..a1b3e38 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -13,7 +13,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" #include "libvirt/virterror.h" diff --git a/src/virterror.c b/src/virterror.c index bf4062d..83cf7ca 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -8,7 +8,7 @@ * Author: Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/xen_internal.c b/src/xen_internal.c index a8cecef..1292382 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/src/xen_unified.c b/src/xen_unified.c index d46e63b..d5b2ec2 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -8,7 +8,7 @@ * Richard W.M. Jones <rjones(a)redhat.com> */ -#include "config.h" +#include <config.h> #ifdef WITH_XEN diff --git a/src/xend_internal.c b/src/xend_internal.c index 61af69b..814d16f 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -11,7 +11,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <sys/types.h> diff --git a/src/xm_internal.c b/src/xm_internal.c index 90dc1a4..57d0eb4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -23,7 +23,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <dirent.h> #include <time.h> diff --git a/src/xml.c b/src/xml.c index a546002..76ca91c 100644 --- a/src/xml.c +++ b/src/xml.c @@ -8,7 +8,7 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include "config.h" +#include <config.h> #include "libvirt/libvirt.h" diff --git a/src/xmlrpc.c b/src/xmlrpc.c index f956f0d..ac4ea6e 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -8,7 +8,7 @@ * Anthony Liguori <aliguori(a)us.ibm.com> */ -#include "config.h" +#include <config.h> #include "xmlrpc.h" #include "internal.h" diff --git a/src/xs_internal.c b/src/xs_internal.c index 1dbbba6..6d8610c 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -9,7 +9,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/conftest.c b/tests/conftest.c index abb68fd..637b737 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <unistd.h> #include <stdlib.h> diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 969b85c..c80e65c 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 22e2e81..5606744 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2ab1696..1be0e46 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/reconnect.c b/tests/reconnect.c index 4c4d648..e9bdcdb 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 6586e92..c55aa4b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/testutils.c b/tests/testutils.c index 4fea6b6..80b1022 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/virshtest.c b/tests/virshtest.c index fd6dcbb..676cb71 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/xencapstest.c b/tests/xencapstest.c index bf9ce07..1307d80 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 51f4b67..424eae4 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -21,7 +21,7 @@ * */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 2d18e60..3118379 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -1,5 +1,5 @@ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> diff --git a/tests/xmlrpctest.c b/tests/xmlrpctest.c index 5fa937f..eb75f64 100644 --- a/tests/xmlrpctest.c +++ b/tests/xmlrpctest.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> -- 1.5.4.rc4.15.g215c5

3 3

[Libvir] 6/8 Enable the po-check test; fix violations.
by Jim Meyering 29 Jan '08

29 Jan '08

This ensures that files with translatable strings are listed in po/POTFILES.in. Currently it checks only the "error" function. Obviously we'll have to add a few more here, but I'll do that separately. ---------------- Enable the po-check test; fix violations. * Makefile.cfg (local-checks-to-skip) [po-check]: Enable. * po/POTFILES.in: Add three file names. Sort. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.cfg | 1 - po/POTFILES.in | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile.cfg b/Makefile.cfg index 2c1c9e7..697fde4 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -26,7 +26,6 @@ url_dir_list = \ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ - po-check \ makefile_path_separator_check \ makefile-check \ sc_no_have_config_h \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 50422fb..b4b9cd2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,13 +1,16 @@ -src/libvirt.c -src/virterror.c -src/xmlrpc.c +gnulib/lib/gai_strerror.c +src/conf.c +src/console.c src/hash.c -src/test.c -src/xml.c +src/libvirt.c +src/proxy_internal.c +src/remote_internal.c src/sexpr.c -src/xend_internal.c +src/test.c src/virsh.c -src/conf.c -src/xs_internal.c -src/proxy_internal.c +src/virterror.c src/xen_internal.c +src/xend_internal.c +src/xml.c +src/xmlrpc.c +src/xs_internal.c -- 1.5.4.rc4.15.g215c5

3 2

[Libvir] 5/8 update from gnulib
by Jim Meyering 29 Jan '08

29 Jan '08

Checking for violations in libvirt exposed a few new ones in gnulib. This fixes those and also pulls in a few unrelated changes. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- gnulib/lib/Makefile.am | 2 ++ gnulib/lib/poll.c | 6 +++--- gnulib/lib/string.in.h | 15 +++++++++++---- gnulib/m4/string_h.m4 | 4 +++- gnulib/tests/test-getaddrinfo.c | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index e7a6edf..64fc398 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -509,8 +509,10 @@ string.h: string.in.h -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/string.in.h; \ } > $@-t diff --git a/gnulib/lib/poll.c b/gnulib/lib/poll.c index db7b517..aa40d8c 100644 --- a/gnulib/lib/poll.c +++ b/gnulib/lib/poll.c @@ -1,7 +1,7 @@ /* Emulation for poll(2) Contributed by Paolo Bonzini. - Copyright 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of gnulib. @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" +#include <config.h> #include <sys/types.h> #include "poll.h" @@ -132,7 +132,7 @@ poll (pfd, nfd, timeout) maxfd = pfd[i].fd; /* Windows use a linear array of sockets (of size FD_SETSIZE). The - descriptor value is not used to address the array. */ + descriptor value is not used to address the array. */ #if defined __CYGWIN__ || (!defined _WIN32 && !defined __WIN32__) if (maxfd > FD_SETSIZE) { diff --git a/gnulib/lib/string.in.h b/gnulib/lib/string.in.h index dbbe2fd..b10a491 100644 --- a/gnulib/lib/string.in.h +++ b/gnulib/lib/string.in.h @@ -313,11 +313,15 @@ char *strstr (const char *haystack, const char *needle) /* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive comparison. */ -#if ! @HAVE_STRCASESTR@ +#if @GNULIB_STRCASESTR@ +# if @REPLACE_STRCASESTR@ +# define strcasestr rpl_strcasestr +# endif +# if ! @HAVE_STRCASESTR@ || @REPLACE_STRCASESTR@ extern char *strcasestr (const char *haystack, const char *needle) __attribute__ ((__pure__)); -#endif -#if defined GNULIB_POSIXCHECK +# endif +#elif defined GNULIB_POSIXCHECK /* strcasestr() does not work with multibyte strings: It is a glibc extension, and glibc implements it only for unibyte locales. */ @@ -542,7 +546,10 @@ extern char *strerror (int); #endif #if @GNULIB_STRSIGNAL@ -# if ! @HAVE_DECL_STRSIGNAL@ +# if @REPLACE_STRSIGNAL@ +# define strsignal rpl_strsignal +# endif +# if ! @HAVE_DECL_STRSIGNAL@ || @REPLACE_STRSIGNAL@ extern char *strsignal (int __sig); # endif #elif defined GNULIB_POSIXCHECK diff --git a/gnulib/m4/string_h.m4 b/gnulib/m4/string_h.m4 index 69761d7..766d7e9 100644 --- a/gnulib/m4/string_h.m4 +++ b/gnulib/m4/string_h.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # Written by Paul Eggert. @@ -80,6 +80,8 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], HAVE_DECL_STRERROR=1; AC_SUBST([HAVE_DECL_STRERROR]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) + REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) + REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) ]) diff --git a/gnulib/tests/test-getaddrinfo.c b/gnulib/tests/test-getaddrinfo.c index 7763f43..00a980b 100644 --- a/gnulib/tests/test-getaddrinfo.c +++ b/gnulib/tests/test-getaddrinfo.c @@ -1,6 +1,6 @@ /* Test the getaddrinfo module. - Copyright (C) 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ /* Written by Simon Josefsson. */ -#include "config.h" +#include <config.h> #include "getaddrinfo.h" #include "inet_ntop.h" #include <stdio.h> -- 1.5.4.rc4.15.g215c5

3 2

[Libvir] 0/8 add syntax checks
by Jim Meyering 29 Jan '08

29 Jan '08

A few days ago I wrote a patch eliminating all of the useless if tests of the form "if (foo) free (foo);". In general, when making such a global change, I prefer to add a check so that it is easy to ensure mechanically that the new violations don't sneak back in. So I wrote a script to detect the above, then another to perform the "remove-if-cond" part as a double check against my detect-and-manually-remove work. Once you can mechanically detect the offending pattern, it's good to make it as easy as possible to check for recurrence. In other projects, I've used "make syntax-check", because most such tests are syntax-related and detectable using tools like grep. The first patch simply removes the useless if tests. Following it, I introduce a "make syntax-check" framework similar to what I use in coreutils. In it, most tests are disabled, except the new one that tests for the unnecessary "if"-before-free. In the following 6 patches, I enable new tests one by one, and correct the violations each one exposes. I deliberately keep these tests in a separate Makefile.maint file, and pull them in via GNUmakefile so that they are not subject to the burdensome portability constraints associated with regular Makefile.am contents. I.e., if you run "make syntax-check", you are expected to have GNU make as well as a reasonable set of working tools. Thus, we don't have to worry about whether egrep works or whether e.g., perl is present. Jim

2 1

Re: [Libvir] compilation of libvirt 0.4.0 and cvs snapshot failson SLES10sp1
by Sebastian Reitenbach 29 Jan '08

29 Jan '08

Hi, "Richard W.M. Jones" <rjones(a)redhat.com> wrote: > Sebastian Reitenbach wrote: > > Hi, > > > > I am running sles10sp1 x86_64. I try to get xen 3.1.0 running on it, as I > > need a feature not in 3.0.4. > > > > Configure works well, but when it comes to compilation, then it fails with > > the following reason: > > > > > > gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include > > -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\"/usr/local/libexec\" > > -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" > > -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" > > -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security > > -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow > > -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline > > -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions > > -fasynchronous-unwind-tables -DWITH_QEMU -DWITH_TEST -DWITH_REMOTE -DWITH_XEN -g > > -O2 -MT > > libvirt_la-xen_unified.lo -MD -MP -MF .deps/libvirt_la-xen_unified.Tpo -c > > xen_unified.c -fPIC -DPIC -o .libs/libvirt_la-xen_unified.o > > In file included from /usr/include/xen/dom0_ops.h:31, > > from xen_unified.c:29: > > /usr/include/xen/xen.h:579: error: expected '=', ',', ';', 'asm' > > or '__attribute__' before 'char' > > /usr/include/xen/xen.h:580: error: expected '=', ',', ';', 'asm' > > or '__attribute__' before 'short' > > /usr/include/xen/xen.h:581: error: expected '=', ',', ';', 'asm' > > or '__attribute__' before 'int' > > /usr/include/xen/xen.h:582: error: expected '=', ',', ';', 'asm' > > or '__attribute__' before 'long' > > make[2]: *** [libvirt_la-xen_unified.lo] Error 1 > > make[2]: Leaving directory `/usr/local/src/libvirt-0.4.0/src' > > make[1]: *** [all-recursive] Error 1 > > make[1]: Leaving directory `/usr/local/src/libvirt-0.4.0' > > make: *** [all] Error 2 > > Does src/xen_unified.c in that version '#include <config.h>' somewhere > very close to the top of the file? yes, it includes the config.h but it looks like this: #include "config.h" Sebastian

1 0

[Libvir] compilation of libvirt 0.4.0 and cvs snapshot fails on SLES10sp1
by Sebastian Reitenbach 29 Jan '08

29 Jan '08

Hi, I am running sles10sp1 x86_64. I try to get xen 3.1.0 running on it, as I need a feature not in 3.0.4. Configure works well, but when it comes to compilation, then it fails with the following reason: gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_QEMU -DWITH_TEST -DWITH_REMOTE -DWITH_XEN -g -O2 -MT libvirt_la-xen_unified.lo -MD -MP -MF .deps/libvirt_la-xen_unified.Tpo -c xen_unified.c -fPIC -DPIC -o .libs/libvirt_la-xen_unified.o In file included from /usr/include/xen/dom0_ops.h:31, from xen_unified.c:29: /usr/include/xen/xen.h:579: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'char' /usr/include/xen/xen.h:580: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'short' /usr/include/xen/xen.h:581: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int' /usr/include/xen/xen.h:582: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'long' make[2]: *** [libvirt_la-xen_unified.lo] Error 1 make[2]: Leaving directory `/usr/local/src/libvirt-0.4.0/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/usr/local/src/libvirt-0.4.0' make: *** [all] Error 2 The same happens with xen 3.0.4 installed. any hint what I can do about that? kind regards Sebastian

2 1

Re: [Libvir] Libvirt on windows
by Richard W.M. Jones 29 Jan '08

29 Jan '08

Gabriel Kaufmann wrote: > I want to be able to connect to the Xen server using libvirt [...] And yes, connecting to a remote Xen server from Windows should work. At least, it does for me. The server must be running libvirtd, and you will need to specify a remote connection URI such as xen+tcp://server/ (see http://libvirt.org/remote.html) Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

Re: [Libvir] Libvirt on windows
by Richard W.M. Jones 29 Jan '08

29 Jan '08

Gabriel Kaufmann wrote: > Hi, > > I'm still unable to build (see output files attached). This is from the sources I downloaded from ftp://libvirt.org/libvirt/libvirt-cvs-snapshot.tar.gz > > When running configure I get a popup error message that libconf-2.dll is missing. Looking at MinGW site, I found version 1.11 of libconv. Do I have to use a later version? If yes where can I find it. > > I'm having problem understanding which libraries and versions I should use for the compilation. > Do you have a more detailed list of packages to install in MinGW. > If you can send me this lis, I'll start from the beginning using a new (clean) XP installation. > > Can I just use the binaries compiled in https://www.redhat.com/archives/libvir-list/2008-January/msg00072.html ? > I want to be able to connect to the Xen server using libvirt from Microsoft Visual Studio using c/C++. Sorry for late reply, I was on holiday yesterday. For the build error, looks like a regression because of some recently added / updated code. I'll have to boot up my Windows machine and take a look. Versions of the packages used: MinGW & MSYS "candidate" versions (specifically, gcc 4 is required) GnuTLS 1.6.3 (binary for Windows on their site) Make sure you install it in a location _without_ a space in the path (ie. not the default). You have to hack the *.la files to correct the hard-coded paths. libxml2 2.6.30 (I compiled from source, but there are also binaries available) My PortableXDR library. You should be able to use the binaries from that location. Within the installer you'll find a 'libvirt.dll' + all the *.dll that it requires. Supposedly this DLL will work on MS VC++, but obviously I haven't tested this. The thing to do is to try it. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] Re; virDomainBlockStats
by Gareth Bult 27 Jan '08

27 Jan '08

Hi, I've a number of servers running XEN and am trying to write some code to monitor them through libvirt. (Xeon/Dual Core/Ubuntu Gutsy/Xen 3.1) All was going well until I got to virDomainBlockStats and it simply refused to accept my coding .. My solution (the code now works) is to change the following; src/stats_linux.c: #ifndef XENVBD_MAJOR #define XENVBD_MAJOR 3 // <--- I changed this! /*#define XENVBD_MAJOR 202*/ #endif device = XENVBD_MAJOR * 256 + 1 + minor /* * 16 */; <-- this too! It now seems to give me some meaningful numbers without feeding my any error messages. Can anyone tell me "why" I needed to do this? I'm using "xvda" as the device path .. tried every other device name I could think of with out any good results ... ????? tia Gareth.

3 6

Re: [Libvir] Re; virDomainBlockStats
by Gareth Bult 27 Jan '08

27 Jan '08

Mmm, Ok .. I've pretty much spent the last week getting Xen 3.2 to function "properly" built entirely from raw XEN sources using Xen's documentation. AIO is still a flakey as hell, one time through the loop and the instance seems to work, second time around it won't start and neither will anything else. I have file: based instances running just fine .. my guess is the unload problem is still there, but the kernel logging is gone and they've created a critical system lock-up in it's place. Is there any documentation to the effect that "file" is bad?? The official XEN documentation lists "file" as the standard and makes no mention of "aio". Currently I'm mounting my image on gluster filesystems and I'm getting 70Mb/sec so I'm not unhappy with the performance, and I've had no issues recently with crashes. ... more information would be useful if you have it. Whereas I'm happy to accept that aio is better in principle, as far as I can see although it may work for you, I've now tried it in a number of different configurations on a number of machines and it's simply unusable. tia Gareth. ----- Original Message ----- step 3.: "Daniel P. Berrange" <berrange(a)redhat.com> To: "Gareth Bult" <gareth(a)encryptec.net> Sent: 19 January 2008 17:50:01 o'clock (GMT) Europe/London Subject: Re: [Libvir] Re; virDomainBlockStats On Sat, Jan 19, 2008 at 05:18:58PM +0000, Gareth Bult wrote: > Mmm, > > Interesting .. > > First off, xentop doesn't display block device stats for tap:aio based systems and it does for file. > Second, tap:aio generated kernel Ooops's when you shutdown a DomU. > > Not exactly what I'd call mainstream (!) That must be a flaw in Ubuntu's kernels. tap:aio works flawlessly in Fedora / RHEL and is the only supported option, because file: has catastrophic data loss issues during host crashes. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 4