- Devel - libvirt List Archives

[Libvir] moving "aux" files into a subdir
by Jim Meyering 06 Dec '07

06 Dec '07

I noticed that gnulib-tool had deposited a file named link-warning.h into the top-level directory. How odd, I thought. This doesn't affect other projects because most of them define what autoconf calls the "AUX" directory, with a line like this in configure.in or configure.ac: AC_CONFIG_AUX_DIR(build-aux) If you don't define that, it defaults to the top level directory, and that's where files pulled in by gettextize like these are deposited: config.guess compile libtool ltconfig ltmain.sh config.sub config.rpath mkinstalldirs Rather than committing link-warning.h in the top-level, I propose to add the above AC_CONFIG_AUX_DIR line. That change should be transparent to all the other tools, and would let me commit link-warning.h in the build-aux subdir, instead of in the top-level dir. Any objection?

2 2

[Libvir] Preliminary packages for libvirt on Debian
by Richard W.M. Jones 06 Dec '07

06 Dec '07

These are preliminary packages for libvirt 0.3.3 on Debian. The libvirt package is derived from the one in Ubuntu, originally packaged by Andrew Mitchell. Xen --- Unfortunately a patch is needed to the base Xen package in Debian, so that it includes the header files needed by libvirt. Doubly unfortunately because of the strange way that Xen is packaged in Debian it isn't possible to modify the changelog (therefore the version or release number) without some voodoo which I don't understand[1]. So the version here has the same version/release as the one currently in Debian testing. As a result you'll have to manually install it using dpkg. Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/xen-docs-3.1_3.1.1-1_all.deb http://et.redhat.com/~rjones/debian-libvirt/xen-hypervisor-3.1-1-i386_3.1.1… http://et.redhat.com/~rjones/debian-libvirt/xen-hypervisor-3.1-1-i386-nonpa… http://et.redhat.com/~rjones/debian-libvirt/xen-utils-3.1-1_3.1.1-1_i386.deb Patch required to get the right header files: http://et.redhat.com/~rjones/debian-libvirt/debian-xen-includes.patch libvirt ------- Source: http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.diff.gz http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.dsc http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1_i386.changes http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3.orig.tar.gz Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/libvirt0_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-bin_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-dev_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/python-libvirt_0.3.3-1_i386.deb virt-install & virt-manager --------------------------- I'm working on these, although I managed to "brick" my Debian install because of some stupidity in pycentral ... Rich. [1] See this thread for the full details: http://lists.alioth.debian.org/pipermail/pkg-xen-devel/2007-November/001506… -- 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

2 1

[Libvir] [PATCH] Clean up a warning in remote_internal.c
by Richard W.M. Jones 06 Dec '07

06 Dec '07

After applying this patch, you can compile CVS libvirt with -Werror. 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

3 2

[Libvir] [PATCH] fix compilation if readline lib is not available
by Daniel Veillard 06 Dec '07

06 Dec '07

The current CVS code doesn't compile on RHEL5/F6 because readline lib there require ncurses, and we removed that check earlier. Sor we find the readline headers but the lib is not found. Unfortunately virsh.c tests the availablility of the header to use readline, and link time failures follow. The patch below: - exports a READLINE_CFLAGS from configure if used - use the READLINE_CFLAGS when compiling virsh.c - change virsh.c to rely on this instead of the header test - adds a message about readline usage at the end of configure configure: Miscellaneous configure: configure: Debug: no configure: Readline: yes configure: Another patch available soon should fix the readline library detection itself, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 8

[Libvir] searchable archive of this list?
by jack snodgrass 06 Dec '07

06 Dec '07

Is there a searchable archive of this list somewhere? Thanks - jack

3 2

[Libvir] libvirt and dnsmasq question
by jack snodgrass 06 Dec '07

06 Dec '07

I have Fedora 8 witch contains: libvirt-0.3.3-2.fc8 This version of libvirt automatically starts a copy of dnsmasq if it exists. Is there a way to specify a dnsmasq.conf file that this will use or specify command line options for dnsmasq when it is started? There are dnsmasq options and config changes that I'd like to specify but I can't figure out where this would be done. libvirt does not use the /etc/dnsmasq.conf file or start dnsmasq using the normal init scripts. Thanks - jack

2 1

[Libvir] gnulib: take2, trunk-relative patch
by Jim Meyering 06 Dec '07

06 Dec '07

Here's the complete patch (but still none of the new files), rebased and relative to the trunk. As before, this passes "make distcheck". And as Daniel Veillard noted, you'd need git. However the next patch will cvs-add all of the bootstrap-imported files, so you won't need git unless you want to try this particular patch. ------------------------------------------------------------- Use gnulib, starting with its physmem and getaddrinfo modules. New files go into these directories: gnulib/lib gnulib/m4 tests/gnulib * bootstrap: A wrapper around gnulib-tool. * configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY before any macro that uses AC_COMPILE_IFELSE. (AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile. * Makefile.am (SUBDIRS): Add gnulib/lib and tests/gnulib. Remove m4. * m4/Makefile.am: Remove file. Not needed. * src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib. (LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la. * src/nodeinfo.c: Include "physmem.h". * qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h". (MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions. (virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate. * tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib. (LDADDS): Add ../gnulib/lib/libgnu.la. * qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la. * tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total memory from a file. Update expected output not to include "Memory: NNNN" * tests/nodeinfodata/linux-nodeinfo-1.txt: * tests/nodeinfodata/linux-nodeinfo-2.txt: * tests/nodeinfodata/linux-nodeinfo-3.txt: * tests/nodeinfodata/linux-nodeinfo-4.txt: * 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". * autogen.sh: Add -I gnulib/m4. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.am | 5 +- autogen.sh | 2 +- bootstrap | 108 +++++++++++++++++++++++++++++++ configure.in | 11 ++- m4/Makefile.am | 3 - qemud/Makefile.am | 3 +- qemud/qemud.c | 1 + src/Makefile.am | 8 ++- src/nodeinfo.c | 55 +++------------- src/remote_internal.c | 1 + src/test.c | 2 - tests/Makefile.am | 2 + tests/nodeinfodata/linux-nodeinfo-1.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-2.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-3.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-4.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-5.txt | 2 +- tests/nodeinfodata/linux-nodeinfo-6.txt | 2 +- tests/nodeinfotest.c | 23 ++----- 19 files changed, 151 insertions(+), 85 deletions(-) create mode 100755 bootstrap delete mode 100644 m4/Makefile.am diff --git a/Makefile.am b/Makefile.am index eaa204e..1f2ca52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po m4 scripts +SUBDIRS = gnulib/lib src qemud proxy include docs @PYTHON_SUBDIR@ \ + tests/gnulib tests po scripts -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 EXTRA_DIST = libvirt.spec.in libvirt.spec COPYING.LIB \ libvirt.pc.in libvirt.pc TODO AUTHORS ChangeLog \ diff --git a/autogen.sh b/autogen.sh index 97b636d..3bcffd3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -57,7 +57,7 @@ fi autopoint --force #rm -rf m4 libtoolize --copy --force -aclocal -I m4 +aclocal -I m4 -I gnulib/m4 autoheader automake --add-missing autoconf diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..ca186bd --- /dev/null +++ b/bootstrap @@ -0,0 +1,108 @@ +#!/bin/sh +# Run this after autogen.sh, to pull in all of the gnulib-related bits. +# It's important to run *after* autogen.sh, since it updates some of +# the same files autogen.sh does, yet those from gnulib are newer, +# and match the tests. So if a gnulib bug has been fixed since the +# snapshot taken for whatever gettext release you're using, yet you +# run "make check" against the wrong version, the corresponding unit +# test in gl-tests/ may well fail. + +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. + +If the file bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} + +for option +do + case $option in + --help) + usage + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=$.*$'`;; + *) + echo >&2 "$0: $option: unknown option" + exit 1;; + esac +done + +cleanup_gnulib() { + st=$? + rm -fr .gnulib + exit $st +} + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + git clone --depth 1 git://git.sv.gnu.org/gnulib .gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=.gnulib +esac + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# Tell gnulib to: +# put tests in new tests/gnulib/ dir +# put *.m4 files in new gnulib/m4/ dir +# put *.[ch] files in new gnulib/lib/ dir. +# With --avoid=snprintf, we drop support for systems (many!) with +# losing snprintf but pull in about 30 fewer files +# With the current gnulib and gettext-0.17, the following +# files are added to m4/ by both. But gnulib is stable enough +# and gettext-0.16.1 is new enough that they are identical. +# compiler-flags.m4 +# inttypes_h.m4 +# longlong.m4 +# size_max.m4 +# stdint_h.m4 +# wchar_t.m4 +# wint_t.m4 +# xsize.m4 + +# Note that if we don't exclude the snprintf module, there are two tests +# that have incompatible licenses, so we would have to exclude them. Even +# excluding those two test modules, find reports a total of 94 added files. +# Yes, snprintf has some heavy-duty dependents. +# --avoid=snprintf-tests +# --avoid=vasnprintf-tests + +avoid='--avoid=snprintf' + +avoid=' + --avoid=snprintf-tests + --avoid=vasnprintf-tests +' + +$gnulib_tool \ + --lgpl \ + $avoid \ + --avoid=snprintf-tests \ + --avoid=vasnprintf-tests \ + --with-tests \ + --m4-base=gnulib/m4 \ + --source-base=gnulib/lib \ + --tests-base=tests/gnulib \ + --import physmem getaddrinfo diff --git a/configure.in b/configure.in index 6cd7fe2..0cc8b6d 100644 --- a/configure.in +++ b/configure.in @@ -28,11 +28,15 @@ AVAHI_REQUIRED="0.6.0" dnl Checks for C compiler. AC_PROG_CC -AM_PROG_CC_STDC -AC_C_CONST AC_PROG_INSTALL AC_PROG_CPP +gl_EARLY +gl_INIT + +AM_PROG_CC_STDC +AC_C_CONST + dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) @@ -555,11 +559,12 @@ cp COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ + gnulib/lib/Makefile tests/gnulib/Makefile \ libvirt.pc libvirt.spec \ po/Makefile.in scripts/Makefile \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ - qemud/Makefile m4/Makefile \ + qemud/Makefile \ tests/Makefile proxy/Makefile \ tests/xml2sexprdata/Makefile \ tests/sexpr2xmldata/Makefile \ diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 188b2fe..0000000 --- a/m4/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -EXTRA_DIST = compiler-flags.m4 - diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1737176..7e3b694 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -27,6 +27,7 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/include -I$(top_builddir)/include \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) \ $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ @@ -37,7 +38,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la -libvirtd_LDADD = ../src/libvirt.la +libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la if HAVE_AVAHI libvirtd_SOURCES += mdns.c mdns.h diff --git a/qemud/qemud.c b/qemud/qemud.c index f88ed42..caccd29 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -53,6 +53,7 @@ #include <libvirt/virterror.h> #include "internal.h" +#include "getaddrinfo.h" #include "../src/internal.h" #include "../src/remote_internal.h" #include "../src/conf.h" diff --git a/src/Makefile.am b/src/Makefile.am index 52ffbaf..f9a2308 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_builddir)/include \ +INCLUDES = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ + -I../include \ -I@top_srcdir@/include \ -I@top_srcdir@/qemud \ $(LIBXML_CFLAGS) \ @@ -14,7 +16,7 @@ INCLUDES = -I$(top_builddir)/include \ $(WARN_CFLAGS) \ $(LIBVIRT_FEATURES) DEPS = libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) libvirt.la ../gnulib/lib/libgnu.la VIRSH_LIBS = @VIRSH_LIBS@ confdir = $(sysconfdir)/libvirt/ @@ -60,7 +62,7 @@ SERVER_SOURCES = \ libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES) libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(LTLIBOBJS) \ - @CYGWIN_EXTRA_LIBADD@ + @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ -version-info @LIBVIRT_VERSION_INFO@ \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index a0a26eb..2ef49cb 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -29,14 +29,14 @@ #include <ctype.h> #include "nodeinfo.h" +#include "physmem.h" #ifdef __linux__ -#define MEMINFO_PATH "/proc/meminfo" #define CPUINFO_PATH "/proc/cpuinfo" /* NB, these are not static as we need to call them from testsuite */ -int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); +int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, + virNodeInfoPtr nodeinfo); int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo) { char line[1024]; @@ -114,44 +114,11 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n return 0; } - -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, - virNodeInfoPtr nodeinfo) { - char line[1024]; - - nodeinfo->memory = 0; - - while (fgets(line, sizeof(line), meminfo) != NULL) { - if (STREQLEN(line, "MemTotal:", 9)) { - char *p; - unsigned int ui; - if (xstrtol_ui(line + 10, &p, 10, &ui) == 0 - && (*p == '\0' || isspace(*p))) { - nodeinfo->memory = ui; - break; - } - } - } - if (!nodeinfo->memory) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "no memory found"); - return -1; - } - - return 0; -} - - #endif int virNodeInfoPopulate(virConnectPtr conn, virNodeInfoPtr nodeinfo) { struct utsname info; -#ifdef __linux__ - int ret; - FILE *cpuinfo, *meminfo; -#endif if (uname(&info) < 0) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, @@ -164,7 +131,9 @@ int virNodeInfoPopulate(virConnectPtr conn, nodeinfo->model[sizeof(nodeinfo->model)-1] = '\0'; #ifdef __linux__ - cpuinfo = fopen(CPUINFO_PATH, "r"); + { + int ret; + FILE *cpuinfo = fopen(CPUINFO_PATH, "r"); if (!cpuinfo) { __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, @@ -176,17 +145,11 @@ int virNodeInfoPopulate(virConnectPtr conn, if (ret < 0) return -1; - meminfo = fopen(MEMINFO_PATH, "r"); - if (!meminfo) { - __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "cannot open %s %s", MEMINFO_PATH, strerror(errno)); - return -1; - } - ret = linuxNodeInfoMemPopulate(conn, meminfo, nodeinfo); - fclose(meminfo); + /* Convert to KB. */ + nodeinfo->memory = physmem_total () / 1024; return ret; + } #else /* XXX Solaris will need an impl later if they port QEMU driver */ __virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote_internal.c b/src/remote_internal.c index a8227f3..275405a 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -52,6 +52,7 @@ #include "internal.h" #include "driver.h" +#include "getaddrinfo.h" #include "remote_internal.h" #include "remote_protocol.h" diff --git a/src/test.c b/src/test.c index 010ea15..bab280f 100644 --- a/src/test.c +++ b/src/test.c @@ -25,8 +25,6 @@ #ifdef WITH_TEST -#define _GNU_SOURCE /* for asprintf */ - #include <stdio.h> #include <string.h> #include <sys/time.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index 512162b..8220e1b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,6 +11,7 @@ SUBDIRS = virshdata confdata sexpr2xmldata xml2sexprdata xmconfigdata xencapsdat LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) INCLUDES = \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/include \ @@ -29,6 +30,7 @@ LDADDS = \ $(GNUTLS_LIBS) \ $(WARN_CFLAGS) \ $(LIBVIRT) \ + ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ diff --git a/tests/nodeinfodata/linux-nodeinfo-1.txt b/tests/nodeinfodata/linux-nodeinfo-1.txt index 1a38ad1..e52e20a 100644 --- a/tests/nodeinfodata/linux-nodeinfo-1.txt +++ b/tests/nodeinfodata/linux-nodeinfo-1.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 2053960 +CPUs: 2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-2.txt b/tests/nodeinfodata/linux-nodeinfo-2.txt index 1c31a0c..12e819b 100644 --- a/tests/nodeinfodata/linux-nodeinfo-2.txt +++ b/tests/nodeinfodata/linux-nodeinfo-2.txt @@ -1 +1 @@ -CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1, Memory: 4059540 +CPUs: 2, MHz: 2211, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-3.txt b/tests/nodeinfodata/linux-nodeinfo-3.txt index e2cc841..d285781 100644 --- a/tests/nodeinfodata/linux-nodeinfo-3.txt +++ b/tests/nodeinfodata/linux-nodeinfo-3.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1595, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-4.txt b/tests/nodeinfodata/linux-nodeinfo-4.txt index 2c75ea3..991d4f9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-4.txt +++ b/tests/nodeinfodata/linux-nodeinfo-4.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 1, Cores: 4, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-5.txt b/tests/nodeinfodata/linux-nodeinfo-5.txt index 01fee52..dce7ada 100644 --- a/tests/nodeinfodata/linux-nodeinfo-5.txt +++ b/tests/nodeinfodata/linux-nodeinfo-5.txt @@ -1 +1 @@ -CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 2814, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfodata/linux-nodeinfo-6.txt b/tests/nodeinfodata/linux-nodeinfo-6.txt index a7a2cfe..75cdaa9 100644 --- a/tests/nodeinfodata/linux-nodeinfo-6.txt +++ b/tests/nodeinfodata/linux-nodeinfo-6.txt @@ -1 +1 @@ -CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1, Memory: 4059272 +CPUs: 4, MHz: 1000, Nodes: 1, Sockets: 2, Cores: 2, Threads: 1 diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 7275cc3..fb563b5 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -21,14 +21,13 @@ static char *abs_top_srcdir; #ifdef __linux__ extern int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); -extern int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo); -static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofile, const char *outputfile) { +static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; char expectData[MAX_FILE]; char *expect = &expectData[0]; virNodeInfo nodeinfo; - FILE *cpuinfo, *meminfo; + FILE *cpuinfo; if (virtTestLoadFile(outputfile, &expect, MAX_FILE) < 0) return -1; @@ -42,19 +41,10 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil } fclose(cpuinfo); - meminfo = fopen(meminfofile, "r"); - if (!meminfo) - return -1; - if (linuxNodeInfoMemPopulate(NULL, meminfo, &nodeinfo) < 0) { - fclose(meminfo); - return -1; - } - fclose(meminfo); - snprintf(actualData, MAX_FILE, - "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u, Memory: %lu\n", + "CPUs: %u, MHz: %u, Nodes: %u, Sockets: %u, Cores: %u, Threads: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads, nodeinfo.memory); + nodeinfo.cores, nodeinfo.threads); if (STRNEQ(actualData, expectData)) { if (getenv("DEBUG_TESTS")) { @@ -70,15 +60,12 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *meminfofil static int linuxTestNodeInfo(const void *data) { char cpuinfo[PATH_MAX]; - char meminfo[PATH_MAX]; char output[PATH_MAX]; snprintf(cpuinfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.cpuinfo", abs_top_srcdir, (const char*)data); - snprintf(meminfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.meminfo", - abs_top_srcdir, (const char*)data); snprintf(output, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.txt", abs_top_srcdir, (const char*)data); - return linuxTestCompareFiles(cpuinfo, meminfo, output); + return linuxTestCompareFiles(cpuinfo, output); } #endif -- 1.5.3.6.950.g92b7b

4 20

[Libvir] gnulib: done (first two modules)
by Jim Meyering 06 Dec '07

06 Dec '07

I've checked in all of the changes to let libvirt use the first two modules from gnulib. That exposed the fact that gnulib's gl_INIT macro depends on autoconf-2.59c or newer for its definition of the m4_foreach_w macro. Here's a kludgey work-around patch, just committed, to fix build failure for developers who are stuck using such old tools: (also removed some trailing blanks) Accommodate developers using autoconf-2.59. * configure.in (m4_foreach_w): Define if not defined. I'll propose the proper change (in gnulib) tomorrow. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 5 +++++ configure.in | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b3c266..302706c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 5 23:57:53 CET 2007 Jim Meyering <meyering(a)redhat.com> + + Accommodate developers using autoconf-2.59. + * configure.in (m4_foreach_w): Define if not defined. + Wed Dec 5 22:38:18 CET 2007 Jim Meyering <meyering(a)redhat.com> Include "config.h". diff --git a/configure.in b/configure.in index a7f692e..8d2a143 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,13 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP +dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59. +dnl In order to accommodate developers with such old tools, here's a +dnl replacement definition. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + gl_EARLY gl_INIT @@ -289,8 +296,8 @@ LIBXML_LIBS="" LIBXML_FOUND="no" AC_ARG_WITH(libxml, [ --with-libxml=[PFX] libxml2 location]) -if test "z$with_libxml" = "zno" ; then - AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) +if test "z$with_libxml" = "zno" ; then + AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR(libxml2 >= $LIBXML_REQUIRED is required for libvirt) elif test "z$with_libxml" = "z" -a "x$PKG_CONFIG" != "x" ; then PKG_CHECK_EXISTS(libxml-2.0,[LIBXML_FOUND=yes]) @@ -299,7 +306,7 @@ elif test "z$with_libxml" = "z" -a "x$PKG_CONFIG" != "x" ; then fi fi if test "z$LIBXML_FOUND" = "zno" ; then - if test "z$with_libxml" != "z" ; then + if test "z$with_libxml" != "z" ; then LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG fi AC_MSG_CHECKING(libxml2 $LIBXML_CONFIG >= $LIBXML_REQUIRED ) @@ -442,8 +449,8 @@ AC_SUBST(AVAHI_LIBS) dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) -AC_CHECK_LIB(readline, main, - [VIRSH_LIBS="$VIRSH_LIBS -lreadline"], +AC_CHECK_LIB(readline, main, + [VIRSH_LIBS="$VIRSH_LIBS -lreadline"], [AC_MSG_WARN([readline library not found])], [$VIRSH_LIBS]) AC_SUBST(VIRSH_LIBS) -- 1.5.3.7.1006.g8c6a6

1 0

[Libvir] Fix compilation --without-sasl
by Richard W.M. Jones 05 Dec '07

05 Dec '07

Fixes compilation when ./configure --without-sasl. 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

2 1

[Libvir] PATCH: 0/10: remote authentication support
by Daniel P. Berrange 05 Dec '07

05 Dec '07

This the 3rd iteration of the remote authentication / SASL patches previously provided here: v1: http://www.redhat.com/archives/libvir-list/2007-October/msg00131.html v2: http://www.redhat.com/archives/libvir-list/2007-November/msg00005.html This iteration has incorporate the feedback /bugs identified from previous iterations. It also adds in an API for a callback to collect credentials from the client applications, meaning username+password based authentication is now also supported alongside Kerberos/GSSAPI. I have also re-worked my previous PolicyKit patches: http://www.redhat.com/archives/libvir-list/2007-September/msg00168.html To fit into the generic authentication RPC mechanisms I added for SASL. The resulting incremental patch for PolicyKit is much simpler, and integrates better with client applications. Finally, I have exposed the authentication callback support to python and prototyped its use in virt-manager as a sanity check for the whole API style. 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 -=|

4 66