- Devel - libvirt List Archives

Re: [Libvir] a couple of questions -Newbie
by Richard W.M. Jones 04 Mar '08

04 Mar '08

On Mon, Mar 03, 2008 at 03:38:46PM -0700, Spencer Parker wrote: > I actually just saw this and started playing around with it. Should > actually do what I need to do for that part. The next thing I need to > monitor is disk usage. Disk usage is tricky to monitor from the hypervisor. Have a look around for my 'virt-df' tool (which doesn't actually work at the moment -- it needs a bit of loving). Here are a couple of starting points: http://www.redhat.com/archives/libvir-list/2007-September/msg00266.html http://hg.et.redhat.com/virt/applications/virt-top--devel?f=ba4432dc8714;fi… In general terms, if you want to monitor things like disk usage, actual memory usage, process lists and so on, you need to have an agent running inside the guest. Collectd might be a good start. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 1

[Libvir] OS X Compile Issue
by Pat Wendorf 04 Mar '08

04 Mar '08

I followed the large thread posted in January re: building libvirt on OS X, but I seem to have run into a snag near the end of the compile: 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_TEST -DWITH_REMOTE -I /opt/local/include -L/opt/local/lib -DIN_LIBVIRT -I /opt/local/include -L/opt/local/lib -MT libvirt_la-storage_backend_fs.lo -MD -MP -MF .deps/libvirt_la-storage_backend_fs.Tpo -c storage_backend_fs.c -fno-common -DPIC -o .libs/libvirt_la-storage_backend_fs.o storage_backend_fs.c:34:20: error: endian.h: No such file or directory storage_backend_fs.c:35:22: error: byteswap.h: No such file or directory storage_backend_fs.c:36:20: error: mntent.h: No such file or directory storage_backend_fs.c:110: error: '__BIG_ENDIAN' undeclared here (not in a function) storage_backend_fs.c:143: error: '__LITTLE_ENDIAN' undeclared here (not in a function) storage_backend_fs.c: In function 'virStorageBackendProbeFile': storage_backend_fs.c:377: warning: comparison between pointer and integer storage_backend_fs.c:394: warning: comparison between pointer and integer storage_backend_fs.c: In function 'virStorageBackendFileSystemIsMounted': storage_backend_fs.c:458: error: '_PATH_MOUNTED' undeclared (first use in this function) storage_backend_fs.c:458: error: (Each undeclared identifier is reported only once storage_backend_fs.c:458: error: for each function it appears in.) storage_backend_fs.c:458: warning: passing argument 1 of 'fopen' from incompatible pointer type storage_backend_fs.c:461: warning: format '%s' expects type 'char *', but argument 4 has type 'struct <anonymous> *' storage_backend_fs.c:465: warning: implicit declaration of function 'getmntent' storage_backend_fs.c:465: warning: nested extern declaration of 'getmntent' storage_backend_fs.c:465: warning: assignment makes pointer from integer without a cast storage_backend_fs.c:466: error: dereferencing pointer to incomplete type storage_backend_fs.c:466: error: request for member 'mnt_dir' in something not a structure or union storage_backend_fs.c:466: warning: passing argument 1 of 'strcmp' from incompatible pointer type make[2]: *** [libvirt_la-storage_backend_fs.lo] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 endian.h does exist on OS X, but under a bits directory, but byteswap.h and mntent.h don't exist at all on the default X-Code install. Any ideas? - Pat

5 6

[Libvir] virsh list
by John Levon 04 Mar '08

04 Mar '08

Am I the only one who finds the default behaviour of virsh list really confusing and annoying? That is, I would like --all to be the default. regards john

3 4

[Libvir] Any API available for renaming the guest OS
by Ajishrao.r 04 Mar '08

04 Mar '08

Hi, I couldn't direct API to rename Guest OS? -- Thanks&Regards Ajeesh

2 4

[Libvir] a couple of questions -Newbie
by Spencer Parker 03 Mar '08

03 Mar '08

I am really excited to start using this, but I have a couple of questions about how to use it exactly. I want to be able to pull a list of stats out of my Xen machines. I need to get something like network i/o. I just need to know how much in and out traffic that a specific machine is doing. I am pretty new to python and to programming in general. I have looked at the APi and stuff like that, but am a little confused still on how to actually do this. Mainly I just need to know how to connect to certain things. Once I have a basic understanding of what is going on then I can take it from there. Thanks for all the help! Spencer Parker

3 2

[Libvir] API Question...
by Spencer Parker 03 Mar '08

03 Mar '08

Okay...so I am still trying to get what this says I can get. But I want to do it with Python. I am looking at this: virDomainInterfaceStatsStruct and wondering if I can grab this info with Python or not. I looked at the libvirt module, but I don't see how I would grab this. Any ideas?

2 1

[Libvir] [PATCH] Avoid segfault upon early libvirtd failure.
by Jim Meyering 03 Mar '08

03 Mar '08

One of today's leak-plugging patches introduced a bug. Fortunately, it can strike only when libvirtd is about to fail anyway. The consequence is that instead of failing in an orderly manner, it would probably segfault. Sorry about that. Here's the fix: Avoid segfault upon early libvirtd failure. * qemud/qemud.c (main): Don't call qemudCleanup on an uninitialized pointer. By the way, even though this evoked a warning from gcc, "make distcheck" passes. Obviously, that means the distcheck rule is inadequate. I'll fix it so that it turns on -Werror for the final build. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 96fdf32..b6b82ed 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2025,7 +2025,7 @@ libvirt management daemon:\n\ #define MAX_LISTEN 5 int main(int argc, char **argv) { - struct qemud_server *server; + struct qemud_server *server = NULL; struct sigaction sig_action; int sigpipe[2]; const char *pid_file = NULL; @@ -2180,7 +2180,8 @@ int main(int argc, char **argv) { unlink (pid_file); error1: - qemudCleanup(server); + if (server) + qemudCleanup(server); return ret; } -- 1.5.4.3.366.g55277

2 1

[Libvir] Need more information on virDomainBlockStats, virDomainInterfaceStats and virNodeGetCellsFreeMemory
by Ajishrao.r 03 Mar '08

03 Mar '08

Hi, I am trying to use libvirt, any one please help more about virDomainBlockStats, virDomainInterfaceStats and virNodeGetCellsFreeMemory any pointer or docs? -- Thanks&Regards Ajeesh

3 3

[Libvir] (no subject)
by Pat Wendorf 03 Mar '08

03 Mar '08

1 0

[Libvir] [PATCH]Change MAC address to case insensitive
by S.Sakamoto 03 Mar '08

03 Mar '08

Hi, xenXMDomainAttachDevice and xenXMDomainDetachDevice treats "case sensitve" for MAC address of stopping domain. This patch changes from case sensitive to case insensitive. Thanks, Shigeki Sakamoto. Index: src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.64 diff -u -p -r1.64 xm_internal.c --- src/xm_internal.c 20 Feb 2008 15:29:13 -0000 1.64 +++ src/xm_internal.c 26 Feb 2008 06:40:57 -0000 @@ -2812,7 +2812,7 @@ xenXMAttachInterface(virDomainPtr domain key = nextkey; } - if (!(strcmp(dommac, (const char *) mac))) { + if (!(strcasecmp(dommac, (const char *) mac))) { if (autoassign) { free(mac); mac = NULL; @@ -3087,7 +3087,7 @@ xenXMDomainDetachDevice(virDomainPtr dom mac = nextmac; } - if (!(strcmp(dommac, (const char *) key))) + if (!(strcasecmp(dommac, (const char *) key))) break; } skip:

4 12

[Libvir] [PATCH] Fix capabilities xml for topology info
by Cole Robinson 03 Mar '08

03 Mar '08

The patch below fixes the capabilities xml generated for the hosts topology info. This was causing virt-install to barf when using the test driver (see attached capabilities xml from before this patch). Thanks, Cole diff --git a/src/capabilities.c b/src/capabilities.c index bedd445..01bb308 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -583,7 +583,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) caps->host.numaCell[i]->ncpus) < 0) goto no_memory; for (j = 0 ; j < caps->host.numaCell[i]->ncpus ; j++) - if (virBufferVSprintf(&xml, " <cpu id='%d'>\n", + if (virBufferVSprintf(&xml, " <cpu id='%d'/>\n", caps->host.numaCell[i]->cpus[j]) < 0) goto no_memory; if (virBufferAddLit(&xml, " </cpus>\n") < 0) <capabilities> <host> <cpu> <arch>i686</arch> <features> <pae/> <nonpae/> </features> </cpu> <topology> <cells num='2'> <cell id='0'> <cpus num='8'> <cpu id='0'> <cpu id='2'> <cpu id='4'> <cpu id='6'> <cpu id='8'> <cpu id='10'> <cpu id='12'> <cpu id='14'> </cpus> </cell> <cell id='1'> <cpus num='8'> <cpu id='1'> <cpu id='3'> <cpu id='5'> <cpu id='7'> <cpu id='9'> <cpu id='11'> <cpu id='13'> <cpu id='15'> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>linux</os_type> <arch name='i686'> <wordsize>32</wordsize> <domain type='test'> </domain> </arch> <features> <pae/> <nonpae/> </features> </guest> </capabilities>

2 1

[Libvir] fix another bug exposed by a compiler warning
by Jim Meyering 03 Mar '08

03 Mar '08

Correct a no-op conditional. * src/qemu_conf.c (qemudReportError): Reverse a test, and use the pointer, errorMessage not its first byte, errorMessage[0]. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bc..3877849 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (!errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug skipped-qemudCleanup leak.
by Jim Meyering 03 Mar '08

03 Mar '08

And another: Plug skipped-qemudCleanup leak. * qemud/qemud.c (main): Call qemudCleanup also upon failure. Otherwise, an error return would skip it and induce leaks. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 6 ++++++ qemud/qemud.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 049f515..81452ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Jim Meyering <meyering(a)redhat.com> + + Plug skipped-qemudCleanup leak. + * qemud/qemud.c (main): Call qemudCleanup also upon failure. + Otherwise, an error return would skip it and induce leaks. + Mon Mar 3 07:16:35 CET 2008 Daniel Veillard <veillard(a)redhat.com> * include/libvirt/libvirt.h include/libvirt/libvirt.h.in: diff --git a/qemud/qemud.c b/qemud/qemud.c index 851e83e..7ccc9ee 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2166,8 +2166,6 @@ int main(int argc, char **argv) { qemudRunLoop(server); - qemudCleanup(server); - close(sigwrite); if (godaemon) @@ -2181,6 +2179,7 @@ int main(int argc, char **argv) { unlink (pid_file); error1: + qemudCleanup(server); return ret; } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug saslUsernameWhitelist leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Here's the last one: Plug saslUsernameWhitelist leak. * qemud/qemud.c (qemudCleanup): Free the array as well as the strings in it. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 7ccc9ee..96fdf32 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1661,6 +1661,7 @@ static void qemudCleanup(struct qemud_server *server) { free(*list); list++; } + free(server->saslUsernameWhitelist); } #endif -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Plug remoteReadConfigFile leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Another. This happens only upon reading an invalid config file. Plug remoteReadConfigFile leak. * qemud/qemud.c (remoteReadConfigFile): Be careful to free "conf" after a successful virConfReadFile. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 9ce9edd..851e83e 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1877,7 +1877,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, tcp_port); if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) - return -1; + goto free_and_fail; #if HAVE_POLKIT /* Change default perms to be wide-open if PolicyKit is enabled. * Admin can always override in config file @@ -1886,11 +1886,11 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) unix_sock_rw_mask = 0777; #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &auth_unix_ro, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tcp", &auth_tcp, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tls", &auth_tls, filename) < 0) - return -1; + goto free_and_fail; GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Avoid two more leaks.
by Jim Meyering 03 Mar '08

03 Mar '08

Here are two more: Avoid two more leaks. * src/capabilities.c (virCapabilitiesFree): Free host.migrateTrans. (virCapabilitiesFreeGuest): Free arch.name member. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 2544bd3..bedd445 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -91,6 +91,7 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) int i; free(guest->ostype); + free(guest->arch.name); free(guest->arch.defaultInfo.emulator); free(guest->arch.defaultInfo.loader); for (i = 0 ; i < guest->arch.defaultInfo.nmachines ; i++) @@ -130,6 +131,10 @@ virCapabilitiesFree(virCapsPtr caps) { virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]); free(caps->host.numaCell); + for (i = 0 ; i < caps->host.nmigrateTrans ; i++) + free(caps->host.migrateTrans[i]); + free(caps->host.migrateTrans); + free(caps->host.arch); free(caps); } -- 1.5.4.3.366.g55277

2 4

[Libvir] [PATCH] Plug a leak.
by Jim Meyering 03 Mar '08

03 Mar '08

I ran valgrind via "make check" and found some leaks. This fixes the first: Plug a leak. * src/capabilities.c (virCapabilitiesFreeGuestDomain): Free dom->type. (virCapabilitiesAddGuestDomain): Remove duplicate strdup stmt. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 263935c..2544bd3 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -73,6 +73,7 @@ virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr dom) for (i = 0 ; i < dom->info.nmachines ; i++) free(dom->info.machines[i]); free(dom->info.machines); + free(dom->type); free(dom); } @@ -328,9 +329,6 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, if ((dom->type = strdup(hvtype)) == NULL) goto no_memory; - if ((dom->type = strdup(hvtype)) == NULL) - goto no_memory; - if (emulator && (dom->info.emulator = strdup(emulator)) == NULL) goto no_memory; -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] fix typos (part3)
by Atsushi SAKAI 29 Feb '08

29 Feb '08

2 1

[Libvir] Snapshots in Libvirt
by Gabriel Kaufmann 28 Feb '08

28 Feb '08

Hi, Can anyone tell me on which version of libvirt, the snapshot functionality is planned to be implemented fos Xen and KVM? By snapshot I mean to be able to save the state of the machine in order to be able to revert to the snapshot. Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

4 4

[Libvir] [PATCH] Avoid link errors with "configure --disable-shared".
by Jim Meyering 28 Feb '08

28 Feb '08

I got link errors when building with --disable-shared, and finally fixed it. Here's most of the solution. The patch after this one adjusts the gcov (test-coverage)-related things so that works with the new setup, too. This also fixes what look like accidental omissions in src/libvirt_sym.version. Avoid link errors with "configure --disable-shared". * src/Makefile.am: Create a convenience library, libvirt_test.la, and don't restrict access to *its* symbols. * tests/Makefile.am (LDADDS): Add ../src/libvirt_test.la, so that "configure --disable-shared" no longer provokes link errors. (LIBVIRT): Remove definition. (LDADDS): Remove use. ($(LIBVIRT)): Remove rule. (LDADDS): Use the new convenience library instead. (CLEANFILES): Define. * docs/examples/index.py (dump_Makefile): Append $(COVERAGE_LDFLAGS), to the LDADDS definition, to avoid link error with the combination of --enable-test-coverage and --disable-shared. * docs/examples/Makefile.am: Regenerate. * docs/examples/index.html: Likewise. * qemud/Makefile.am (libvirtd_LDFLAGS): Append $(COVERAGE_LDFLAGS). Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/Makefile.am | 2 +- docs/examples/index.html | 2 +- docs/examples/index.py | 3 ++- qemud/Makefile.am | 26 ++++++++++++++++---------- src/Makefile.am | 19 +++++++++++++++++++ src/libvirt_sym.version | 11 +++++++---- tests/Makefile.am | 13 ++----------- 7 files changed, 48 insertions(+), 28 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 9da4e21..d8e4868 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/docs/examples/index.html b/docs/examples/index.html [...omitting generated diff containing a couple of 4000+-byte lines...] diff --git a/docs/examples/index.py b/docs/examples/index.py index 8f386ed..6be80c5 100755 --- a/docs/examples/index.py +++ b/docs/examples/index.py @@ -225,7 +225,8 @@ def dump_Makefile(): SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1e1f861..b39bc2f 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,18 +47,22 @@ 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) $(SASL_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ - -DSYSCONF_DIR="\"$(sysconfdir)\"" \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ + -I$(top_srcdir)/include -I$(top_builddir)/include \ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ + $(COVERAGE_CFLAGS) \ + -DSYSCONF_DIR="\"$(sysconfdir)\"" \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \ - -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + +libvirtd_LDFLAGS = \ + $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ + $(COVERAGE_LDFLAGS) + $(POLKIT_LIBS) -libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ - $(POLKIT_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la @@ -144,7 +148,6 @@ libvirtd.init: libvirtd.init.in chmod a+x $@-t mv $@-t $@ -CLEANFILES = libvirtd.init else install-init: @@ -153,3 +156,6 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT endif # WITH_LIBVIRTD + +CLEANFILES = libvirtd.init +CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/src/Makefile.am b/src/Makefile.am index 02be9db..c15de77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,25 @@ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT +# Create an automake "convenience library" version of libvirt_la, +# just for testing, since the test harness requires access to internal +# bits and pieces that we don't want to make publicly accessible. +noinst_LTLIBRARIES = libvirt_test.la + +# Convert libvirt_sym.version +# to libvirt_test_sym.version, and +# remove -version-info X.Y.Z (not needed since this is a convenience library. +test_LDFLAGS = \ + $$(echo '$(libvirt_la_LDFLAGS)' \ + |sed 's!-Wl,--v.*_sym\.version!!' \ + |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!') + +# Just like the above, but with a slightly different set of public symbols. +libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) +libvirt_test_la_LIBADD = $(libvirt_la_LIBADD) +libvirt_test_la_LDFLAGS = $(test_LDFLAGS) +libvirt_test_la_CFLAGS = $(COVERAGE_CFLAGS) + bin_PROGRAMS = virsh virsh_SOURCES = virsh.c console.c console.h util-lib.c diff --git a/src/libvirt_sym.version b/src/libvirt_sym.version index 38b631e..581f380 100644 --- a/src/libvirt_sym.version +++ b/src/libvirt_sym.version @@ -32,6 +32,7 @@ virDomainLookupByName; virDomainLookupByUUID; virDomainLookupByUUIDString; + virDomainParseXMLDesc; virDomainRestore; virDomainResume; virDomainSave; @@ -166,10 +167,10 @@ __virEventRegisterImpl; - __virStateInitialize; - __virStateCleanup; - __virStateReload; - __virStateActive; + __virStateInitialize; + __virStateCleanup; + __virStateReload; + __virStateActive; __virDrvSupportsFeature; @@ -184,6 +185,8 @@ __virBufferVSprintf; __virBufferAdd; __virBufferAddChar; + __virErrorMsg; + __virRaiseError; local: *; }; diff --git a/tests/Makefile.am b/tests/Makefile.am index fb9bcff..644715e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,14 +3,6 @@ SUBDIRS = virshdata confdata sexpr2xmldata \ xml2sexprdata xmconfigdata xencapsdata -# Wierd libtool related juju... -# -# We explicitly want wildcard here instead of just linking -# to the libvirt.a file. This ensures that when coverage -# tests are run, all the output data ends up in the correct -# location. ie, src/ instead of src/.libs. -LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) - INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ @@ -34,7 +26,7 @@ LDADDS = \ $(SASL_LIBS) \ $(SELINUX_LIBS) \ $(WARN_CFLAGS) \ - $(LIBVIRT) \ + ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) @@ -132,5 +124,4 @@ reconnect_SOURCES = \ reconnect.c reconnect_LDADD = $(LDADDS) -$(LIBVIRT): - -@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent) +CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -- 1.5.4.3.231.gc0a6

3 4

[Libvir] [Q] gnulib comment
by Atsushi SAKAI 28 Feb '08

28 Feb '08

Hi, Jim I have two questions on gnulib in libvirt. 1)tupe is typo?(I attach a patch.) (I do not guess the correct words, it is jargon?) 2)many NUL appeared on comment. Is the normal comment on gnulib? I think it should be NULL. c.f. I do spell check for my diversion. Thanks Atsushi SAKAI

4 3

[Libvir] PATCH: Set mac address on TUN device to fix Xenner
by Daniel P. Berrange 28 Feb '08

28 Feb '08

The QEMU driver pre-allocates a TAP device and connects it to a bridge when using virtual networking. The FD associated with the tap device is then passed to QEMU. When running Xen guests, Xenner needs to turn this FD back into a TUN device name. It does this by querying the hardware address of each NIC and looking for the one which matches that it expects - ie its TUN device. This obviously requires that the TUN device be configured with a MAC address though. libvirt does not currently do this. This patch fixes this and thus makes Xenner work from the QEMU driver when using virtual networking With this patch applied, and the latest 'virt-install' from upstream and the latest 'xenner' RPM from Fedora 9, it is now possible to create Xen paravirt guests under KVM using virt-install. That said there's a few more pending patch to cleanup various hacks. bridge.c | 14 ++++++++++++++ bridge.h | 1 + qemu_conf.c | 1 + 3 files changed, 16 insertions(+) Dan. Index: bridge.c =================================================================== RCS file: /data/cvs/libvirt/src/bridge.c,v retrieving revision 1.8 diff -u -p -r1.8 bridge.c --- bridge.c 5 Feb 2008 19:27:37 -0000 1.8 +++ bridge.c 27 Feb 2008 21:32:44 -0000 @@ -42,6 +42,7 @@ #include <linux/sockios.h> /* SIOCBRADDBR etc. */ #include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */ #include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */ +#include <net/if_arp.h> /* ARPHRD_ETHER */ #include "internal.h" @@ -312,6 +313,7 @@ brDeleteInterface(brControl *ctl ATTRIBU int brAddTap(brControl *ctl, const char *bridge, + unsigned char *macaddr, char *ifname, int maxlen, int *tapfd) @@ -355,6 +357,18 @@ brAddTap(brControl *ctl, } if (ioctl(fd, TUNSETIFF, &try) == 0) { + struct ifreq addr; + memset(&addr, 0, sizeof(addr)); + memcpy(addr.ifr_hwaddr.sa_data, macaddr, 6); + addr.ifr_hwaddr.sa_family = ARPHRD_ETHER; + + /* Device actually starts in 'UP' state, but it + * needs to be down to set the MAC addr + */ + if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 0))) + goto error; + if (ioctl(fd, SIOCSIFHWADDR, &addr) != 0) + goto error; if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) goto error; if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) Index: bridge.h =================================================================== RCS file: /data/cvs/libvirt/src/bridge.h,v retrieving revision 1.4 diff -u -p -r1.4 bridge.h --- bridge.h 29 Jan 2008 18:15:54 -0000 1.4 +++ bridge.h 27 Feb 2008 21:32:44 -0000 @@ -62,6 +62,7 @@ int brDeleteInterface (brContr int brAddTap (brControl *ctl, const char *bridge, + unsigned char *mac, char *ifname, int maxlen, int *tapfd); Index: qemu_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_conf.c,v retrieving revision 1.38 diff -u -p -r1.38 qemu_conf.c --- qemu_conf.c 27 Feb 2008 04:35:08 -0000 1.38 +++ qemu_conf.c 27 Feb 2008 21:32:44 -0000 @@ -1530,6 +1530,7 @@ qemudNetworkIfaceConnect(virConnectPtr c } if ((err = brAddTap(driver->brctl, brname, + net->mac, ifname, BR_IFNAME_MAXLEN, &tapfd))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "Failed to add tap interface '%s' to bridge '%s' : %s", -- |=- 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 -=|

3 2

[Libvir] [PATCH] Use virErrorMsg in qemudReportError
by Cole Robinson 28 Feb '08

28 Feb '08

Currently the qemu driver doesn't use virErrorMsg when raising error messages. This causes some errors to appear as "libvir: QEMU error: " if a custom string wasn't raised, which isn't all that useful. The patch below fixes this. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e39c7bc..6aed88b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -58,6 +58,7 @@ void qemudReportError(virConnectPtr conn, int code, const char *fmt, ...) { va_list args; char errorMessage[QEMUD_MAX_ERROR_LEN]; + const char *virerr; if (fmt) { va_start(args, fmt); @@ -66,8 +67,10 @@ void qemudReportError(virConnectPtr conn, } else { errorMessage[0] = '\0'; } + + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, "%s", errorMessage); + virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } int qemudLoadDriverConfig(struct qemud_driver *driver,

3 3

[Libvir] [PATCH] make qemud/'s rpcgen rules work
by Jim Meyering 27 Feb '08

27 Feb '08

I applied Rich's patch and found that qemud/remote_protocol.c was not automatically rebuilt. Since the Makefile rule is an implicit one using a non-default suffix (.x), you have to tell make about the new suffix. In straight make, you'd have to add ".SUFFIXES: .x" but with automake, it is recommended to use the SUFFIXES variable: Make qemud/'s rpcgen rules work. * qemud/Makefile.am (SUFFIXES): Define to .x before implicit rule. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1e1f861..3094b18 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -14,6 +14,7 @@ EXTRA_DIST = libvirtd.init.in libvirtd.sysconf default-network.xml \ libvirtd.conf if RPCGEN +SUFFIXES = .x .x.c: rm -f $@ rpcgen -c -o $@ $< -- 1.5.4.3.231.gc0a6

2 2

[Libvir] [PATCH] (for discussion) DHCP host mappings using 3 arrays API
by Richard W.M. Jones 27 Feb '08

27 Feb '08

This patch is an evolution of the previous patch for implementing DHCP host mappings. The virNetworkListDHCPHostMappings calls has been changed to take three arrays of strings: int virNetworkListDHCPHostMappings (virNetworkPtr network, char **const hwaddrs, char **const ipaddrs, char **const hostnames, int maxmappings); Also I've fixed a number of bugs throughout, particularly in the way that the hosts file was being parsed. This patch is for discussion only. There is a segfault on the client side of (perhaps ironically) the virNetworkListDHCPHostMappings call. Been looking for about an hour but I can't see it yet ... All the other calls appear to work OK. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

4 8