- Devel - libvirt List Archives

[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

[Libvir] [PATCH] Rewrite test-coverage rules to accommodate multiple .o files per .c.
by Jim Meyering 27 Feb '08

27 Feb '08

This makes the "make -C src cov" rule work with the addition of the libvirt_test.la convenience library. The trouble is that since there are now two .o files per .c (one for the "real" libvirt library, and another for the convenience library, libvirt_test.la, with no access restrictions, for testing), when you generate test-coverage stats, you have stats for each .c file in two different places, one for each .o file. This solves the problem by running gcov on each pair of .o files. A minor twist: when profiling with --disable-shared, the .o files are in ".", rather than in ".libs/", so configure.in now records the dirname in a new AC_SUBST'd variable, LV_LIBTOOL_OBJDIR, and src/Makefile.am uses that. Thus, profiling works with shared as well as static libraries. Rewrite test-coverage rules to accommodate multiple .o files per .c. * src/Makefile.am (cov): Rewrite rule to merge gcov results corresponding to two .o files: the libvirt_la- one, and the libvirt_test_la- one. (tst): Remove unused rule. * configure.in (LV_LIBTOOL_OBJDIR): Define and AC_SUBST. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- configure.in | 7 +++++++ src/Makefile.am | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index c2030c7..6367990 100644 --- a/configure.in +++ b/configure.in @@ -913,6 +913,13 @@ AC_SUBST(MINGW_EXTRA_LDFLAGS) AC_SYS_LARGEFILE +# Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether +# we're building shared libraries. This is the name of the directory +# in which .o files will be created. +test "$enable_shared" = no && lt_cv_objdir=. +LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} +AC_SUBST(LV_LIBTOOL_OBJDIR) + # very annoying rm -f COPYING cp COPYING.LIB COPYING diff --git a/src/Makefile.am b/src/Makefile.am index c15de77..f8f2c4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,20 +137,20 @@ else EXTRA_DIST += parthelper.c endif -# -# target to ease building test programs -# -tst: tst.c - $(CC) $(CFLAGS) $(INCLUDES) -I../include -o tst tst.c .libs/libvirt.a $(LIBXML_LIBS) $(VIRSH_LIBS) $(GNUTLS_LIBS) $(LIBS) - -COVERAGE_FILES = $(CLIENT_SOURCES:%.c=libvirt_la-%.cov) - -cov: clean-cov $(COVERAGE_FILES) +cov: clean-cov + for i in $(CLIENT_SOURCES); do \ + case $$i in *.c) ;; *) continue;; esac; \ + b=$$(basename $$i .c); \ + o_files=; \ + for i in '' _test; do \ + o="$(LV_LIBTOOL_OBJDIR)/libvirt$${i}_la-$$b.o"; \ + test -f "$$o" \ + && o_files="$$o_files $$o"; \ + done; \ + gcov -b -f $$o_files > $$b.cov; \ + done clean-cov: rm -f *.cov *.gcov -%.cov: .libs/%.o - gcov -b -f -o .libs $< > $@ - CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -- 1.5.4.3.231.gc0a6

1 0

[Libvir] [PATCH] Avoid "make distcheck" failure.
by Jim Meyering 27 Feb '08

27 Feb '08

Here's another trivial one: util-lib.h wasn't included in the tarball created by "make dist", so "make distcheck" would fail. Avoid "make distcheck" failure. * src/Makefile.am (virsh_SOURCES): Add util-lib.h. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 02be9db..9c4810a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,7 +101,7 @@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT bin_PROGRAMS = virsh -virsh_SOURCES = virsh.c console.c console.h util-lib.c +virsh_SOURCES = virsh.c console.c console.h util-lib.c util-lib.h virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) virsh_DEPENDENCIES = $(DEPS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) -- 1.5.4.3.231.gc0a6

2 1

[Libvir] [PATCH] Fix a "make syntax-check" failure.
by Jim Meyering 27 Feb '08

27 Feb '08

"make syntax-check" reported this: src/capabilities.c Makefile.maint: the above files do not include <config.h> make: *** [sc_require_config_h] Error 1 The fix is so trivial it's barely worth posting, but just in case... And besides, it's good policy. Fix a "make syntax-check" failure. * src/capabilities.c: Include <config.h> from the .c file, * src/capabilities.h: ... not from the .h file. --- src/capabilities.c | 4 +++- src/capabilities.h | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 94f7d17..263935c 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -21,6 +21,8 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ +#include <config.h> + #include "capabilities.h" #include "buf.h" @@ -30,7 +32,7 @@ * @arch: host machine architecture * @offlineMigrate: non-zero if offline migration is available * @liveMigrate: non-zero if live migration is available - * + * * Allocate a new capabilities object */ virCapsPtr diff --git a/src/capabilities.h b/src/capabilities.h index 97bd06f..b379e51 100644 --- a/src/capabilities.h +++ b/src/capabilities.h @@ -24,9 +24,6 @@ #ifndef __VIR_CAPABILITIES_H #define __VIR_CAPABILITIES_H -#include <config.h> - - typedef struct _virCapsGuestFeature virCapsGuestFeature; typedef virCapsGuestFeature *virCapsGuestFeaturePtr; struct _virCapsGuestFeature { -- 1.5.4.3.231.gc0a6

1 0

[Libvir] [PATCH] fix typo
by Atsushi SAKAI 27 Feb '08

27 Feb '08

2 1

[Libvir] [PATCH 0/2] Re-organize generation / handling of capabilities data
by Daniel P. Berrange 27 Feb '08

27 Feb '08

Earlier today I started the 'simple' task of extending the QEMU driver to support Xenner for running Xen paravirt guests under KVM. This was at first glance easy because it basically looks like QEMU - in fact all we needed was to extend the capabilities XML for the QEMU driver to include data about Xen guests if Xenner is available. Unfortunately this was easier said than done... - The code generating the XML in qemu_driver.c was a mix of string formatting for the XML, and functional logic for determining runtime capabilities (kvm, kqemu, etc). - More runtime logic was in the qemu_conf.c file and stuff that should be runtime logic was static. I attempted to fix up the QEMU code for capabilities but it quickly turned into a horrible mess of spaghetti. Looking at the Xen driver, the situation was pretty much the same, but with the capabilities XML generation spread out over 3 files (xml.c, xen_internal.c and xend_internal.c). So I decided that we needed to have a internal API & structure to allow drivers to formally register & query their capabilities , and also add a central method for serializing it to XML. The following 2 patches implement this idea, and porting the Xen, QEMU and Test drivers to use it. This removes a lot of code duplication in XML formatting and makes the resulting code easier to follow, and should make it much quicker to adding capabilities info to new drivers too. 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 -=|

3 10

[Libvir] [PATCH] Implement virDomainBlockStats for QEMU/KVM
by Richard W.M. Jones 26 Feb '08

26 Feb '08

This little patch just implements the virDomainBlockStats call for qemu & kvm. It does this by using the new 'info blockstats' monitor command which I added to qemu & KVM upstream some months back, and (hopefully) it does the right thing if this command is not available. 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 5

[Libvir] [PATCH]check NULL of mac
by S.Sakamoto 26 Feb '08

26 Feb '08

Hi, "attach-device" become the segmentation fault, when it uses following xml. (There is no "address='xx'") +----------------------------------------------------+ | <interface type='bridge'> | | <source bridge='xenbr0'/> | | <mac/> | | <script path='/etc/xen/scripts/vif-bridge'/> | | </interface> | +----------------------------------------------------+ Libxml gives back NULL when there is not an attribute. "xenXMAttachInterface" compares it in strcmp as NULL. So, I make the patch which solved this problem. 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:39:05 -0000 @@ -2769,12 +2769,13 @@ xenXMAttachInterface(virDomainPtr domain } source = xmlGetProp(node, BAD_CAST type); - if (!(node = virXPathNode("/interface/mac", ctxt))) { + if ((node = virXPathNode("/interface/mac", ctxt))) + mac = xmlGetProp(node, BAD_CAST "address"); + if (!node || !mac) { if (!(mac = (xmlChar *)xenXMAutoAssignMac())) goto cleanup; autoassign = 1; - } else - mac = xmlGetProp(node, BAD_CAST "address"); + } list_item = virConfGetValue(entry->conf, "vif"); if (list_item && list_item->type == VIR_CONF_LIST) {

4 4

[Libvir] RFC: Supporting serial & parallel ports for QEMU (and improving Xen)
by Daniel P. Berrange 26 Feb '08

26 Feb '08

One user's feature request for our QEMU driver is to support serial ports. Easy you might think... you'd be wrong :-) On Xen we have very simple approach. When creating a guest simply add <console/> And it'll cause a serial port to be setup with an autoallocated pty, so you get back <console pty='/dev/pts/5'/> In retrospect calling it 'console' was dumb, but hey we're stuck with that now and its only a tiny naming issue so I don't mind really. We can do the same thing with QEMU quite easily. QEMU, however, supports many many many more ways to hooking up the serial port to Dom0. Indeed so does Xen fullyvirt, but we don't expose this ability. Parallel ports have identical config syntax to serial ports so we might as well deal with both at once. So, here's a stripped down version of the QEMU docs: [quote http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC10] `-serial dev' Redirect the virtual serial port to host character device dev. The default device is vc in graphical mode and stdio in non graphical mode. This option can be used several times to simulate up to 4 serials ports. Use -serial none to disable all serial ports. Available character devices are: vc Virtual console pty [Linux only] Pseudo TTY (a new PTY is automatically allocated) none No device is allocated. null void device /dev/XXX [Linux only] Use host tty, e.g. `/dev/ttyS0'. The host serial port parameters are set according to the emulated ones. /dev/parportN [Linux only, parallel port only] Use host parallel port N. Currently only SPP parallel port features can be used. file:filename Write output to filename. No character can be read. stdio [Unix only] standard input/output pipe:filename name pipe filename COMn [Windows only] Use host serial port n udp:[remote_host]:remote_port[@[src_ip]:src_port] This implements UDP Net Console. tcp:[host]:port[,server][,nowait][,nodelay] The TCP Net Console has two modes of operation. telnet:host:port[,server][,nowait][,nodelay] The telnet protocol is used instead of raw tcp sockets. unix:path[,server][,nowait] A unix domain socket is used instead of a tcp socket. [/quote] I don't see any reason to not support all/most of these options. The things I don't like here is that /dev/XXX, vs /dev/parportN, vs COMn differences for connecting guest <-> host passthrough of the devices. I figure it could be simpler if it was just represented as 'n' and we'd translate that to be /dev/ttyS[n] or /dev/parport[n] or COM[n] as needed. The question as ever is how to represent this in XML. For serial ports we'll stick with '<console>', while parallel ports we might as well use a better named '<parallel>'. Next up, I think should use a 'type' attribute on this element to determine the main way ot connecting the device, and then more type specific attributes or sub-elements as needed. If 'type' was not specified then use a default of 'pty', since that gives compatability with existing practice. As an illustrative example /* * Parse the XML definition for a character device * * Top level node will be <console> or <parallel>, but all attributes * and sub-elements are identical. * * type=vc|pty|null|host|file|pipe|udp|tcp|telnet, default is pty * * <console type='vc'/> * * <console type='pty' pty='/dev/pts/3'/> * * <console type='null'/> * * <console type='host' port='3'/> * * <console type='file' path='/some/file'/> * * <console type='pipe' path='/some/file'/> * * <console type='udp'> * <sendto port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * <bind port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * <bind addr='127.0.0.1' port='12356'/> * </console> * * <console type='tcp'> * <listen port='12356'/> * </console> * * <console type='tcp'> * <listen addr='127.0.0.1' port='12356'> * <nowait/> * <nodelay/> * </listen> * </console> * * <console type='tcp'> * <connect addr='127.0.0.1' port='12356'> * <nodelay/> * </connect> * </console> * * <console type='telnet'> * <listen addr='127.0.0.1' port='12356'/> * </console> * * <console type='telnet'> * <connect addr='127.0.0.1' port='12356'/> * </console> * */ BTW, the udp, tcp, telnet options are only available on QEMU >= 0.9.0. We already have ability to detect / validate that for both Xen & QEMU drivers. NB, whereever there are IP addresses, hostnames can be used too, hence I call the attriute 'addr' instead of 'ip' Regards, 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 -=|

5 8

[Libvir] How to stop 'make install' clobbering /etc/libvirt/libvirtd.conf
by Richard W.M. Jones 26 Feb '08

26 Feb '08

Currently 'make install' clobbers configuration files, in particular /etc/libvirt/libvirtd.conf. It shouldn't. Does anyone know how to persuade automake to stop it from doing this? As far as I can see the only way would be to write a custom install rule. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 1

[Libvir] default hypervisor selection
by Daniel Veillard 26 Feb '08

26 Feb '08

While going though the ovirt installation steps I got annoyed with the need to add "-c qemu:///system" each time we are trying to start a virsh command if using KVM. The dfault setup is basically to assume a Xen hypervisor if the URI is not specified, this is glued in the do_open internal opening routine associated to the opening of connections: -------------------------------------- static virConnectPtr do_open (const char *name, virConnectAuthPtr auth, int flags) { int i, res; virConnectPtr ret = NULL; xmlURIPtr uri; /* Convert NULL or "" to xen:/// for back compat */ if (!name || name[0] == '\0') name = "xen:///"; -------------------------------------- In one hand this is the default behaviour of the library, but in my opinion it's not very smart. We should be able to be smarter than that, for example: - if /proc/xen doesn't exist (on linux, or /dev/xen on Solaris) well we should not do that we are pretty sure we will get an error when trying to connect - if /proc/vz is present, well it's very likely that if the kernel has been compiled with OpenVZ support, it's likely to be used as the default virtualization - if there is a kvm module loaded well we should probably use qemu:///system if running as root or qemu:///session otherwise I guess on Solaris an easy heuristic would allow to pick the right hypervisor by default too. At some point we may have multiple hypervisor support simultaneously on a linux system thanks to pv_ops, but right now it doesn't make too much sense to force a default Xen connection even when we know it won't work. For a virsh specific solution there is the VIRSH_DEFAULT_CONNECT_URI environment variable, but it's not really user friendly and not very generic, What do people think ? I would be tempted to provide a patch to change do_open() behaviour on linux in the case name is NULL or "", and then check what hypervisor might be present and running, 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/

7 16

[Libvir] [Discussion] 0/4 Implement DHCP host mappings for virtual networks
by Richard W.M. Jones 25 Feb '08

25 Feb '08

This is a series of patches to implement DHCP IP & hostname mappings for libvirt virtual networks. ** NOTE: This patch is not to be applied. There is some memory corruption bug which I'm still tracking down. What this patch allows you to do is to create a table of IP address to host (defined by its hardware / MAC address) for each virtual network. Optionally you can also assign a hostname. When a host starts up and requests an IP address through DHCP, if it is in this table then it gets the fixed IP address from the table and, optionally, a fixed hostname. Four new API calls are added. Two are required to list the contents of the mapping table. Two more allow you to add and delete a mapping. The mapping table is semi-permanent. It is stored in /var/lib/libvirt/hosts-<networkname>.conf and survives across libvirtd restarts. The implementation simply uses dnsmasq's --dhcp-hostsfile flag. Refer to the dnsmasq(1) manual page. 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

4 18

[Libvir] [PATCH] Avoid new "make syntax-check" failures.
by Jim Meyering 25 Feb '08

25 Feb '08

With recent changes, I introduced some new "make syntax-check" failures. Also, there were two remaining invalid uses of write(2). This fixes all that. Avoid new "make syntax-check" failures. * .x-sc_avoid_write: Exempt src/util-lib.c, too. * Makefile.maint (sc_unmarked_diagnostics): Filter out false positives. * src/storage_backend_fs.c (virStorageBackendFileSystemVolCreate): Use safewrite, not write. * src/storage_backend_logical.c (virStorageBackendLogicalBuildPool): Likewise. --- .x-sc_avoid_write | 1 + Makefile.maint | 6 +++++- src/storage_backend_fs.c | 2 +- src/storage_backend_logical.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write index 72a196d..fe38d83 100644 --- a/.x-sc_avoid_write +++ b/.x-sc_avoid_write @@ -1,2 +1,3 @@ ^src/util\.c$ ^src/xend_internal\.c$ +^src/util-lib\.c$ diff --git a/Makefile.maint b/Makefile.maint index fe964a5..0c3acf8 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -304,6 +304,9 @@ err_func_re = \ # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. +# The sed filters eliminate false-positives like these: +# _("...: " +# "%s", _("no storage vol w..." sc_unmarked_diagnostics: @grep -nE \ '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ @@ -312,7 +315,8 @@ sc_unmarked_diagnostics: exit 1; } || : @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ - | grep '[ ]"' && \ + | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ + | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 9425cbc..1d540e1 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -854,7 +854,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, int bytes = sizeof(zeros); if (bytes > remain) bytes = remain; - if ((bytes = write(fd, zeros, bytes)) < 0) { + if ((bytes = safewrite(fd, zeros, bytes)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot fill file '%s': %s"), vol->target.path, strerror(errno)); diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index a70c087..f8a075d 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -287,7 +287,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn, strerror(errno)); goto cleanup; } - if (write(fd, zeros, sizeof(zeros)) != sizeof(zeros)) { + if (safewrite(fd, zeros, sizeof(zeros)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot clear device header %s"), strerror(errno)); -- 1.5.4.2.185.gf5f8

2 2

[Libvir] Error - when compiling sample libvirt program - Failed to find libvirt proxy
by Sunil Lingappa 25 Feb '08

25 Feb '08

Hello Everybody I am trying to compile the sample program which is present at the libvirt.org sample program section. I am running the program which is used to retrieve domain information. While i am able to compile it with success, when i run it i get the following error : *" failed to find libvirt_proxy " * But the output is still displayed. Can anybody please help me how to overcome this error message. find below the patch level info : rpm -qa | grep libvirt libvirt-devel-0.2.0-0.16 libvirt-0.2.0-0.16 libvirt-python-0.2.0-0.16 Thanks & Best Regards Sunil

2 1

[Libvir] [PATCH] 1/2: Move safewrite and saferead to a separate file.
by Jim Meyering 25 Feb '08

25 Feb '08

Move safewrite and saferead to a separate file. We currently use safewrite from inside libvirt and don't want to publish any such function name. However, we do want to use it in applications like virsh, libvirtd and libvirt_proxy that link with libvirt. To that end, this change moves that function definition (along with the nearly identical saferead) into a new file, util-lib.c. To avoid maintaining separate copies of even such small functions, we simply include that new file from util.c. Then, the separate applications that need to use safewrite simply compile and link with util-lib.c. Of course, this does mean that each of those applications will containing two copies of these functions. However, the functions are so small that it's not worth worrying about that. * src/util.c (saferead, safewrite): Move function definitions to util-lib.c and include that .c file. * src/util-lib.c (saferead, safewrite): New file. Functions from src/util.c with slight change (s/int r =/ssize_t r =/) to reflect read/write return type. * src/util-lib.h: Declare the two moved functions. * src/util.h: Remove declarations. Include src/util-lib.h. * proxy/Makefile.am (libvirt_proxy_SOURCES): Add src/util-lib.c. * qemud/Makefile.am (libvirtd_SOURCES): Likewise. * src/Makefile.am (virsh_SOURCES): Add util-lib.c. Remove some SP-before-TAB. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- proxy/Makefile.am | 6 +++- proxy/libvirt_proxy.c | 16 ++++---------- qemud/Makefile.am | 3 +- src/Makefile.am | 16 +++++++------- src/util-lib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ src/util-lib.h | 16 +++++++++++++++ src/util.c | 43 ++------------------------------------- src/util.h | 10 ++++---- 8 files changed, 95 insertions(+), 67 deletions(-) create mode 100644 src/util-lib.c create mode 100644 src/util-lib.h diff --git a/proxy/Makefile.am b/proxy/Makefile.am index ff9a3eb..68e3317 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -12,11 +12,13 @@ libexec_PROGRAMS = libvirt_proxy libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \ @top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c \ @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \ - @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c @top_srcdir@/src/uuid.c + @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c \ + @top_srcdir@/src/util-lib.c \ + @top_srcdir@/src/uuid.c libvirt_proxy_LDFLAGS = $(WARN_CFLAGS) libvirt_proxy_DEPENDENCIES = libvirt_proxy_LDADD = install-exec-hook: chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy -endif \ No newline at end of file +endif diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d96d3db..a22ba6c 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -2,7 +2,7 @@ * proxy_svr.c: root suid proxy server for Xen access to APIs with no * side effects from unauthenticated clients. * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -26,6 +26,7 @@ #include "internal.h" #include "proxy_internal.h" +#include "util.h" #include "xen_internal.h" #include "xend_internal.h" #include "xs_internal.h" @@ -317,19 +318,12 @@ proxyWriteClientSocket(int nr, virProxyPacketPtr req) { return(-1); } -retry: - ret = write(pollInfos[nr].fd, (char *) req, req->len); + ret = safewrite(pollInfos[nr].fd, (char *) req, req->len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d to client %d interrupted\n", - pollInfos[nr].fd, nr); - goto retry; - } fprintf(stderr, "write %d bytes to socket %d from client %d failed\n", req->len, pollInfos[nr].fd, nr); - proxyCloseClientSocket(nr); - return(-1); + proxyCloseClientSocket(nr); + return(-1); } if (ret == 0) { if (debug) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index db6adb1..1e1f861 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -42,6 +42,7 @@ libvirtd_SOURCES = \ qemud.c internal.h \ remote_protocol.h remote_protocol.c \ remote.c \ + $(srcdir)/../src/util-lib.c \ event.c event.h #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L @@ -151,4 +152,4 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT -endif # WITH_LIBVIRTD \ No newline at end of file +endif # WITH_LIBVIRTD diff --git a/src/Makefile.am b/src/Makefile.am index 7bbf816..1da0d73 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,21 +51,21 @@ CLIENT_SOURCES = \ conf.c conf.h \ xm_internal.c xm_internal.h \ remote_internal.c remote_internal.h \ - bridge.c bridge.h \ - iptables.c iptables.h \ - uuid.c uuid.h \ - qemu_driver.c qemu_driver.h \ + bridge.c bridge.h \ + iptables.c iptables.h \ + uuid.c uuid.h \ + qemu_driver.c qemu_driver.h \ qemu_conf.c qemu_conf.h \ openvz_conf.c openvz_conf.h \ - openvz_driver.c openvz_driver.h \ + openvz_driver.c openvz_driver.h \ nodeinfo.h nodeinfo.c \ storage_conf.h storage_conf.c \ storage_driver.h storage_driver.c \ storage_backend.h storage_backend.c \ - storage_backend_fs.h storage_backend_fs.c \ + storage_backend_fs.h storage_backend_fs.c \ util.c util.h -SERVER_SOURCES = \ +SERVER_SOURCES = \ ../qemud/remote_protocol.c ../qemud/remote_protocol.h if WITH_STORAGE_LVM @@ -100,7 +100,7 @@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) bin_PROGRAMS = virsh -virsh_SOURCES = virsh.c console.c console.h +virsh_SOURCES = virsh.c console.c console.h util-lib.c virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) virsh_DEPENDENCIES = $(DEPS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) diff --git a/src/util-lib.c b/src/util-lib.c new file mode 100644 index 0000000..92496cd --- /dev/null +++ b/src/util-lib.c @@ -0,0 +1,52 @@ +/* + * common, generic utility functions + * + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. + * See COPYING.LIB for the License of this software + */ + +#include <config.h> + +#include <unistd.h> +#include <errno.h> + +#include "util-lib.h" + +/* Like read(), but restarts after EINTR */ +int saferead(int fd, void *buf, size_t count) +{ + size_t nread = 0; + while (count > 0) { + ssize_t r = read(fd, buf, count); + if (r < 0 && errno == EINTR) + continue; + if (r < 0) + return r; + if (r == 0) + return nread; + buf = (char *)buf + r; + count -= r; + nread += r; + } + return nread; +} + +/* Like write(), but restarts after EINTR */ +ssize_t safewrite(int fd, const void *buf, size_t count) +{ + size_t nwritten = 0; + while (count > 0) { + ssize_t r = write(fd, buf, count); + + if (r < 0 && errno == EINTR) + continue; + if (r < 0) + return r; + if (r == 0) + return nwritten; + buf = (const char *)buf + r; + count -= r; + nwritten += r; + } + return nwritten; +} diff --git a/src/util-lib.h b/src/util-lib.h new file mode 100644 index 0000000..4a14810 --- /dev/null +++ b/src/util-lib.h @@ -0,0 +1,16 @@ +/* + * private utility functions + * + * Copyright (C) 2008 Red Hat, Inc. + * See COPYING.LIB for the License of this software + */ + +#ifndef __UTIL_LIB_H__ +#define __UTIL_LIB_H__ + +#include <sys/types.h> + +int saferead(int fd, void *buf, size_t count); +ssize_t safewrite(int fd, const void *buf, size_t count); + +#endif diff --git a/src/util.c b/src/util.c index 19131a7..67cb0b8 100644 --- a/src/util.c +++ b/src/util.c @@ -1,7 +1,7 @@ /* * utils.c: common, generic utility functions * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain @@ -46,6 +46,8 @@ #include "buf.h" #include "util.h" +#include "util-lib.c" + #define MAX_ERROR_LEN 1024 #define virLog(msg...) fprintf(stderr, msg) @@ -276,45 +278,6 @@ virExecNonBlock(virConnectPtr conn, #endif /* __MINGW32__ */ -/* Like read(), but restarts after EINTR */ -int saferead(int fd, void *buf, size_t count) -{ - size_t nread = 0; - while (count > 0) { - int r = read(fd, buf, count); - if (r < 0 && errno == EINTR) - continue; - if (r < 0) - return r; - if (r == 0) - return nread; - buf = (unsigned char *)buf + r; - count -= r; - nread += r; - } - return nread; -} - -/* Like write(), but restarts after EINTR */ -ssize_t safewrite(int fd, const void *buf, size_t count) -{ - size_t nwritten = 0; - while (count > 0) { - int r = write(fd, buf, count); - - if (r < 0 && errno == EINTR) - continue; - if (r < 0) - return r; - if (r == 0) - return nwritten; - buf = (unsigned char *)buf + r; - count -= r; - nwritten += r; - } - return nwritten; -} - int __virFileReadAll(const char *path, int maxlen, diff --git a/src/util.h b/src/util.h index 7080ed0..23a016d 100644 --- a/src/util.h +++ b/src/util.h @@ -25,14 +25,14 @@ #define __VIR_UTIL_H__ #include "internal.h" +#include "util-lib.h" -int virExec(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); -int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); +int virExec(virConnectPtr conn, char **argv, int *retpid, + int infd, int *outfd, int *errfd); +int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, + int infd, int *outfd, int *errfd); int virRun(virConnectPtr conn, char **argv, int *status); -int saferead(int fd, void *buf, size_t count); -ssize_t safewrite(int fd, const void *buf, size_t count); - int __virFileReadAll(const char *path, int maxlen, char **buf); -- 1.5.4.2.185.gf5f8

3 3

[Libvir] Proposal: More script hooks for <interface type='ethernet'>
by Charles Duffy 25 Feb '08

25 Feb '08

I have a few issues with <interface type='ethernet'>: - The requirement that either (1) the tap device already exists and has a constant name, or (2) the tap device can be created by the current user without privilege escalation doesn't work for places where the user wants to - dynamically generate tap devices - ...but is running kvm without privileges to do so. (this is particularly likely now that write privileges to /dev/net/tap are not enough, and the user needs CAP_NET_ADMIN to create a tap device). Allowing a target script to be specified (which is responsible for gaining any privileges necessary) which runs *before* the tap device is opened and would resolve this. - A qemu-ifup script can be specified, but not a qemu-ifdown replacement. Before looking to use libvirt, I had kvm's invocation wrapped by a script which did appropriate privilege escalation (ifname=$(sudo tunctl -b -u $USER), with sudo configured with the NOPASSWORD flag for this request -- though plenty of other approaches are certainly possible). It would be ideal if more hooks were available... for instance: <interface type='ethernet'>  <target script='/usr/local/bin/make-me-a-tap-device'/>  <script path='/etc/qemu-ifup-mynet'/>  <script-down path='/etc/qemu-ifdown-mynet'/> </interface> Working around this means that I would need to preallocate the tap devices and assign them to specific VMs (boo! hiss!) or that (if I wrapped libvirt's invocation to have the tap device created just ahead of time and its name substituted into interface/@dev) 3rd-party libvirt-based management tools couldn't be used (which would defeat the point of switching to libvirt from my homegrown script collection in the first place). So -- does the proposed syntax extension look reasonable?

3 2

[Libvir] Libparted history contribution
by Matt Davis 24 Feb '08

24 Feb '08

Hello, I am sending this email out to various programs that use libparted for partition table manipulation. If you are on the libparted devel list, you probably have caught word of this. I have implemented some functionality that allows parted to maintain a list of disk changes, allowing for a user to undo/redo changes before they are actually committed, or written, to disk. This "History" is a safety feature, and a library change vs usefulness might not be wanted by you all. I was just querying to see if such functionality, as an addition to libparted, would be welcomed? In any case, it might be useful for me to wrap it up into its own library, possibly something such as libparted-utilities or extras. While the changes I have implemented can exist outside of the library, I figured it might be something other projects might find useful. But making any library changes, especially when many well-known projects use such a library, is a serious decision. If this is a worthy change I would like to hear your feedback. Thanks -Matt

1 0

[Libvir] Why QEMU?
by Anton Protopopov 23 Feb '08

23 Feb '08

Hi, all. When I executing virsh to connect to openvz I get the following: [root@localhost ~]# virsh -c openvz:///system libvir: QEMU error : cannot create bridge 'virbr0' : File exists Failed to autostart network 'default': cannot create bridge 'virbr0' : File existsWelcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # ... But I didn't want to connect to QEMU... Anton

4 5

[Libvir] [RFC][PATCH]: Make the iscsi storage backend mostly use sysfs
by Chris Lalancette 22 Feb '08

22 Feb '08

Hello, The newer version of iscsi-initiator-utils (6.2.0.865-0.2), available in the f8-updates repository, is required as part of the fix for a hang when doing iscsi logout (the other fix is in the 2.6.25 kernel). Unfortunately, this version also changes the output of the iscsiadm -m session -P 3 command; this output was being used to gather the scsi devices available in a pool and present them as volumes. Consequently, when starting an iSCSI pool on a machine with these newer versions of the iscsi tools, the pool will be successfully created but you won't be able to see any of the LUNs presented. The attached patch *lessens* our dependency on the iscsiadm output by using sysfs to gather the /dev devices. Note that this patch is not to be applied; I'm just putting it out there so people can take a look at it. DanB has suggested getting rid of our dependency on the iscsiadm output altogether is the way to go, and I agree with him there; this is mostly just a short-term solution, to possibly base future work on. Chris Lalancette

2 1

[Libvir] Problem using libvirtd on RHEL5.1
by Tiago Cruz 22 Feb '08

22 Feb '08

Hello 8-) I'm using libvirt-0.4.0-1 (re)compiled from libvirt-0.4.0.tar.gz, on Red Hat EL 5.1 x86_64. The problem is: # /etc/init.d/libvirtd start Starting libvirtd daemon: libvir: QEMU error : cannot create bridge 'virbr0' : File exists Failed to autostart network 'default': cannot create bridge[FAILED]' : File exists And I can't destroy the 'virbr0', because I don't know how :^) --- I've tried do compile the libvirt-cvs-snapshot.tar.gz, but I can't too :( In file included from libvirt.c:36: util.h:28:22: error: util-lib.h: No such file or directory RPM build errors: File not found: /var/tmp/libvirt-0.4.0-root/usr/libexec/libvirt_parthelper Maybe you have some tip/ trick for me :) Many thanks -- Tiago Cruz http://everlinux.com Linux User #282636

2 2

[Libvir] tons of format string warnings on rawhide
by Jim Meyering 22 Feb '08

22 Feb '08

Avoid warnings like this: file:nnn:format not a string literal and no format arguments Easy to fix: prepend an "%s" argument. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 68 +++++++++++++++----------- qemud/remote.c | 28 ++++++----- src/iptables.c | 4 +- src/qemu_driver.c | 23 ++++++--- src/storage_backend.c | 22 ++++---- src/storage_backend_fs.c | 29 ++++++------ src/storage_backend_iscsi.c | 18 ++++---- src/storage_backend_logical.c | 20 ++++---- src/storage_conf.c | 77 +++++++++++++++--------------- src/storage_driver.c | 103 +++++++++++++++++++++-------------------- 10 files changed, 207 insertions(+), 185 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index a40dfcb..e01b6dc 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -245,9 +245,9 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, switch (sigc) { case SIGHUP: - qemudLog(QEMUD_INFO, _("Reloading configuration on SIGHUP")); + qemudLog(QEMUD_INFO, "%s", _("Reloading configuration on SIGHUP")); if (virStateReload() < 0) - qemudLog(QEMUD_WARN, _("Error while reloading drivers")); + qemudLog(QEMUD_WARN, "%s", _("Error while reloading drivers")); break; case SIGINT: @@ -274,7 +274,8 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -288,7 +289,8 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -467,7 +469,7 @@ static int qemudListenUnix(struct qemud_server *server, if (!sock) { qemudLog(QEMUD_ERR, - _("Failed to allocate memory for struct qemud_socket")); + "%s", _("Failed to allocate memory for struct qemud_socket")); return -1; } @@ -517,7 +519,7 @@ static int qemudListenUnix(struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to add server event callback")); + qemudLog(QEMUD_ERR, "%s", _("Failed to add server event callback")); goto cleanup; } @@ -647,7 +649,7 @@ remoteListenTCP (struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to add server event callback")); + qemudLog(QEMUD_ERR, "%s", _("Failed to add server event callback")); return -1; } @@ -698,7 +700,7 @@ static int qemudInitPaths(struct qemud_server *server, snprintf_error: qemudLog(QEMUD_ERR, - _("Resulting path to long for buffer in qemudInitPaths()")); + "%s", _("Resulting path to long for buffer in qemudInitPaths()")); return -1; } @@ -706,7 +708,7 @@ static struct qemud_server *qemudInitialize(int sigread) { struct qemud_server *server; if (!(server = calloc(1, sizeof(*server)))) { - qemudLog(QEMUD_ERR, _("Failed to allocate struct qemud_server")); + qemudLog(QEMUD_ERR, "%s", _("Failed to allocate struct qemud_server")); return NULL; } @@ -935,20 +937,23 @@ remoteCheckCertificate (gnutls_session_t session) if (status != 0) { if (status & GNUTLS_CERT_INVALID) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate is not trusted.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "the client certificate is not trusted.")); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " - "certificate has unknown issuer.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: the client " + "certificate has unknown issuer.")); if (status & GNUTLS_CERT_REVOKED) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate has been revoked.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "the client certificate has been revoked.")); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - qemudLog (QEMUD_ERR, + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: the client certificate" " uses an insecure algorithm.")); #endif @@ -957,13 +962,13 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "certificate is not X.509")); + qemudLog (QEMUD_ERR, + "%s", _("remoteCheckCertificate: certificate is not X.509")); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: no peers")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: no peers")); return -1; } @@ -973,7 +978,7 @@ remoteCheckCertificate (gnutls_session_t session) gnutls_x509_crt_t cert; if (gnutls_x509_crt_init (&cert) < 0) { - qemudLog (QEMUD_ERR, + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: gnutls_x509_crt_init failed")); return -1; } @@ -984,15 +989,15 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate has expired")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: " + "the client certificate has expired")); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " - "certificate is not yet activated")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: the client " + "certificate is not yet activated")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1000,7 +1005,7 @@ remoteCheckCertificate (gnutls_session_t session) if (i == 0) { if (!remoteCheckDN (cert)) { /* This is the most common error: make it informative. */ - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1016,9 +1021,13 @@ remoteCheckAccess (struct qemud_client *client) { /* Verify client certificate. */ if (remoteCheckCertificate (client->tlssession) == -1) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: failed to verify client's certificate")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "failed to verify client's certificate")); if (!tls_no_verify_certificate) return -1; - else qemudLog (QEMUD_INFO, _("remoteCheckCertificate: tls_no_verify_certificate is set so the bad certificate is ignored")); + else qemudLog (QEMUD_INFO, "%s", + _("remoteCheckCertificate: tls_no_verify_certificate " + "is set so the bad certificate is ignored")); } /* Checks have succeeded. Write a '\1' byte back to the client to @@ -1889,7 +1898,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) if (unix_sock_group) { if (getuid() != 0) { qemudLog (QEMUD_WARN, - _("Cannot set group when not running as root")); + "%s", _("Cannot set group when not running as root")); } else { struct group *grp = getgrnam(unix_sock_group); if (!grp) { @@ -2146,7 +2155,8 @@ int main(int argc, char **argv) { POLLIN, qemudDispatchSignalEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to register callback for signal pipe")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to register callback for signal pipe")); ret = 3; goto error2; } diff --git a/qemud/remote.c b/qemud/remote.c index f7c9b24..014fe65 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -2130,7 +2130,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL init request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL init request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2184,7 +2184,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, cipher = gnutls_cipher_get(client->tlssession); if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { - qemudLog(QEMUD_ERR, _("cannot TLS get cipher size")); + qemudLog(QEMUD_ERR, "%s", _("cannot TLS get cipher size")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2250,7 +2250,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { - qemudLog(QEMUD_ERR, _("cannot allocate mechlist")); + qemudLog(QEMUD_ERR, "%s", _("cannot allocate mechlist")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2323,7 +2323,7 @@ remoteSASLCheckAccess (struct qemud_server *server, return -1; } if (val == NULL) { - qemudLog(QEMUD_ERR, _("no client username was found")); + qemudLog(QEMUD_ERR, "%s", _("no client username was found")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2333,7 +2333,7 @@ remoteSASLCheckAccess (struct qemud_server *server, client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { - qemudLog(QEMUD_ERR, _("out of memory copying username")); + qemudLog(QEMUD_ERR, "%s", _("out of memory copying username")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2378,7 +2378,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, REMOTE_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2458,7 +2458,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, REMOTE_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2532,7 +2532,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL init request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL init request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2544,7 +2544,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL start request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2556,7 +2556,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL step request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL step request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2597,13 +2597,14 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - qemudLog(QEMUD_ERR, _("client tried invalid PolicyKit init request")); + qemudLog(QEMUD_ERR, + "%s", _("client tried invalid PolicyKit init request")); remoteDispatchFailAuth(client, req); return -2; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - qemudLog(QEMUD_ERR, _("cannot get peer socket identity")); + qemudLog(QEMUD_ERR, "%s", _("cannot get peer socket identity")); remoteDispatchFailAuth(client, req); return -2; } @@ -2713,7 +2714,8 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported PolicyKit init request")); + qemudLog(QEMUD_ERR, + "%s", _("client tried unsupported PolicyKit init request")); remoteDispatchFailAuth(client, req); return -1; } diff --git a/src/iptables.c b/src/iptables.c index f970701..dda1c24 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -148,8 +148,8 @@ notifyRulesRemoved(const char *table, len = virFileReadAll(SYSCONF_DIR "/sysconfig/system-config-firewall", MAX_FILE_LEN, &content); if (len < 0) { - qemudLog(QEMUD_WARN, _("Failed to read " SYSCONF_DIR - "/sysconfig/system-config-firewall")); + qemudLog(QEMUD_WARN, "%s", _("Failed to read " SYSCONF_DIR + "/sysconfig/system-config-firewall")); return; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..f5fe504 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -71,7 +71,8 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -85,7 +86,8 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -182,7 +184,8 @@ qemudStartup(void) { goto snprintf_error; if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) { - qemudLog (QEMUD_ERR, _("out of memory in asprintf")); + qemudLog (QEMUD_ERR, + "%s", _("out of memory in asprintf")); goto out_of_memory; } } @@ -224,11 +227,12 @@ qemudStartup(void) { snprintf_error: qemudLog(QEMUD_ERR, - _("Resulting path to long for buffer in qemudInitPaths()")); + "%s", _("Resulting path to long for buffer in qemudInitPaths()")); return -1; out_of_memory: - qemudLog (QEMUD_ERR, _("qemudStartup: out of memory")); + qemudLog (QEMUD_ERR, + "%s", _("qemudStartup: out of memory")); free (base); free(qemu_driver); qemu_driver = NULL; @@ -246,7 +250,8 @@ qemudReload(void) { qemudScanConfigs(qemu_driver); if (qemu_driver->iptables) { - qemudLog(QEMUD_INFO, _("Reloading iptables rules")); + qemudLog(QEMUD_INFO, + "%s", _("Reloading iptables rules")); iptablesReloadRules(qemu_driver->iptables); } @@ -777,7 +782,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { kill(vm->pid, SIGKILL); if (waitpid(vm->pid, NULL, 0) != vm->pid) { - qemudLog(QEMUD_WARN, _("Got unexpected pid, damn")); + qemudLog(QEMUD_WARN, + "%s", _("Got unexpected pid, damn")); } } @@ -1265,7 +1271,8 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); if (waitpid(network->dnsmasqPid, NULL, 0) != network->dnsmasqPid) - qemudLog(QEMUD_WARN, _("Got unexpected pid for dnsmasq\n")); + qemudLog(QEMUD_WARN, + "%s", _("Got unexpected pid for dnsmasq\n")); } network->bridge[0] = '\0'; diff --git a/src/storage_backend.c b/src/storage_backend.c index 6f8940f..a13d9a4 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -247,7 +247,7 @@ virStorageBackendUpdateVolInfoFD(virConnectPtr conn, } vol->target.perms.label = strdup(filecon); if (vol->target.perms.label == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("context")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); return -1; } freecon(filecon); @@ -306,7 +306,7 @@ virStorageBackendStablePath(virConnectPtr conn, stablepath = malloc(strlen(pool->def->target.path) + 1 + strlen(dent->d_name) + 1); if (stablepath == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("path")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("path")); closedir(dh); return NULL; } @@ -359,7 +359,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, /* Compile all regular expressions */ if ((reg = calloc(nregex, sizeof(*reg))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("regex")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("regex")); return -1; } @@ -385,12 +385,12 @@ virStorageBackendRunProgRegex(virConnectPtr conn, /* Storage for matched variables */ if ((groups = calloc(totgroups, sizeof(*groups))) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } if ((vars = calloc(maxvars+1, sizeof(*vars))) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } @@ -402,7 +402,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, if ((list = fdopen(fd, "r")) == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot read fd")); + "%s", _("cannot read fd")); goto cleanup; } @@ -426,7 +426,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, if ((groups[ngroup++] = strdup(line + vars[j+1].rm_so)) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } } @@ -489,7 +489,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, } } else { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("command did not exit cleanly")); + "%s", _("command did not exit cleanly")); return -1; } } @@ -530,7 +530,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, if (n_columns > SIZE_MAX / sizeof *v || (v = malloc (n_columns * sizeof *v)) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("n_columns too large")); + "%s", _("n_columns too large")); return -1; } for (i = 0; i < n_columns; i++) @@ -543,7 +543,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, if ((fp = fdopen(fd, "r")) == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot read fd")); + "%s", _("cannot read fd")); goto cleanup; } @@ -611,7 +611,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, } } else { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("command did not exit cleanly")); + "%s", _("command did not exit cleanly")); return -1; } } diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index ffb4010..9425cbc 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -503,18 +503,18 @@ virStorageBackendFileSystemMount(virConnectPtr conn, if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.dir == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source path")); + "%s", _("missing source path")); return -1; } } else { if (pool->def->source.ndevice != 1) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } } @@ -537,7 +537,7 @@ virStorageBackendFileSystemMount(virConnectPtr conn, src = strdup(pool->def->source.devices[0].path); } if (src == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("source")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("source")); return -1; } mntargv[3] = src; @@ -568,18 +568,18 @@ virStorageBackendFileSystemUnmount(virConnectPtr conn, if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.dir == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source dir")); + "%s", _("missing source dir")); return -1; } } else { if (pool->def->source.ndevice != 1) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } } @@ -680,7 +680,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, vol = calloc(1, sizeof(virStorageVolDef)); if (vol == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume")); + "%s", _("volume")); goto cleanup; } @@ -688,7 +688,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, if (vol->name == NULL) { free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume name")); + "%s", _("volume name")); goto cleanup; } @@ -699,7 +699,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, free(vol->target.path); free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume name")); + "%s", _("volume name")); goto cleanup; } strcpy(vol->target.path, pool->def->target.path); @@ -710,7 +710,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, free(vol->target.path); free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume key")); + "%s", _("volume key")); goto cleanup; } @@ -822,7 +822,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, vol->target.path = malloc(strlen(pool->def->target.path) + 1 + strlen(vol->name) + 1); if (vol->target.path == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("target")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("target")); return -1; } strcpy(vol->target.path, pool->def->target.path); @@ -831,7 +831,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, vol->key = strdup(vol->target.path); if (vol->key == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("storage vol key")); + "%s", _("storage vol key")); return -1; } @@ -963,7 +963,8 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, } #else virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("creation of non-raw images is not supported without qemu-img")); + "%s", _("creation of non-raw images " + "is not supported without qemu-img")); return -1; #endif } diff --git a/src/storage_backend_iscsi.c b/src/storage_backend_iscsi.c index 2f7d746..fc79b46 100644 --- a/src/storage_backend_iscsi.c +++ b/src/storage_backend_iscsi.c @@ -92,7 +92,7 @@ virStorageBackendISCSIExtractSession(virConnectPtr conn, if (STREQ(groups[1], pool->def->source.devices[0].path)) { if ((*session = strdup(groups[0])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("session")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("session")); return -1; } } @@ -133,7 +133,7 @@ virStorageBackendISCSISession(virConnectPtr conn, if (session == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot find session")); + "%s", _("cannot find session")); return NULL; } @@ -174,17 +174,17 @@ virStorageBackendISCSIMakeLUN(virConnectPtr conn, snprintf(lunid, sizeof(lunid)-1, "lun-%s", groups[3]); if ((vol = calloc(1, sizeof(virStorageVolDef))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } if ((vol->name = strdup(lunid)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("name")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("name")); goto cleanup; } if ((devpath = malloc(5 + strlen(dev) + 1)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("devpath")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("devpath")); goto cleanup; } strcpy(devpath, "/dev/"); @@ -230,7 +230,7 @@ virStorageBackendISCSIMakeLUN(virConnectPtr conn, /* XXX use unique iSCSI id instead */ vol->key = strdup(vol->target.path); if (vol->key == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("key")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("key")); goto cleanup; } @@ -342,7 +342,7 @@ virStorageBackendISCSIPortal(virConnectPtr conn, portal = malloc(strlen(ipaddr) + 1 + 4 + 2 + 1); if (portal == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("portal")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("portal")); return NULL; } @@ -361,14 +361,14 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.ndevice != 1 || pool->def->source.devices[0].path == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index c14e788..a70c087 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -113,12 +113,12 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, /* Or a completely new volume */ if (vol == NULL) { if ((vol = calloc(1, sizeof(*vol))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } if ((vol->name = strdup(groups[0])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } @@ -130,7 +130,7 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, if (vol->target.path == NULL) { if ((vol->target.path = malloc(strlen(pool->def->target.path) + 1 + strlen(vol->name) + 1)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } strcpy(vol->target.path, pool->def->target.path); @@ -140,7 +140,7 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, if (vol->key == NULL && (vol->key = strdup(groups[1])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } @@ -151,30 +151,30 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, /* Finally fill in extents information */ if ((tmp = realloc(vol->source.extents, sizeof(*tmp) * (vol->source.nextent + 1))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("extents")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("extents")); return -1; } vol->source.extents = tmp; if ((vol->source.extents[vol->source.nextent].path = strdup(groups[2])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("extents")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("extents")); return -1; } if (virStrToLong_ull(groups[3], NULL, 10, &offset) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent offset value")); + "%s", _("malformed volume extent offset value")); return -1; } if (virStrToLong_ull(groups[4], NULL, 10, &length) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent length value")); + "%s", _("malformed volume extent length value")); return -1; } if (virStrToLong_ull(groups[5], NULL, 10, &size) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent size value")); + "%s", _("malformed volume extent size value")); return -1; } @@ -266,7 +266,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn, /* XXX multiple pvs */ if ((vgargv = malloc(sizeof(char*) * (1))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("command line")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("command line")); return -1; } diff --git a/src/storage_conf.c b/src/storage_conf.c index 8dfcde7..76e141e 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -153,14 +153,14 @@ virStoragePoolDefParseAuthChap(virConnectPtr conn, auth->login = virXPathString("string(/pool/source/auth/@login)", ctxt); if (auth->login == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing auth host attribute")); + "%s", _("missing auth host attribute")); return -1; } auth->passwd = virXPathString("string(/pool/source/auth/@passwd)", ctxt); if (auth->passwd == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing auth passwd attribute")); + "%s", _("missing auth passwd attribute")); return -1; } @@ -183,7 +183,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, perms->mode = strtol(mode, &end, 8); if (*end || perms->mode < 0 || perms->mode > 0777) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed octal mode")); + "%s", _("malformed octal mode")); return -1; } } @@ -193,7 +193,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/pool/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed owner element")); + "%s", _("malformed owner element")); return -1; } perms->uid = (int)v; @@ -204,7 +204,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/pool/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed group element")); + "%s", _("malformed group element")); return -1; } perms->gid = (int)v; @@ -232,7 +232,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (STRNEQ((const char *)root->name, "pool")) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("unknown root element")); + "%s", _("unknown root element")); goto cleanup; } @@ -248,7 +248,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((ret->name = virXPathString("string(/pool/name)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing name element")); + "%s", _("missing name element")); goto cleanup; } @@ -256,13 +256,13 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (uuid == NULL) { if (virUUIDGenerate(ret->uuid) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("unable to generate uuid")); + "%s", _("unable to generate uuid")); goto cleanup; } } else { if (virUUIDParse(uuid, ret->uuid) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed uuid element")); + "%s", _("malformed uuid element")); goto cleanup; } free(uuid); @@ -281,7 +281,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_HOST) { if ((ret->source.host.name = virXPathString("string(/pool/source/host/@name)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source host name")); + "%s", _("missing source host name")); goto cleanup; } } @@ -291,12 +291,12 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((nsource = virXPathNodeSet("/pool/source/device", ctxt, &nodeset)) <= 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("cannot extract source devices")); + "%s", _("cannot extract source devices")); goto cleanup; } if ((ret->source.devices = calloc(nsource, sizeof(*ret->source.devices))) == NULL) { free(nodeset); - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("device")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("device")); goto cleanup; } for (i = 0 ; i < nsource ; i++) { @@ -304,7 +304,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (path == NULL) { free(nodeset); virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source device path")); + "%s", _("missing source device path")); goto cleanup; } ret->source.devices[i].path = (char *)path; @@ -315,7 +315,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_DIR) { if ((ret->source.dir = virXPathString("string(/pool/source/dir/@path)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source path")); + "%s", _("missing source path")); goto cleanup; } } @@ -346,7 +346,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((ret->target.path = virXPathString("string(/pool/target/path)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing target path")); + "%s", _("missing target path")); goto cleanup; } @@ -378,21 +378,21 @@ virStoragePoolDefParse(virConnectPtr conn, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed xml document")); + "%s", _("malformed xml document")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (ctxt == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("xmlXPathContext")); + "%s", _("xmlXPathContext")); goto cleanup; } node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing root element")); + "%s", _("missing root element")); goto cleanup; } @@ -429,7 +429,7 @@ virStoragePoolDefFormat(virConnectPtr conn, type = virStorageBackendToString(def->type); if (!type) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("unexpected pool type")); + "%s", _("unexpected pool type")); goto cleanup; } if (virBufferVSprintf(buf, "<pool type='%s'>\n", type) < 0) @@ -540,7 +540,7 @@ virStoragePoolDefFormat(virConnectPtr conn, return virBufferContentAndFree(buf); no_memory: - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("xml")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("xml")); cleanup: virBufferFree(buf); return NULL; @@ -562,7 +562,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, perms->mode = strtol(mode, &end, 8); if (*end || perms->mode < 0 || perms->mode > 0777) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed octal mode")); + "%s", _("malformed octal mode")); return -1; } } @@ -572,7 +572,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/volume/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing owner element")); + "%s", _("missing owner element")); return -1; } perms->uid = (int)v; @@ -582,7 +582,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/volume/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing owner element")); + "%s", _("missing owner element")); return -1; } perms->gid = (int)v; @@ -653,12 +653,12 @@ virStorageSize(virConnectPtr conn, if (virStrToLong_ull (val, &end, 10, ret) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed capacity element")); + "%s", _("malformed capacity element")); return -1; } if (*ret > (ULLONG_MAX / mult)) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("capacity element value too large")); + "%s", _("capacity element value too large")); return -1; } @@ -687,14 +687,14 @@ virStorageVolDefParseDoc(virConnectPtr conn, if (STRNEQ((const char *)root->name, "volume")) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("unknown root element")); + "%s", _("unknown root element")); goto cleanup; } ret->name = virXPathString("string(/volume/name)", ctxt); if (ret->name == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing name element")); + "%s", _("missing name element")); goto cleanup; } @@ -705,7 +705,7 @@ virStorageVolDefParseDoc(virConnectPtr conn, unit = virXPathString("string(/volume/capacity/@unit)", ctxt); if (capacity == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing capacity element")); + "%s", _("missing capacity element")); goto cleanup; } if (virStorageSize(conn, unit, capacity, &ret->capacity) < 0) @@ -766,21 +766,21 @@ virStorageVolDefParse(virConnectPtr conn, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed xml document")); + "%s", _("malformed xml document")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (ctxt == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("xmlXPathContext")); + "%s", _("xmlXPathContext")); goto cleanup; } node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing root element")); + "%s", _("missing root element")); goto cleanup; } @@ -903,7 +903,7 @@ virStorageVolDefFormat(virConnectPtr conn, return virBufferContentAndFree(buf); no_memory: - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("xml")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("xml")); cleanup: virBufferFree(buf); return NULL; @@ -1013,7 +1013,7 @@ virStoragePoolObjAssignDef(virConnectPtr conn, if (!(pool = calloc(1, sizeof(virStoragePoolObj)))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("pool")); + "%s", _("pool")); return NULL; } @@ -1150,26 +1150,27 @@ virStoragePoolObjSaveDef(virConnectPtr conn, if (virFileBuildPath(driver->configDir, def->name, ".xml", path, sizeof(path)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot construct config file path")); + "%s", _("cannot construct config file path")); return -1; } if (!(pool->configFile = strdup(path))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("configFile")); + "%s", _("configFile")); return -1; } if (virFileBuildPath(driver->autostartDir, def->name, ".xml", path, sizeof(path)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot construct autostart link path")); + "%s", _("cannot construct " + "autostart link path")); free(pool->configFile); pool->configFile = NULL; return -1; } if (!(pool->autostartLink = strdup(path))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("config file")); + "%s", _("config file")); free(pool->configFile); pool->configFile = NULL; return -1; @@ -1178,7 +1179,7 @@ virStoragePoolObjSaveDef(virConnectPtr conn, if (!(xml = virStoragePoolDefFormat(conn, def))) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to generate XML")); + "%s", _("failed to generate XML")); return -1; } diff --git a/src/storage_driver.c b/src/storage_driver.c index f97f706..2fa06af 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -261,7 +261,7 @@ storagePoolLookupByUUID(virConnectPtr conn, if (!pool) { virStorageReportError(conn, VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return NULL; } @@ -279,7 +279,7 @@ storagePoolLookupByName(virConnectPtr conn, if (!pool) { virStorageReportError(conn, VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching name")); + "%s", _("no pool with matching name")); return NULL; } @@ -329,7 +329,7 @@ storageListPools(virConnectPtr conn, if (virStoragePoolObjIsActive(pool)) { if (!(names[got] = strdup(pool->def->name))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("names")); + "%s", _("names")); goto cleanup; } got++; @@ -366,7 +366,7 @@ storageListDefinedPools(virConnectPtr conn, if (!virStoragePoolObjIsActive(pool)) { if (!(names[got] = strdup(pool->def->name))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("names")); + "%s", _("names")); goto cleanup; } got++; @@ -401,7 +401,7 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjFindByUUID(driver, def->uuid) || virStoragePoolObjFindByName(driver, def->name)) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool already exists")); + "%s", _("storage pool already exists")); virStoragePoolDefFree(def); return NULL; } @@ -470,13 +470,13 @@ storagePoolUndefine(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("pool is still active")); + "%s", _("pool is still active")); return -1; } @@ -507,7 +507,7 @@ storagePoolStart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -517,7 +517,7 @@ storagePoolStart(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("pool already active")); + "%s", _("pool already active")); return -1; } if (backend->startPool && @@ -546,7 +546,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -556,7 +556,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is already active")); + "%s", _("storage pool is already active")); return -1; } @@ -577,7 +577,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -587,7 +587,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -618,7 +618,7 @@ storagePoolDelete(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -628,13 +628,13 @@ storagePoolDelete(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is still active")); + "%s", _("storage pool is still active")); return -1; } if (!backend->deletePool) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("pool does not support volume delete")); + "%s", _("pool does not support volume delete")); return -1; } if (backend->deletePool(obj->conn, pool, flags) < 0) @@ -655,7 +655,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -665,7 +665,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -696,7 +696,7 @@ storagePoolGetInfo(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -725,7 +725,7 @@ storagePoolDumpXML(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } @@ -741,7 +741,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return -1; } @@ -763,13 +763,13 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return -1; } if (!pool->configFile) { virStorageReportError(obj->conn, VIR_ERR_INVALID_ARG, - _("pool has no config file")); + "%s", _("pool has no config file")); return -1; } @@ -819,13 +819,13 @@ storagePoolNumVolumes(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -844,13 +844,13 @@ storagePoolListVolumes(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -859,7 +859,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, while (vol && i < maxnames) { names[i] = strdup(vol->name); if (names[i] == NULL) { - virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, _("name")); + virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, + "%s", _("name")); goto cleanup; } vol = vol->next; @@ -888,13 +889,13 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -902,7 +903,7 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } @@ -931,7 +932,7 @@ storageVolumeLookupByKey(virConnectPtr conn, } virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, - _("no storage vol with matching key")); + "%s", _("no storage vol with matching key")); return NULL; } @@ -956,7 +957,7 @@ storageVolumeLookupByPath(virConnectPtr conn, } virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, - _("no storage vol with matching path")); + "%s", _("no storage vol with matching path")); return NULL; } @@ -972,13 +973,13 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -991,14 +992,14 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (virStorageVolDefFindByName(pool, vol->name)) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("storage vol already exists")); + "%s", _("storage vol already exists")); virStorageVolDefFree(vol); return NULL; } if (!backend->createVol) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("storage pool does not support volume creation")); + "%s", _("storage pool does not support volume creation")); virStorageVolDefFree(vol); return NULL; } @@ -1026,13 +1027,13 @@ storageVolumeDelete(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -1043,13 +1044,13 @@ storageVolumeDelete(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return -1; } if (!backend->deleteVol) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("storage pool does not support vol deletion")); + "%s", _("storage pool does not support vol deletion")); virStorageVolDefFree(vol); return -1; } @@ -1089,13 +1090,13 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -1103,7 +1104,7 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return -1; } @@ -1133,13 +1134,13 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -1147,7 +1148,7 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } @@ -1167,13 +1168,13 @@ storageVolumeGetPath(virStorageVolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -1181,13 +1182,13 @@ storageVolumeGetPath(virStorageVolPtr obj) { if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } ret = strdup(vol->target.path); if (ret == NULL) { - virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, _("path")); + virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, "%s", _("path")); return NULL; } return ret; -- 1.5.4.1.144.gc2249

2 2

[Libvir] [PATCH] 2/2: Use safewrite in place of write, in many cases.
by Jim Meyering 22 Feb '08

22 Feb '08

Use safewrite in place of write, in many cases. Also add "make syntax-check" rules to ensure no new uses sneak in. There are many uses of write like this: if (write (fd, xml, towrite) != towrite) return -1; The problem is that the syscall can succeed, yet write less than the requested number of bytes, so the caller should retry rather than simply failing. This patch changes most of them to use util.c's safewrite wrapper, which encapsulates the process. Also, there were a few cases in which the retry loop was open-coded, and I replaced those, too. Note: the change to libvirt_proxy.c removes a diagnostic that would have warned about an EINTR-interrupted (and retried) write, but that seems ok. * Makefile.maint (sc_avoid_write): New rule, to avoid recurrence. * .x-sc_avoid_write: New file. Record two legitimate exemptions. * qemud/qemud.c (sig_handler, qemudClientWriteBuf): Use safewrite, not write. * src/conf.c (__virConfWriteFile): Likewise. * src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): Likewise. * src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon) (qemudVMData, PROC_IP_FORWARD): Likewise. * proxy/libvirt_proxy.c: Include "util.h". (proxyWriteClientSocket): Use safewrite. * src/test.c (testDomainSave, testDomainCoreDump): Likewise. * src/proxy_internal.c (virProxyWriteClientSocket): Likewise. * src/virsh.c: Include "util-lib.h". (vshOutputLogFile): Use safewrite. * src/console.c: Include "util-lib.h". (vshRunConsole): Use safewrite. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_avoid_write | 2 ++ Makefile.maint | 11 +++++++++++ qemud/qemud.c | 10 ++++------ src/conf.c | 2 +- src/console.c | 6 ++++-- src/proxy_internal.c | 14 ++++---------- src/qemu_conf.c | 4 ++-- src/qemu_driver.c | 19 +++++++------------ src/test.c | 9 +++++---- src/virsh.c | 5 +++-- 10 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 .x-sc_avoid_write diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write new file mode 100644 index 0000000..72a196d --- /dev/null +++ b/.x-sc_avoid_write @@ -0,0 +1,2 @@ +^src/util\.c$ +^src/xend_internal\.c$ diff --git a/Makefile.maint b/Makefile.maint index 39320df..fe964a5 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -46,6 +46,17 @@ sc_avoid_if_before_free: { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : +# Avoid uses of write(2). Either switch to streams (fwrite), or use +# the safewrite wrapper. +sc_avoid_write: + @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + { echo "$(ME): the above files use write;" \ + " consider using the safewrite wrapper instead" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + sc_cast_of_argument_to_free: @grep -nE '\<free \(\(' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ diff --git a/qemud/qemud.c b/qemud/qemud.c index a40dfcb..d53a813 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -118,7 +118,7 @@ static void sig_handler(int sig) { return; origerrno = errno; - r = write(sigwrite, &sigc, 1); + r = safewrite(sigwrite, &sigc, 1); if (r == -1) { sig_errors++; sig_lasterrno = errno; @@ -1360,11 +1360,9 @@ static int qemudClientWriteBuf(struct qemud_server *server, const char *data, int len) { int ret; if (!client->tlssession) { - if ((ret = write(client->fd, data, len)) == -1) { - if (errno != EAGAIN) { - qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); - qemudDispatchClientFailure(server, client); - } + if ((ret = safewrite(client->fd, data, len)) == -1) { + qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); + qemudDispatchClientFailure(server, client); return -1; } } else { diff --git a/src/conf.c b/src/conf.c index e0ecdea..53ea993 100644 --- a/src/conf.c +++ b/src/conf.c @@ -904,7 +904,7 @@ __virConfWriteFile(const char *filename, virConfPtr conf) goto error; } - ret = write(fd, buf->content, buf->use); + ret = safewrite(fd, buf->content, buf->use); close(fd); if (ret != (int) buf->use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content"), 0); diff --git a/src/console.c b/src/console.c index 02a9c7f..079d4ef 100644 --- a/src/console.c +++ b/src/console.c @@ -1,7 +1,7 @@ /* * console.c: A dumb serial console client * - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2008 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +37,7 @@ #include "console.h" #include "internal.h" +#include "util-lib.h" /* ie Ctrl-] as per telnet */ #define CTRL_CLOSE_BRACKET '\35' @@ -161,7 +162,8 @@ int vshRunConsole(const char *tty) { while (sent < got) { int done; - if ((done = write(destfd, buf + sent, got - sent)) <= 0) { + if ((done = safewrite(destfd, buf + sent, got - sent)) + <= 0) { fprintf(stderr, _("failure writing output: %s\n"), strerror(errno)); goto cleanup; diff --git a/src/proxy_internal.c b/src/proxy_internal.c index bc94763..c3e50c6 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -26,6 +26,7 @@ #include "internal.h" #include "driver.h" #include "proxy_internal.h" +#include "util.h" #include "xen_unified.h" #define STANDALONE @@ -345,17 +346,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { if ((fd < 0) || (data == NULL) || (len < 0)) return(-1); -retry: - ret = write(fd, data, len); + ret = safewrite(fd, data, len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d, %d bytes interrupted\n", - fd, len); - goto retry; - } fprintf(stderr, _("Failed to write to socket %d\n"), fd); - return(-1); + return(-1); } if (debug) fprintf(stderr, "wrote %d bytes to socket %d\n", diff --git a/src/qemu_conf.c b/src/qemu_conf.c index ac1cc1e..fc82a6d 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1866,7 +1866,7 @@ static int qemudSaveConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", vm->configFile, strerror(errno)); @@ -2089,7 +2089,7 @@ static int qemudSaveNetworkConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", network->configFile, strerror(errno)); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..85d042f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -539,11 +539,9 @@ static int qemudWaitForMonitor(virConnectPtr conn, "console"); buf[sizeof(buf)-1] = '\0'; - retry: - if (write(vm->logfile, buf, strlen(buf)) < 0) { + + if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -656,15 +654,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = argv; while (*tmp) { - if (write(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); - if (write(vm->logfile, " ", 1) < 0) + if (safewrite(vm->logfile, " ", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); tmp++; } - if (write(vm->logfile, "\n", 1) < 0) + if (safewrite(vm->logfile, "\n", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); @@ -733,11 +731,8 @@ static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, } buf[ret] = '\0'; - retry: - if (write(vm->logfile, buf, ret) < 0) { + if (safewrite(vm->logfile, buf, ret) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -1113,7 +1108,7 @@ qemudEnableIpForwarding(void) if ((fd = open(PROC_IP_FORWARD, O_WRONLY|O_TRUNC)) == -1) return 0; - if (write(fd, "1\n", 2) < 0) + if (safewrite(fd, "1\n", 2) < 0) ret = 0; close (fd); diff --git a/src/test.c b/src/test.c index f860e49..1d064d3 100644 --- a/src/test.c +++ b/src/test.c @@ -42,6 +42,7 @@ #include "test.h" #include "xml.h" #include "buf.h" +#include "util.h" #include "uuid.h" /* Flags that determine the action to take on a shutdown or crash of a domain @@ -1293,19 +1294,19 @@ static int testDomainSave(virDomainPtr domain, return (-1); } len = strlen(xml); - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); return (-1); } - if (write(fd, (char*)&len, sizeof(len)) != sizeof(len)) { + if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata length"); close(fd); return (-1); } - if (write(fd, xml, len) != len) { + if (safewrite(fd, xml, len) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata"); free(xml); @@ -1398,7 +1399,7 @@ static int testDomainCoreDump(virDomainPtr domain, "cannot save domain core"); return (-1); } - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); diff --git a/src/virsh.c b/src/virsh.c index 5a5f04e..356c496 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -46,9 +46,10 @@ #include <readline/history.h> #endif +#include "buf.h" #include "console.h" #include "util.h" -#include "buf.h" +#include "util-lib.h" static char *progname; @@ -6170,7 +6171,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, va_list snprintf(msg_buf + strlen(msg_buf), sizeof(msg_buf) - strlen(msg_buf), "\n"); /* write log */ - if (write(ctl->log_fd, msg_buf, strlen(msg_buf)) == -1) { + if (safewrite(ctl->log_fd, msg_buf, strlen(msg_buf)) < 0) { vshCloseLogFile(ctl); vshError(ctl, FALSE, "%s", _("failed to write the log file")); } -- 1.5.4.2.185.gf5f8

2 1

[Libvir] [PATCH] write(2) may write less than the total requested
by Jim Meyering 22 Feb '08

22 Feb '08

Use safewrite in place of write, in many cases. And add "make syntax-check" rules to ensure no new uses sneak in. There are many uses of write like this: if (write (fd, xml, towrite) != towrite) return -1; The problem is that the syscall can succeed, yet write less than the requested number of bytes, so the caller should retry rather than simply failing. This patch changes most of them to use util.c's safewrite wrapper, which encapsulates the process. Also, there were a few cases in which the retry loop was open-coded, and I replaced those, too. However, there remain invalid uses of write in both virsh.c and console.c. I would have replaced those, too, but util.c isn't linked with them, so it would have made this change more involved. xend_internal.c has one use, but it's ok, and not easily replaced. Note: the change to libvirt_proxy.c removes a diagnostic that would have warned about an EINTR-interrupted (and retried) write, but that seems ok. * qemud/qemud.c (sig_handler): * src/conf.c (__virConfWriteFile): * src/proxy_internal.c (virProxyWriteClientSocket): * src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): * src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon) (qemudVMData, PROC_IP_FORWARD): * src/test.c (testDomainSave, testDomainCoreDump): * proxy/libvirt_proxy.c (proxyWriteClientSocket): * proxy/Makefile.am (libvirt_proxy_SOURCES): Add src/util.c. * Makefile.maint (sc_avoid_write): New rule. * .x-sc_avoid_write: New file. Record the two legitimate exemptions, and two that are temporarily grandfathered in. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_avoid_write | 4 ++++ Makefile.maint | 11 +++++++++++ proxy/Makefile.am | 5 +++-- proxy/libvirt_proxy.c | 15 ++++----------- qemud/qemud.c | 10 ++++------ src/conf.c | 2 +- src/proxy_internal.c | 13 +++---------- src/qemu_conf.c | 4 ++-- src/qemu_driver.c | 19 +++++++------------ src/test.c | 8 ++++---- 10 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 .x-sc_avoid_write diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write new file mode 100644 index 0000000..0933e20 --- /dev/null +++ b/.x-sc_avoid_write @@ -0,0 +1,4 @@ +^src/util\.c$ +^src/xend_internal\.c$ +^src/virsh\.c$ +^src/console\.c$ diff --git a/Makefile.maint b/Makefile.maint index 4b54baf..afddddb 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -46,6 +46,17 @@ sc_avoid_if_before_free: { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : +# Avoid uses of write(2). Either switch to streams (fwrite), or use +# the safewrite wrapper. +sc_avoid_write: + @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + { echo "$(ME): the above files use write;" \ + " consider using the safewrite wrapper instead" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + sc_cast_of_argument_to_free: @grep -nE '\<free \(\(' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ diff --git a/proxy/Makefile.am b/proxy/Makefile.am index ff9a3eb..6827f36 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -12,11 +12,12 @@ libexec_PROGRAMS = libvirt_proxy libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \ @top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c \ @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \ - @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c @top_srcdir@/src/uuid.c + @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c \ + @top_srcdir@/src/util.c @top_srcdir@/src/uuid.c libvirt_proxy_LDFLAGS = $(WARN_CFLAGS) libvirt_proxy_DEPENDENCIES = libvirt_proxy_LDADD = install-exec-hook: chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy -endif \ No newline at end of file +endif diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d96d3db..12d0f35 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -2,7 +2,7 @@ * proxy_svr.c: root suid proxy server for Xen access to APIs with no * side effects from unauthenticated clients. * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -317,19 +317,12 @@ proxyWriteClientSocket(int nr, virProxyPacketPtr req) { return(-1); } -retry: - ret = write(pollInfos[nr].fd, (char *) req, req->len); + ret = safewrite(pollInfos[nr].fd, (char *) req, req->len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d to client %d interrupted\n", - pollInfos[nr].fd, nr); - goto retry; - } fprintf(stderr, "write %d bytes to socket %d from client %d failed\n", req->len, pollInfos[nr].fd, nr); - proxyCloseClientSocket(nr); - return(-1); + proxyCloseClientSocket(nr); + return(-1); } if (ret == 0) { if (debug) diff --git a/qemud/qemud.c b/qemud/qemud.c index 3a5e44c..269e9fe 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -118,7 +118,7 @@ static void sig_handler(int sig) { return; origerrno = errno; - r = write(sigwrite, &sigc, 1); + r = safewrite(sigwrite, &sigc, 1); if (r == -1) { sig_errors++; sig_lasterrno = errno; @@ -1360,11 +1360,9 @@ static int qemudClientWriteBuf(struct qemud_server *server, const char *data, int len) { int ret; if (!client->tlssession) { - if ((ret = write(client->fd, data, len)) == -1) { - if (errno != EAGAIN) { - qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); - qemudDispatchClientFailure(server, client); - } + if ((ret = safewrite(client->fd, data, len)) == -1) { + qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); + qemudDispatchClientFailure(server, client); return -1; } } else { diff --git a/src/conf.c b/src/conf.c index e0ecdea..53ea993 100644 --- a/src/conf.c +++ b/src/conf.c @@ -904,7 +904,7 @@ __virConfWriteFile(const char *filename, virConfPtr conf) goto error; } - ret = write(fd, buf->content, buf->use); + ret = safewrite(fd, buf->content, buf->use); close(fd); if (ret != (int) buf->use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content"), 0); diff --git a/src/proxy_internal.c b/src/proxy_internal.c index bc94763..5a14e54 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -345,17 +345,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { if ((fd < 0) || (data == NULL) || (len < 0)) return(-1); -retry: - ret = write(fd, data, len); + ret = safewrite(fd, data, len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d, %d bytes interrupted\n", - fd, len); - goto retry; - } fprintf(stderr, _("Failed to write to socket %d\n"), fd); - return(-1); + return(-1); } if (debug) fprintf(stderr, "wrote %d bytes to socket %d\n", diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e39c7bc..ff6a92e 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1866,7 +1866,7 @@ static int qemudSaveConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", vm->configFile, strerror(errno)); @@ -2089,7 +2089,7 @@ static int qemudSaveNetworkConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", network->configFile, strerror(errno)); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..85d042f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -539,11 +539,9 @@ static int qemudWaitForMonitor(virConnectPtr conn, "console"); buf[sizeof(buf)-1] = '\0'; - retry: - if (write(vm->logfile, buf, strlen(buf)) < 0) { + + if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -656,15 +654,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = argv; while (*tmp) { - if (write(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); - if (write(vm->logfile, " ", 1) < 0) + if (safewrite(vm->logfile, " ", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); tmp++; } - if (write(vm->logfile, "\n", 1) < 0) + if (safewrite(vm->logfile, "\n", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); @@ -733,11 +731,8 @@ static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, } buf[ret] = '\0'; - retry: - if (write(vm->logfile, buf, ret) < 0) { + if (safewrite(vm->logfile, buf, ret) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -1113,7 +1108,7 @@ qemudEnableIpForwarding(void) if ((fd = open(PROC_IP_FORWARD, O_WRONLY|O_TRUNC)) == -1) return 0; - if (write(fd, "1\n", 2) < 0) + if (safewrite(fd, "1\n", 2) < 0) ret = 0; close (fd); diff --git a/src/test.c b/src/test.c index 003d6b7..3dd1007 100644 --- a/src/test.c +++ b/src/test.c @@ -1293,19 +1293,19 @@ static int testDomainSave(virDomainPtr domain, return (-1); } len = strlen(xml); - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); return (-1); } - if (write(fd, (char*)&len, sizeof(len)) != sizeof(len)) { + if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata length"); close(fd); return (-1); } - if (write(fd, xml, len) != len) { + if (safewrite(fd, xml, len) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata"); free(xml); @@ -1398,7 +1398,7 @@ static int testDomainCoreDump(virDomainPtr domain, "cannot save domain core"); return (-1); } - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); -- 1.5.4.2.134.g82883

4 9

[Libvir] avoid new warnings
by Jim Meyering 22 Feb '08

22 Feb '08

Here are two easy ones: With --without-xen, avoid warning about unused function. * tests/statstest.c (testQuietError) [!WITH_XEN]: Don't define. --- tests/statstest.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tests/statstest.c b/tests/statstest.c index 6213da8..2d6fc1d 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -7,10 +7,13 @@ #include "stats_linux.h" #include "internal.h" -static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr error ATTRIBUTE_UNUSED) +#if WITH_XEN +static void testQuietError(void *userData ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED) { /* nada */ } +#endif #if __linux__ && WITH_XEN static int testDevice(const char *path, int expect) -- ============================================================================= With --enable-iptables-lokkit=no, avoid warning about unused parameter. * src/iptables.c (iptRulesSave) [!ENABLE_IPTABLES_LOKKIT]: Mark parameter as used. --- src/iptables.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/iptables.c b/src/iptables.c index 04b1da6..f970701 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -256,6 +256,8 @@ iptRulesSave(iptRules *rules) notifyRulesUpdated(rules->table, rules->path); else notifyRulesRemoved(rules->table, rules->path); +#else + (void) rules; #endif /* ENABLE_IPTABLES_LOKKIT */ } -- 1.5.4.2.185.gf5f8

2 2

[Libvir] Please add RSS for libvirt updates.
by Atsushi SAKAI 22 Feb '08

22 Feb '08

Hi, I have a request about libvirt updates. Currently I am checking software updates by seeing RSS reader. Of course, mercurial(hg) and git creates RSS feeds. But CVS does not create such kind of feeds. I hope some day libvirt adds RSS feeds by using cvs2rss etc. http://laughingmeme.org/cvs2rss/ Thanks Atsushi SAKAI

4 5

[Libvir] [RFC] 0/3 Add Linux Container support to libvirt
by Dave Leskovec 21 Feb '08

21 Feb '08

The following set of patches add the first batch of linux container support to libvirt. The work is not complete but I wanted to start getting some of this out for comments. This set of patches supports the following: * new switch --with-lxc to enable linux container support (off by default) * virConnectOpen * virConnectClose * virConnectListDomains (of course none are listed since we can't start the containers yet) * virConnectNumOfDomains * virConnectListDefinedDomains * virConnectNumOfDefinedDomains * virDomainLookupByUUID * virDomainLookupByName * virDomainGetInfo * virDomainGetXMLDesc * virDomainDefineXML * virDomainUndefine A sample XML format that can be used to define a linux container domain: <domain type='linuxcontainer'> <name>TestContainer3</name> <container> <filesystem type='mount'> <source dir='/home/user/lxc_files/etc/'/> <target dir='/etc/'/> </filesystem> <filesystem type='mount'> <source dir='/home/user/lxc_files/var/'/> <target dir='/var/'/> </filesystem> <init>/usr/sbin/container_init</init> </container> <memory>65536</memory> <devices> <console tty='/dev/pts/4'/> </devices> </domain> I've left out the network definition as I'll be tackling that a little later on... I'm currently working on starting a container. Any and all questions and comments are welcome. Thanks! -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

5 9

[Libvir] [PATCH] Rewrite openvzSetUUID.
by Jim Meyering 21 Feb '08

21 Feb '08

There were several unchecked syscalls in this function, along with the at-least-theoretical risk of a file descriptor leak, so I rewrote this function to avoid all that, using a stream rather than a bare file descriptor. Subject: [PATCH] Rewrite openvzSetUUID. * src/openvz_conf.c (openvzSetUUID): Rewrite to avoid unchecked lseek, write, and close as well as a potential file descriptor leak. Regarding style, the if (expr1 + expr2 + expr3) below might look odd, but it's better than "if (expr1 || expr2 || expr3)", which loses if expr1 or expr2 is true, since it short-circuits and skips expr3, which is the required fclose call. I could have used "|", but that seemed worse, and I didn't like the duplication in if (expr1) ret = -1; if (expr2) ret = -1; if (expr3) ret = -1; In an early iteration, I even wrote this (which still has too much duplication but isn't that bad): ret = 0; ret |= e1; ret |= e2; ret |= e3; Anyway, just trying to avoid a drawn-out discussion on style.... Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/openvz_conf.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index a274223..1f45c24 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -680,7 +680,7 @@ openvzSetUUID(int vpsid) char uuidstr[VIR_UUID_STRING_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN]; char *conf_dir; - int fd, ret; + int ret; conf_dir = openvzLocateConfDir(); if (conf_dir == NULL) @@ -688,26 +688,27 @@ openvzSetUUID(int vpsid) sprintf(conf_file, "%s/%d.conf", conf_dir, vpsid); free(conf_dir); - fd = open(conf_file, O_RDWR); - if(fd == -1) - return -1; - ret = openvzGetVPSUUID(vpsid, uuidstr); - if(ret == -1) + if (ret) return -1; - if(uuidstr[0] == 0) { + if (uuidstr[0] == 0) { + FILE *fp = fopen(conf_file, "a"); + if (fp == NULL) + return -1; + virUUIDGenerate(uuid); virUUIDFormat(uuid, uuidstr); - lseek(fd, 0, SEEK_END); - write(fd, "\n#UUID: ", 8); - write(fd, uuidstr, strlen(uuidstr)); - write(fd, "\n", 1); - close(fd); + /* Record failure if any of these fails, + and be careful always to close the stream. */ + if ((fseek(fp, 0, SEEK_END) < 0) + + (fprintf(fp, "\n#UUID: %s\n", uuidstr) < 0); + + (fclose(fp) == EOF)) + ret = -1; } - return 0; + return ret; } /* -- 1.5.4.2.134.g82883

2 4