- Devel - libvirt List Archives

[libvirt] [PATCHv4] network: Avoid memory leaks on networkBuildDnsmasqArgv
by ajia＠redhat.com 02 Feb '12

02 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 973af236. * src/network/bridge_driver.c: fix memory leaks on failure and successful path. * How to reproduce? % make -C tests check TESTS=networkxml2argvtest % cd tests && valgrind -v --leak-check=full ./networkxml2argvtest * Actual result: ==2226== 3 bytes in 1 blocks are definitely lost in loss record 1 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2D9: networkBuildDhcpDaemonCommandLine (bridge_driver.c:545) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 3 bytes in 1 blocks are definitely lost in loss record 2 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A307: networkBuildDhcpDaemonCommandLine (bridge_driver.c:551) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 5 bytes in 1 blocks are definitely lost in loss record 4 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2AB: networkBuildDhcpDaemonCommandLine (bridge_driver.c:539) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== LEAK SUMMARY: ==2226== definitely lost: 11 bytes in 3 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/network/bridge_driver.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5d0d528..36bdf44 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -459,6 +459,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, int r, ret = -1; int nbleases = 0; int ii; + char *record = NULL; + char *recordPort = NULL; + char *recordWeight = NULL; + char *recordPriority = NULL; virNetworkIpDefPtr tmpipdef; /* @@ -516,7 +520,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, int i; for (i = 0; i < dns->ntxtrecords; i++) { - char *record = NULL; if (virAsprintf(&record, "%s,%s", dns->txtrecords[i].name, dns->txtrecords[i].value) < 0) { @@ -529,11 +532,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, } for (i = 0; i < dns->nsrvrecords; i++) { - char *record = NULL; - char *recordPort = NULL; - char *recordPriority = NULL; - char *recordWeight = NULL; - if (dns->srvrecords[i].service && dns->srvrecords[i].protocol) { if (dns->srvrecords[i].port) { if (virAsprintf(&recordPort, "%d", dns->srvrecords[i].port) < 0) { @@ -568,6 +566,9 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, virCommandAddArgPair(cmd, "--srv-host", record); VIR_FREE(record); + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); } } } @@ -671,6 +672,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, ret = 0; cleanup: + VIR_FREE(record); + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); return ret; } -- 1.7.1

3 3

[libvirt] [PATCH v2] tests: dynamically replace dnsmasq path
by Philipp Hahn 02 Feb '12

02 Feb '12

The path to the dnsmasq binary can be configured while in the test data the path is hard-coded to /usr/bin/. This break the test suite if a the binary is located in a different location, like /usr/local/sbin/. Replace the hard coded path in the test data by a token, which is dynamically replaced in networkxml2argvtest with the configured path after the test data has been loaded. (Another option would have been to modify configure.ac to generate the test data during configure, but I do not know of an easy way do trick configure into mass-generate those test files without listing every single one, which I consider less flexible.) v2: - Use VIR_REALLOC_N() instead of realloc() - Use memcpy() for replacement - Skip shrinking buffer - Add missing update of token_end - simplify code after the changes above - unit-test the unit-test: #include <assert.h> #define TEST(in,token,rep,out) { char *buf = strdup(in); assert(!replaceTokens(&buf, token, rep) && !strcmp(buf, out)); free(buf); } TEST("", "AA", "B", ""); TEST("A", "AA", "B", "A"); TEST("AA", "AA", "B", "B"); TEST("AAA", "AA", "B", "BA"); TEST("AA", "AA", "BB", "BB"); TEST("AA", "AA", "BBB", "BBB"); TEST("<AA", "AA", "B", "<B"); TEST("<AA", "AA", "BB", "<BB"); TEST("<AA", "AA", "BBB", "<BBB"); TEST("AA>", "AA", "B", "B>"); TEST("AA>", "AA", "BB", "BB>"); TEST("AA>", "AA", "BBB", "BBB>"); TEST("<AA>", "AA", "B", "<B>"); TEST("<AA>", "AA", "BB", "<BB>"); TEST("<AA>", "AA", "BBB", "<BBB>"); TEST("<AA|AA>", "AA", "B", "<B|B>"); TEST("<AA|AA>", "AA", "BB", "<BB|BB>"); TEST("<AA|AA>", "AA", "BBB", "<BBB|BBB>"); TEST("<AAAA>", "AA", "B", "<BB>"); TEST("<AAAA>", "AA", "BB", "<BBBB>"); TEST("<AAAA>", "AA", "BBB", "<BBBBBB>"); TEST("AAAA>", "AA", "B", "BB>"); TEST("AAAA>", "AA", "BB", "BBBB>"); TEST("AAAA>", "AA", "BBB", "BBBBBB>"); TEST("<AAAA", "AA", "B", "<BB"); TEST("<AAAA", "AA", "BB", "<BBBB"); TEST("<AAAA", "AA", "BBB", "<BBBBBB"); alarm(1); /* no infinit loop */ TEST("A", "A", "A", "A"); TEST("AA", "A", "A", "AA"); alarm(0); Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/networkxml2argvdata/isolated-network.argv | 2 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 2 +- .../nat-network-dns-srv-record-minimal.argv | 2 +- .../nat-network-dns-srv-record.argv | 2 +- .../nat-network-dns-txt-record.argv | 2 +- tests/networkxml2argvdata/nat-network.argv | 2 +- tests/networkxml2argvdata/netboot-network.argv | 2 +- .../networkxml2argvdata/netboot-proxy-network.argv | 2 +- tests/networkxml2argvdata/routed-network.argv | 2 +- tests/networkxml2argvtest.c | 33 ++++++++++++++++++++ 10 files changed, 42 insertions(+), 9 deletions(-) diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 7ea2e94..a9beb05 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 2158df8..c7e4967 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,3 +1,3 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index 021e8f0..ea1da6d 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 85afbba..84c2d2f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index be6ba4b..bed309f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --txt-record=example,example value \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d7faee2..80878a8 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 78e873c..7ae5b75 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 5fe1b8e..2c5a0d5 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index d059630..75303e6 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,2 +1,2 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 2dd9b7f..f2e9086 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -15,6 +15,36 @@ #include "memory.h" #include "network/bridge_driver.h" +/* Replace all occurrences of @token in @buf by @replacement and adjust size of + * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ +static int replaceTokens(char **buf, const char *token, const char *replacement) { + char *token_start, *token_end; + size_t buf_len, rest_len; + const size_t token_len = strlen(token); + const size_t replacement_len = strlen(replacement); + const int diff = replacement_len - token_len; + + buf_len = rest_len = strlen(*buf) + 1; + token_end = *buf; + for (;;) { + token_start = strstr(token_end, token); + if (token_start == NULL) + break; + rest_len -= token_start + token_len - token_end; + token_end = token_start + token_len; + buf_len += diff; + if (diff > 0) + if (VIR_REALLOC_N(*buf, buf_len) < 0) + return -1; + if (diff != 0) + memmove(token_end + diff, token_end, rest_len); + memcpy(token_start, replacement, replacement_len); + token_end += diff; + } + /* if diff < 0, we could shrinkt the buffer here... */ + return 0; +} + static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; @@ -32,6 +62,9 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (virtTestLoadFile(outargv, &outArgvData) < 0) goto fail; + if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) + goto fail; + if (!(dev = virNetworkDefParseString(inXmlData))) goto fail; -- 1.7.1

2 1

[libvirt] [PATCH v2] tests: virnettlscontexttest needs gnutls-2.6.0
by Philipp Hahn 01 Feb '12

01 Feb '12

virnettlscontexttest uses gnutls_x509_crt_set_subject_alt_name() and GNUTLS_FSAN_APPEND, which - according to <http://www.gnu.org/software/gnutls/manual/gnutls.html> - are only available since 2.6.0. Since libvirt still works fine with gnutls-1.0.25 from RHEL5, only enable the test when the version of GNUTLS is at least 2.6.0. v2: greater-equal 2.6.0 instead of strictly greater. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/virnettlscontexttest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51f75b4..508617a 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -36,7 +36,7 @@ #include "virsocketaddr.h" #include "gnutls_1_0_compat.h" -#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT +#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT && LIBGNUTLS_VERSION_NUMBER >= 0x020600 # include <libtasn1.h> # include "rpc/virnettlscontext.h" -- 1.7.1

2 1

[libvirt] [PATCH 0/3] add virDomainBlockRebase
by Eric Blake 01 Feb '12

01 Feb '12

As discussed here: https://www.redhat.com/archives/libvir-list/2012-January/msg01448.html Qemu patch series here: https://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03488.html This is the bare-minimum implementation for getting the API in place prior to the 0.9.10 rc1 freeze; I can later do patches to wire up the new optional argument to the qemu block_stream monitor command to actually make use of the new base argument. Eric Blake (3): block rebase: add new API virDomainBlockRebase block rebase: wire up remote protocol block rebase: initial qemu implementation docs/apibuild.py | 1 + include/libvirt/libvirt.h.in | 9 +++- src/driver.h | 5 ++ src/libvirt.c | 84 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 40 +++++++++++++------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 10 ++++- src/remote_protocol-structs | 8 ++++ src/rpc/gendispatch.pl | 1 + 10 files changed, 143 insertions(+), 17 deletions(-) -- 1.7.7.6

2 8

[libvirt] [PATCH 0/2] build: add missing functions to libvirt_private.syms
by Laine Stump 01 Feb '12

01 Feb '12

Both of these pushed under the build-breaker rule.

1 2

[libvirt] [libvirt-glib] Add gvir_storage_vol_resize()
by Zeeshan Ali (Khattak) 01 Feb '12

01 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add wrapper for virStorageVolResize(). --- libvirt-gobject/libvirt-gobject-storage-vol.c | 45 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 20 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 491e2e6..f6f0c50 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -299,3 +299,48 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, return TRUE; } + +/** + * gvir_storage_vol_resize: + * @vol: the storage volume to resize + * @capacity: the new capacity of the volume + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Changes the capacity of the storage volume @vol to @capacity. + * + * Returns: the new capacity of the volume on success, 0 otherwise + */ +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + GVirStorageVolResizeFlags flags, + GError **err) +{ + GVirStoragePoolInfo* pool_info = NULL; + GVirStorageVolInfo* volume_info = NULL; + gboolean ret = FALSE; + + pool_info = gvir_storage_pool_get_info (vol->priv->pool, err); + if (err != NULL && *err != NULL) + goto cleanup; + volume_info = gvir_storage_vol_get_info (vol, err); + if (err != NULL && *err != NULL) + goto cleanup; + + if (virStorageVolResize(vol->priv->handle, capacity, flags) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to resize volume storage"); + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (pool_info) + g_boxed_free(GVIR_TYPE_STORAGE_POOL_INFO, pool_info); + if (volume_info) + gvir_storage_vol_info_free(volume_info); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 25f683a..459a2ac 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -23,6 +23,7 @@ #if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) #error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." #endif +#include <libvirt/libvirt.h> #ifndef __LIBVIRT_GOBJECT_STORAGE_VOL_H__ #define __LIBVIRT_GOBJECT_STORAGE_VOL_H__ @@ -65,6 +66,21 @@ typedef enum { GVIR_STORAGE_VOL_STATE_DIR = 2, /* Directory-passthrough based volume */ } GVirStorageVolType; +/** + * GVirStorageVolResizeFlags: + * @GVIR_STORAGE_VOL_RESIZE_NONE: No flags + * @GVIR_STORAGE_VOL_RESIZE_ALLOCATE: force allocation of new size + * @GVIR_STORAGE_VOL_RESIZE_DELTA: size is relative to current + * @GVIR_STORAGE_VOL_RESIZE_SHRINK: allow decrease in capacity. This combined + * with #GVIR_STORAGE_VOL_RESIZE_DELTA, implies a negative delta. + */ +typedef enum { + GVIR_STORAGE_VOL_RESIZE_NONE = 0, + GVIR_STORAGE_VOL_RESIZE_ALLOCATE = VIR_STORAGE_VOL_RESIZE_ALLOCATE, + GVIR_STORAGE_VOL_RESIZE_DELTA = VIR_STORAGE_VOL_RESIZE_DELTA, + GVIR_STORAGE_VOL_RESIZE_SHRINK = VIR_STORAGE_VOL_RESIZE_SHRINK, +} GVirStorageVolResizeFlags; + typedef struct _GVirStorageVolInfo GVirStorageVolInfo; struct _GVirStorageVolInfo { @@ -89,6 +105,10 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, GError **err); GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err); +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + GVirStorageVolResizeFlags flags, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a4f03f7..468bf65 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -126,6 +126,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_storage_vol_get_config; gvir_storage_vol_get_info; gvir_storage_vol_delete; + gvir_storage_vol_resize; gvir_connection_handle_get_type; -- 1.7.7.6

4 5

[libvirt] Generic processing of xml data
by Hendrik Schwartke 01 Feb '12

01 Feb '12

There are some changes made to the conf code to handle some new tags like <title> or to add some "metadata" to a domain description in the last days. I'm wondering if there is a more generic (read better) way to handle those extra data in xml config elements. I think it would be far more reasonable to use xml namespaces to enable libvirt to differentiate between config options which it has to process and data which are unknown to libvirt and thus are only stored without any further processing. This distinction could then by easily used for expansions like the <title>-tag, to store the x- and y-position of a guest in a graphical visualization of virtual networks, to add some names of administrators which are responsible for the guests, to add some hints to interfaces concerning quality of service, etc... I don't know how complex such in implementation would be but I think it would be worth the effort. Hendrik Schwartke

2 3

[libvirt] [PATCH] qemu: Silent bogus warning about unitialized variable
by Jiri Denemark 01 Feb '12

01 Feb '12

GCC complaints about uninitialized use of len, which however is only used when errors != NULL and in that case len is always initialized. It's trivial to silence this by always initializing len. --- Pushed as both trivial and build-breaking. daemon/remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 8fbcf43..26ac4a6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3608,7 +3608,7 @@ static int remoteDispatchDomainGetDiskErrors( int rv = -1; virDomainPtr dom = NULL; virDomainDiskErrorPtr errors = NULL; - int len; + int len = 0; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); -- 1.7.8.4

1 0

[libvirt] Unable to compile libvirt git src... python-config error
by Deepak C Shetty 01 Feb '12

01 Feb '12

Hi All, I am getting this error, while trying to compile latest git src. ./autogen.sh --prefix=$HOME/usr --enable-compile-warnings=error running bootstrap... ./bootstrap: Error: 'python-config' not found ./bootstrap: Please install the prerequisite programs Failed to bootstrap, please investigate. I am ubuntu, and all packages related to python-config are installed.. as seen by the 'i' below... aptitude search python-config i python-configglue - Glues together optparse.OptionParser and ConfigParser.ConfigParser i python-configobj - simple but powerful config file reader and writer for Python Can someone help, what i am missing ? thanx, deepak

2 2

[libvirt] [PATCH 0/2][RFC] netlink events
by D. Herrendoerfer 01 Feb '12

01 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> I'd like to put this up for discussion. This is the prototype for netlink events as discussed before, it follows the design of the event_poll functions. Included is the unfinished prototype netlink event callback for virnetdevmacvtap.c as reference. We are still working with lldpad to get the message finalized and tested. Regards, Dirk H. D. Herrendoerfer (2): Add netlink message event service macvtap: listen for netlink messages from lldpad daemon/Makefile.am | 3 +- daemon/libvirtd.c | 7 + src/Makefile.am | 1 + src/libvirt_private.syms | 7 + src/util/netlink-event.c | 363 +++++++++++++++++++++++++++++++++++++++++++ src/util/netlink-event.h | 63 ++++++++ src/util/netlink.c | 1 + src/util/virnetdevmacvlan.c | 161 +++++++++++++++++++- src/util/virnetdevmacvlan.h | 1 + 9 files changed, 605 insertions(+), 2 deletions(-) create mode 100644 src/util/netlink-event.c create mode 100644 src/util/netlink-event.h -- 1.7.7.5

3 8

[libvirt] [PATCH] daemon: Allow overriding NOFILES ulimit for the daemon as well
by Michal Privoznik 01 Feb '12

01 Feb '12

One of my latest patches (d8db0f9690) created support for setting the limit for the maximum of opened files by qemu user. However, since libvirtd keeps one FD opened per domain (well, for qemu at least) it will likely hit this limit on huge scenarios. --- daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 37 +++++++++++++++++++++++++++++++++++++ daemon/libvirtd.conf | 9 +++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 9d78bd7..278099b 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -58,6 +58,7 @@ module Libvirtd = | int_entry "max_requests" | int_entry "max_client_requests" | int_entry "prio_workers" + | int_entry "max_files" let logging_entry = int_entry "log_level" | str_entry "log_filters" diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b1b542b..34bdd39 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -139,6 +139,8 @@ struct daemonConfig { int max_requests; int max_client_requests; + int max_files; + int log_level; char *log_filters; char *log_outputs; @@ -1081,6 +1083,8 @@ daemonConfigLoad(struct daemonConfig *data, GET_CONF_INT (conf, filename, max_requests); GET_CONF_INT (conf, filename, max_client_requests); + GET_CONF_INT (conf, filename, max_files); + GET_CONF_INT (conf, filename, audit_level); GET_CONF_INT (conf, filename, audit_logging); @@ -1198,6 +1202,34 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +/* + * daemonSetProcessLimits: + * @config: where to take limits from + * + * Set both soft and hard limits set in config file. + * + * Returns 0 on success, -1 otherwise. + */ +static int +daemonSetProcessLimits(struct daemonConfig *config) +{ + struct rlimit rlim; + + if (config->max_files > 0) { + /* Max number of opened files is one greater than + * actual limit. See man setrlimit */ + rlim.rlim_cur = rlim.rlim_max = config->max_files + 1; + if (setrlimit(RLIMIT_NOFILE, &rlim) < 0) { + virReportSystemError(errno, + _("cannot set max opened files to %d"), + config->max_files); + return -1; + } + } + + return 0; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -1429,6 +1461,11 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (daemonSetProcessLimits(config) < 0) { + /* Helper reported error */ + exit(EXIT_FAILURE); + } + if (godaemon) { char ebuf[1024]; diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 3eab2be..70d5294 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -279,6 +279,15 @@ # and max_workers parameter #max_client_requests = 5 +# If max_files is set to positive integer, the maximum number +# of opened files for the daemon is set to given value. This +# can be used to override host system default value. +# Please keep in mind that in some drivers (like qemu) this +# will affect the upper bound of domains which can run simultaneously. +# That's because the daemon keeps one file opened per domain - monitor. +# Well, at least one. +#max_files = 0 + ################################################################# # # Logging controls -- 1.7.3.4

2 6

[libvirt] virDomainNetGetActualBridgeName doesn't return the actual bridge
by Hendrik Schwartke 01 Feb '12

01 Feb '12

Hi, calling virDomainNetGetActualBridgeName on a bridge with type VIR_DOMAIN_NET_TYPE_NETWORK seems to return NULL in any case, because iface->data.network.actual is NULL. Is that intented? What is the best way to determine the bridge the interface is connected to? Hendrik Schwartke

3 4

[libvirt] [PATCH v3 0/5] Add virDomainGetDiskErrors API
by Jiri Denemark 01 Feb '12

01 Feb '12

We already provide ways to detect when a domain has been paused as a result of I/O error, but there was no way of getting the exact error or even the device that experienced it. This new API may be used for both. Changes in version 3: - special case errors == NULL, maxerrors == 0 returns size of the array the caller should pass - explicitly document that disks with no error are not returned and that the caller must free disk names - explicitly document what happens when maxerrors is lower then the actual number of disk errors - maxerrors turned unsigned - the first patch was split into two (public API and RPC) - python binding is back Changes in version 2: - the API is now called virDomainGetDiskErrors - it returns a list (allocated by caller) of disks with errors instead so that users don't have to call it multiple times to get all errors - there's no python API yet since it can't be autogenerated; I'll send a patch for it tomorrow Jiri Denemark (5): virDomainGetDiskErrors public API Remote protocol for virDomainGetDiskErrors qemu: Implement virDomainGetDiskErrors virsh: Implement domblkerror command python: Add binding for virDomainGetDiskErrors daemon/remote.c | 103 +++++++++++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 32 ++++++++++++ python/generator.py | 3 +- python/libvirt-override-api.xml | 6 ++ python/libvirt-override.c | 50 +++++++++++++++++++ src/driver.h | 7 +++ src/libvirt.c | 65 ++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 86 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 40 +++++++++++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 8 +++ src/qemu/qemu_monitor_text.c | 15 ++++++ src/remote/remote_driver.c | 77 +++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 23 ++++++++- src/remote_protocol-structs | 17 ++++++ tools/virsh.c | 78 +++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 19 files changed, 618 insertions(+), 2 deletions(-) -- 1.7.8.4

2 12

[libvirt] [PATCH] python: correct a copy-paste error
by Alex.Jia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> * python/libvirt-override-virStream.py: fix a copy-paste error in sendAll(). Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-virStream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override-virStream.py b/python/libvirt-override-virStream.py index ff53a16..b5cec2a 100644 --- a/python/libvirt-override-virStream.py +++ b/python/libvirt-override-virStream.py @@ -86,7 +86,7 @@ ret = self.send(got) if ret == -2: - raise libvirtError("cannot use recvAll with " + raise libvirtError("cannot use sendAll with " "nonblocking stream") def recv(self, nbytes): -- 1.7.1

2 1

[libvirt] [PATCH] command: Fix ATTRIBUTE_UNUSED on virSetCapabilities
by Michal Privoznik 01 Feb '12

01 Feb '12

If we are building not on a WIN32 architecture and without HAVE_CAPNG virSetCapabilities has unused argument and virClearCapabilities is unused as well. --- Pushed under build breaker rule. src/util/command.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index e3a8371..6f51fbb 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -169,8 +169,9 @@ virCommandFDSet(int fd, #ifndef WIN32 -# if HAVE_CAPNG static int virClearCapabilities(void) ATTRIBUTE_UNUSED; + +# if HAVE_CAPNG static int virClearCapabilities(void) { int ret; @@ -220,7 +221,8 @@ static int virClearCapabilities(void) return 0; } -static int virSetCapabilities(unsigned long long capabilities) +static int +virSetCapabilities(unsigned long long capabilities ATTRIBUTE_UNUSED) { return 0; } -- 1.7.3.4

1 0

[libvirt] [PATCH] qemu: Clenup qemuDomainSetInterfaceParameters
by Michal Privoznik 01 Feb '12

01 Feb '12

which contained some useless lines, copied code, NULL dereference. --- src/libvirt.c | 4 ++-- src/qemu/qemu_driver.c | 44 ++++++++++++++++---------------------------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e702a34..433ae0a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7226,8 +7226,8 @@ error: * * Change a subset or all parameters of interface; currently this * includes bandwidth parameters. The value of @flags should be - * either VIR_DOMAIN_AFFECT_CURRENT, or a bitwise-or of values from - * VIR_DOMAIN_AFFECT_LIVE and VIR_DOMAIN_AFFECT_CURRENT, although + * either VIR_DOMAIN_AFFECT_CURRENT, or a bitwise-or of values + * VIR_DOMAIN_AFFECT_LIVE and VIR_DOMAIN_AFFECT_CONFIG, although * hypervisors vary in which flags are supported. * * This function may require privileged access to the hypervisor. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b147a9..b1d0b7f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7779,20 +7779,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, } } - if (VIR_ALLOC(bandwidth) < 0) { + if ((VIR_ALLOC(bandwidth) < 0) || + (VIR_ALLOC(bandwidth->in) < 0) || + (VIR_ALLOC(bandwidth->out) < 0)) { virReportOOMError(); goto cleanup; } - if (VIR_ALLOC(bandwidth->in) < 0) { - virReportOOMError(); - goto cleanup; - } - memset(bandwidth->in, 0, sizeof(*bandwidth->in)); - if (VIR_ALLOC(bandwidth->out) < 0) { - virReportOOMError(); - goto cleanup; - } - memset(bandwidth->out, 0, sizeof(*bandwidth->out)); for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; @@ -7817,11 +7809,9 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, * inbound/outbound to not be set. */ if (!bandwidth->in->average) { VIR_FREE(bandwidth->in); - bandwidth->in = NULL; } if (!bandwidth->out->average) { VIR_FREE(bandwidth->out); - bandwidth->out = NULL; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { @@ -7833,29 +7823,27 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, /* virNetDevBandwidthSet() will clear any previous value of * bandwidth parameters, so merge with old bandwidth parameters * here to prevent them from being lost. */ - if (bandwidth->in || net->bandwidth->in) { + if (bandwidth->in || + (net->bandwidth && net->bandwidth->in)) { if (VIR_ALLOC(newBandwidth->in) < 0) { virReportOOMError(); goto cleanup; } - if (bandwidth->in) - memcpy(newBandwidth->in, bandwidth->in, - sizeof(*newBandwidth->in)); - else if (net->bandwidth->in) - memcpy(newBandwidth->in, net->bandwidth->in, - sizeof(*newBandwidth->in)); - } - if (bandwidth->out || net->bandwidth->out) { + + memcpy(newBandwidth->in, + bandwidth->in ? bandwidth->in : net->bandwidth->in, + sizeof(*newBandwidth->in)); + } + if (bandwidth->out || + (net->bandwidth && net->bandwidth->out)) { if (VIR_ALLOC(newBandwidth->out) < 0) { virReportOOMError(); goto cleanup; } - if (bandwidth->out) - memcpy(newBandwidth->out, bandwidth->out, - sizeof(*newBandwidth->out)); - else if (net->bandwidth->out) - memcpy(newBandwidth->out, net->bandwidth->out, - sizeof(*newBandwidth->out)); + + memcpy(newBandwidth->out, + bandwidth->out ? bandwidth->out : net->bandwidth->out, + sizeof(*newBandwidth->out)); } if (virNetDevBandwidthSet(net->ifname, newBandwidth) < 0) { -- 1.7.3.4

2 2

[libvirt] [PATCH] qemu: Don't jump to endjob if no job was even started
by Michal Privoznik 01 Feb '12

01 Feb '12

In qemuDomainShutdownFlags if we try to use guest agent, which has error or is not configured, we jump go endjob label even if we haven't started any job yet. This may lead to the daemon crash: 1) virsh shutdown --mode agent on a domain without agent configured 2) wait until domain quits 3) virsh edit --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b147a9..7945c5d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1546,12 +1546,12 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (priv->agentError) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("QEMU guest agent is not available due to an error")); - goto endjob; + goto cleanup; } if (!priv->agent) { qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("QEMU guest agent is not configured")); - goto endjob; + goto cleanup; } } -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH 1/2] Add 2 new functions in storageAPI
by Wayne Sun 01 Feb '12

01 Feb '12

* download(self, poolname, volname, stream, offset, length, flags = 0) * upload(self, poolname, volname, stream, offset, length, flags = 0) --- lib/storageAPI.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/lib/storageAPI.py b/lib/storageAPI.py index 6c9d286..b0733f8 100644 --- a/lib/storageAPI.py +++ b/lib/storageAPI.py @@ -466,3 +466,20 @@ class StorageAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def download(self, poolname, volname, stream, offset, length, flags = 0): + try: + volobj = self.get_volume_obj(poolname, volname) + return volobj.download(stream, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def upload(self, poolname, volname, stream, offset, length, flags = 0): + try: + volobj = self.get_volume_obj(poolname, volname) + return volobj.upload(stream, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) -- 1.7.1

3 4

[libvirt] ANNOUNCE: virt-manager 0.9.1 and virtinst 0.600.1 released
by Cole Robinson 01 Feb '12

01 Feb '12

I'm happy to announce two new releases: virt-manager 0.9.1: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.600.1: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.1.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.600.1.tar.gz The virt-manager release includes: - Support for adding usb redirection devices (Marc-André Lureau) - Option to switch usb controller to support usb2.0 (Marc-André Lureau) - Option to specify machine type for non-x86 guests (Li Zhang) - Support for filesystem device type and write policy (Deepak C Shetty) - Many bug fixes! The virtinst release includes: - virt-install: --redir option for usb redirection (Marc-André Lureau) - virt-install: Advanced --controller support for usb2 (Marc-André Lureau) - Many bug fixes and minor improvments. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] tests: dynamically replace dnsmasq path
by Philipp Hahn 01 Feb '12

01 Feb '12

The path to the dnsmasq binary can be configured while in the test data the path is hard-coded to /usr/bin/. This break the test suite if a the binary is located in a different location, like /usr/local/sbin/. Replace the hard coded path in the test data by a token, which is dynamically replaced in networkxml2argvtest with the configured path after the test data has been loaded. (Another option would have been to modify configure.ac to generate the test data during configure, but I do not know of an easy way do trick configure into mass-generate those test files without listing every single one, which I consider less flexible.) Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/networkxml2argvdata/isolated-network.argv | 2 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 2 +- .../nat-network-dns-srv-record-minimal.argv | 2 +- .../nat-network-dns-srv-record.argv | 2 +- .../nat-network-dns-txt-record.argv | 2 +- tests/networkxml2argvdata/nat-network.argv | 2 +- tests/networkxml2argvdata/netboot-network.argv | 2 +- .../networkxml2argvdata/netboot-proxy-network.argv | 2 +- tests/networkxml2argvdata/routed-network.argv | 2 +- tests/networkxml2argvtest.c | 42 ++++++++++++++++++++ 10 files changed, 51 insertions(+), 9 deletions(-) diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 7ea2e94..a9beb05 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 2158df8..c7e4967 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,3 +1,3 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index 021e8f0..ea1da6d 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 85afbba..84c2d2f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index be6ba4b..bed309f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --txt-record=example,example value \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d7faee2..80878a8 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 78e873c..7ae5b75 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 5fe1b8e..2c5a0d5 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index d059630..75303e6 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,2 +1,2 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 2dd9b7f..ec2ef39 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -15,6 +15,45 @@ #include "memory.h" #include "network/bridge_driver.h" +/* Replace all occurrences of @token in @buf by @replacement and adjust size of + * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ +static int replaceTokens(char **buf, const char *token, const char *replacement) { + char *token_start, *token_end; + size_t old_len, new_len, rest_len; + void *tmp; + const size_t token_len = strlen(token); + const size_t replacement_len = strlen(replacement); + const int diff = replacement_len - token_len; + + old_len = rest_len = strlen(*buf) + 1; + token_end = *buf; + for (;;) { + token_start = strstr(token_end, token); + if (token_start == NULL) + break; + rest_len -= token_start + token_len - token_end; + token_end = token_start + token_len; + new_len = old_len + diff; + if (diff > 0) { + tmp = realloc((void *)*buf, new_len); + if (tmp == NULL) + return -1; + *buf = tmp; + } + if (diff != 0) + memmove(token_end + diff, token_end, rest_len); + memmove(token_start, replacement, replacement_len); + if (diff < 0) { + tmp = realloc((void *)*buf, new_len); + if (tmp == NULL) + return -1; + *buf = tmp; + } + old_len = new_len; + } + return 0; +} + static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; @@ -32,6 +71,9 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (virtTestLoadFile(outargv, &outArgvData) < 0) goto fail; + if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) + goto fail; + if (!(dev = virNetworkDefParseString(inXmlData))) goto fail; -- 1.7.1

2 3

[libvirt] Implement virStorageVolResize() for FS backend
by Zeeshan Ali (Khattak) 01 Feb '12

01 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Currently only VIR_STORAGE_VOL_RESIZE_DELTA flag is supported. --- src/storage/storage_backend.h | 6 +++ src/storage/storage_backend_fs.c | 53 +++++++++++++++++++++++ src/storage/storage_driver.c | 88 ++++++++++++++++++++++++++++++++++++++ src/util/storage_file.c | 16 +++++++ src/util/storage_file.h | 2 + 5 files changed, 165 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75ed676..a37bf7c 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -44,6 +44,11 @@ typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjP typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); +typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags); /* File creation/cloning functions used for cloning between backends */ int virStorageBackendCreateRaw(virConnectPtr conn, @@ -78,6 +83,7 @@ struct _virStorageBackend { virStorageBackendCreateVol createVol; virStorageBackendRefreshVol refreshVol; virStorageBackendDeleteVol deleteVol; + virStorageBackendVolumeResize resizeVol; }; virStorageBackendPtr virStorageBackendForType(int type); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d8dc29c..1af12e6 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1187,6 +1187,56 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, return 0; } +static int +virStorageBackendFilesystemResizeQemuImg(const char *path, + unsigned long long capacity) +{ + int ret = -1; + char *img_tool; + virCommandPtr cmd = NULL; + + /* KVM is usually ahead of qemu on features, so try that first */ + img_tool = virFindFileInPath("kvm-img"); + if (!img_tool) + img_tool = virFindFileInPath("qemu-img"); + + if (!img_tool) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + return -1; + } + + cmd = virCommandNew(img_tool); + virCommandAddArgList(cmd, "resize", path, NULL); + virCommandAddArgFormat(cmd, "%llu", capacity); + + ret = virCommandRun(cmd, NULL); + + VIR_FREE(img_tool); + virCommandFree(cmd); + + return ret; +} + +/** + * Resize a volume + */ +static int +virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + virCheckFlags(0, -1); + + if (vol->target.format == VIR_STORAGE_FILE_RAW) + return virStorageFileResize(vol->target.path, capacity); + else + return virStorageBackendFilesystemResizeQemuImg(vol->target.path, + capacity); +} + virStorageBackend virStorageBackendDirectory = { .type = VIR_STORAGE_POOL_DIR, @@ -1199,6 +1249,7 @@ virStorageBackend virStorageBackendDirectory = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #if WITH_STORAGE_FS @@ -1216,6 +1267,7 @@ virStorageBackend virStorageBackendFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; virStorageBackend virStorageBackendNetFileSystem = { .type = VIR_STORAGE_POOL_NETFS, @@ -1232,5 +1284,6 @@ virStorageBackend virStorageBackendNetFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a332ada..e7a8a8b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1695,7 +1695,94 @@ out: return ret; } +static int +storageVolumeResize(virStorageVolPtr obj, + long long capacity, + unsigned int flags) +{ + virStorageDriverStatePtr driver = obj->conn->storagePrivateData; + virStorageBackendPtr backend; + virStoragePoolObjPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + unsigned long long abs_capacity; + int ret = -1; + + virCheckFlags(VIR_STORAGE_VOL_RESIZE_DELTA, -1); + + storageDriverLock(driver); + pool = virStoragePoolObjFindByName(&driver->pools, obj->pool); + storageDriverUnlock(driver); + + if (!pool) { + virStorageReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching uuid")); + goto out; + } + + if (!virStoragePoolObjIsActive(pool)) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool is not active")); + goto out; + } + + if ((backend = virStorageBackendForType(pool->def->type)) == NULL) + goto out; + + vol = virStorageVolDefFindByName(pool, obj->name); + + if (vol == NULL) { + virStorageReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + obj->name); + goto out; + } + + if (vol->building) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still being allocated."), + vol->name); + goto out; + } + if (flags & VIR_STORAGE_VOL_RESIZE_DELTA) { + abs_capacity = vol->capacity + capacity; + flags &= ~VIR_STORAGE_VOL_RESIZE_DELTA; + } else { + abs_capacity = capacity; + } + + if (abs_capacity < vol->allocation) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("can't shrink capacity below " + "existing allocation")); + goto out; + } + + if (abs_capacity > vol->allocation + pool->def->available) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("Not enough space left on storage pool")); + goto out; + } + + if (!backend->resizeVol) { + virStorageReportError(VIR_ERR_NO_SUPPORT, + _("storage pool does not support changing of " + "volume capacity")); + goto out; + } + + if (backend->resizeVol(obj->conn, pool, vol, abs_capacity, flags) < 0) + goto out; + + vol->capacity = abs_capacity; + ret = 0; + +out: + if (pool) + virStoragePoolObjUnlock(pool); + + return ret; +} /* If the volume we're wiping is already a sparse file, we simply * truncate and extend it to its original size, filling it with @@ -2243,6 +2330,7 @@ static virStorageDriver storageDriver = { .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ .volGetPath = storageVolumeGetPath, /* 0.4.0 */ + .volResize = storageVolumeResize, /* 0.9.10 */ .poolIsActive = storagePoolIsActive, /* 0.7.3 */ .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ diff --git a/src/util/storage_file.c b/src/util/storage_file.c index ba9cfc5..8260adb 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -931,6 +931,22 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) VIR_FREE(meta); } +/** + * virStorageFileResize: + * + * Change the capacity of the raw storage file at 'path'. + */ +int +virStorageFileResize(const char *path, unsigned long long capacity) +{ + if (truncate(path, capacity) < 0) { + virReportSystemError(errno, _("Failed to truncate file '%s'"), path); + return -1; + } + + return 0; +} + #ifdef __linux__ # ifndef NFS_SUPER_MAGIC diff --git a/src/util/storage_file.h b/src/util/storage_file.h index b8920d0..96afb12 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -72,6 +72,8 @@ int virStorageFileGetMetadataFromFD(const char *path, void virStorageFileFreeMetadata(virStorageFileMetadata *meta); +int virStorageFileResize(const char *path, unsigned long long capacity); + enum { VIR_STORAGE_FILE_SHFS_NFS = (1 << 0), VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), -- 1.7.7.6

3 2

[libvirt] [PATCHv3] network: Avoid memory leaks on networkBuildDnsmasqArgv
by ajia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 973af236. * src/network/bridge_driver.c: fix memory leaks on failure and successful path. * How to reproduce? % make -C tests check TESTS=networkxml2argvtest % cd tests && valgrind -v --leak-check=full ./networkxml2argvtest * Actual result: ==2226== 3 bytes in 1 blocks are definitely lost in loss record 1 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2D9: networkBuildDhcpDaemonCommandLine (bridge_driver.c:545) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 3 bytes in 1 blocks are definitely lost in loss record 2 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A307: networkBuildDhcpDaemonCommandLine (bridge_driver.c:551) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 5 bytes in 1 blocks are definitely lost in loss record 4 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2AB: networkBuildDhcpDaemonCommandLine (bridge_driver.c:539) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== LEAK SUMMARY: ==2226== definitely lost: 11 bytes in 3 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/network/bridge_driver.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5d0d528..c9a8ccf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -458,7 +458,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, { int r, ret = -1; int nbleases = 0; - int ii; + int ii, i, j; + char *recordPort = NULL; + char *recordPriority = NULL; + char *recordWeight = NULL; virNetworkIpDefPtr tmpipdef; /* @@ -513,7 +516,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (network->def->dns != NULL) { virNetworkDNSDefPtr dns = network->def->dns; - int i; for (i = 0; i < dns->ntxtrecords; i++) { char *record = NULL; @@ -530,10 +532,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, for (i = 0; i < dns->nsrvrecords; i++) { char *record = NULL; - char *recordPort = NULL; - char *recordPriority = NULL; - char *recordWeight = NULL; - if (dns->srvrecords[i].service && dns->srvrecords[i].protocol) { if (dns->srvrecords[i].port) { if (virAsprintf(&recordPort, "%d", dns->srvrecords[i].port) < 0) { @@ -671,6 +669,11 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, ret = 0; cleanup: + for (j = 0; j < i; j++) { + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); + } return ret; } -- 1.7.1

4 5

[libvirt] [PATCHv3] simplify block of codes
by Alex.Jia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> Using new function 'virTypedParameterArrayClear' to simplify block of codes. * daemon/remote.c, src/remote/remote_driver.c: simplify codes. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 6 +----- src/remote/remote_driver.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cb8423a..e7d9b2f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -848,11 +848,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, cleanup: if (rv < 0) { - int j; - for (j = 0; j < i; ++j) { - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + virTypedParameterArrayClear(params, i); VIR_FREE(params); } return params; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 61b96e9..031becd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -46,6 +46,7 @@ #include "virfile.h" #include "command.h" #include "intprops.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + if (rv < 0) + virTypedParameterArrayClear(params, i); return rv; } @@ -2384,15 +2381,9 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, rv = ret.nparams; cleanup: - if (rv < 0) { - int max = nparams * ncpus; - int i; + if (rv < 0) + virTypedParameterArrayClear(params, nparams * ncpus); - for (i = 0; i < max; i++) { - if (params[i].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[i].value.s); - } - } xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, (char *) &ret); done: -- 1.7.1

2 1

[libvirt] [PATCHv2] schema: Relax schema for domain name
by Peter Krempa 31 Jan '12

31 Jan '12

The domain schema enforced restrictions on the domain name string that the code doesn't. This patch relaxes the check, leaving the restrictions on the driver or hypervisor. The only invalid character is a newline. --- docs/schemas/domaincommon.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4fa968d..ecf3484 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3030,7 +3030,7 @@ </define> <define name="domainName"> <data type="string"> - <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> + <param name="pattern">[^\n]+</param> </data> </define> <define name="diskSerial"> -- 1.7.3.4

2 3

[libvirt] RFC API proposal: virDomainBlockRebase
by Eric Blake 31 Jan '12

31 Jan '12

Right now, the existing virDomainBlockPull API has a tough limitation - it is an all-or-none approach. In all my examples below, I'm starting from the following relationship, where '<-' means 'is a backing file of': template <- intermediate <- current virDomainBlockPull can only convert things in a forward direction, with the merge destination being the current image, resulting in: merge template and intermediate into current, creating: current Meanwhile, qemu is adding support for a partial block pull operation, still on the current image as the merge destination, but where you can now specify an optional argument to limit the pull to just the intermediate files and altering the current image to be backed by an ancestor file, as in: merge intermediate into current, creating: template <- current For 0.9.10, I'd like to add the following API: /** * virDomainBlockRebase: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand * @base: new base image, or NULL for entire block pull * @bandwidth: (optional) specify copy bandwidth limit in Mbps * @flags: extra flags; not used yet, so callers should always pass 0 * * Populate a disk image with data from its backing image chain, and * setting the new backing image to @base, where base is the absolute * path of one of the backing images in the chain. If @base is NULL, * then this operation is identical to virDomainBlockPull(). Once all * data from its backing image chain has been pulled, the disk no * longer depends on those intermediate backing images. This function * pulls data for the entire device in the background. Progress of the * operation can be checked with virDomainGetBlockJobInfo() and * the operation can be aborted with virDomainBlockJobAbort(). When * finished, an asynchronous event is raised to indicate the final * status. * * The @disk, @bandwidth, and @flags parameters are handled as in * virDomainBlockPull(). * * Returns 0 if the operation has started, -1 on failure. */ int virDomainBlockRebase(virDomainPtr dom, const char *disk, const char *base, unsigned long bandwidth, unsigned int flags); Given that Adam has a pending patch to support a VIR_DOMAIN_BLOCK_PULL_ASYNC flag, this same flag would have to be supported in virDomainBlockRebase. I've also been chatting with Federico Simoncelli about how the above operation would work for VDSM purposes in doing a live block move, while preserving a common template base file: start with: vda: template <- current1 create a disk-only snapshot, with: tmpsnap = virDomainSnapshotCreateXML(dom, "<domainsnapshot>\n" " <disks>\n" " <disk name='vda'>\n" " <source>/path/to/current2</source>\n" " </disk>\n" " <disks>\n" "</domainsnapshot>", VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) where the xml calls out the destination file name, resulting in: vda: template <- current1 <- current2 perform the block rebase, with: virDomainBlockRebase(dom, "vda", "/path/to/template", VIR_DOMAIN_BLOCK_PULL_ASYNC) as well as waiting for the event (or polling status) to wait for completion, resulting in: vda: template <- current2 delete the disk-only snapshot metadata as no longer useful, with: virDomainSnapshotDelete(tmpsnap, VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY) At one point, I thought of creating a single libvirt API that performs all of those steps in one call; but right now, I'm not proposing that, because of the fact that qemu has no way to undo a snapshot. In other words, without an undo operation, if the snapshot phase succeeds but the block rebase phase fails, a single API would have to report failure even though the domain was altered, while the ideal scenario is that reporting failure means things were in the same state as before the API started. Beyond 0.9.10, there are some additional useful merge patterns that might be worth exposing. All of these operations are already possible on offline images, using qemu-img; but none of them are possible on live images using current qemu, which is why I'm thinking it is something for another day. I'm also hoping to someday enhance the set of virStorageVol APIs to make backing file manipulation of offline images easier. At any rate, the addition merge operations are: forward live merge with a non-current image as the merge destination, as in: merge template into intermediate, creating: intermediate <- current backward merge of a current image (that is, undoing a current snapshot): merge current into intermediate, creating: template <- intermediate and backward merge of a non-current image (that is, undoing an earlier snapshot, but by modifying the template rather than the current image): merge intermediate into base, creating: template <- current Backward merge of the current image seems like something easy to fit into my proposed API (add a new flag, maybe called VIR_DOMAIN_BLOCK_REBASE_BACKWARD). Manipulations of anything that does not involve the current image seems tougher, assuming qemu ever even reaches the point where it exposes those operations on live volumes - the user has to specify not one, but two backing file names. But even that could possibly be fit into my API, by adding a flag that states that the const char *backing argument is treated as an XML snippet describing the full details of the merge, with the XML listing which image is being merged to which destination, rather than as just the name of the backing file becoming the new base of the current image. Perhaps something like: virDomainBlockRebase(dom, block, "<rebase>\n" " <source>/path/to/intermediate</source>\n" " <dest>/path/to/template</dest>\n" "</rebase>", VIR_DOMAIN_BLOCK_REBASE_XML|VIR_DOMAIN_BLOCK_REBASE_BACKWARD) as a specification to take the contents of intermediate, merge those backwards into template, and as well as adjusting the rest of the backing file chain so that whatever used to be backed by intermediate is now backed by template. Or, if qemu ever gives us the ability to merge non-current images, we may decide at that time that it is worth a new API to expose those new complexities. Another thing I have been thinking about is virDomainSnapshotDelete. The above conversation talks about merging of a single disk, but a live disk snapshot operation can create backing file chains for multiple disks at once, all tracked by a snapshot. Additionally, the current code allows a snapshot delete of internal snapshots, but refuses to do anything useful with an external snapshot, because there is currently no way to specify if the snapshot is removed by merging the base into the new current, or by undoing the current and merging it backwards into the base. Alas, virDomainSnapshotDelete doesn't take any arguments for how to handle the situation, and use of a flag to make the decision would limit all disks to be handled in the same manner. So what I'm thinking is that when a snapshot is created (or redefined, using redefinition as the vehicle to add in the new XML), that the snapshot XML itself can record the preferred direction for undoing the snapshot; for example: <domainsnapshot> <disks> <disk name='/path/to/old_vda'> <source file='/path/to/new_vda'/> <on_delete merge='forward'/> </disk> <disk name='/path/to/old_vdb'> <source file='/path/to/new_vdb'/> <on_delete merge='backward'/> </disk> <disks> </domainsnapshot> then when virDomainSnapshotDelete is called on that snapshot, old_vda would be forward merged into new_vda, while new_vdb would be backward merged into old_vdb. Again, that's food for thought for post-0.9.10, and shouldn't get in the way of adding virDomainBlockRebase() now. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 3

[libvirt] Qemu text monitor
by Shradha Shah 31 Jan '12

31 Jan '12

Hello All, I am currently working with libvirt on RHEL6.2. There are a few points I have noticed regarding the QEMU monitor. When I hotplug a device into the guest, the Qemu text monitor receives a device_add command and adds the device to its current devices list (I found this list via the qemu-monitor-command "info pci"). When I hot-unplug the device from the guest, the Qemu text monitor receives the device_del command but does not remove the device from its current devices list (qemu-monitor-command "info pci" still shows the device). The result of this is that the next hotplug of the device fails giving an error "Duplicate id". I was wondering if any of you have hit this issue before or know about any qemu-monitor bugs I may not be aware of? Many Thanks in advance, Regards, Shradha Shah

3 2

[libvirt] [PATCH v2 0/4] RFC: grant KVM guest rawio capability
by Taku Izumi 31 Jan '12

31 Jan '12

This is the new version of http://www.redhat.com/archives/libvir-list/2012-January/msg01312.html Thank you for reviewing, Danie, Paolo, and Eric. -- This patchset achieves #1 and #2 of the following tasks: > 1. rawio="yes|nmo" on the <disk> element somewhere > 2. Give the QEMU process CAP_SYS_RAWIO > 3. Use the devices cgroup to specify which individual disks > can use rawio. In short, if you specify the following XML: <disk type='block' device='lun' rawio='yes'> the domain will be granted CAP_SYS_RAWIO. # virsh start VM # cat /proc/<VM's PID>/status ... CapInh: 0000000000000000 CapPrm: fffffffc00020000 CapEff: fffffffc00020000 CapBnd: fffffffc00020000 ... *[PATCH v2 1/4] conf: add rawio attribute to disk element of domain XML *[PATCH v2 2/4] util: add functions to keep capabilities *[PATCH v2 3/4] util: extend virExecWithHook() *[PATCH v2 4/4] qemu: make qemu processes to retain rawio capability - Best regards, Taku Izumi

4 15

[libvirt] [PATCH] qemu: never send SIGKILL to qemu process unless specifically requested
by Laine Stump 31 Jan '12

31 Jan '12

When libvirt is shutting down the qemu process, it first sends SIGTERM, then waits for 1.6 seconds and, if it sees the process still there, sends a SIGKILL. There have been reports that this behavior can lead to data loss because the guest running in qemu doesn't have time to flush it's disk cache buffers before it's unceremoniously whacked. One suggestion on how to solve that problem was to remove SIGKILL from the normal virDomainDestroyFlags, but still provide the ability to kill qemu with SIGKILL by using a new flag to virDomainDestroyFlags. This patch is a quick attempt at that in order to start a conversation on the topic. So what are your opinions? Is this the right way to solve the problem? Any better ideas? --- include/libvirt/libvirt.h.in | 12 ++++++------ src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 40 ++++++++++++++++++++++------------------ src/qemu/qemu_process.h | 8 +++++++- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e99cd00..f9ac865 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1182,12 +1182,6 @@ virConnectPtr virDomainGetConnect (virDomainPtr domain); * Domain creation and destruction */ - -/* - * typedef enum { - * } virDomainDestroyFlagsValues; - */ - virDomainPtr virDomainCreateXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); @@ -1222,6 +1216,12 @@ int virDomainReset (virDomainPtr domain, unsigned int flags); int virDomainDestroy (virDomainPtr domain); + +typedef enum { + VIR_DOMAIN_DESTROY_NONE = 0, /* Default behavior */ + VIR_DOMAIN_DESTROY_IMMEDIATE = 1 << 0, /* immediately kill, could lead to data loss!! */ +} virDomainDestroyFlagsValues; + int virDomainDestroyFlags (virDomainPtr domain, unsigned int flags); int virDomainRef (virDomainPtr domain); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ab69dca..0e80241 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1754,7 +1754,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_DESTROY_IMMEDIATE, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1775,7 +1775,10 @@ qemuDomainDestroyFlags(virDomainPtr dom, * can kill the process even if a job is active. Killing * it now means the job will be released */ - qemuProcessKill(vm, false); + if (flags & VIR_DOMAIN_DESTROY_IMMEDIATE) + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_IMMEDIATELY); + else + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); /* We need to prevent monitor EOF callback from doing our work (and sending * misleading events) while the vm is unlocked inside BeginJob API diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d22020b..efbe46c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -586,7 +586,7 @@ endjob: cleanup: if (vm) { if (ret == -1) - qemuProcessKill(vm, false); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); if (virDomainObjUnref(vm) > 0) virDomainObjUnlock(vm); } @@ -611,12 +611,12 @@ qemuProcessShutdownOrReboot(struct qemud_driver *driver, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm, true); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_GRACEFULLY); /* Safe to ignore value since ref count was incremented above */ ignore_value(virDomainObjUnref(vm)); } } else { - qemuProcessKill(vm, true); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_GRACEFULLY); } } @@ -3524,30 +3524,34 @@ cleanup: } -void qemuProcessKill(virDomainObjPtr vm, bool gracefully) +void qemuProcessKill(virDomainObjPtr vm, unsigned int killMode) { int i; - VIR_DEBUG("vm=%s pid=%d gracefully=%d", - vm->def->name, vm->pid, gracefully); + VIR_DEBUG("vm=%s pid=%d killMode=%d", + vm->def->name, vm->pid, killMode); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); return; } - /* This loop sends SIGTERM, then waits a few iterations - * (1.6 seconds) to see if it dies. If still alive then - * it does SIGKILL, and waits a few more iterations (1.6 - * seconds more) to confirm that it has really gone. + /* This loop sends SIGTERM (or SIGKILL if killMode is + * VIR_QEMU_KILL_MODE_IMMEDIATELY), then waits a few iterations + * (3.2 seconds) to see if it dies. Note that the IMMEDIATELY mode + * will very likely result in lost data in the guest, so it should + * only be used if the guest is hung and can't be destroyed in any + * other manner. */ - for (i = 0 ; i < 15 ; i++) { + for (i = 0 ; i < 16 ; i++) { int signum; - if (i == 0) - signum = SIGTERM; - else if (i == 8) - signum = SIGKILL; - else + if (i == 0) { + if (killMode == VIR_QEMU_PROCESS_KILL_IMMEDIATELY) + signum = SIGKILL; + else + signum = SIGTERM; + } else { signum = 0; /* Just check for existence */ + } if (virKillProcess(vm->pid, signum) < 0) { if (errno != ESRCH) { @@ -3558,7 +3562,7 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) break; } - if (i == 0 && gracefully) + if (i == 0 && (killMode == VIR_QEMU_PROCESS_KILL_GRACEFULLY)) break; usleep(200 * 1000); @@ -3651,7 +3655,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - qemuProcessKill(vm, false); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); /* Stop autodestroy in case guest is restarted */ qemuProcessAutoDestroyRemove(driver, vm); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 062d79e..755d4a6 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -68,7 +68,13 @@ int qemuProcessAttach(virConnectPtr conn, virDomainChrSourceDefPtr monConfig, bool monJSON); -void qemuProcessKill(virDomainObjPtr vm, bool gracefully); +typedef enum { + VIR_QEMU_PROCESS_KILL_GRACEFULLY = 0, + VIR_QEMU_PROCESS_KILL_FORCEFULLY = 1, + VIR_QEMU_PROCESS_KILL_IMMEDIATELY = 2, +} virQemuProcessKillMode; + +void qemuProcessKill(virDomainObjPtr vm, unsigned int killMode); int qemuProcessAutoDestroyInit(struct qemud_driver *driver); void qemuProcessAutoDestroyRun(struct qemud_driver *driver, -- 1.7.7.5

4 8

[libvirt] [PATCH v2 0/3] Add virDomainGetDiskErrors API
by Jiri Denemark 31 Jan '12

31 Jan '12

We already provide ways to detect when a domain has been paused as a result of I/O error, but there was no way of getting the exact error or even the device that experienced it. This new API may be used for both. Changes in version 2: - the API is now called virDomainGetDiskErrors - it returns a list (allocated by caller) of disks with errors instead so that users don't have to call it multiple times to get all errors - there's no python API yet since it can't be autogenerated; I'll send a patch for it tomorrow Jiri Denemark (3): virDomainGetDiskErrors public API and remote protocol qemu: Implement virDomainGetDiskErrors virsh: Implement domblkerror command daemon/remote.c | 40 +++++++++++++++++++ include/libvirt/libvirt.h.in | 32 +++++++++++++++ python/generator.py | 3 +- src/driver.h | 7 +++ src/libvirt.c | 52 ++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 83 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 40 +++++++++++++++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 8 ++++ src/qemu/qemu_monitor_text.c | 15 +++++++ src/remote/remote_driver.c | 34 ++++++++++++++++ src/remote/remote_protocol.x | 22 ++++++++++- src/remote_protocol-structs | 16 +++++++ src/rpc/gendispatch.pl | 47 ++++++++++++++++++++++ tools/virsh.c | 89 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 18 files changed, 496 insertions(+), 2 deletions(-) -- 1.7.8.4

2 9

[libvirt] [PATCH] XenXs: Update documentation
by Philipp Hahn 31 Jan '12

31 Jan '12

Fix several references to now renamed functions and parameters when the functions were moved from src/xen/ to src/xenxs/. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xenxs/xen_sxpr.c | 222 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 185 insertions(+), 37 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 04ba5aa..ac15853 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -37,7 +37,7 @@ #include "xenxs_private.h" #include "xen_sxpr.h" -/* Get a domain id from a sexpr string */ +/* Get a domain id from a S-expression string */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) { struct sexpr *root = string2sexpr(sexpr); @@ -50,7 +50,7 @@ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) return id; } -/* Get a domain id from a sexpr */ +/* Get a domain id from a S-expression */ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; @@ -66,16 +66,15 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) /***************************************************************** ****** - ****** Parsing of SEXPR into virDomainDef objects + ****** Parsing of S-Expression into virDomainDef objects ****** *****************************************************************/ /** - * xenParseSxprOS + * xenParseSxprOS: * @node: the root of the parsed S-Expression * @def: the domain config - * @hvm: true or 1 if no contains HVM S-Expression - * @bootloader: true or 1 if a bootloader is defined + * @hvm: true or 1 if node contains HVM S-Expression * * Parse the xend sexp for description of os and append it to buf. * @@ -166,6 +165,16 @@ no_memory: return -1; } + +/** + * xenParseSxprChar: + * @value: A string describing a character device. + * @tty: the console pty path + * + * Parse the xend S-expression for description of a character device. + * + * Returns a character device object or NULL in case of failure. + */ virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty) @@ -316,13 +325,15 @@ error: return NULL; } + /** - * xend_parse_sexp_desc_disks - * @conn: connection - * @root: root sexpr + * xenParseSxprDisks: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if node contains HVM S-Expression * @xendConfigVersion: version of xend * - * This parses out block devices from the domain sexpr + * This parses out block devices from the domain S-expression * * Returns 0 if successful or -1 if failed. */ @@ -518,6 +529,15 @@ error: } +/** + * xenParseSxprNets: + * @def: the domain config + * @root: root S-expression + * + * This parses out network devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprNets(virDomainDefPtr def, const struct sexpr *root) @@ -614,6 +634,15 @@ cleanup: } +/** + * xenParseSxprSound: + * @def: the domain config + * @str: comma separated list of sound models + * + * This parses out sound devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ int xenParseSxprSound(virDomainDefPtr def, const char *str) @@ -692,6 +721,15 @@ error: } +/** + * xenParseSxprUSB: + * @def: the domain config + * @root: root S-expression + * + * This parses out USB devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprUSB(virDomainDefPtr def, const struct sexpr *root) @@ -733,6 +771,19 @@ no_memory: return -1; } + +/* + * xenParseSxprGraphicsOld: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if root contains HVM S-Expression + * @xendConfigVersion: version of xend + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsOld(virDomainDefPtr def, const struct sexpr *root, @@ -821,6 +872,16 @@ error: } +/* + * xenParseSxprGraphicsNew: + * @def: the domain config + * @root: root S-expression + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsNew(virDomainDefPtr def, const struct sexpr *root, int vncport) @@ -918,11 +979,13 @@ error: return -1; } + /** - * xenParseSxprPCI + * xenParseSxprPCI: + * @def: the domain config * @root: root sexpr * - * This parses out block devices from the domain sexpr + * This parses out PCI devices from the domain sexpr * * Returns 0 if successful or -1 if failed. */ @@ -1044,16 +1107,17 @@ error: /** * xenParseSxpr: - * @conn: the connection associated with the XML * @root: the root of the parsed S-Expression * @xendConfigVersion: version of xend * @cpus: set of cpus the domain may be pinned to + * @tty: the console pty path + * @vncport: VNC port number * - * Parse the xend sexp description and turn it into the XML format similar - * to the one unsed for creation. + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. * - * Returns the 0 terminated XML string or NULL in case of error. - * the caller must free() the returned value. + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. */ virDomainDefPtr xenParseSxpr(const struct sexpr *root, @@ -1424,6 +1488,20 @@ error: return NULL; } + +/** + * xenParseSxprString: + * @sexpr: the root of the parsed S-Expression + * @xendConfigVersion: version of xend + * @tty: the console pty path + * @vncport: VNC port number + * + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. + * + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. + */ virDomainDefPtr xenParseSxprString(const char *sexpr, int xendConfigVersion, char *tty, int vncport) @@ -1449,15 +1527,12 @@ xenParseSxprString(const char *sexpr, /** - * virtDomainParseXMLGraphicsDescVFB: - * @conn: pointer to the hypervisor connection - * @node: node containing graphics description - * @buf: a buffer for the result S-Expr + * xenFormatSxprGraphicsNew: + * @def: the domain config + * @buf: a buffer for the result S-expression * - * Parse the graphics part of the XML description and add it to the S-Expr - * in buf. This is a temporary interface as the S-Expr interface will be - * replaced by XML-RPC in the future. However the XML format should stay - * valid over time. + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM > 3.0.4 or PV > 3.0.3) * * Returns 0 in case of success, -1 in case of error */ @@ -1508,6 +1583,17 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, } +/** + * xenFormatSxprGraphicsOld: + * @def: the domain config + * @buf: a buffer for the result S-expression + * @xendConfigVersion: version of xend + * + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM <= 3.0.4 or PV <= 3.0.3) + * + * Returns 0 in case of success, -1 in case of error + */ static int xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf, @@ -1553,6 +1639,17 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, return 0; } + +/** + * xenFormatSxprChr: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert the character deivce part of the domain config into a S-expression + * in buf. + * + * Returns 0 in case of success, -1 in case of error + */ int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf) @@ -1631,15 +1728,14 @@ xenFormatSxprChr(virDomainChrDefPtr def, /** - * virDomainParseXMLDiskDesc: - * @node: node containing disk description - * @buf: a buffer for the result S-Expr + * xenFormatSxprDisk: + * @node: node containing the disk description + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one disk in the XML description and add it to the S-Expr in buf - * This is a temporary interface as the S-Expr interface - * will be replaced by XML-RPC in the future. However the XML format should - * stay valid over time. + * Convert the disk device part of the domain config into a S-expresssion in buf. * * Returns 0 in case of success, -1 in case of error. */ @@ -1757,12 +1853,15 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, } /** - * xenFormatSxprNet - * @node: node containing the interface description - * @buf: a buffer for the result S-Expr + * xenFormatSxprNet: + * @conn: connection + * @def: the domain config + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one interface the XML description and add it to the S-Expr in buf + * Convert the interface description of the domain config into a S-expression in buf. * This is a temporary interface as the S-Expr interface * will be replaced by XML-RPC in the future. However the XML format should * stay valid over time. @@ -1893,6 +1992,15 @@ xenFormatSxprNet(virConnectPtr conn, } +/** + * xenFormatSxprPCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) @@ -1904,6 +2012,17 @@ xenFormatSxprPCI(virDomainHostdevDefPtr def, def->source.subsys.u.pci.function); } + +/** + * xenFormatSxprOnePCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * @detach: create expression for device detach (1). + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ int xenFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, @@ -1926,6 +2045,16 @@ xenFormatSxprOnePCI(virDomainHostdevDefPtr def, return 0; } + +/** + * xenFormatSxprAllPCI: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all PCI device parts of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static int xenFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) @@ -1973,6 +2102,16 @@ xenFormatSxprAllPCI(virDomainDefPtr def, return 0; } + +/** + * xenFormatSxprSound: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all sound device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) @@ -2001,6 +2140,15 @@ xenFormatSxprSound(virDomainDefPtr def, } +/** + * xenFormatSxprInput: + * @input: the input config + * @buf: a buffer for the result S-expression + * + * Convert all input device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ static int xenFormatSxprInput(virDomainInputDefPtr input, virBufferPtr buf) @@ -2033,7 +2181,7 @@ verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); * @def: domain config definition * @xendConfigVersion: xend configuration file format * - * Generate an SEXPR representing the domain configuration. + * Generate an S-expression representing the domain configuration. * * Returns the 0 terminated S-Expr string or NULL in case of error. * the caller must free() the returned value. -- 1.7.1

2 4

[libvirt] [PATCH] tests: virnettlscontexttest needs gnutls-2.6.0
by Philipp Hahn 31 Jan '12

31 Jan '12

virnettlscontexttest uses gnutls_x509_crt_set_subject_alt_name() and GNUTLS_FSAN_APPEND, which - according to <http://www.gnu.org/software/gnutls/manual/gnutls.html> - are only available since 2.6.0. Since libvirt still works fine with gnutls-1.0.25 from RHEL5, only enable the test when the version of GNUTLS is at least 2.6.0. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/virnettlscontexttest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51f75b4..6dd42d4 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -36,7 +36,7 @@ #include "virsocketaddr.h" #include "gnutls_1_0_compat.h" -#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT +#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT && LIBGNUTLS_VERSION_NUMBER > 0x020600 # include <libtasn1.h> # include "rpc/virnettlscontext.h" -- 1.7.1

3 4

[libvirt] [[libvirt-glib PATCHv3] 1/3] Add proper error reporting to gvir_storage_vol_get_path
by Christophe Fergeau 31 Jan '12

31 Jan '12

gvir_storage_vol_get_name currently call g_error when an error occurs. Since g_error trigger a coredump, calling it in a library is harmful. Replace this with proper GError error reporting. --- libvirt-gobject/libvirt-gobject-storage-vol.c | 7 +++++-- libvirt-gobject/libvirt-gobject-storage-vol.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 5b18877..5e83e1b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -184,13 +184,16 @@ const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) return name; } -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *path; if (!(path = virStorageVolGetPath(priv->handle))) { - g_error("Failed to get storage_vol path on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol path on %p", + priv->handle); + return NULL; } return path; diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index db63865..25f683a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -78,7 +78,7 @@ GType gvir_storage_vol_info_get_type(void); GType gvir_storage_vol_handle_get_type(void); const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error); gboolean gvir_storage_vol_delete(GVirStorageVol *vol, guint flags, -- 1.7.7.6

2 5

[libvirt] RFC: setting mac address on network devices being assigned to a guest via PCI passthrough (<hostdev>)
by Laine Stump 31 Jan '12

31 Jan '12

To refresh everyone's memory, the origin of the problem I'm trying to solve here is that the VFs of an SRIOV-capable ethernet card are given new random MAC addresses each time the card is initialized. If those VFs are then passed-through to a guest using the existing <hostdev> config, the guest will see a new MAC address each time the host is restarted, and will thus believe that a new ethernet card has been installed. This can result in anything from a dialog claiming that the guest has connected to a new network (MS products) to a new network device name showing up (Linux - "hmm, eth0 was unplugged, but here's this new device. Let's call it "eth1"!) Several months ago I sent out some mail proposing a scheme for automatically allocating network devices from a pool to be assigned to guests via PCI passthrough: https://www.redhat.com/archives/libvir-list/2011-August/msg00937.html My idea was to have a new <network> forward mode combined with guest <interface> definitions that would end up auto-generating a transient <hostdev> entry in the guest's config (and setting the VF's mac address in the process). Dan Berrange pointed out in that thread that we really do need to have a persistent <hostdev> entry for these devices in the domain xml, if for no other reason than to guarantee that the same guest-side PCI address is always used (thus preventing surprises in the guest, such as re-activation demands from Microsoft OSes). (There were other reasons, but that one was the real "hard stop" for me.) I've come back to this problem, and have decided that, while having the actual host device auto-allocated at runtime would be nice, first implementing a less ambitious solution that uses a hand-picked device would not preclude adding the more complicated/useful functionality later. So, here's a new simpler proposal. Step 1 ------ In the end, the solution will be that the VF's auto-generated random MAC address should be replaced with a fixed MAC address supplied by libvirt prior to assigning the VF to the guest. As a first step to satisfy this basic requirement, I'm figuring to just extend the <hostdev> xml in this way: |<hostdev mode='subsystem' type='pci' managed='yes'> |<source> |<address bus='0x06' slot='0x02' function='0x0'/> |</source> |<mac address='11:22:33:44:55:66"/> |</hostdev> When libvirt sees <mac address...> in the hostdev at device attach time, it would first verify that the device is a network device (if not, it would log an error and fail the operation). If it is a network device, the pci address would be converted into a network device name, and that device would have its MAC address set to the configured value, and then the attach would proceed. My main questions here are: 1) Is this the right place for the new element? Or should it go into <source>? 2) Should we bother trying to save the original MAC address to restore when the device is released? (I guess that might be important if, for example, the guest config was changed to use a different device but same MAC address - you could end up with two devices having the same MAC address). 3) I've seen requests from 2 places to do host-side virtual port association (i.e. vepa / 802.1Qb[gh]). Would it be feasible to do that association with the device after setting MAC address and before assigning it to the guest? (and likewise for the inverse) Or would the act of PCI assignment screw that up somehow? (one of the messages in the earlier thread says something about the device initialization by the guest un-doing necessary setup) (if it would work, a <virtualport> could just be added along with <mac address>). Beyond those 3 questons, this all seems rather uncontroversial, so I'll start coding something up right away (and modify as necessary after discussion). Step 2 ------ Once the basic functionality is in place, a further step would be one just to simplify the admins job - we could do this by replacing this config: | <source> | <address bus='x' slot='y' function='z'/> | </source> with: | <source> | <address netdev='eth22'/> | </source> (or possibly it could be a separate element within <source>, e.g. "<network dev='eth22'/>") As long as the domain isn't running, the config would remain like this. The first time the device was attached, the name in netdev would be resolved to a pci address (or failed if the given netdev wasn't a PCI device); and the config auto-filled as follows: | <source> | <address bus='x' slot='y' function='z' netdev='eth22'/> | </source> On subsequent attaches (i.e. when both netdev and a pci address are present) the netdev would again be resolved and compared to the pci address to make sure they still agree; if not, the operation would fail. This would satisfy management applications' desire to see the pci address info of all devices assigned to guests, while retaining the original config info (and also lead quite nicely into step 3...). Step 3 ------ To further simplify configuration, it would be very nice if the choice of network device could be done automatically. Since libvirt's networks already have the concept of a pool of devices (and also of portgroups which can be used to set <virtualport> parameters), it kind of makes to sense to use that. In this case, a network would be defined something like this: | <network> | <name>passthrough-net</name> | <forward dev='eth20' mode='hostdev'>  | <interface dev='eth20'/> | <interface dev='eth21'/> | <interface dev='eth22'/> | .. | </forward> | </network> (it could also contain a virtualport definition and/or portgroups containing virtualport definitions. Obviously, we would have to prohibit <bandwidth> elements (and several other things) in the definitions>) Then, in lieu of a pci address or network device name (as "netdev"), the <hostdev>'s <source> would have a reference to the network: |<hostdev mode='subsystem' type='pci' managed='yes'> |<source> |<address network='passthrough-net'/> |</source> |<mac address='11:22:33:44:55:66"/> |</hostdev> (or, again, maybe use the separate <network> element: "<network name='passthrough-net'/>) At attach time, the pool of devices in passthrough-net would be searched for a free device, and if found, that device would have its MAC address changed and be assigned to the guest. In this case, the live XML would be updated with the pci address information, but when the guest was destroyed, the device would be handed back to the pool, and the pci address info once again removed from the config. Step 2 & 3 probably won't be implemented right away, but I thought I should toss the ideas out there in case they lead to something else that would require a change in step 1.

3 11

[libvirt] [[libvirt-glib PATCHv2]] API to get/set custom metadata from/to domain config
by Christophe Fergeau 31 Jan '12

31 Jan '12

Based on a patch from Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 60 +++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 7 +++ libvirt-gconfig/libvirt-gconfig-helpers-private.h | 1 + libvirt-gconfig/libvirt-gconfig-helpers.c | 23 ++++++++- libvirt-gconfig/libvirt-gconfig-object-private.h | 3 + libvirt-gconfig/libvirt-gconfig-object.c | 20 +++++++ libvirt-gconfig/libvirt-gconfig.sym | 2 + 7 files changed, 115 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 61af625..606f5a4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -449,3 +449,63 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain) return data.devices; } + +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error) +{ + GVirConfigObject *metadata; + GVirConfigObject *custom_xml; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), FALSE); + g_return_val_if_fail(xml != NULL, FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + metadata = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), "metadata"); + + custom_xml = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_OBJECT, NULL, NULL, xml, error); + if (error != NULL && *error != NULL) + return FALSE; + + gvir_config_object_set_namespace(custom_xml, ns, ns_uri); + + gvir_config_object_attach_replace(metadata, custom_xml); + + return TRUE; +} + +struct LookupNamespacedNodeData { + const char *ns_uri; + xmlNodePtr node; +}; + +static gboolean lookup_namespaced_node(xmlNodePtr node, gpointer opaque) +{ + struct LookupNamespacedNodeData* data = opaque; + + if (node->ns == NULL) + return TRUE; + + if (g_strcmp0((char *)node->ns->href, data->ns_uri) == 0) { + data->node = node; + return FALSE; + } + + return TRUE; +} + +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri) +{ + struct LookupNamespacedNodeData data = { NULL, NULL }; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + g_return_val_if_fail(ns_uri != NULL, NULL); + + data.ns_uri = ns_uri; + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(domain), "metadata", + lookup_namespaced_node, &data); + return gvir_config_xml_node_to_string(data.node); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 6cdaec9..769d2f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -126,6 +126,13 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain); void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, GVirConfigDomainLifecycleEvent event, GVirConfigDomainLifecycleAction action); +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error); +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 96ec02e..514aeb0 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -56,6 +56,7 @@ char *gvir_config_xml_get_child_element_content_glib (xmlNode *node, const char *child_name); xmlChar *gvir_config_xml_get_attribute_content(xmlNodePtr node, const char *attr_name); +char *gvir_config_xml_node_to_string(xmlNodePtr node); char *gvir_config_xml_get_attribute_content_glib(xmlNodePtr node, const char *attr_name); const char *gvir_config_genum_get_nick (GType enum_type, gint value); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index fecf3eb..a324d0e 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -148,7 +148,8 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) "Unable to parse configuration"); return NULL; } - if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { + if ((!doc->children) || + (g_strcmp0((char *)doc->children->name, root_node) != 0)) { g_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, @@ -307,3 +308,23 @@ gvir_config_genum_get_value (GType enum_type, const char *nick, g_return_val_if_reached(default_value); } + +G_GNUC_INTERNAL char * +gvir_config_xml_node_to_string(xmlNodePtr node) +{ + xmlBufferPtr xmlbuf; + char *xml; + + if (node == NULL) + return NULL; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, node->doc, node, 0, 0) < 0) + return NULL; + else + xml = g_strndup((gchar *)xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + + xmlBufferFree(xmlbuf); + + return xml; +} diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index 781e1a3..7e000f5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -90,6 +90,9 @@ void gvir_config_object_foreach_child(GVirConfigObject *object, const char *parent_name, GVirConfigXmlNodeIterator iter_func, gpointer opaque); +gboolean gvir_config_object_set_namespace(GVirConfigObject *object, + const char *ns, + const char *ns_uri); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 2e28208..f664b12 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -846,3 +846,23 @@ gvir_config_object_remove_attribute(GVirConfigObject *object, status = xmlUnsetProp(object->priv->node, (xmlChar *)attr_name); } while (status == 0); } + +G_GNUC_INTERNAL gboolean +gvir_config_object_set_namespace(GVirConfigObject *object, const char *ns, + const char *ns_uri) +{ + xmlNsPtr namespace; + + g_return_val_if_fail(GVIR_CONFIG_IS_OBJECT(object), FALSE); + g_return_val_if_fail(ns != NULL, FALSE); + g_return_val_if_fail(ns_uri != NULL, FALSE); + + namespace = xmlNewNs(object->priv->node, + (xmlChar *)ns_uri, (xmlChar *)ns); + if (namespace == NULL) + return FALSE; + + xmlSetNs(object->priv->node, namespace); + + return TRUE; +} diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 88aef57..ab2c7bf 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -14,6 +14,8 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; + gvir_config_domain_set_custom_xml; + gvir_config_domain_get_custom_xml; gvir_config_domain_get_description; gvir_config_domain_set_description; gvir_config_domain_get_devices; -- 1.7.7.6

2 2

[libvirt] [[libvirt-glib PATCHv2] 1/4] Add proper error reporting to GVirStorageVol getters
by Christophe Fergeau 31 Jan '12

31 Jan '12

gvir_storage_vol_get_name and gvir_storage_vol_get_path currently call g_error when an error occurs. Since g_error trigger a coredump, calling it in a library is harmful. Replace this with proper GError error reporting. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 10 +++++++--- libvirt-gobject/libvirt-gobject-storage-vol.c | 14 ++++++++++---- libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index bf25641..a88699e 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -528,6 +528,7 @@ GVirStorageVol *gvir_storage_pool_create_volume const gchar *xml; virStorageVolPtr handle; GVirStoragePoolPrivate *priv = pool->priv; + const char *name; xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); @@ -545,11 +546,14 @@ GVirStorageVol *gvir_storage_pool_create_volume volume = GVIR_STORAGE_VOL(g_object_new(GVIR_TYPE_STORAGE_VOL, "handle", handle, NULL)); + name = gvir_storage_vol_get_name(volume, err); + if (name == NULL) { + g_object_unref(G_OBJECT(volume)); + return NULL; + } g_mutex_lock(priv->lock); - g_hash_table_insert(priv->volumes, - g_strdup(gvir_storage_vol_get_name(volume)), - volume); + g_hash_table_insert(priv->volumes, g_strdup(name), volume); g_mutex_unlock(priv->lock); return g_object_ref(volume); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 5b18877..c427e42 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -172,25 +172,31 @@ gvir_storage_vol_info_free(GVirStorageVolInfo *info) G_DEFINE_BOXED_TYPE(GVirStorageVolInfo, gvir_storage_vol_info, gvir_storage_vol_info_copy, gvir_storage_vol_info_free) -const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *name; if (!(name = virStorageVolGetName(priv->handle))) { - g_error("Failed to get storage_vol name on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol name on %p", + priv->handle); + return NULL; } return name; } -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *path; if (!(path = virStorageVolGetPath(priv->handle))) { - g_error("Failed to get storage_vol path on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol path on %p", + priv->handle); + return NULL; } return path; diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index db63865..fd2be80 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -77,8 +77,8 @@ GType gvir_storage_vol_get_type(void); GType gvir_storage_vol_info_get_type(void); GType gvir_storage_vol_handle_get_type(void); -const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol, GError **error); +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error); gboolean gvir_storage_vol_delete(GVirStorageVol *vol, guint flags, -- 1.7.7.6

2 6

[libvirt] Build issue with libvirt 0.9.8
by Christophe Fergeau 31 Jan '12

31 Jan '12

Hi, When building libvirt 0.9.8 with jhbuild, I have now reproduced twice some issue during the build. Namely, after successfully building and installing libvirt 0.9.8, when I try to run virsh, I get: virsh: /home/teuf/jhbuild-boxes/opt/lib64/libvirt.so.0: version `LIBVIRT_PRIVATE_0.9.7' not found (required by /home/teuf/jhbuild-boxes/opt/lib64/libvirt-qemu.so.0) This happens when I start from a clean prefix (no libvirt in it), then I install 0.9.7, and then I try to install 0.9.8 on top of it. If I rebuild libvirt-0.9.8 once more this goes away, so this is not a blocking problem for me. I have checked that libvirt-qemu.so.0 is the 0.9.8 version, I have looked in the build logs and in Makefile.am and everything looks correct to me, so I was wondering if anyone had any explanation for this behaviour. Once again, it's easy to workaround so it's not a big issue, but I'm mentioning it in case there would something obvious I missed. I put the build logs at http://people.gnome.org/~teuf/libvirt-0.9.7 and http://people.gnome.org/~teuf/libvirt-0.9.8 Christophe

2 3

[libvirt] g_error considered harmful
by Christophe Fergeau 31 Jan '12

31 Jan '12

Hi, g_error calls abort() when it's called, thus it should only be used for bad assertion failures. We currently are using it in some places in libvirt-gobject as if it was g_warning. This patch series gets rid of most occurrences of g_error by either replacing it with g_warning or by adding a GError ** argument to the function calling g_error. Christophe

3 13

[libvirt] [PATCH] resize: slightly alter signature
by Eric Blake 31 Jan '12

31 Jan '12

Our existing virDomainBlockResize takes an unsigned long long argument; if that command is later taught a DELTA and SHRINK flag, we cannot change its type without breaking API (but at least such a change would be ABI compatible). Meanwhile, the only time a negative size makes sense is if both DELTA and SHRINK are used together, but if we keep the argument unsigned, applications can pass the positive delta amount by which they would like to shrink the system, and have the flags imply the negative value. So, since this API has not yet been released, and in the interest of consistency with existing API, we swap virStorageVolResize to always pass an unsigned value. * include/libvirt/libvirt.h.in (virStorageVolResize): Use unsigned argument. * src/libvirt.c (virStorageVolResize): Likewise. * src/driver.h (virDrvStorageVolUpload): Adjust clients. * src/remote/remote_protocol.x (remote_storage_vol_resize_args): Likewise. * src/remote_protocol-structs: Regenerate. Suggested by Daniel P. Berrange. --- include/libvirt/libvirt.h.in | 2 +- src/driver.h | 2 +- src/libvirt.c | 17 +++++++++-------- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 0a7b324..d9b9b95 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2415,7 +2415,7 @@ typedef enum { } virStorageVolResizeFlags; int virStorageVolResize (virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index ba7dbc4..2e2042e 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1277,7 +1277,7 @@ typedef int unsigned int flags); typedef int (*virDrvStorageVolResize) (virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags); typedef int diff --git a/src/libvirt.c b/src/libvirt.c index e702a34..c609202 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13014,16 +13014,20 @@ error: * Normally, this operation should only be used to enlarge capacity; * but if @flags contains VIR_STORAGE_RESIZE_SHRINK, it is possible to * attempt a reduction in capacity even though it might cause data loss. + * If VIR_STORAGE_RESIZE_DELTA is also present, then @capacity is + * subtracted from the current size; without it, @capacity represents + * the absolute new size regardless of whether it is larger or smaller + * than the current size. * * Returns 0 on success, or -1 on error. */ int virStorageVolResize(virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p capacity=%lld flags=%x", vol, capacity, flags); + VIR_DEBUG("vol=%p capacity=%llu flags=%x", vol, capacity, flags); virResetLastError(); @@ -13040,12 +13044,9 @@ virStorageVolResize(virStorageVolPtr vol, goto error; } - /* Negative capacity is valid only with both delta and shrink; - * zero capacity is valid with either delta or shrink. */ - if ((capacity < 0 && !(flags & VIR_STORAGE_VOL_RESIZE_DELTA) && - !(flags & VIR_STORAGE_VOL_RESIZE_SHRINK)) || - (capacity == 0 && !((flags & VIR_STORAGE_VOL_RESIZE_DELTA) || - (flags & VIR_STORAGE_VOL_RESIZE_SHRINK)))) { + /* Zero capacity is only valid with either delta or shrink. */ + if (capacity == 0 && !((flags & VIR_STORAGE_VOL_RESIZE_DELTA) || + (flags & VIR_STORAGE_VOL_RESIZE_SHRINK))) { virLibStorageVolError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b58925a..b2c8426 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1709,7 +1709,7 @@ struct remote_storage_vol_get_path_ret { struct remote_storage_vol_resize_args { remote_nonnull_storage_vol vol; - hyper capacity; + unsigned hyper capacity; unsigned int flags; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 5eac9bf..e9137a9 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1282,7 +1282,7 @@ struct remote_storage_vol_get_path_ret { }; struct remote_storage_vol_resize_args { remote_nonnull_storage_vol vol; - int64_t capacity; + uint64_t capacity; u_int flags; }; struct remote_node_num_of_devices_args { -- 1.7.7.6

2 1

[libvirt] [PATCHv2 0/4] API for modification of domain metadata
by Peter Krempa 31 Jan '12

31 Jan '12

This is a corrected version of the domain metadata modification API. I dropped the limit on length of the domain title and added skipping of newlines added at the end of file by some editors, which made --edit unusable with --title for the new desc command. Peter Krempa (4): xml: Add element <title> to allow short description of domains API: Add api to set and get domain metadata virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 24 ++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 11 + src/conf/domain_conf.h | 1 + src/driver.h | 16 ++ src/libvirt.c | 181 +++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 174 ++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 24 ++- src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 283 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 17 files changed, 787 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

2 6

[libvirt] Public API Change Advice
by Phantomcircuit 30 Jan '12

30 Jan '12

I'd like to add a simple flag to virStorageVolWipe to use O_DIRECT. What's the proper way to add such a flag?

2 1

[libvirt] [PATCH 0/4] RFC: grant KVM guest rawio capability
by Taku Izumi 30 Jan '12

30 Jan '12

This patch is as a result of the following dispute: http://www.redhat.com/archives/libvir-list/2011-December/msg00857.html http://www.redhat.com/archives/libvir-list/2011-December/msg00950.html http://www.redhat.com/archives/libvir-list/2012-January/msg00449.html This patchset achieves #1 and #2 of the following tasks: > 1. rawio="yes|nmo" on the <disk> element somewhere > 2. Give the QEMU process CAP_SYS_RAWIO > 3. Use the devices cgroup to specify which individual disks > can use rawio. In short, if you specify the following XML: <disk type='block' device='lun' rawio='yes'> the domain will be granted CAP_SYS_RAWIO. # virsh start VM # cat /proc/<VM's PID>/status ... CapInh: 0000000000000000 CapPrm: fffffffc00020000 CapEff: fffffffc00020000 CapBnd: fffffffc00020000 ... *[PATCH 1/4] conf: add rawio attribute to disk element of domain XML *[PATCH 2/4] util: add functions to keep capabilities *[PATCH 3/4] util: extend virExecWithHook() *[PATCH 4/4] qemu: make qemu processes to retain capabilities - Best regards, Taku Izumi -- Taku Izumi <izumi.taku(a)jp.fujitsu.com>

4 10

[libvirt] [PATCH] XenXs: Update documentation
by Philipp Hahn 30 Jan '12

30 Jan '12

Fix several references to now renamed functions and parameters when the functions were moved from src/xen/ to src/xenxs/. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xenxs/xen_sxpr.c | 222 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 185 insertions(+), 37 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 09e7730..03a0eb1 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -37,7 +37,7 @@ #include "xenxs_private.h" #include "xen_sxpr.h" -/* Get a domain id from a sexpr string */ +/* Get a domain id from a S-expression string */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) { struct sexpr *root = string2sexpr(sexpr); @@ -50,7 +50,7 @@ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) return id; } -/* Get a domain id from a sexpr */ +/* Get a domain id from a S-expression */ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; @@ -66,16 +66,15 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) /***************************************************************** ****** - ****** Parsing of SEXPR into virDomainDef objects + ****** Parsing of S-Expression into virDomainDef objects ****** *****************************************************************/ /** - * xenParseSxprOS + * xenParseSxprOS: * @node: the root of the parsed S-Expression * @def: the domain config - * @hvm: true or 1 if no contains HVM S-Expression - * @bootloader: true or 1 if a bootloader is defined + * @hvm: true or 1 if node contains HVM S-Expression * * Parse the xend sexp for description of os and append it to buf. * @@ -166,6 +165,16 @@ no_memory: return -1; } + +/** + * xenParseSxprChar: + * @value: A string describing a character device. + * @tty: the console pty path + * + * Parse the xend S-expression for description of a character device. + * + * Returns a character device object or NULL in case of failure. + */ virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty) @@ -316,13 +325,15 @@ error: return NULL; } + /** - * xend_parse_sexp_desc_disks - * @conn: connection - * @root: root sexpr + * xenParseSxprDisks: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if node contains HVM S-Expression * @xendConfigVersion: version of xend * - * This parses out block devices from the domain sexpr + * This parses out block devices from the domain S-expression * * Returns 0 if successful or -1 if failed. */ @@ -518,6 +529,15 @@ error: } +/** + * xenParseSxprNets: + * @def: the domain config + * @root: root S-expression + * + * This parses out network devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprNets(virDomainDefPtr def, const struct sexpr *root) @@ -614,6 +634,15 @@ cleanup: } +/** + * xenParseSxprSound: + * @def: the domain config + * @str: comma separated list of sound models + * + * This parses out sound devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ int xenParseSxprSound(virDomainDefPtr def, const char *str) @@ -692,6 +721,15 @@ error: } +/** + * xenParseSxprUSB: + * @def: the domain config + * @root: root S-expression + * + * This parses out USB devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprUSB(virDomainDefPtr def, const struct sexpr *root) @@ -733,6 +771,19 @@ no_memory: return -1; } + +/* + * xenParseSxprGraphicsOld: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if root contains HVM S-Expression + * @xendConfigVersion: version of xend + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsOld(virDomainDefPtr def, const struct sexpr *root, @@ -821,6 +872,16 @@ error: } +/* + * xenParseSxprGraphicsNew: + * @def: the domain config + * @root: root S-expression + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsNew(virDomainDefPtr def, const struct sexpr *root, int vncport) @@ -918,11 +979,13 @@ error: return -1; } + /** - * xenParseSxprPCI + * xenParseSxprPCI: + * @def: the domain config * @root: root sexpr * - * This parses out block devices from the domain sexpr + * This parses out PCI devices from the domain sexpr * * Returns 0 if successful or -1 if failed. */ @@ -1044,16 +1107,17 @@ error: /** * xenParseSxpr: - * @conn: the connection associated with the XML * @root: the root of the parsed S-Expression * @xendConfigVersion: version of xend * @cpus: set of cpus the domain may be pinned to + * @tty: the console pty path + * @vncport: VNC port number * - * Parse the xend sexp description and turn it into the XML format similar - * to the one unsed for creation. + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. * - * Returns the 0 terminated XML string or NULL in case of error. - * the caller must free() the returned value. + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. */ virDomainDefPtr xenParseSxpr(const struct sexpr *root, @@ -1424,6 +1488,20 @@ error: return NULL; } + +/** + * xenParseSxprString: + * @sexpr: the root of the parsed S-Expression + * @xendConfigVersion: version of xend + * @tty: the console pty path + * @vncport: VNC port number + * + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. + * + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. + */ virDomainDefPtr xenParseSxprString(const char *sexpr, int xendConfigVersion, char *tty, int vncport) @@ -1449,15 +1527,12 @@ xenParseSxprString(const char *sexpr, /** - * virtDomainParseXMLGraphicsDescVFB: - * @conn: pointer to the hypervisor connection - * @node: node containing graphics description - * @buf: a buffer for the result S-Expr + * xenFormatSxprGraphicsNew: + * @def: the domain config + * @buf: a buffer for the result S-expression * - * Parse the graphics part of the XML description and add it to the S-Expr - * in buf. This is a temporary interface as the S-Expr interface will be - * replaced by XML-RPC in the future. However the XML format should stay - * valid over time. + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM > 3.0.4 or PV > 3.0.3) * * Returns 0 in case of success, -1 in case of error */ @@ -1508,6 +1583,17 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, } +/** + * xenFormatSxprGraphicsOld: + * @def: the domain config + * @buf: a buffer for the result S-expression + * @xendConfigVersion: version of xend + * + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM <= 3.0.4 or PV <= 3.0.3) + * + * Returns 0 in case of success, -1 in case of error + */ static int xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf, @@ -1553,6 +1639,17 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, return 0; } + +/** + * xenFormatSxprChr: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert the character deivce part of the domain config into a S-expression + * in buf. + * + * Returns 0 in case of success, -1 in case of error + */ int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf) @@ -1631,15 +1728,14 @@ xenFormatSxprChr(virDomainChrDefPtr def, /** - * virDomainParseXMLDiskDesc: - * @node: node containing disk description - * @buf: a buffer for the result S-Expr + * xenFormatSxprDisk: + * @node: node containing the disk description + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one disk in the XML description and add it to the S-Expr in buf - * This is a temporary interface as the S-Expr interface - * will be replaced by XML-RPC in the future. However the XML format should - * stay valid over time. + * Convert the disk device part of the domain config into a S-expresssion in buf. * * Returns 0 in case of success, -1 in case of error. */ @@ -1757,12 +1853,15 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, } /** - * xenFormatSxprNet - * @node: node containing the interface description - * @buf: a buffer for the result S-Expr + * xenFormatSxprNet: + * @conn: connection + * @def: the domain config + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one interface the XML description and add it to the S-Expr in buf + * Convert the interface description of the domain config into a S-expression in buf. * This is a temporary interface as the S-Expr interface * will be replaced by XML-RPC in the future. However the XML format should * stay valid over time. @@ -1893,6 +1992,15 @@ xenFormatSxprNet(virConnectPtr conn, } +/** + * xenFormatSxprPCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) @@ -1904,6 +2012,17 @@ xenFormatSxprPCI(virDomainHostdevDefPtr def, def->source.subsys.u.pci.function); } + +/** + * xenFormatSxprOnePCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * @detach: create expression for device detach (1). + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ int xenFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, @@ -1926,6 +2045,16 @@ xenFormatSxprOnePCI(virDomainHostdevDefPtr def, return 0; } + +/** + * xenFormatSxprAllPCI: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all PCI device parts of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static int xenFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) @@ -1973,6 +2102,16 @@ xenFormatSxprAllPCI(virDomainDefPtr def, return 0; } + +/** + * xenFormatSxprSound: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all sound device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) @@ -2001,6 +2140,15 @@ xenFormatSxprSound(virDomainDefPtr def, } +/** + * xenFormatSxprInput: + * @input: the input config + * @buf: a buffer for the result S-expression + * + * Convert all input device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ static int xenFormatSxprInput(virDomainInputDefPtr input, virBufferPtr buf) @@ -2033,7 +2181,7 @@ verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); * @def: domain config definition * @xendConfigVersion: xend configuration file format * - * Generate an SEXPR representing the domain configuration. + * Generate an S-expression representing the domain configuration. * * Returns the 0 terminated S-Expr string or NULL in case of error. * the caller must free() the returned value. -- 1.7.1

2 1

[libvirt] [PATCH RFC 0/4] Allow hibernation on guests
by Michal Privoznik 30 Jan '12

30 Jan '12

As we've added guest agent recently, the whole world of new functionality has opened. As this patch set, which allows domains to enter S4 state. What is needed for this? Patched qemu. As this is not in qemu git, but patches are await to be pushed in very short future. They can be found here: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03261.html Despite that, if anybody is willing to give me review if I am going the right way, I'd appreciate it. One thing, that you'll probably notice is this 'set-support-level' command. Basically, it tells GA what qemu version is it running on. Ideally, this should be done as soon as GA starts up. However, that cannot be determined from outside world as GA doesn't emit any events yet. Ideally^2 this command should be left out as it should be qemu who tells its own agent this kind of information. Anyway, I was going to call this command in qemuProcess{Startup, Reconnect,Attach}, but it won't work. We need to un-pause guest CPUs so guest can boot and start GA, but that implies returning from qemuProcess*. So I am setting this just before 'guest-suspend' command, as there is one more thing about GA. It is unable to remember anything upon its restart (GA process). Which has BTW show flaw in our current code with FS freeze & thaw. If we freeze guest FS, and somebody restart GA, the simple FS Thaw will not succeed as GA thinks FS are not frozen. But that's a different cup of tea. Because of what written above, we need to call set-level on every suspend. Michal Privoznik (4): qemu-agent: Allow setting supported level qemu-agent: Create suspend function Create new virDrvDomainSuspendFlags API Wire up qemu agent for suspend include/libvirt/libvirt.h.in | 8 +++ src/driver.h | 4 ++ src/libvirt.c | 55 ++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 105 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 13 +++++ src/qemu/qemu_driver.c | 57 +++++++++++++++++++--- src/qemu/qemu_process.c | 45 +++++++++++++++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++- src/remote_protocol-structs | 5 ++ tools/virsh.c | 30 ++++++++++-- 12 files changed, 317 insertions(+), 16 deletions(-) -- 1.7.3.4

6 27

[libvirt] [PATCHv2] simplify block of codes
by ajia＠redhat.com 30 Jan '12

30 Jan '12

From: Alex Jia <ajia(a)redhat.com> Using new function 'virTypedParameterArrayClear' to simplify block of codes. * daemon/remote.c, src/remote/remote_driver.c: simplify codes. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 6 +----- src/remote/remote_driver.c | 16 ++++------------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cb8423a..e7d9b2f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -848,11 +848,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, cleanup: if (rv < 0) { - int j; - for (j = 0; j < i; ++j) { - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + virTypedParameterArrayClear(params, i); VIR_FREE(params); } return params; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 61b96e9..15a20ff 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -46,6 +46,7 @@ #include "virfile.h" #include "command.h" #include "intprops.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + if (rv < 0) + virTypedParameterArrayClear(params, *nparams); return rv; } @@ -2386,12 +2383,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, cleanup: if (rv < 0) { int max = nparams * ncpus; - int i; - - for (i = 0; i < max; i++) { - if (params[i].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[i].value.s); - } + virTypedParameterArrayClear(params, max); } xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, (char *) &ret); -- 1.7.1

2 1

[libvirt] [PATCH 0/6] qemu: add suport for "romfile", and associated cleanups
by Laine Stump 30 Jan '12

30 Jan '12

This patchset started out as cleanup to make it easier to add in support for doing PCI passthrough via the <interface> element (to be used to attach a host network device to a guest after performing some network-device-specific setup), but turned out to also make it much easier to add support for QEMU's "romfile" option, as requested in https://bugzilla.redhat.com/show_bug.cgi?id=781562 Patch 1 is trivial, and probably qualifies for pushing under the trivial rule, but it's just as easy to leave it in with the rest. Patches 2-4 reorganize some data definitions, and the code associated with them, with no functional change. Patch 5 expands support for "rombar" to network devices (as long as they attach to the guest PCI bus), and Patch 6 adds support for "romfile" to both generic PCI devices and network devices.

2 18

[libvirt] Segfault fixed
by Hendrik Schwartke 30 Jan '12

30 Jan '12

Hi, there is a segfault in qemu_monitor_text.c. If some error accurs in qemuMonitorTextGetBlockInfo then the cleanup code calls VIR_FREE(info) without ensuring that info is initialized. Patch based on c6ec021b3c19c3ecc97d60d35b12eaa0b94da701: diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a33d192..fb3309b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -774,7 +774,7 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, virHashTablePtr table) { - struct qemuDomainDiskInfo *info; + struct qemuDomainDiskInfo *info=NULL; char *reply = NULL; int ret = -1; char *dummy;

2 1

[libvirt] [PATCH] xen: Don't add <console> to xml for dom0
by Cole Robinson 30 Jan '12

30 Jan '12

It just doesn't really make sense and confuses virt-manager --- src/xenxs/xen_sxpr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 7a53f94..09e7730 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1392,7 +1392,7 @@ xenParseSxpr(const struct sexpr *root, chr->target.port = 0; def->parallels[def->nparallels++] = chr; } - } else { + } else if (def->id != 0) { def->nconsoles = 1; if (VIR_ALLOC_N(def->consoles, 1) < 0) goto no_memory; -- 1.7.7.5

2 2

[libvirt] [PATCH] Add virt-host-validate.1 to Mingw32 RPM spec file list
by Daniel P. Berrange 30 Jan '12

30 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed under trivial rule --- mingw32-libvirt.spec.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 961c3ba..7937e22 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -185,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_mandir}/man1/virsh.1* %{_mingw32_mandir}/man1/virt-xml-validate.1* %{_mingw32_mandir}/man1/virt-pki-validate.1* +%{_mingw32_mandir}/man1/virt-host-validate.1* %changelog -- 1.7.7.6

1 0

[libvirt] [libvirt-glib] Add virStorageVolResize()
by Zeeshan Ali (Khattak) 30 Jan '12

30 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add a new function to allow changing of capacity of storage volumes. --- include/libvirt/libvirt.h.in | 5 ++ src/driver.h | 5 ++ src/libvirt.c | 50 ++++++++++++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++- src/remote_protocol-structs | 6 ++ src/storage/storage_backend.h | 6 ++ src/storage/storage_backend_fs.c | 18 +++++++ src/storage/storage_driver.c | 83 ++++++++++++++++++++++++++++++ src/util/storage_file.c | 105 ++++++++++++++++++++++++++++++++++++++ src/util/storage_file.h | 4 ++ tools/virsh.c | 53 +++++++++++++++++++ 13 files changed, 345 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e99cd00..b169592 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2386,6 +2386,11 @@ char * virStorageVolGetXMLDesc (virStorageVolPtr pool, char * virStorageVolGetPath (virStorageVolPtr vol); +int virStorageVolResize (virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); + + /** * virKeycodeSet: * diff --git a/src/driver.h b/src/driver.h index df2aa60..c850926 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1261,6 +1261,10 @@ typedef int unsigned long long offset, unsigned long long length, unsigned int flags); +typedef int + (*virDrvStorageVolResize) (virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); typedef int (*virDrvStoragePoolIsActive)(virStoragePoolPtr pool); @@ -1323,6 +1327,7 @@ struct _virStorageDriver { virDrvStorageVolGetInfo volGetInfo; virDrvStorageVolGetXMLDesc volGetXMLDesc; virDrvStorageVolGetPath volGetPath; + virDrvStorageVolResize volResize; virDrvStoragePoolIsActive poolIsActive; virDrvStoragePoolIsPersistent poolIsPersistent; }; diff --git a/src/libvirt.c b/src/libvirt.c index e9d638b..44865e8 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12927,6 +12927,56 @@ error: return NULL; } +/** + * virStorageVolResize: + * @vol: pointer to storage volume + * @capacity: new capacity + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Changes the capacity of the storage volume @vol to @capacity. The new + * capacity must not exceed the sum of current capacity of the volume and + * remainining free space of its parent pool. Also the new capacity must + * be greater than or equal to current allocation of the volume. + * + * Returns 0 on success, or -1 on error. + */ +int +virStorageVolResize(virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DEBUG("vol=%p", vol); + + virResetLastError(); + + if (!VIR_IS_STORAGE_VOL(vol)) { + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + conn = vol->conn; + + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->storageDriver && conn->storageDriver->volResize) { + int ret; + ret = conn->storageDriver->volResize(vol, capacity, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(vol->conn); + return -1; +} /** * virNodeNumOfDevices: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 1340b0c..67c113e 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -520,6 +520,7 @@ LIBVIRT_0.9.10 { global: virDomainShutdownFlags; virStorageVolWipePattern; + virStorageVolResize; } LIBVIRT_0.9.9; # .... define new API here using predicted next version number .... diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f79f53e..2bb4cbf 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4837,6 +4837,7 @@ static virStorageDriver storage_driver = { .volGetInfo = remoteStorageVolGetInfo, /* 0.4.1 */ .volGetXMLDesc = remoteStorageVolGetXMLDesc, /* 0.4.1 */ .volGetPath = remoteStorageVolGetPath, /* 0.4.1 */ + .volResize = remoteStorageVolResize, /* 0.9.10 */ .poolIsActive = remoteStoragePoolIsActive, /* 0.7.3 */ .poolIsPersistent = remoteStoragePoolIsPersistent, /* 0.7.3 */ }; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 0f354bb..29f98fc 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1676,6 +1676,12 @@ struct remote_storage_vol_get_path_ret { remote_nonnull_string name; }; +struct remote_storage_vol_resize_args { + remote_nonnull_storage_vol vol; + unsigned hyper capacity; + unsigned int flags; +}; + /* Node driver calls: */ struct remote_node_num_of_devices_args { @@ -2667,7 +2673,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SET_INTERFACE_PARAMETERS = 256, /* autogen autogen */ REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS = 257, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, /* autogen autogen */ - REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259 /* autogen autogen */ + REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259, /* autogen autogen */ + REMOTE_PROC_STORAGE_VOL_RESIZE = 300 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index de85862..9a60fc2 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1260,6 +1260,11 @@ struct remote_storage_vol_get_path_args { struct remote_storage_vol_get_path_ret { remote_nonnull_string name; }; +struct remote_storage_vol_resize_args { + remote_nonnull_storage_vol vol; + uint64_t capacity; + u_int flags; +}; struct remote_node_num_of_devices_args { remote_string cap; u_int flags; @@ -2101,4 +2106,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS = 257, REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, REMOTE_PROC_STORAGE_VOL_WIPE_PATTERN = 259, + REMOTE_PROC_STORAGE_VOL_RESIZE = 300, }; diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75ed676..a37bf7c 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -44,6 +44,11 @@ typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjP typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); +typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags); /* File creation/cloning functions used for cloning between backends */ int virStorageBackendCreateRaw(virConnectPtr conn, @@ -78,6 +83,7 @@ struct _virStorageBackend { virStorageBackendCreateVol createVol; virStorageBackendRefreshVol refreshVol; virStorageBackendDeleteVol deleteVol; + virStorageBackendVolumeResize resizeVol; }; virStorageBackendPtr virStorageBackendForType(int type); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d8dc29c..20f5534 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1187,6 +1187,21 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, return 0; } +/** + * Resize a volume + */ +static int +virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags ATTRIBUTE_UNUSED) +{ + return virStorageFileResize(vol->target.path, + vol->target.format, + capacity); +} + virStorageBackend virStorageBackendDirectory = { .type = VIR_STORAGE_POOL_DIR, @@ -1199,6 +1214,7 @@ virStorageBackend virStorageBackendDirectory = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #if WITH_STORAGE_FS @@ -1216,6 +1232,7 @@ virStorageBackend virStorageBackendFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; virStorageBackend virStorageBackendNetFileSystem = { .type = VIR_STORAGE_POOL_NETFS, @@ -1232,5 +1249,6 @@ virStorageBackend virStorageBackendNetFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a332ada..d3eff93 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1695,7 +1695,89 @@ out: return ret; } +static int +storageVolumeResize(virStorageVolPtr obj, + unsigned long long capacity, + unsigned int flags) +{ + virStorageDriverStatePtr driver = obj->conn->storagePrivateData; + virStorageBackendPtr backend; + virStoragePoolObjPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + storageDriverLock(driver); + pool = virStoragePoolObjFindByName(&driver->pools, obj->pool); + storageDriverUnlock(driver); + if (!pool) { + virStorageReportError(VIR_ERR_NO_STORAGE_POOL, + "%s", _("no storage pool with matching uuid")); + goto out; + } + + if (!virStoragePoolObjIsActive(pool)) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("storage pool is not active")); + goto out; + } + + if ((backend = virStorageBackendForType(pool->def->type)) == NULL) + goto out; + + vol = virStorageVolDefFindByName(pool, obj->name); + + if (vol == NULL) { + virStorageReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + obj->name); + goto out; + } + + if (vol->building) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still being allocated."), + vol->name); + goto out; + } + + if (capacity < vol->allocation) { + virStorageReportError(VIR_ERR_INVALID_ARG, + "%s", _("can not shrink capacity below " + "existing allocation")); + + goto out; + } + + if (capacity > vol->allocation + pool->def->available) { + virStorageReportError(VIR_ERR_INVALID_ARG, + "%s", _("Not enough space left on storage pool")); + + goto out; + } + + if (!backend->resizeVol) { + virStorageReportError(VIR_ERR_NO_SUPPORT, + "%s", _("storage pool does not support changing " + "of volume capacity")); + + goto out; + } + + if (backend->resizeVol(obj->conn, pool, vol, capacity, flags) < 0) + goto out; + + vol->capacity = capacity; + ret = 0; + +out: + if (pool) + virStoragePoolObjUnlock(pool); + + return ret; +} /* If the volume we're wiping is already a sparse file, we simply * truncate and extend it to its original size, filling it with @@ -2243,6 +2325,7 @@ static virStorageDriver storageDriver = { .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ .volGetPath = storageVolumeGetPath, /* 0.4.0 */ + .volResize = storageVolumeResize, /* 0.9.10 */ .poolIsActive = storagePoolIsActive, /* 0.7.3 */ .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ diff --git a/src/util/storage_file.c b/src/util/storage_file.c index ba9cfc5..f84feab 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -931,6 +931,111 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) VIR_FREE(meta); } +static int +virStorageFileResizeForFD(const char *path, + int fd, + int format, + unsigned long long capacity) +{ + unsigned char *head = NULL; + ssize_t len = STORAGE_MAX_HEAD; + int ret = -1; + struct stat sb; + + if (fstat(fd, &sb) < 0) { + virReportSystemError(errno, + _("cannot stat file '%s'"), + path); + return -1; + } + + /* No header to probe for directories */ + if (S_ISDIR(sb.st_mode)) { + return 0; + } + + if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { + virReportSystemError(errno, _("cannot seek to start of '%s'"), path); + return -1; + } + + if (VIR_ALLOC_N(head, len) < 0) { + virReportOOMError(); + return -1; + } + + if ((len = read(fd, head, len)) < 0) { + virReportSystemError(errno, _("cannot read header '%s'"), path); + goto cleanup; + } + + if (format == VIR_STORAGE_FILE_AUTO) + format = virStorageFileProbeFormatFromBuf(path, head, len); + + if (format < 0 || + format >= VIR_STORAGE_FILE_LAST) { + virReportSystemError(EINVAL, _("unknown storage file format %d"), + format); + goto cleanup; + } + + if (fileTypeInfo[format].sizeOffset != -1) { + unsigned long long *file_capacity; + + if ((fileTypeInfo[format].sizeOffset + 8) > len) + return -1; + + file_capacity = (unsigned long long *)(head + fileTypeInfo[format].sizeOffset); + if (fileTypeInfo[format].endian == LV_LITTLE_ENDIAN) + *file_capacity = htole64(capacity); + else + *file_capacity = htobe64(capacity); + + *file_capacity /= fileTypeInfo[format].sizeMultiplier; + } + + /* Move to start of file to write the header back with adjusted capacity */ + if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { + virReportSystemError(errno, _("cannot seek to start of '%s'"), path); + return -1; + } + + if ((len = write(fd, head, len)) < 0) { + virReportSystemError(errno, _("cannot write header '%s'"), path); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(head); + return ret; +} + +/** + * virStorageFileResize: + * + * Change the capacity of the storage file at 'path'. + */ +int +virStorageFileResize(const char *path, + int format, + unsigned long long capacity) +{ + int fd, ret; + + if ((fd = open(path, O_RDWR)) < 0) { + virReportSystemError(errno, _("cannot open file '%s'"), path); + return -1; + } + + ret = virStorageFileResizeForFD(path, fd, format, capacity); + + VIR_FORCE_CLOSE(fd); + + return ret; +} + #ifdef __linux__ # ifndef NFS_SUPER_MAGIC diff --git a/src/util/storage_file.h b/src/util/storage_file.h index b8920d0..f6c6048 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -72,6 +72,10 @@ int virStorageFileGetMetadataFromFD(const char *path, void virStorageFileFreeMetadata(virStorageFileMetadata *meta); +int virStorageFileResize(const char *path, + int format, + unsigned long long capacity); + enum { VIR_STORAGE_FILE_SHFS_NFS = (1 << 0), VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), diff --git a/tools/virsh.c b/tools/virsh.c index 74655c2..20d4bd0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11279,6 +11279,58 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "vol-resize" command + */ +static const vshCmdInfo info_vol_resize[] = { + {"help", N_("resize a vol")}, + {"desc", N_("Resizes a storage vol.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_vol_resize[] = { + {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")}, + {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, N_("new capacity for the vol with optional k,M,G,T suffix")}, + {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdVolResize(vshControl *ctl, const vshCmd *cmd) +{ + virStorageVolPtr vol; + const char *capacityStr = NULL; + unsigned long long capacity = 0; + bool ret = true; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) + return false; + + if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0) + goto cleanup; + if (cmdVolSize(capacityStr, &capacity) < 0) { + vshError(ctl, _("Malformed size %s"), capacityStr); + goto cleanup; + } + + if (virStorageVolResize(vol, capacity, 0) == 0) { + vshPrint(ctl, "Size of volume '%s' successfully changed to %s\n", + virStorageVolGetName(vol), capacityStr); + ret = true; + } else { + vshError(ctl, "Failed to change size of volume '%s' to %s\n", + virStorageVolGetName(vol), capacityStr); + ret = false; + } + +cleanup: + virStorageVolFree(vol); + return ret; +} + /* * "vol-dumpxml" command @@ -16141,6 +16193,7 @@ static const vshCmdDef storageVolCmds[] = { {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool, 0}, {"vol-upload", cmdVolUpload, opts_vol_upload, info_vol_upload, 0}, {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe, 0}, + {"vol-resize", cmdVolResize, opts_vol_resize, info_vol_resize, 0}, {NULL, NULL, NULL, NULL, 0} }; -- 1.7.7.5

3 4

[libvirt] Feature Request: sniff a virtual interface of a guest
by Hendrik Schwartke 30 Jan '12

30 Jan '12

Hi, there is currently no support for sniffing the network traffic of a virtual nic, from local or remote. In some cases the debugging or monitoring of a guest is therefore not as easy as it could be. Although it's easy to start a network sniffer on the physical host, it requires direct access to a shell and some knowledge of the current configuration of the virtual networks. I think it would be a great benefit for libvirt if network sniffing would be possible out of the box. One idea would be to start a local tshark sniffing on the card and connect this to a local socket. This could then be forwarded by ssh to a wireshark process running on a desktop. I created a feature request for that: https://bugzilla.redhat.com/show_bug.cgi?id=784893 Any thoughts or hints to implement that? Hendrik Schwartke

2 2

[libvirt] [PATCHv2 2/2] qemu: eliminate "Ignoring open failure"
by Laine Stump 30 Jan '12

30 Jan '12

These patches are a 2nd go at eliminating the warning message described in: https://bugzilla.redhat.com/show_bug.cgi?id=624447 The first round of patches was here: https://www.redhat.com/archives/libvir-list/2012-January/msg00503.html This time I've addressed Eric's concerns from the first round, but also taken the chance to refactor virFileOpenAs() to remove some historical baggage, make it easier to understand, and also more useful as a general purpose replacement for open(2). Note that, due to the way the diff interleaves the new and old code, the diffs of the virFileOpenAs() don't make a lot of sense - it's much simpler to apply the patches and look at the new function as a whole. (Or maybe install my favorite newly found program of the week, "meld", and "git-meld": http://meldmerge.org/ https://github.com/wmanley/git-meld I think this is the nicest looking visual diff tool I've ever seen.)

2 7

[libvirt] [PATCH] simplify block of codes
by ajia＠redhat.com 30 Jan '12

30 Jan '12

From: Alex Jia <ajia(a)redhat.com> Using new function 'virTypedParameterArrayClear' to simplify block of codes. * daemon/remote.c, src/remote/remote_driver.c: simplify codes. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 10 ++-------- src/remote/remote_driver.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cb8423a..7e90bd7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -847,14 +847,8 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; ++j) { - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } - VIR_FREE(params); - } + if (rv < 0) + virTypedParameterArrayClear(params, *nparams); return params; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 61b96e9..15a20ff 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -46,6 +46,7 @@ #include "virfile.h" #include "command.h" #include "intprops.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + if (rv < 0) + virTypedParameterArrayClear(params, *nparams); return rv; } @@ -2386,12 +2383,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, cleanup: if (rv < 0) { int max = nparams * ncpus; - int i; - - for (i = 0; i < max; i++) { - if (params[i].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[i].value.s); - } + virTypedParameterArrayClear(params, max); } xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, (char *) &ret); -- 1.7.1

3 2

[libvirt] [PATCHv2] network: Avoid memory leaks on networkBuildDnsmasqArgv
by ajia＠redhat.com 29 Jan '12

29 Jan '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 973af236. * src/network/bridge_driver.c: fix memory leaks on failure and successful path. * How to reproduce? % make -C tests check TESTS=networkxml2argvtest % cd tests && valgrind -v --leak-check=full ./networkxml2argvtest * Actual result: ==2226== 3 bytes in 1 blocks are definitely lost in loss record 1 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2D9: networkBuildDhcpDaemonCommandLine (bridge_driver.c:545) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 3 bytes in 1 blocks are definitely lost in loss record 2 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A307: networkBuildDhcpDaemonCommandLine (bridge_driver.c:551) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 5 bytes in 1 blocks are definitely lost in loss record 4 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2AB: networkBuildDhcpDaemonCommandLine (bridge_driver.c:539) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== LEAK SUMMARY: ==2226== definitely lost: 11 bytes in 3 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/network/bridge_driver.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5d0d528..5bd5a50 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -459,6 +459,9 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, int r, ret = -1; int nbleases = 0; int ii; + char *recordPort = NULL; + char *recordPriority = NULL; + char *recordWeight = NULL; virNetworkIpDefPtr tmpipdef; /* @@ -530,9 +533,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, for (i = 0; i < dns->nsrvrecords; i++) { char *record = NULL; - char *recordPort = NULL; - char *recordPriority = NULL; - char *recordWeight = NULL; if (dns->srvrecords[i].service && dns->srvrecords[i].protocol) { if (dns->srvrecords[i].port) { @@ -671,6 +671,9 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, ret = 0; cleanup: + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); return ret; } -- 1.7.1

3 2

[libvirt] Schedule for libvirt-0.9.10 release
by Daniel Veillard 28 Jan '12

28 Jan '12

First I don't see any good reason to try to bump the major release number :-) so next release is expected to be 0.9.10, hope there isn't disapointment ;-) [1] Second I would really like to keep the monthly shedule, and have the release done by February 6 or earlier, so this would mean entering the 0.9.10 freeze on Monday 30, i.e. in a bit less than two weeks. I hope this is okay, Daniel [1] actually the addition of fine grained access control would be a good reason for such a version bump -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 0/4] API for modification of domain metadata
by Peter Krempa 28 Jan '12

28 Jan '12

This patchset is based on my previous work to add a domain title. I chose a more general aproach to allow working with the <metadata> element as suggested by Eric and Daniel, although I did not implement the <metadata> operations code. I only provided a patch for the qemu driver for review, but I'll follow up with a patch for LXC as well as I'll have a final version of this. Peter Krempa (4): xml: Add element <title> to allow short description of domains API: Add api to set and get domain metadata virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 31 +++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 19 ++ src/conf/domain_conf.h | 1 + src/driver.h | 15 + src/libvirt.c | 125 +++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 195 ++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 ++- src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 274 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 17 files changed, 758 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

4 11

[libvirt] [PATCH] tests: fix reversed comparisons
by Eric Blake 27 Jan '12

27 Jan '12

Otherwise, a failed test gives misleading output. * tests/commandtest.c (test13, test14, test16): Pass arguments in correct order. --- Pushing under the trivial rule. tests/commandtest.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index b4b6044..9b9130c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1,7 +1,7 @@ /* * commandtest.c: Test the libCommand API * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 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 @@ -481,7 +481,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) cmd = NULL; if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -526,11 +526,11 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) cmd = NULL; if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } if (!STREQ(erractual, errexpect)) { - virtTestDifference(stderr, erractual, errexpect); + virtTestDifference(stderr, errexpect, erractual); goto cleanup; } @@ -604,7 +604,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) } if (!STREQ(outactual, outexpect)) { - virtTestDifference(stderr, outactual, outexpect); + virtTestDifference(stderr, outexpect, outactual); goto cleanup; } -- 1.7.7.6

1 0

[libvirt] [PATCH v2] Return more error output if policykit auth fails.
by Cole Robinson 27 Jan '12

27 Jan '12

Several not uncommon issues can be diagnosed through pkcheck output, like lack of/malfunctioning desktop agent, or lack of/malfunctioning polkit dbus agent. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Don't print (null) for empty output daemon/remote.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 4725896..d2150bf 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2472,7 +2472,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, int status = -1; char *ident = NULL; bool authdismissed = 0; - char *pkout = NULL; + char *pkout = NULL, *pkerr = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2484,6 +2484,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); virCommandSetOutputBuffer(cmd, &pkout); + virCommandSetErrorBuffer(cmd, &pkerr); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2537,15 +2538,22 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, error: virCommandFree(cmd); VIR_FREE(ident); - VIR_FREE(pkout); virResetLastError(); + if (authdismissed) { virNetError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); + } else if (pkout || pkerr) { + virNetError(VIR_ERR_AUTH_FAILED, "%s %s", + pkerr ? pkerr : "", + pkout ? pkout : ""); } else { virNetError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); } + + VIR_FREE(pkout); + VIR_FREE(pkerr); virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; -- 1.7.7.5

2 2

[libvirt] [PATCH v2] Add new error code VIR_ERROR_AUTH_CANCELLED
by Cole Robinson 27 Jan '12

27 Jan '12

And hook it up for policykit auth. This allows virt-manager to detect that the user clicked the policykit 'cancel' button and not throw an 'authentication failed' error message at the user. v2: Don't leak pkout Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/remote.c | 14 ++++++++++++-- include/libvirt/virterror.h | 1 + src/util/virterror.c | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1ada146..cedc26a 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2471,6 +2471,8 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, const char *action; int status = -1; char *ident = NULL; + int authdismissed = 0; + char *pkout = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2481,6 +2483,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, "org.libvirt.unix.manage"; cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); + virCommandSetOutputBuffer(cmd, &pkout); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2509,6 +2512,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, if (virCommandRun(cmd, &status) < 0) goto authfail; + authdismissed = (pkout && strstr(pkout, "dismissed=true")); if (status != 0) { char *tmp = virCommandTranslateStatus(status); VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"), @@ -2533,9 +2537,15 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, error: virCommandFree(cmd); VIR_FREE(ident); + VIR_FREE(pkout); virResetLastError(); - virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + if (authdismissed) { + virNetError(VIR_ERR_AUTH_CANCELLED, "%s", + _("authentication cancelled by user")); + } else { + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + } virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e896d67..9844cbe 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -243,6 +243,7 @@ typedef enum { risky domain snapshot revert */ VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was canceled/aborted by user */ + VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ } virErrorNumber; /** diff --git a/src/util/virterror.c b/src/util/virterror.c index 85eec8d..31ddd9d 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1022,6 +1022,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("authentication failed: %s"); break; + case VIR_ERR_AUTH_CANCELLED: + if (info == NULL) + errmsg = _("authentication cancelled"); + else + errmsg = _("authentication cancelled: %s"); + break; case VIR_ERR_NO_STORAGE_POOL: if (info == NULL) errmsg = _("Storage pool not found"); -- 1.7.7.5

2 5

[libvirt] [PATCH 1/2] qemu: caps: Fix segfault on daemon startup
by Cole Robinson 27 Jan '12

27 Jan '12

On my f16 box at least, this tries to free p unconditionally which isn't always okay, 'p' is freeable only under a limited scope. --- src/qemu/qemu_capabilities.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6dee9d8..5487ecd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1336,10 +1336,9 @@ fail: qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse %s version number in '%s'"), qemu, p ? p : help); - -cleanup: VIR_FREE(p); +cleanup: return -1; } -- 1.7.7.5

2 2

[libvirt] [PATCH 2/2] Add new error code VIR_ERROR_AUTH_CANCELLED
by Cole Robinson 27 Jan '12

27 Jan '12

And hook it up for policykit auth. This allows virt-manager to detect that the user clicked the policykit 'cancel' button and not throw an 'authentication failed' error message at the user. --- daemon/remote.c | 13 +++++++++++-- include/libvirt/virterror.h | 1 + src/util/virterror.c | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1ada146..2e813d6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2471,6 +2471,8 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, const char *action; int status = -1; char *ident = NULL; + int authdismissed = 0; + char *pkoutput = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2481,6 +2483,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, "org.libvirt.unix.manage"; cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); + virCommandSetOutputBuffer(cmd, &pkoutput); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2509,6 +2512,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, if (virCommandRun(cmd, &status) < 0) goto authfail; + authdismissed = (pkoutput && strstr(pkoutput, "dismissed=true")); if (status != 0) { char *tmp = virCommandTranslateStatus(status); VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"), @@ -2534,8 +2538,13 @@ error: virCommandFree(cmd); VIR_FREE(ident); virResetLastError(); - virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + if (authdismissed) { + virNetError(VIR_ERR_AUTH_CANCELLED, "%s", + _("authentication cancelled by user")); + } else { + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + } virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e896d67..9844cbe 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -243,6 +243,7 @@ typedef enum { risky domain snapshot revert */ VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was canceled/aborted by user */ + VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ } virErrorNumber; /** diff --git a/src/util/virterror.c b/src/util/virterror.c index 85eec8d..31ddd9d 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1022,6 +1022,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("authentication failed: %s"); break; + case VIR_ERR_AUTH_CANCELLED: + if (info == NULL) + errmsg = _("authentication cancelled"); + else + errmsg = _("authentication cancelled: %s"); + break; case VIR_ERR_NO_STORAGE_POOL: if (info == NULL) errmsg = _("Storage pool not found"); -- 1.7.7.5

1 1

[libvirt] [PATCH] build: fix missing include
by Eric Blake 27 Jan '12

27 Jan '12

Fix a build failure: virt-host-validate.c: In function 'main': virt-host-validate.c:82:5: error: implicit declaration of function 'setlocale' [-Werror=implicit-function-declaration] virt-host-validate.c:82:5: error: nested extern declaration of 'setlocale' [-Werror=nested-externs] virt-host-validate.c:82:20: error: 'LC_ALL' undeclared (first use in this function) * tools/virt-host-validate.c: Add <locale.h>. --- Pushing under the build-breaker rule. tools/virt-host-validate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index 3893ba3..cdf8302 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <gettext.h> #include <getopt.h> +#include <locale.h> #include "internal.h" #include "configmake.h" -- 1.7.7.6

1 0

[libvirt] [PATCH] xml: fix struct typos
by Eric Blake 27 Jan '12

27 Jan '12

Noticed this while reviewing Dan's patches. * src/util/xml.c (virXMLRewritFileData): Rename to virXMLRewriteFileData. --- Pushing under the trivial rule. src/util/xml.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index 2909e85..b0d90de 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -1,7 +1,7 @@ /* * xml.c: XML based interfaces for the libvir library * - * Copyright (C) 2005, 2007-2011 Red Hat, Inc. + * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -801,7 +801,7 @@ error: } -struct virXMLRewritFileData { +struct virXMLRewriteFileData { const char *warnName; const char *warnCommand; const char *xml; @@ -810,7 +810,7 @@ struct virXMLRewritFileData { static int virXMLRewriteFile(int fd, void *opaque) { - struct virXMLRewritFileData *data = opaque; + struct virXMLRewriteFileData *data = opaque; if (data->warnName && data->warnCommand) { if (virEmitXMLWarning(fd, data->warnName, data->warnCommand) < 0) @@ -829,7 +829,7 @@ virXMLSaveFile(const char *path, const char *warnCommand, const char *xml) { - struct virXMLRewritFileData data = { warnName, warnCommand, xml }; + struct virXMLRewriteFileData data = { warnName, warnCommand, xml }; return virFileRewrite(path, S_IRUSR | S_IWUSR, virXMLRewriteFile, &data); } -- 1.7.7.6

1 0

[libvirt] [PATCH 0/3] Make util.[ch] a little bit smaller still
by Daniel P. Berrange 27 Jan '12

27 Jan '12

In keeping with the drive to stop src/util/util.[ch] being a general dumping ground, move some more functions out into their own dedicated files

2 8

[libvirt] [PATCH v2] Add a virt-host-validate command to sanity check HV config
by Daniel P. Berrange 27 Jan '12

27 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> To assist people in verifying that their host is operating in an optimal manner, provide a 'virt-host-validate' command. For each type of hypervisor, it will check any pre-requisites, or other good recommendations and report what's working & what is not. eg # virt-host-validate QEMU: Checking for device /dev/kvm : FAIL (Check that the 'kvm-intel' or 'kvm-amd' modules are loaded & the BIOS has enabled virtualization) QEMU: Checking for device /dev/vhost : WARN (Load the 'vhost_net' module to improve performance of virtio networking) QEMU: Checking for device /dev/net/tun : PASS LXC: Checking for Linux >= 2.6.26 : PASS This warns people if they have vmx/svm, but don't have /dev/kvm. It also warns about missing /dev/vhost net. In version 2: - Add to RPM specs - Add man page - Use getopt to parse --help, --version & --quiet options - Don't use VT100 escape codes unless on a tty - Disable QEMU / LXC checks if not compiled into libvirt --- tools/Makefile.am | 33 ++++++- tools/virt-host-validate-common.c | 214 +++++++++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 57 ++++++++++ tools/virt-host-validate-lxc.c | 37 +++++++ tools/virt-host-validate-lxc.h | 27 +++++ tools/virt-host-validate-qemu.c | 52 +++++++++ tools/virt-host-validate-qemu.h | 27 +++++ tools/virt-host-validate.c | 213 ++++++++++++++++++++++++++++++++++++ 8 files changed, 658 insertions(+), 2 deletions(-) create mode 100644 tools/virt-host-validate-common.c create mode 100644 tools/virt-host-validate-common.h create mode 100644 tools/virt-host-validate-lxc.c create mode 100644 tools/virt-host-validate-lxc.h create mode 100644 tools/virt-host-validate-qemu.c create mode 100644 tools/virt-host-validate-qemu.h create mode 100644 tools/virt-host-validate.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 6705546..6596a51 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -30,14 +30,18 @@ EXTRA_DIST = \ DISTCLEANFILES = bin_SCRIPTS = virt-xml-validate virt-pki-validate -bin_PROGRAMS = virsh +bin_PROGRAMS = virsh virt-host-validate if HAVE_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif -dist_man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1 +dist_man1_MANS = \ + virt-host-validate.1 \ + virt-pki-validate.1 \ + virt-xml-validate.1 \ + virsh.1 if HAVE_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif @@ -56,6 +60,9 @@ virt-pki-validate: virt-pki-validate.in Makefile virt-pki-validate.1: virt-pki-validate.in $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ +virt-host-validate.1: virt-host-validate.c + $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ + virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \ -e 's,[@]LOCALSTATEDIR@,$(localstatedir),' < $< > $@ \ @@ -64,6 +71,28 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ +virt_host_validate_SOURCES = \ + virt-host-validate.c \ + virt-host-validate-common.c virt-host-validate-common.h \ + virt-host-validate-qemu.c virt-host-validate-qemu.h \ + virt-host-validate-lxc.c virt-host-validate-lxc.h \ + $(NULL) + +virt_host_validate_LDFLAGS = \ + $(WARN_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +virt_host_validate_LDADD = \ + ../src/libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) + +virt_host_validate_CFLAGS = \ + $(WARN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + virsh_SOURCES = \ console.c console.h \ virsh.c diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c new file mode 100644 index 0000000..e8cff85 --- /dev/null +++ b/tools/virt-host-validate-common.c @@ -0,0 +1,214 @@ +/* + * virt-host-validate-common.c: Sanity check helper APis + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/utsname.h> + +#include "util.h" +#include "memory.h" +#include "virfile.h" +#include "virt-host-validate-common.h" + +static bool quiet; + +void virHostMsgSetQuiet(bool quietFlag) +{ + quiet = quietFlag; +} + +void virHostMsgCheck(const char *prefix, + const char *format, + ...) +{ + va_list args; + char *msg; + + if (quiet) + return; + + va_start(args, format); + if (virVasprintf(&msg, format, args) < 0) { + perror("malloc"); + abort(); + } + va_end(args); + + fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); + VIR_FREE(msg); +} + +static bool virHostMsgWantEscape(void) +{ + static bool detectTty = true; + static bool wantEscape = false; + if (detectTty) { + if (isatty(STDOUT_FILENO)) + wantEscape = true; + detectTty = false; + } + return wantEscape; +} + +void virHostMsgPass(void) +{ + if (quiet) + return; + + if (virHostMsgWantEscape()) + fprintf(stdout, "\033[32m%s\033[0m\n", _("PASS")); + else + fprintf(stdout, "%s\n", _("PASS")); +} + + +static const char * failMessages[] = { + N_("FAIL"), + N_("WARN"), + N_("NOTE"), +}; + +verify(ARRAY_CARDINALITY(failMessages) == VIR_HOST_VALIDATE_LAST); + +static const char *failEscapeCodes[] = { + "\033[31m", + "\033[33m", + "\033[34m", +}; + +verify(ARRAY_CARDINALITY(failEscapeCodes) == VIR_HOST_VALIDATE_LAST); + +void virHostMsgFail(virHostValidateLevel level, + const char *hint) +{ + if (virHostMsgWantEscape()) + fprintf(stdout, "%s%s\033[0m (%s)\n", + failEscapeCodes[level], _(failMessages[level]), hint); + else + fprintf(stdout, "%s (%s)\n", + _(failMessages[level]), hint); +} + + +int virHostValidateDevice(const char *hvname, + const char *devname, + virHostValidateLevel level, + const char *hint) +{ + virHostMsgCheck(hvname, "for device %s", devname); + + if (access(devname, R_OK|W_OK) < 0) { + virHostMsgFail(level, hint); + return -1; + } + + virHostMsgPass(); + return 0; +} + + +int virHostValidateHasCPUFlag(const char *name) +{ + FILE *fp = fopen("/proc/cpuinfo", "r"); + int ret = 0; + + if (!fp) + return 0; + + do { + char line[1024]; + + if (!fgets(line, sizeof(line), fp)) + break; + + if (strstr(line, name)) { + ret = 1; + break; + } + } while (1); + + VIR_FORCE_FCLOSE(fp); + + return ret; +} + + +int virHostValidateLinuxKernel(const char *hvname, + int version, + virHostValidateLevel level, + const char *hint) +{ + struct utsname uts; + int major, minor, micro; + unsigned long thisversion; + + uname(&uts); + + virHostMsgCheck(hvname, _("for Linux >= %d.%d.%d"), + ((version >> 16) & 0xff), + ((version >> 8) & 0xff), + (version & 0xff)); + + if (STRNEQ(uts.sysname, "Linux")) { + virHostMsgFail(level, hint); + return -1; + } + + if (virParseVersionString(uts.release, &thisversion, true) < 0) { + virHostMsgFail(level, hint); + return -1; + } + + micro = (thisversion & 0xff); + minor = ((thisversion >> 8) & 0xff); + major = ((thisversion >> 16) & 0xff); + + if (major > ((version >> 16) & 0xff)) { + virHostMsgPass(); + return 0; + } else if (major < ((version >> 16) & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + if (minor > ((version >> 8) & 0xff)) { + virHostMsgPass(); + return 0; + } else if (minor < ((version >> 8) & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + if (micro > (version & 0xff)) { + virHostMsgPass(); + return 0; + } else if (micro < (version & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + virHostMsgPass(); + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h new file mode 100644 index 0000000..99b09b6 --- /dev/null +++ b/tools/virt-host-validate-common.h @@ -0,0 +1,57 @@ +/* + * virt-host-validate-common.h: Sanity check helper APis + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_COMMON_H__ +#define __VIRT_HOST_VALIDATE_COMMON_H__ + +#include "internal.h" + +typedef enum { + VIR_HOST_VALIDATE_FAIL, + VIR_HOST_VALIDATE_WARN, + VIR_HOST_VALIDATE_NOTE, + + VIR_HOST_VALIDATE_LAST, +} virHostValidateLevel; + +extern void virHostMsgSetQuiet(bool quietFlag); + +extern void virHostMsgCheck(const char *prefix, + const char *format, + ...) ATTRIBUTE_FMT_PRINTF(2, 3); + +extern void virHostMsgPass(void); +extern void virHostMsgFail(virHostValidateLevel level, + const char *hint); + +extern int virHostValidateDevice(const char *hvname, + const char *devname, + virHostValidateLevel level, + const char *hint); + +extern int virHostValidateHasCPUFlag(const char *name); + +extern int virHostValidateLinuxKernel(const char *hvname, + int version, + virHostValidateLevel level, + const char *hint); + +#endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c new file mode 100644 index 0000000..9d69b67 --- /dev/null +++ b/tools/virt-host-validate-lxc.c @@ -0,0 +1,37 @@ +/* + * virt-host-validate-lxc.c: Sanity check a LXC hypervisor host + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virt-host-validate-lxc.h" +#include "virt-host-validate-common.h" + +int virHostValidateLXC(void) +{ + int ret = 0; + + if (virHostValidateLinuxKernel("LXC", (2 << 16) | (6 << 8) | 26, + VIR_HOST_VALIDATE_FAIL, + _("Upgrade to a kernel supporting namespaces")) < 0) + ret = -1; + + return ret; +} diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h new file mode 100644 index 0000000..ef824be --- /dev/null +++ b/tools/virt-host-validate-lxc.h @@ -0,0 +1,27 @@ +/* + * virt-host-validate-lxc.h: Sanity check a LXC hypervisor host + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_LXC_H__ +#define __VIRT_HOST_VALIDATE_LXC_H__ + +extern int virHostValidateLXC(void); + +#endif /* __VIRT_HOST_VALIDATE_LXC_H__ */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c new file mode 100644 index 0000000..d3a82cc --- /dev/null +++ b/tools/virt-host-validate-qemu.c @@ -0,0 +1,52 @@ +/* + * virt-host-validate-qemu.c: Sanity check a QEMU hypervisor host + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virt-host-validate-qemu.h" +#include "virt-host-validate-common.h" + +int virHostValidateQEMU(void) +{ + int ret = 0; + + if (virHostValidateHasCPUFlag("svm") || + virHostValidateHasCPUFlag("vmx")) { + if (virHostValidateDevice("QEMU", "/dev/kvm", + VIR_HOST_VALIDATE_FAIL, + _("Check that the 'kvm-intel' or 'kvm-amd' modules are " + "loaded & the BIOS has enabled virtualization")) < 0) + ret = -1; + } + + if (virHostValidateDevice("QEMU", "/dev/vhost-net", + VIR_HOST_VALIDATE_WARN, + _("Load the 'vhost_net' module to improve performance " + "of virtio networking")) < 0) + ret = -1; + + if (virHostValidateDevice("QEMU", "/dev/net/tun", + VIR_HOST_VALIDATE_FAIL, + _("Load the 'tun' module to enable networking for QEMU guests")) < 0) + ret = -1; + + return ret; +} diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h new file mode 100644 index 0000000..3e79d51 --- /dev/null +++ b/tools/virt-host-validate-qemu.h @@ -0,0 +1,27 @@ +/* + * virt-host-validate-qemu.h: Sanity check a QEMU hypervisor host + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_QEMU_H__ +#define __VIRT_HOST_VALIDATE_QEMU_H__ + +extern int virHostValidateQEMU(void); + +#endif /* __VIRT_HOST_VALIDATE_QEMU_H__ */ diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c new file mode 100644 index 0000000..06fee58 --- /dev/null +++ b/tools/virt-host-validate.c @@ -0,0 +1,213 @@ +/* + * virt-host-check.c: Sanity check a hypervisor host + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <gettext.h> +#include <getopt.h> + +#include "internal.h" +#include "configmake.h" + +#include "virt-host-validate-common.h" +#if WITH_QEMU +#include "virt-host-validate-qemu.h" +#endif +#if WITH_LXC +#include "virt-host-validate-lxc.h" +#endif + +static void +show_help(FILE *out, const char *argv0) +{ + fprintf(out, + _("\n" + "syntax: %s [OPTIONS] [HVTYPE]\n" + "\n" + " Hypervisor types:\n" + "\n" + " - qemu\n" + " - lxc\n" + "\n" + " Options:\n" + " -h, --help Display command line help\n" + " -v, --version Display command version\n" + " -q, --quiet Don't display progress information\n" + "\n"), + argv0); +} + +static void +show_version(FILE *out, const char *argv0) +{ + fprintf(out, "version: %s %s\n", argv0, VERSION); +} + +static const struct option argOptions[] = { + { "help", 0, NULL, 'h', }, + { "version", 0, NULL, 'v', }, + { "quiet", 0, NULL, 'q', }, + { NULL, 0, NULL, '\0', } +}; + +int +main(int argc, char **argv) +{ + const char *hvname = NULL; + int c; + int ret = EXIT_SUCCESS; + bool quiet = false; + + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + return EXIT_FAILURE; + } + if (!textdomain(PACKAGE)) { + perror("textdomain"); + return EXIT_FAILURE; + } + + while ((c = getopt_long(argc, argv, "hvq", argOptions, NULL)) != -1) { + switch (c) { + case 'v': + show_version(stdout, argv[0]); + return EXIT_SUCCESS; + + case 'h': + show_help(stdout, argv[0]); + return EXIT_SUCCESS; + + case 'q': + quiet = true; + break; + + case '?': + default: + show_help(stderr, argv[0]); + return EXIT_FAILURE; + } + } + + if ((argc-optind) > 2) { + fprintf(stderr, _("%s: too many command line arguments\n"), argv[0]); + show_help(stderr, argv[0]); + return EXIT_FAILURE; + } + + if (argc > 1) + hvname = argv[optind]; + + virHostMsgSetQuiet(quiet); + +#if WITH_QEMU + if ((!hvname || STREQ(hvname, "qemu")) && + virHostValidateQEMU() < 0) + ret = EXIT_FAILURE; +#endif + +#if WITH_LXC + if ((!hvname || STREQ(hvname, "lxc")) && + virHostValidateLXC() < 0) + ret = EXIT_FAILURE; +#endif + + return ret; +} + +/* + +=pod + +=head1 NAME + + virt-host-validate - validate host virtualization setup + +=head1 SYNOPSIS + + virt-host-validate [OPTIONS...] [HV-TYPE] + +=head1 DESCRIPTION + +This tool validates that the host is configured in a suitable +way to run libvirt hypervisor drivers. If invoked without any +arguments it will check support for all hypervisor drivers it +is aware of. Optionally it can be given a particular hypervisor +type ('qemu' or 'lxc') to restrict the checks to those relevant +for that virtualization technology + +=head1 OPTIONS + +=over 4 + +=item C<-v>, C<--version> + +Display the command version + +=item C<-h>, C<--help> + +Display the command line help + +=item C<-q>, C<--quiet> + +Don't display details of individual checks being performed. +Only display output if a check does not pass. + +=back + +=head1 EXIT STATUS + +Upon successful validation, an exit status of 0 will be set. Upon +failure a non-zero status will be set. + +=head1 AUTHOR + +Daniel P. Berrange + +=head1 BUGS + +Report any bugs discovered to the libvirt community via the +mailing list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>. +Alternatively report bugs to your software distributor / vendor. + +=head1 COPYRIGHT + +Copyright (C) 2012 by Red Hat, Inc. + +=head1 LICENSE + +virt-host-validate is distributed under the terms of the GNU GPL v2+. +This is free software; see the source for copying conditions. There +is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE + +=head1 SEE ALSO + +C<virsh(1)>, C<virt-pki-validate>, C<virt-xml-validate> + +=cut + +*/ -- 1.7.7.6

2 2

[libvirt] [PATCH v3 0/2] nwfilter: Compare filters for equality when updating
by Stefan Berger 27 Jan '12

27 Jan '12

When a filter is updated, compare it and the original one for equality so that unnecessary instantiations of rules can be avoided. v3: - introducing a function to instantiate all running VMs' filters; call it upon nwfilter driver reload - reworked function comparing filters; determining whether two filters are equal now by comparing their XML representations v2: - added a test case for testing virHashEqual Regards, Stefan

2 5

[libvirt] [PATCH v2 0/7] qemu: support disabling/enabling kvmclock with <timer> elements
by Paolo Bonzini 27 Jan '12

27 Jan '12

QEMU supports a bunch of CPUID features that are tied to the kvm CPUID nodes rather than the processor's. They are "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvm_asyncpf". These are not known to libvirt and their CPUID leaf might move if (for example) the Hyper-V extensions are enabled. Hence their handling would anyway require some special-casing. However, among these the most useful is kvmclock; an additional "property" of this feature is that a <timer> element is a better model than a CPUID feature. This is what this series does. Actually, while working on this I noticed that it is quite difficult to have round-trip testcases involving -cpu, that can be used with both qemuargv2xmltest and qemuxml2argvtest. This is what the first five four patches do. The first patch is unrelated. The second patch updates the CPU feature map with default CPUs, and is a prerequisite for patch 3. That one makes the -cpu parsing code detect the "lm" CPU feature, so that the guest arch is correctly set to either i686 or x86_64. The fifth patch is also mostly needed for testing. It notices the default models qemu32/qemu64 and does not generate <cpu> elements; this happens with "-cpu qemu32,-kvmclock" for example. Then, the last two patches actually add the new feature. Paolo Bonzini (7): qemu: parse -enable-kvm x86: add kvm32 and kvm64, update qemu64 qemu: detect arch correctly for KVM qemu: get arch name from <cpu> element qemu: do not create useless <cpu> element conf: add kvmclock timer qemu: parse and create -cpu ...,-kvmclock v1->v2: completely redone first patch (which became patches 1-5 :) docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/cpu/cpu_map.xml | 31 +++++ src/qemu/qemu_command.c | 129 ++++++++++++++++++-- tests/qemuargv2xmltest.c | 4 + .../qemuxml2argv-cpu-host-kvmclock.args | 4 + .../qemuxml2argv-cpu-host-kvmclock.xml | 23 ++++ .../qemuxml2argv-cpu-kvmclock.args | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 24 ++++ tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 4 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 21 +++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 3 + 15 files changed, 244 insertions(+), 17 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml -- 1.7.7.6

2 15

[libvirt] [PATCH] qemu: support qmp on RHEL/CentOS qemu
by Eric Blake 27 Jan '12

27 Jan '12

I'm getting tired of remembering to backport RHEL-specific patches when building upstream libvirt on RHEL 6.x or CentOS. All the affected versions of RHEL qemu-kvm have backported enough patches to a) make JSON useful, and b) modify the -help text to mention libvirt as the preferred interface; which means this string in the help output is a reliable indicator that we can outsmart a strict version check, even when upstream qemu 0.12 lacked the needed features. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Recognize particular help string present when enough features were backported to be worth using JSON. * tests/qemuhelptest.c (mymain): Update tests accordingly. --- src/qemu/qemu_capabilities.c | 17 +++++++++++++---- tests/qemuhelptest.c | 6 ++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 54757fc..c4bad6f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1104,7 +1104,8 @@ qemuCapsComputeCmdFlags(const char *help, if (strstr(help, "-netdev")) { /* Disable -netdev on 0.12 since although it exists, * the corresponding netdev_add/remove monitor commands - * do not, and we need them to be able todo hotplug */ + * do not, and we need them to be able to do hotplug. + * But see below about RHEL build. */ if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_NETDEV); } @@ -1169,12 +1170,20 @@ qemuCapsComputeCmdFlags(const char *help, /* While JSON mode was available in 0.12.0, it was too * incomplete to contemplate using. The 0.13.0 release * is good enough to use, even though it lacks one or - * two features. The benefits of JSON mode now outweigh - * the downside. + * two features. This is also true of versions of qemu + * built for RHEL, labeled 0.12.1, but with extra text + * in the help output that mentions that features were + * backported for libvirt. The benefits of JSON mode now + * outweigh the downside. */ #if HAVE_YAJL - if (version >= 13000) + if (version >= 13000) { qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); + } else if (version >= 12000 && + strstr(help, "libvirt")) { + qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); + qemuCapsSet(flags, QEMU_CAPS_NETDEV); + } #endif if (version >= 13000) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 8802271..5ad55bc 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -354,9 +354,11 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_BALLOON, QEMU_CAPS_DEVICE, QEMU_CAPS_SMP_TOPOLOGY, + QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, QEMU_CAPS_NO_KVM_PIT, @@ -503,9 +505,11 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_BALLOON, QEMU_CAPS_DEVICE, QEMU_CAPS_SMP_TOPOLOGY, + QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, QEMU_CAPS_NO_KVM_PIT, @@ -559,8 +563,10 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_BALLOON, + QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DEVICE, QEMU_CAPS_SMP_TOPOLOGY, + QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, QEMU_CAPS_NO_KVM_PIT, -- 1.7.7.6

2 2

[libvirt] [PATCH] qemu: require qmp on new enough qemu
by Eric Blake 27 Jan '12

27 Jan '12

The qemu developers have made it clear that modern qemu will no longer guarantee human monitor command stability; furthermore, some features, such as async events, are only supported via qmp. If we are compiled without support for handling JSON, we cannot expect to sanely interact with modern qemu. However, things must continue to build on RHEL 5, where qemu is stuck at 0.10, and where yajl is not available. Another benefit of this patch: future additions of new monitor commands need only focus on qemu_monitor_json.c, instead of also wasting time with qemu_monitor_text.c. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Report error if yajl is missing but qemu requires qmp. (qemuCapsParseHelpStr): Propagate error. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Likewise. --- Tested on Fedora 16, RHEL 6.2, and RHEL 5.8. src/qemu/qemu_capabilities.c | 33 ++++++++++++++++++++++++++++----- src/qemu/qemu_capabilities.h | 3 ++- tests/qemuhelptest.c | 2 +- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c4bad6f..13a9cb0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -982,12 +982,13 @@ virCapsPtr qemuCapsInit(virCapsPtr old_caps) } -static void +static int qemuCapsComputeCmdFlags(const char *help, unsigned int version, unsigned int is_kvm, unsigned int kvm_version, - virBitmapPtr flags) + virBitmapPtr flags, + bool check_yajl ATTRIBUTE_UNUSED) { const char *p; const char *fsdev; @@ -1184,6 +1185,23 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); qemuCapsSet(flags, QEMU_CAPS_NETDEV); } +#else + /* Starting with qemu 0.15 and newer, upstream qemu no longer + * promised to keep the human interface stable, but request that + * we use QMP (the JSON interface) for everything. If the user + * forgot to include YAJL libraries when building their own + * libvirt but is targetting a newer qemu, we are better off + * telling them to recompile (the spec file includes the + * dependency, so distros won't hit this). */ + if (version >= 15000 || + (version >= 12000 && strstr(help, "libvirt"))) { + if (check_yajl) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this qemu binary requires compilation with yajl")); + return -1; + } + qemuCapsSet(flags, QEMU_CAPS_NETDEV); + } #endif if (version >= 13000) @@ -1204,6 +1222,7 @@ qemuCapsComputeCmdFlags(const char *help, if (version >= 11000) qemuCapsSet(flags, QEMU_CAPS_CPU_HOST); + return 0; } /* We parse the output of 'qemu -help' to get the QEMU @@ -1235,7 +1254,8 @@ int qemuCapsParseHelpStr(const char *qemu, virBitmapPtr flags, unsigned int *version, unsigned int *is_kvm, - unsigned int *kvm_version) + unsigned int *kvm_version, + bool check_yajl) { unsigned major, minor, micro; const char *p = help; @@ -1291,7 +1311,9 @@ int qemuCapsParseHelpStr(const char *qemu, *version = (major * 1000 * 1000) + (minor * 1000) + micro; - qemuCapsComputeCmdFlags(help, *version, *is_kvm, *kvm_version, flags); + if (qemuCapsComputeCmdFlags(help, *version, *is_kvm, *kvm_version, + flags, check_yajl) < 0) + goto cleanup; strflags = virBitmapString(flags); VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s", @@ -1314,6 +1336,7 @@ fail: _("cannot parse %s version number in '%s'"), qemu, p ? p : help); +cleanup: VIR_FREE(p); return -1; @@ -1455,7 +1478,7 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, if (!(flags = qemuCapsNew()) || qemuCapsParseHelpStr(qemu, help, flags, - &version, &is_kvm, &kvm_version) == -1) + &version, &is_kvm, &kvm_version, true) == -1) goto cleanup; /* Currently only x86_64 and i686 support PCI-multibus. */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8b009f9..18d6bc8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -162,7 +162,8 @@ int qemuCapsParseHelpStr(const char *qemu, virBitmapPtr qemuCaps, unsigned int *version, unsigned int *is_kvm, - unsigned int *kvm_version); + unsigned int *kvm_version, + bool check_yajl); int qemuCapsParseDeviceStr(const char *str, virBitmapPtr qemuCaps); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 5ad55bc..370cd0d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -53,7 +53,7 @@ static int testHelpStrParsing(const void *data) goto cleanup; if (qemuCapsParseHelpStr("QEMU", help, flags, - &version, &is_kvm, &kvm_version) == -1) + &version, &is_kvm, &kvm_version, false) == -1) goto cleanup; # ifndef HAVE_YAJL -- 1.7.7.6

2 2

[libvirt] [PATCH RFC] Add a virt-host-validate command to sanity check HV config
by Daniel P. Berrange 27 Jan '12

27 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> To assist people in verifying that their host is operating in an optimal manner, provide a 'virt-host-validate' command. For each type of hypervisor, it will check any pre-requisites, or other good recommendations and report what's working & what is not. eg # virt-host-validate QEMU: Checking for device /dev/kvm : FAIL (Check that the 'kvm-intel' or 'kvm-amd' modules are loaded & the BIOS has enabled virtualization) QEMU: Checking for device /dev/vhost : WARN (Load the 'vhost_net' module to improve performance of virtio networking) QEMU: Checking for device /dev/net/tun : PASS LXC: Checking for Linux >= 2.6.26 : PASS This warns people if they have vmx/svm, but don't have /dev/kvm. It also warns about missing /dev/vhost net. --- tools/Makefile.am | 25 ++++++- tools/virt-host-validate-common.c | 166 +++++++++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 53 ++++++++++++ tools/virt-host-validate-lxc.c | 37 ++++++++ tools/virt-host-validate-lxc.h | 27 ++++++ tools/virt-host-validate-qemu.c | 50 +++++++++++ tools/virt-host-validate-qemu.h | 27 ++++++ tools/virt-host-validate.c | 77 +++++++++++++++++ 8 files changed, 461 insertions(+), 1 deletions(-) create mode 100644 tools/virt-host-validate-common.c create mode 100644 tools/virt-host-validate-common.h create mode 100644 tools/virt-host-validate-lxc.c create mode 100644 tools/virt-host-validate-lxc.h create mode 100644 tools/virt-host-validate-qemu.c create mode 100644 tools/virt-host-validate-qemu.h create mode 100644 tools/virt-host-validate.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 6705546..2b14319 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = \ DISTCLEANFILES = bin_SCRIPTS = virt-xml-validate virt-pki-validate -bin_PROGRAMS = virsh +bin_PROGRAMS = virsh virt-host-validate if HAVE_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup @@ -64,6 +64,29 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ +virt_host_validate_SOURCES = \ + virt-host-validate.c \ + virt-host-validate-common.c virt-host-validate-common.h \ + virt-host-validate-qemu.c virt-host-validate-qemu.h \ + virt-host-validate-lxc.c virt-host-validate-lxc.h \ + $(NULL) + +virt_host_validate_LDFLAGS = \ + $(WARN_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +virt_host_validate_LDADD = \ + $(WARN_CFLAGS) \ + ../src/libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) + +virt_host_validate_CFLAGS = \ + $(WARN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + virsh_SOURCES = \ console.c console.h \ virsh.c diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c new file mode 100644 index 0000000..7ada218 --- /dev/null +++ b/tools/virt-host-validate-common.c @@ -0,0 +1,166 @@ +/* + * virt-host-validate-common.c: Sanity check helper APis + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/utsname.h> + +#include "util.h" +#include "memory.h" +#include "virt-host-validate-common.h" + +void virHostMsgCheck(const char *prefix, + const char *format, + ...) +{ + va_list args; + char *msg; + + va_start(args, format); + if (virVasprintf(&msg, format, args) < 0) { + perror("malloc"); + abort(); + } + va_end(args); + + fprintf(stdout, "%6s: Checking %-60s: ", prefix, msg); + VIR_FREE(msg); +} + +void virHostMsgPass(void) +{ + fprintf(stdout, "\033[32mPASS\033[0m\n"); +} + +void virHostMsgFail(virHostValidateLevel level, + const char *hint) +{ + if (level == VIR_HOST_VALIDATE_FAIL) + fprintf(stdout, "\033[31mFAIL\033[0m (%s)\n", hint); + else if (level == VIR_HOST_VALIDATE_WARN) + fprintf(stdout, "\033[33mWARN\033[0m (%s)\n", hint); + else if (level == VIR_HOST_VALIDATE_NOTE) + fprintf(stdout, "\033[34mNOTE\033[0m (%s)\n", hint); +} + + +int virHostValidateDevice(const char *hvname, + const char *devname, + virHostValidateLevel level, + const char *hint) +{ + virHostMsgCheck(hvname, "for device %s", devname); + + if (access(devname, R_OK|W_OK) < 0) { + virHostMsgFail(level, hint); + return -1; + } + + virHostMsgPass(); + return 0; +} + + +int virHostValidateHasCPUFlag(const char *name) +{ + FILE *fp = fopen("/proc/cpuinfo", "r"); + int ret = 0; + + if (!fp) + return 0; + + do { + char line[1024]; + + if (!fgets(line, sizeof(line), fp)) + break; + + if (strstr(line, name)) { + ret = 1; + break; + } + } while (1); + + fclose(fp); + + return ret; +} + + +int virHostValidateLinuxKernel(const char *hvname, + int version, + virHostValidateLevel level, + const char *hint) +{ + struct utsname uts; + int major, minor, micro; + + uname(&uts); + + virHostMsgCheck(hvname, "for Linux >= %d.%d.%d", + ((version >> 16) & 0xff), + ((version >> 8) & 0xff), + (version & 0xff)); + + if (STRNEQ(uts.sysname, "Linux")) { + virHostMsgFail(level, hint); + return -1; + } + + if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &micro) != 3) { + micro = 0; + if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { + virHostMsgFail(level, hint); + return -1; + } + } + + if (major > ((version >> 16) & 0xff)) { + virHostMsgPass(); + return 0; + } else if (major < ((version >> 16) & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + if (minor > ((version >> 8) & 0xff)) { + virHostMsgPass(); + return 0; + } else if (minor < ((version >> 8) & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + if (micro > (version & 0xff)) { + virHostMsgPass(); + return 0; + } else if (micro < (version & 0xff)) { + virHostMsgFail(level, hint); + return -1; + } + + virHostMsgPass(); + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h new file mode 100644 index 0000000..6a4d1ac --- /dev/null +++ b/tools/virt-host-validate-common.h @@ -0,0 +1,53 @@ +/* + * virt-host-validate-common.h: Sanity check helper APis + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_COMMON_H__ +#define __VIRT_HOST_VALIDATE_COMMON_H__ + +#include "internal.h" + +typedef enum { + VIR_HOST_VALIDATE_FAIL, + VIR_HOST_VALIDATE_WARN, + VIR_HOST_VALIDATE_NOTE, +} virHostValidateLevel; + +extern void virHostMsgCheck(const char *prefix, + const char *format, + ...) ATTRIBUTE_FMT_PRINTF(2, 3); + +extern void virHostMsgPass(void); +extern void virHostMsgFail(virHostValidateLevel level, + const char *hint); + +extern int virHostValidateDevice(const char *hvname, + const char *devname, + virHostValidateLevel level, + const char *hint); + +extern int virHostValidateHasCPUFlag(const char *name); + +extern int virHostValidateLinuxKernel(const char *hvname, + int version, + virHostValidateLevel level, + const char *hint); + +#endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c new file mode 100644 index 0000000..f41cf78 --- /dev/null +++ b/tools/virt-host-validate-lxc.c @@ -0,0 +1,37 @@ +/* + * virt-host-validate-lxc.c: Sanity check a LXC hypervisor host + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virt-host-validate-lxc.h" +#include "virt-host-validate-common.h" + +int virHostValidateLXC(void) +{ + int ret = 0; + + if (virHostValidateLinuxKernel("LXC", (2 << 16) | (6 << 8) | 26, + VIR_HOST_VALIDATE_FAIL, + "Upgrade to a kernel supporting namespaces") < 0) + ret = -1; + + return ret; +} diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h new file mode 100644 index 0000000..3cae39f --- /dev/null +++ b/tools/virt-host-validate-lxc.h @@ -0,0 +1,27 @@ +/* + * virt-host-validate-lxc.h: Sanity check a LXC hypervisor host + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_LXC_H__ +#define __VIRT_HOST_VALIDATE_LXC_H__ + +extern int virHostValidateLXC(void); + +#endif /* __VIRT_HOST_VALIDATE_LXC_H__ */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c new file mode 100644 index 0000000..b0e4fe5 --- /dev/null +++ b/tools/virt-host-validate-qemu.c @@ -0,0 +1,50 @@ +/* + * virt-host-validate-qemu.c: Sanity check a QEMU hypervisor host + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virt-host-validate-qemu.h" +#include "virt-host-validate-common.h" + +int virHostValidateQEMU(void) +{ + int ret = 0; + + if (virHostValidateHasCPUFlag("svm") || + virHostValidateHasCPUFlag("vmx")) { + if (virHostValidateDevice("QEMU", "/dev/kvm", + VIR_HOST_VALIDATE_FAIL, + "Check that the 'kvm-intel' or 'kvm-amd' modules are loaded & the BIOS has enabled virtualization") < 0) + ret = -1; + } + + if (virHostValidateDevice("QEMU", "/dev/vhost", + VIR_HOST_VALIDATE_WARN, + "Load the 'vhost_net' module to improve performance of virtio networking") < 0) + ret = -1; + + if (virHostValidateDevice("QEMU", "/dev/net/tun", + VIR_HOST_VALIDATE_FAIL, + "Load the 'tun' module to enable networking for QEMU guests") < 0) + ret = -1; + + return ret; +} diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h new file mode 100644 index 0000000..e1dbcbe --- /dev/null +++ b/tools/virt-host-validate-qemu.h @@ -0,0 +1,27 @@ +/* + * virt-host-validate-qemu.h: Sanity check a QEMU hypervisor host + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIRT_HOST_VALIDATE_QEMU_H__ +#define __VIRT_HOST_VALIDATE_QEMU_H__ + +extern int virHostValidateQEMU(void); + +#endif /* __VIRT_HOST_VALIDATE_QEMU_H__ */ diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c new file mode 100644 index 0000000..b94aa8f --- /dev/null +++ b/tools/virt-host-validate.c @@ -0,0 +1,77 @@ +/* + * virt-host-check.c: Sanity check a hypervisor host + * + * Copyright (C) 2011 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <gettext.h> + +#include "internal.h" +#include "configmake.h" + +#include "virt-host-validate-qemu.h" +#include "virt-host-validate-lxc.h" + +static void +show_help(FILE *out, const char *argv0) +{ + fprintf(out, "syntax: %s [OPTIONS] [HVTYPE]\n", argv0); +} + +int +main(int argc, char **argv) +{ + const char *hvname = NULL; + int ret = EXIT_SUCCESS; + + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + return EXIT_FAILURE; + } + if (!textdomain(PACKAGE)) { + perror("textdomain"); + return EXIT_FAILURE; + } + + if (argc > 2) { + fprintf(stderr, "too many command line arguments\n"); + show_help(stderr, argv[0]); + return EXIT_FAILURE; + } + + if (argc > 1) + hvname = argv[1]; + + if ((!hvname || STREQ(hvname, "qemu")) && + virHostValidateQEMU() < 0) + ret = EXIT_FAILURE; + + if ((!hvname || STREQ(hvname, "lxc")) && + virHostValidateLXC() < 0) + ret = EXIT_FAILURE; + + return ret; +} -- 1.7.7.5

3 3

[libvirt] [PATCH v3 0/5] RFC: grant KVM guests retain arbitrary capabilities
by Taku Izumi 27 Jan '12

27 Jan '12

Hi Osier-san, Daniel-san, and all, This patchset adds an option for KVM guests to retain arbitrary capabilities. The previous versions are here: http://www.redhat.com/archives/libvir-list/2011-December/msg00857.html http://www.redhat.com/archives/libvir-list/2011-December/msg00950.html v2 -> v3 I updated my patch according to Osier-san's comment. However,: - retain caps name (depending on cap-ng lib) - no test code is added *[PATCH v3 1/5] conf: add XML schema for capability XML *[PATCH v3 2/5] conf: add XML schema for domain XML *[PATCH v3 3/5] util: add functions to keep capabilities *[PATCH v3 4/5] util: extend virExecWithHook() *[PATCH v3 5/5] qemu: make qemu processes to retain capabilities -- Best regards, Taku Izumi <izumi.taku(a)jp.fujitsu.com>

5 16

[libvirt] [PATCH 0/4] Add virDomainIOError API
by Jiri Denemark 27 Jan '12

27 Jan '12

We already provide ways to detect when a domain has been paused as a result of I/O error, but there was no way of getting the exact error or even the device that experienced it. This new API may be used for both. Jiri Denemark (4): virDomainIOError public API and remote protocol virsh: Implement domioerror command qemu: Refactor qemuMonitorGetBlockInfo qemu: Implement virDomainIOError include/libvirt/libvirt.h.in | 19 +++++++ src/driver.h | 6 ++ src/libvirt.c | 53 ++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 82 +++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.c | 22 +++++--- src/qemu/qemu_monitor.c | 83 ++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.h | 10 +++- src/qemu/qemu_monitor_json.c | 34 +++++++------ src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_monitor_text.c | 62 ++++++++++++++++-------- src/qemu/qemu_monitor_text.h | 3 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +++++- src/remote_protocol-structs | 9 +++ tools/virsh.c | 111 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 11 ++++ 18 files changed, 468 insertions(+), 60 deletions(-) -- 1.7.8.4

3 13

[libvirt] [PATCH] apparmor: Fix use of uninitialized random_data
by Jiri Denemark 27 Jan '12

27 Jan '12

Without this, virt-aa-helper would segfault in -c or -r commands. --- src/security/virt-aa-helper.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 4561bb9..b484a20 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -42,6 +42,7 @@ #include "pci.h" #include "virfile.h" #include "configmake.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_SECURITY @@ -1182,6 +1183,9 @@ main(int argc, char **argv) memset(ctl, 0, sizeof(vahControl)); + if (virRandomInitialize(time(NULL) ^ getpid()) < 0) + vah_error(ctl, 1, _("could not initialize random generator")); + if (vahParseArgv(ctl, argc, argv) != 0) vah_error(ctl, 1, _("could not parse arguments")); -- 1.7.8.4

2 2

[libvirt] [PATCH] util: Include stdint.h because of uint32_t
by Michal Privoznik 27 Jan '12

27 Jan '12

Some files are using uint32_t or int64_t without including stdint.h which defines them. Fix this. --- Pushing under trivial & build-breaker rules. src/util/virhash.h | 2 ++ src/util/virhashcode.h | 1 + src/util/virrandom.h | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/util/virhash.h b/src/util/virhash.h index 0170eaa..7acbcbd 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -13,6 +13,8 @@ #ifndef __VIR_HASH_H__ # define __VIR_HASH_H__ +# include <stdint.h> + /* * The hash table. */ diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index 867e04e..a38043e 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -29,6 +29,7 @@ # define __VIR_HASH_CODE_H__ # include "internal.h" +# include <stdint.h> extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); diff --git a/src/util/virrandom.h b/src/util/virrandom.h index eede373..e180a2f 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -23,6 +23,7 @@ # define __VIR_RANDOM_H__ # include "internal.h" +# include <stdint.h> int virRandomInitialize(uint32_t seed) ATTRIBUTE_RETURN_CHECK; uint64_t virRandomBits(int nbits); -- 1.7.3.4

2 2

[libvirt] [PATCH] Update VIRT_CONTROL audit record with pid.
by Marcelo Cerri 26 Jan '12

26 Jan '12

Added a new field "vm-pid" to the VIRT_CONTROL audit record. This information is useful to correlated another audit events to the events generated by libvirt. --- src/conf/domain_audit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 16937dc..eb85ec7 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -562,8 +562,8 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op, } VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success, - "virt=%s op=%s reason=%s %s uuid=%s", - virt, op, reason, vmname, uuidstr); + "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%d", + virt, op, reason, vmname, uuidstr, vm->pid); VIR_FREE(vmname); } -- 1.7.1

2 1

[libvirt] [PATCH 1/2] daemon: convert virRun to virCommand
by Eric Blake 26 Jan '12

26 Jan '12

Using snprintf to build up argv seems archaic. * daemon/remote.c (remoteDispatchAuthPolkit): Modernize command call. --- daemon/remote.c | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index b158b8b..7f552a7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2468,26 +2468,17 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, uid_t callerUid = -1; const char *action; int status = -1; - char pidbuf[50]; - char ident[100]; - int rv = -1; + char *ident = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - - memset(ident, 0, sizeof ident); + virCommandPtr cmd = NULL; virMutexLock(&priv->lock); action = virNetServerClientGetReadonly(client) ? "org.libvirt.unix.monitor" : "org.libvirt.unix.manage"; - const char * const pkcheck [] = { - PKCHECK_PATH, - "--action-id", action, - "--process", pidbuf, - "--allow-user-interaction", - NULL - }; + cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2495,28 +2486,25 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, goto authfail; } - if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, &callerPid) < 0) { + if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, + &callerPid) < 0) { goto authfail; } VIR_INFO("Checking PID %d running as %d", callerPid, callerUid); - rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid); - if (rv < 0 || rv >= sizeof pidbuf) { - VIR_ERROR(_("Caller PID was too large %d"), callerPid); - goto authfail; - } + virCommandAddArg(cmd, "--process"); + virCommandAddArgFormat(cmd, "%d", callerPid); + virCommandAddArg(cmd, "--allow-user-interaction"); - rv = snprintf(ident, sizeof ident, "pid:%d,uid:%d", callerPid, callerUid); - if (rv < 0 || rv >= sizeof ident) { - VIR_ERROR(_("Caller identity was too large %d:%d"), callerPid, callerUid); + if (virAsprintf(&ident, "pid:%d,uid:%d", callerPid, callerUid) < 0) { + virReportOOMError(); goto authfail; } - if (virRun(pkcheck, &status) < 0) { - VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH); + if (virCommandRun(cmd, &status) < 0) goto authfail; - } + if (status != 0) { char *tmp = virCommandTranslateStatus(status); VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d: %s"), @@ -2533,10 +2521,14 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, virNetServerClientSetIdentity(client, ident); virMutexUnlock(&priv->lock); + virCommandFree(cmd); + VIR_FREE(ident); return 0; error: + virCommandFree(cmd); + VIR_FREE(ident); virResetLastError(); virNetError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); @@ -2553,7 +2545,7 @@ authfail: authdeny: PROBE(RPC_SERVER_CLIENT_AUTH_DENY, "client=%p auth=%d identity=%s", - client, REMOTE_AUTH_POLKIT, (char *)ident); + client, REMOTE_AUTH_POLKIT, ident); goto error; } #elif HAVE_POLKIT0 -- 1.7.7.6

2 5

[libvirt] [PATCH] hash: minor touchups
by Eric Blake 26 Jan '12

26 Jan '12

On RHEL5, I got: util/virrandom.c:66: warning: nested extern declaration of '_gl_verify_function66' [-Wnested-externs] The fix is to hoist the verify earlier. Also some other hodge-podge fixes I noticed while reviewing Dan's recent series. * .gitignore: Ignore new test. * src/util/cgroup.c: Bump copyright year. * src/util/virhash.c: Fix typo in description. * src/util/virrandom.c (virRandomBits): Mark doc comment, and hoist assert to silence older gcc. --- Pushing under the build-breaker rule. We didn't notice it earlier because newer gcc introduced _Static_assert (per C11), so that verify() doesn't have to rely on extern declarations in that case. .gitignore | 1 + src/util/cgroup.c | 2 +- src/util/virhash.c | 2 +- src/util/virrandom.c | 10 +++++----- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 61a9a38..2533fce 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ /tests/openvzutilstest /tests/qemuxmlnstest /tests/shunloadtest +/tests/virhashtest /update.log Makefile Makefile.in diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 3f092ab..15b870d 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -1,7 +1,7 @@ /* * cgroup.c: Tools for managing cgroups * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright IBM Corp. 2008 * * See COPYING.LIB for the License of this software diff --git a/src/util/virhash.c b/src/util/virhash.c index efaa286..6dec684 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -1,5 +1,5 @@ /* - * virhash.c: chained hash tables for domain and domain/connection deallocatiosn + * virhash.c: chained hash tables * * Reference: Your favorite introductory book on algorithms * diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 0af94d5..ec0cf03 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -46,7 +46,11 @@ int virRandomInitialize(uint32_t seed) return 0; } -/* +/* The algorithm of virRandomBits requires that RAND_MAX == 2^n-1 for + * some n; gnulib's random_r meets this property. */ +verify(((RAND_MAX + 1U) & RAND_MAX) == 0); + +/** * virRandomBits: * @nbits: Number of bits of randommess required * @@ -61,10 +65,6 @@ uint64_t virRandomBits(int nbits) uint64_t ret = 0; int32_t bits; - /* This algorithm requires that RAND_MAX == 2^n-1 for some n; - gnulib's random_r meets this property. */ - verify(((RAND_MAX + 1U) & RAND_MAX) == 0); - virMutexLock(&randomLock); while (nbits > bits_per_iter) { -- 1.7.7.6

1 0

[libvirt] libvirt doesn't work with qemu 1.0
by Gerd Hoffmann 26 Jan '12

26 Jan '12

Hi, $subject says all. The error message is: error: internal error cannot parse /home/kraxel/bin/qemu-default version number in 'QEMU emulator version 1.0, Copyright (c) 2003-2008 Fabrice Bellard' cheers, Gerd PS: libvirt-0.9.4-23.el6.x86_64

8 12

[libvirt] [libvirt-glib] Don't loop forever on blank nodes
by Zeeshan Ali (Khattak) 26 Jan '12

26 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-helpers.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index c406a49..fecf3eb 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -174,11 +174,12 @@ void gvir_config_xml_foreach_child(xmlNodePtr node, gboolean cont; xmlNodePtr next = it->next; - if (xmlIsBlankNode(it)) - continue; - cont = iter_func(it, opaque); - if (!cont) - break; + if (!xmlIsBlankNode(it)) { + cont = iter_func(it, opaque); + if (!cont) + break; + } + it = next; } } -- 1.7.7.5

2 1

[libvirt] [libvirt-glib] Don't loop forever on blank nodes
by Zeeshan Ali (Khattak) 26 Jan '12

26 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-helpers.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index c406a49..fecf3eb 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -174,11 +174,12 @@ void gvir_config_xml_foreach_child(xmlNodePtr node, gboolean cont; xmlNodePtr next = it->next; - if (xmlIsBlankNode(it)) - continue; - cont = iter_func(it, opaque); - if (!cont) - break; + if (!xmlIsBlankNode(it)) { + cont = iter_func(it, opaque); + if (!cont) + break; + } + it = next; } } -- 1.7.7.5

1 0

[libvirt] The quest for virStorageVolResize()
by Zeeshan Ali (Khattak) 26 Jan '12

26 Jan '12

Hi everyone, In Boxes we'll need to change the size of the storage volumes (we use qcow2 files) but turns out that there is no virStorageVolResize() yet[1]. In my chat with Daniel on IRC, he mentioned that this would be a trivial task so I thought I should try to do it myself. I've been looking into this for several hours now and haven't gotten very far. I guess Daniel overestimated my skills of deciphering complicated code. :) Attached is my very much WIP patch that at least builds but doesn't exactly work yet: virsh # vol-resize 'Microsoft Windows XP.qcow2' '4G' gnome-boxes error: Failed to change size of volume 'Microsoft Windows XP.qcow2' to 4G error: this function is not supported by the connection driver: virStorageVolResize --------------------- If anyone can have a look and tell me if I'm going anywhere towards the right direction and what level of indirection I'm missing here, that would be awesome! -- Regards, Zeeshan Ali (Khattak) FSF member#5124 [1] Yes, I know there is a virDomainBlockResize but thats limited to running domains and I haven't yet figured if it can be nicely binded in libvirt-glib. Probably we'll want one function in libvirt-glib that will abstract both virDomainBlockResize() and virStorageVolResize().

2 2

[libvirt] [libvirt-glib] Prefer 'for' over 'while'
by Zeeshan Ali (Khattak) 26 Jan '12

26 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> In this particular case 'for' seems like a more natural choice as then we don't need to update the iterator (which we were forgetting to do and causing a hang in Boxes). --- libvirt-gconfig/libvirt-gconfig-helpers.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index c406a49..cc2e5cc 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -169,17 +169,14 @@ void gvir_config_xml_foreach_child(xmlNodePtr node, g_return_if_fail(iter_func != NULL); - it = node->children; - while (it != NULL) { + for (it = node->children; it != NULL; it = it->next) { gboolean cont; - xmlNodePtr next = it->next; if (xmlIsBlankNode(it)) continue; cont = iter_func(it, opaque); if (!cont) break; - it = next; } } -- 1.7.7.5

3 6

[libvirt] [PATCH] Remove tabs from libvirt_public.syms & enforce it
by Daniel P. Berrange 26 Jan '12

26 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/libvirt_public.syms: Death to tabs * cfg.mk: Check .syms files for tabs --- cfg.mk | 4 +- src/libvirt_public.syms | 456 +++++++++++++++++++++++----------------------- 2 files changed, 230 insertions(+), 230 deletions(-) diff --git a/cfg.mk b/cfg.mk index d853caf..c13db18 100644 --- a/cfg.mk +++ b/cfg.mk @@ -413,11 +413,11 @@ sc_prohibit_ctype_h: # Ensure that no C source file, docs, or rng schema uses TABs for # indentation. Also match *.h.in files, to get libvirt.h.in. Exclude # files in gnulib, since they're imported. -space_indent_files=(\.(rng|s?[ch](\.in)?|html.in|py)|(daemon|tools)/.*\.in) +space_indent_files=(\.(rng|s?[ch](\.in)?|html.in|py|syms)|(daemon|tools)/.*\.in) sc_TAB_in_indentation: @prohibit='^ * ' \ in_vc_files='$(space_indent_files)$$' \ - halt='indent with space, not TAB, in C, sh, html, py, and RNG schemas' \ + halt='indent with space, not TAB, in C, sh, html, py, syms and RNG schemas' \ $(_sc_search_regexp) ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index ff018c6..141a571 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -12,283 +12,283 @@ # LIBVIRT_0.0.3 { global: - virConnectClose; - virConnectGetType; - virConnectGetVersion; - virConnectListDomains; - virConnectNumOfDomains; - virConnectOpen; - virConnectOpenReadOnly; - - virDomainCreateLinux; - virDomainDestroy; - virDomainFree; - virDomainGetID; - virDomainGetInfo; - virDomainGetMaxMemory; - virDomainGetName; - virDomainGetOSType; - virDomainGetXMLDesc; - virDomainLookupByID; - virDomainLookupByName; - virDomainRestore; - virDomainResume; - virDomainSave; - virDomainSetMaxMemory; - virDomainShutdown; - virDomainSuspend; - - virGetVersion; + virConnectClose; + virConnectGetType; + virConnectGetVersion; + virConnectListDomains; + virConnectNumOfDomains; + virConnectOpen; + virConnectOpenReadOnly; + + virDomainCreateLinux; + virDomainDestroy; + virDomainFree; + virDomainGetID; + virDomainGetInfo; + virDomainGetMaxMemory; + virDomainGetName; + virDomainGetOSType; + virDomainGetXMLDesc; + virDomainLookupByID; + virDomainLookupByName; + virDomainRestore; + virDomainResume; + virDomainSave; + virDomainSetMaxMemory; + virDomainShutdown; + virDomainSuspend; + + virGetVersion; }; LIBVIRT_0.0.5 { global: - virDomainLookupByUUID; - virDomainGetUUID; + virDomainLookupByUUID; + virDomainGetUUID; } LIBVIRT_0.0.3; LIBVIRT_0.1.0 { global: - virInitialize; - virNodeGetInfo; - virDomainReboot; - - virCopyLastError; - virConnSetErrorFunc; - virResetLastError; - virResetError; - virConnGetLastError; - virGetLastError; - virSetErrorFunc; - virConnCopyLastError; - virConnResetLastError; - virDefaultErrorFunc; + virInitialize; + virNodeGetInfo; + virDomainReboot; + + virCopyLastError; + virConnSetErrorFunc; + virResetLastError; + virResetError; + virConnGetLastError; + virGetLastError; + virSetErrorFunc; + virConnCopyLastError; + virConnResetLastError; + virDefaultErrorFunc; } LIBVIRT_0.0.5; LIBVIRT_0.1.1 { global: - virDomainLookupByUUIDString; - virDomainGetUUIDString; - virDomainSetMemory; - virDomainDefineXML; - virDomainCreate; - virDomainUndefine; - virConnectListDefinedDomains; + virDomainLookupByUUIDString; + virDomainGetUUIDString; + virDomainSetMemory; + virDomainDefineXML; + virDomainCreate; + virDomainUndefine; + virConnectListDefinedDomains; } LIBVIRT_0.1.0; LIBVIRT_0.1.4 { global: - virDomainSetVcpus; - virDomainPinVcpu; - virDomainGetVcpus; + virDomainSetVcpus; + virDomainPinVcpu; + virDomainGetVcpus; } LIBVIRT_0.1.1; LIBVIRT_0.1.5 { global: - virConnectNumOfDefinedDomains; + virConnectNumOfDefinedDomains; } LIBVIRT_0.1.4; LIBVIRT_0.1.9 { global: - virDomainCoreDump; - virDomainAttachDevice; - virDomainDetachDevice; + virDomainCoreDump; + virDomainAttachDevice; + virDomainDetachDevice; } LIBVIRT_0.1.5; LIBVIRT_0.2.0 { global: - virConnectNumOfNetworks; - virConnectListNetworks; - virConnectNumOfDefinedNetworks; - virConnectListDefinedNetworks; - virNetworkLookupByName; - virNetworkLookupByUUID; - virNetworkLookupByUUIDString; - virNetworkCreateXML; - virNetworkDefineXML; - virNetworkUndefine; - virNetworkCreate; - virNetworkDestroy; - virNetworkFree; - virNetworkGetName; - virNetworkGetUUID; - virNetworkGetUUIDString; - virNetworkGetXMLDesc; - virNetworkGetBridgeName; + virConnectNumOfNetworks; + virConnectListNetworks; + virConnectNumOfDefinedNetworks; + virConnectListDefinedNetworks; + virNetworkLookupByName; + virNetworkLookupByUUID; + virNetworkLookupByUUIDString; + virNetworkCreateXML; + virNetworkDefineXML; + virNetworkUndefine; + virNetworkCreate; + virNetworkDestroy; + virNetworkFree; + virNetworkGetName; + virNetworkGetUUID; + virNetworkGetUUIDString; + virNetworkGetXMLDesc; + virNetworkGetBridgeName; } LIBVIRT_0.1.9; LIBVIRT_0.2.1 { global: - virConnectGetCapabilities; - virConnectGetMaxVcpus; - virDomainGetMaxVcpus; - virDomainGetAutostart; - virDomainSetAutostart; - virNetworkGetAutostart; - virNetworkSetAutostart; + virConnectGetCapabilities; + virConnectGetMaxVcpus; + virDomainGetMaxVcpus; + virDomainGetAutostart; + virDomainSetAutostart; + virNetworkGetAutostart; + virNetworkSetAutostart; } LIBVIRT_0.2.0; LIBVIRT_0.2.3 { global: - virDomainGetSchedulerType; - virDomainGetSchedulerParameters; - virDomainSetSchedulerParameters; + virDomainGetSchedulerType; + virDomainGetSchedulerParameters; + virDomainSetSchedulerParameters; } LIBVIRT_0.2.1; LIBVIRT_0.3.0 { global: - virConnectGetHostname; - virConnectGetURI; - virDomainGetConnect; - virNetworkGetConnect; + virConnectGetHostname; + virConnectGetURI; + virDomainGetConnect; + virNetworkGetConnect; } LIBVIRT_0.2.3; LIBVIRT_0.3.2 { global: - virDomainMigrate; - virDomainBlockStats; - virDomainInterfaceStats; + virDomainMigrate; + virDomainBlockStats; + virDomainInterfaceStats; } LIBVIRT_0.3.0; LIBVIRT_0.3.3 { global: - virNodeGetCellsFreeMemory; - virNodeGetFreeMemory; + virNodeGetCellsFreeMemory; + virNodeGetFreeMemory; } LIBVIRT_0.3.2; LIBVIRT_0.4.0 { global: - virConnectOpenAuth; - virConnectAuthPtrDefault; + virConnectOpenAuth; + virConnectAuthPtrDefault; } LIBVIRT_0.3.3; LIBVIRT_0.4.1 { global: - virStoragePoolGetConnect; - virConnectNumOfStoragePools; - virConnectNumOfDefinedStoragePools; - virConnectListStoragePools; - virConnectListDefinedStoragePools; - virStoragePoolLookupByName; - virStoragePoolLookupByUUID; - virStoragePoolLookupByUUIDString; - virStoragePoolLookupByVolume; - virStoragePoolCreateXML; - virStoragePoolDefineXML; - virStoragePoolUndefine; - virStoragePoolCreate; - virStoragePoolBuild; - virStoragePoolDestroy; - virStoragePoolDelete; - virStoragePoolRefresh; - virStoragePoolFree; - virStoragePoolGetName; - virStoragePoolGetUUID; - virStoragePoolGetUUIDString; - virStoragePoolGetInfo; - virStoragePoolGetXMLDesc; - virStoragePoolSetAutostart; - virStoragePoolGetAutostart; - virStoragePoolNumOfVolumes; - virStoragePoolListVolumes; - - virStorageVolGetConnect; - virStorageVolLookupByName; - virStorageVolLookupByKey; - virStorageVolLookupByPath; - virStorageVolCreateXML; - virStorageVolDelete; - virStorageVolFree; - virStorageVolGetName; - virStorageVolGetKey; - virStorageVolGetInfo; - virStorageVolGetXMLDesc; - virStorageVolGetPath; + virStoragePoolGetConnect; + virConnectNumOfStoragePools; + virConnectNumOfDefinedStoragePools; + virConnectListStoragePools; + virConnectListDefinedStoragePools; + virStoragePoolLookupByName; + virStoragePoolLookupByUUID; + virStoragePoolLookupByUUIDString; + virStoragePoolLookupByVolume; + virStoragePoolCreateXML; + virStoragePoolDefineXML; + virStoragePoolUndefine; + virStoragePoolCreate; + virStoragePoolBuild; + virStoragePoolDestroy; + virStoragePoolDelete; + virStoragePoolRefresh; + virStoragePoolFree; + virStoragePoolGetName; + virStoragePoolGetUUID; + virStoragePoolGetUUIDString; + virStoragePoolGetInfo; + virStoragePoolGetXMLDesc; + virStoragePoolSetAutostart; + virStoragePoolGetAutostart; + virStoragePoolNumOfVolumes; + virStoragePoolListVolumes; + + virStorageVolGetConnect; + virStorageVolLookupByName; + virStorageVolLookupByKey; + virStorageVolLookupByPath; + virStorageVolCreateXML; + virStorageVolDelete; + virStorageVolFree; + virStorageVolGetName; + virStorageVolGetKey; + virStorageVolGetInfo; + virStorageVolGetXMLDesc; + virStorageVolGetPath; } LIBVIRT_0.4.0; LIBVIRT_0.4.2 { global: - virDomainBlockPeek; - virDomainMemoryPeek; + virDomainBlockPeek; + virDomainMemoryPeek; } LIBVIRT_0.4.1; LIBVIRT_0.4.5 { global: - virConnectFindStoragePoolSources; + virConnectFindStoragePoolSources; } LIBVIRT_0.4.2; LIBVIRT_0.5.0 { global: - virDomainCreateXML; - virEventRegisterImpl; - virConnectDomainEventRegister; - virConnectDomainEventDeregister; - - virNodeNumOfDevices; - virNodeListDevices; - virNodeDeviceLookupByName; - virNodeDeviceFree; - virNodeDeviceGetXMLDesc; - virNodeDeviceGetName; - virNodeDeviceGetParent; - virNodeDeviceNumOfCaps; - virNodeDeviceListCaps; + virDomainCreateXML; + virEventRegisterImpl; + virConnectDomainEventRegister; + virConnectDomainEventDeregister; + + virNodeNumOfDevices; + virNodeListDevices; + virNodeDeviceLookupByName; + virNodeDeviceFree; + virNodeDeviceGetXMLDesc; + virNodeDeviceGetName; + virNodeDeviceGetParent; + virNodeDeviceNumOfCaps; + virNodeDeviceListCaps; } LIBVIRT_0.4.5; LIBVIRT_0.6.0 { global: - virConnectRef; - virDomainRef; - virNetworkRef; - virStoragePoolRef; - virStorageVolRef; - virNodeDeviceRef; + virConnectRef; + virDomainRef; + virNetworkRef; + virStoragePoolRef; + virStorageVolRef; + virNodeDeviceRef; } LIBVIRT_0.5.0; LIBVIRT_0.6.1 { global: - virFreeError; - virSaveLastError; - virNodeDeviceDettach; - virNodeDeviceReAttach; - virNodeDeviceReset; - virDomainGetSecurityLabel; - virNodeGetSecurityModel; + virFreeError; + virSaveLastError; + virNodeDeviceDettach; + virNodeDeviceReAttach; + virNodeDeviceReset; + virDomainGetSecurityLabel; + virNodeGetSecurityModel; } LIBVIRT_0.6.0; LIBVIRT_0.6.3 { global: - virNodeDeviceCreateXML; - virNodeDeviceDestroy; + virNodeDeviceCreateXML; + virNodeDeviceDestroy; } LIBVIRT_0.6.1; LIBVIRT_0.6.4 { global: - virInterfaceGetConnect; - virConnectNumOfInterfaces; - virConnectListInterfaces; - virInterfaceLookupByName; - virInterfaceLookupByMACString; - virInterfaceGetName; - virInterfaceGetMACString; - virInterfaceGetXMLDesc; - virInterfaceRef; - virInterfaceFree; - virInterfaceDefineXML; - virInterfaceUndefine; - virInterfaceCreate; - virInterfaceDestroy; - virStorageVolCreateXMLFrom; - virConnectDomainXMLFromNative; - virConnectDomainXMLToNative; + virInterfaceGetConnect; + virConnectNumOfInterfaces; + virConnectListInterfaces; + virInterfaceLookupByName; + virInterfaceLookupByMACString; + virInterfaceGetName; + virInterfaceGetMACString; + virInterfaceGetXMLDesc; + virInterfaceRef; + virInterfaceFree; + virInterfaceDefineXML; + virInterfaceUndefine; + virInterfaceCreate; + virInterfaceDestroy; + virStorageVolCreateXMLFrom; + virConnectDomainXMLFromNative; + virConnectDomainXMLToNative; } LIBVIRT_0.6.3; LIBVIRT_0.7.0 { global: - virConnectNumOfDefinedInterfaces; - virConnectListDefinedInterfaces; + virConnectNumOfDefinedInterfaces; + virConnectListDefinedInterfaces; } LIBVIRT_0.6.4; LIBVIRT_0.7.1 { @@ -314,33 +314,33 @@ LIBVIRT_0.7.1 { LIBVIRT_0.7.2 { global: - virStreamNew; - virStreamRef; - virStreamSend; - virStreamRecv; - virStreamSendAll; - virStreamRecvAll; - virStreamEventAddCallback; - virStreamEventUpdateCallback; - virStreamEventRemoveCallback; - virStreamFinish; - virStreamAbort; - virStreamFree; - virDomainMigrateToURI; + virStreamNew; + virStreamRef; + virStreamSend; + virStreamRecv; + virStreamSendAll; + virStreamRecvAll; + virStreamEventAddCallback; + virStreamEventUpdateCallback; + virStreamEventRemoveCallback; + virStreamFinish; + virStreamAbort; + virStreamFree; + virDomainMigrateToURI; } LIBVIRT_0.7.1; LIBVIRT_0.7.3 { global: - virConnectGetLibVersion; - virConnectIsEncrypted; - virConnectIsSecure; - virDomainIsActive; - virDomainIsPersistent; - virNetworkIsActive; - virNetworkIsPersistent; - virStoragePoolIsActive; - virStoragePoolIsPersistent; - virInterfaceIsActive; + virConnectGetLibVersion; + virConnectIsEncrypted; + virConnectIsSecure; + virDomainIsActive; + virDomainIsPersistent; + virNetworkIsActive; + virNetworkIsPersistent; + virStoragePoolIsActive; + virStoragePoolIsPersistent; + virInterfaceIsActive; } LIBVIRT_0.7.2; LIBVIRT_0.7.5 { @@ -355,32 +355,32 @@ LIBVIRT_0.7.7 { virDomainDetachDeviceFlags; virConnectBaselineCPU; virDomainGetJobInfo; - virDomainAbortJob; + virDomainAbortJob; } LIBVIRT_0.7.5; LIBVIRT_0.8.0 { global: - virStorageVolWipe; + virStorageVolWipe; virDomainMigrateSetMaxDowntime; virConnectDomainEventRegisterAny; virConnectDomainEventDeregisterAny; virDomainUpdateDeviceFlags; - virConnectListNWFilters; - virConnectNumOfNWFilters; - virNWFilterLookupByName; - virNWFilterLookupByUUID; - virNWFilterLookupByUUIDString; - virNWFilterFree; - virNWFilterGetName; - virNWFilterGetUUID; - virNWFilterGetUUIDString; - virNWFilterGetXMLDesc; - virNWFilterRef; - virNWFilterDefineXML; - virNWFilterUndefine; - virDomainManagedSave; - virDomainHasManagedSaveImage; - virDomainManagedSaveRemove; + virConnectListNWFilters; + virConnectNumOfNWFilters; + virNWFilterLookupByName; + virNWFilterLookupByUUID; + virNWFilterLookupByUUIDString; + virNWFilterFree; + virNWFilterGetName; + virNWFilterGetUUID; + virNWFilterGetUUIDString; + virNWFilterGetXMLDesc; + virNWFilterRef; + virNWFilterDefineXML; + virNWFilterUndefine; + virDomainManagedSave; + virDomainHasManagedSaveImage; + virDomainManagedSaveRemove; virDomainSnapshotCreateXML; virDomainSnapshotGetXMLDesc; virDomainSnapshotNum; -- 1.7.7.5

2 2

[libvirt] [PATCH v2 0/4] Update the hash table algorithm
by Daniel P. Berrange 26 Jan '12

26 Jan '12

This is a followup to https://www.redhat.com/archives/libvir-list/2012-January/msg00734.html Changes in v2: - Replace virRandom with virRandomBits as per Eric's suggested impl - Move virRandom* functions to virrandom.{c,h} - Move virHash impl to virhash.{c,h} - Remove use of le32toh() function - Convert several virHash functions to use size_t / uint32 instead of int/unsigned long - Split into 4 patches for easier review/bisect

2 11

[libvirt] [PATCH] storage: Support different wiping algorithms
by Michal Privoznik 26 Jan '12

26 Jan '12

Currently, we support only filling a volume with zeroes on wiping. However, it is not enough as data might still be readable by experienced and equipped attacker. Many technical papers have been written, therefore we should support other wiping algorithms. --- Okay, this is not as complete as I'd like it. Wiping could take ages, therefore we *want* it to be asynchronous. But that would mean: 1) Create new API to answer: "Are we done yet?" 2) Create event emitting system - like we have for domains 3) Combination of previous two In fact, I've started writing events, but it turned out to be huge and I am not even in a half yet. I need to find a way of re-using event code we already have. But thats another day and another patch set. For those interested, take a look at Section 4.1.11 of DSS_PCI requirements at [1]. 1: https://www.pcisecuritystandards.org/documents/Virtualization_InfoSupp_v2.p… configure.ac | 26 ++++++++++- include/libvirt/libvirt.h.in | 24 ++++++++++ src/libvirt.c | 6 ++- src/storage/storage_driver.c | 103 ++++++++++++++++++++++++++++++++++------- tools/virsh.c | 41 +++++++++++++++- tools/virsh.pod | 25 ++++++++++- 6 files changed, 201 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index 46a9129..fb5f669 100644 --- a/configure.ac +++ b/configure.ac @@ -2500,7 +2500,31 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) - +dnl scrub program for different volume wiping algorithms + +AC_ARG_WITH([scrub], + AC_HELP_STRING([--with-scrub], [enable different volume wiping algorithms + @<:@default=check@:>@]), + []. + [with_scrub=check]) + +if test "$with_scrub" != "no"; then + AC_PATH_PROG([SCRUB], [scrub]) + if test -z "$SCRUB" ; then + if test "$with_scrub" = "check"; then + with_scrub=no + else + AC_MSG_ERROR([You must install the 'scrub' binary to enable + different volume wiping algorithms]) + fi + else + with_scrub=yes + fi + if test "$with_scrub" = "yes"; then + AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], + [Location of the scrub program]) + fi +fi # Only COPYING.LIB is under version control, yet COPYING diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index ad6fcce..caa9127 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2118,6 +2118,30 @@ typedef enum { VIR_STORAGE_VOL_DELETE_ZEROED = 1, /* Clear all data to zeros (slow) */ } virStorageVolDeleteFlags; +typedef enum { + /* Keep this place for async flag. Currently, + * it is not implemented because of lack of + * events support within storage driver. + * VIR_STORAGE_VOL_WIPE_ASYNC = (1 << 0), + */ + VIR_STORAGE_VOL_WIPE_ALG_NNSA = (1 << 1), /* 4-pass NNSA Policy Letter + NAP-14.1-C (XVI-8) */ + VIR_STORAGE_VOL_WIPE_ALG_DOD = (1 << 2), /* 4-pass DoD 5220.22-M section + 8-306 procedure */ + VIR_STORAGE_VOL_WIPE_ALG_BSI = (1 << 3), /* 9-pass method recommended by the + German Center of Security in + Information Technologies */ + VIR_STORAGE_VOL_WIPE_ALG_GUTMANN = (1 << 4), /* The canonical 35-pass sequence */ + VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER = (1 << 5), /* 7-pass method described by + Bruce Schneier in "Applied + Cryptography" (1996) */ + VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7 = (1 << 6), /* 7-pass random */ + + VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33 = (1 << 7), /* 33-pass random */ + + VIR_STORAGE_VOL_WIPE_ALG_RANDOM = (1 << 8), /* 1-pass random */ +} virStorageVolWipeFlags; + typedef struct _virStorageVolInfo virStorageVolInfo; struct _virStorageVolInfo { diff --git a/src/libvirt.c b/src/libvirt.c index feb3ca6..c3b3665 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12557,7 +12557,11 @@ error: * @vol: pointer to storage volume * @flags: future flags, use 0 for now * - * Ensure data previously on a volume is not accessible to future reads + * Ensure data previously on a volume is not accessible to future reads. + * When specifying wipe algorithm only one algorithm flag is allowed. + * Therefore if one wants to wipe a volume with say NNSA and DOD algorithms, + * he/she needs two subsequent calls. First with _ALG_NNSA flag, second + * with _ALG_DOD. * * Returns 0 on success, or -1 on error */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 8c2d6e1..f3a084a 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1801,14 +1801,16 @@ out: static int -storageVolumeWipeInternal(virStorageVolDefPtr def) +storageVolumeWipeInternal(virStorageVolDefPtr def, + unsigned int flags) { int ret = -1, fd = -1; struct stat st; char *writebuf = NULL; size_t bytes_wiped = 0; + virCommandPtr cmd = NULL; - VIR_DEBUG("Wiping volume with path '%s'", def->target.path); + VIR_DEBUG("Wiping volume with path '%s' flags %x", def->target.path, flags); fd = open(def->target.path, O_RDWR); if (fd == -1) { @@ -1825,29 +1827,62 @@ storageVolumeWipeInternal(virStorageVolDefPtr def) goto out; } - if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { - ret = storageVolumeZeroSparseFile(def, st.st_size, fd); - } else { - - if (VIR_ALLOC_N(writebuf, st.st_blksize) != 0) { - virReportOOMError(); + if (flags) { + cmd = virCommandNew(SCRUB); + virCommandAddArg(cmd, "-f"); + if (flags &VIR_STORAGE_VOL_WIPE_ALG_NNSA) { + virCommandAddArgList(cmd, "-p", "nnsa", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_DOD) { + virCommandAddArgList(cmd, "-p", "dod", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_BSI) { + virCommandAddArgList(cmd, "-p", "bsi", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_GUTMANN) { + virCommandAddArgList(cmd, "-p", "gutmann", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER) { + virCommandAddArgList(cmd, "-p", "schneier", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7) { + virCommandAddArgList(cmd, "-p", "pfitzner7", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33) { + virCommandAddArgList(cmd, "-p", "pfitzner33", NULL); + } else if (flags & VIR_STORAGE_VOL_WIPE_ALG_RANDOM) { + virCommandAddArgList(cmd, "-p", "random", NULL); + } else { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported flags %x"), + flags); goto out; } - ret = storageWipeExtent(def, - fd, - 0, - def->allocation, - writebuf, - st.st_blksize, - &bytes_wiped); + virCommandAddArg(cmd, def->target.path); + + if (virCommandRun(cmd, NULL) < 0) + goto out; + + ret = 0; + } else { + if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { + ret = storageVolumeZeroSparseFile(def, st.st_size, fd); + } else { + + if (VIR_ALLOC_N(writebuf, st.st_blksize) != 0) { + virReportOOMError(); + goto out; + } + + ret = storageWipeExtent(def, + fd, + 0, + def->allocation, + writebuf, + st.st_blksize, + &bytes_wiped); + } } out: + virCommandFree(cmd); VIR_FREE(writebuf); - VIR_FORCE_CLOSE(fd); - return ret; } @@ -1859,9 +1894,41 @@ storageVolumeWipe(virStorageVolPtr obj, virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool = NULL; virStorageVolDefPtr vol = NULL; + unsigned int alg = 0; + unsigned int supported_algs = 0; + unsigned int count = 0; int ret = -1; + supported_algs = VIR_STORAGE_VOL_WIPE_ALG_NNSA | + VIR_STORAGE_VOL_WIPE_ALG_DOD | + VIR_STORAGE_VOL_WIPE_ALG_BSI | + VIR_STORAGE_VOL_WIPE_ALG_GUTMANN | + VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER | + VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7 | + VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33 | + VIR_STORAGE_VOL_WIPE_ALG_RANDOM; + +#ifdef SCRUB + virCheckFlags(supported_algs, -1); +#else virCheckFlags(0, -1); +#endif + + alg = flags & supported_algs; + /* As we support only one algorithm in @flags, + * check if somebody didn't pass two or more + */ + while (alg) { + count += alg & 1L; + alg >>= 1; + } + + if (count > 1) { + virStorageReportError(VIR_ERR_INVALID_ARG, "%s", + _("only one wiping algorithm " + "per call is allowed")); + return -1; + } storageDriverLock(driver); pool = virStoragePoolObjFindByName(&driver->pools, obj->pool); @@ -1895,7 +1962,7 @@ storageVolumeWipe(virStorageVolPtr obj, goto out; } - if (storageVolumeWipeInternal(vol) == -1) { + if (storageVolumeWipeInternal(vol, flags) == -1) { goto out; } diff --git a/tools/virsh.c b/tools/virsh.c index 0bc0519..3cb4109 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10961,6 +10961,7 @@ static const vshCmdInfo info_vol_wipe[] = { static const vshCmdOptDef opts_vol_wipe[] = { {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")}, {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, + {"algorithm", VSH_OT_STRING, 0, N_("perform selected wiping algorithm")}, {NULL, 0, 0, NULL} }; @@ -10968,8 +10969,10 @@ static bool cmdVolWipe(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; - bool ret = true; + bool ret = false; const char *name; + const char *algorithm = NULL; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -10978,13 +10981,45 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) return false; } - if (virStorageVolWipe(vol, 0) == 0) { + if (vshCommandOptString(cmd, "algorithm", &algorithm) < 0) { + vshError(ctl, "%s", _("missing argument")); + goto out; + } + + if (algorithm) { + if (STREQ(algorithm, "nnsa")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_NNSA; + else if (STREQ(algorithm, "dod")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_DOD; + else if (STREQ(algorithm, "bsi")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_BSI; + else if (STREQ(algorithm, "gutmann")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_GUTMANN; + else if (STREQ(algorithm, "schneier")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER; + else if (STREQ(algorithm, "pfitzner7")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7; + else if (STREQ(algorithm, "pfitzner33")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33; + else if (STREQ(algorithm, "random")) + flags |= VIR_STORAGE_VOL_WIPE_ALG_RANDOM; + else { + vshError(ctl, _("Unsupported algorithm '%s'"), + algorithm); + goto out; + } + } + + if (virStorageVolWipe(vol, flags) == 0) { vshPrint(ctl, _("Vol %s wiped\n"), name); } else { vshError(ctl, _("Failed to wipe vol %s"), name); - ret = false; + goto out; } + ret = true; + +out: virStorageVolFree(vol); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 138f886..d96e8c8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1912,12 +1912,35 @@ I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe. I<--offset> is the position in the storage volume at which to start reading the data. I<--length> is an upper bound of the amount of data to be downloaded. -=item B<vol-wipe> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +=item B<vol-wipe> [I<--pool> I<pool-or-uuid>] [I<--algorithm> I<algorithm>] +I<vol-name-or-key-or-path> Wipe a volume, ensure data previously on the volume is not accessible to future reads. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe. +It is possible to choose different wiping algorithms instead of re-writing +volume with zeroes. This can be done via I<--algorithm> switch. + +B<Supported algorithms> + nnsa - 4-pass NNSA Policy Letter NAP-14.1-C (XVI-8) for + sanitizing removable and non-removable hard disks: + random(x2), 0x00, verify. + dod - 4-pass DoD 5220.22-M section 8-306 procedure for + sanitizing removeable and non-removeable rigid + disks: random, 0x00, 0xff, verify. + bsi - 9-pass method recommended by the German Center of + Security in Information Technologies + (http://www.bsi.bund.de) 0xff, 0xfe, 0xfd, 0xfb, + 0xf7, 0xef, 0xdf, 0xbf, 0x7f. + gutmann - The canonical 35-pass sequence described in + Gutmann's paper. + schneier - 7-pass method described by Bruce Schneier in + "Applied Cryptography" (1996): 0x00, 0xff, + random(x5). + pfitzner7 - Roy Pfitzner's 7-random-pass method: random(x7). + pfitzner33 - Roy Pfitzner's 33-random-pass method: random(x33). + random - 1-pass pattern: random(x1). =item B<vol-dumpxml> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> -- 1.7.3.4

2 7

[libvirt] Using Libvirt to change the bridge a virtual network card of a running vm is connected to
by Ralf Spenneberg 26 Jan '12

26 Jan '12

Hi there, we are using libvirt to manage our VMs. We have several VMs connected to different bridges on the same physical KVM host. We need to change the bridge a virtual machine is connected to once in a while. Currently we are just using brctl to do that. Since this needs to be done over the network we would like to use the Libvirtd. Currently this does not seem possible. We have not found any interface or function within the libvirt library to implement this in a live VM. Only shutdown VMs may be changed via editing the XML representation. Is there any reason for that? Could such a function be easily implemented? Everything but the source bridge would stay the same. It works fine manually via brctl. Any thoughts? Ralf Spenneberg

3 3

[libvirt] [PATCH] docs: fix virsh man page
by Eric Blake 26 Jan '12

26 Jan '12

Typo introduced in commit 4e9953a. * tools/virsh.pod (snapshot-create): Fix pod error. --- Pushing under the trivial rule. It bothers me that I have to use RHEL 5 to catch obvious errors, and that newer perl is too lax to flag bugs like this. tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index b6962cf..e1d8774 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2046,7 +2046,7 @@ used to represent properties of snapshots. =over 4 =item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] -| [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external] +| [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external>] [I<--quiesce>]} Create a snapshot for domain I<domain> with the properties specified in -- 1.7.7.6

1 0

[libvirt] [PATCH libvirt] Add missing virGetGroupName()
by Marc-André Lureau 25 Jan '12

25 Jan '12

Add missing function if !HAVE_GETPWUID_R. --- src/util/util.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index c00c2f9..33bcf29 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2471,6 +2471,15 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, "%s", _("virSetUIDGID is not available")); return -1; } + +char * +virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +{ + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("virGetGroupName is not available")); + + return NULL; +} #endif /* HAVE_GETPWUID_R */ -- 1.7.7.5

2 1

[libvirt] [PATCH] storage: Fix any VolLookupByPath if we have an empty logical pool
by Cole Robinson 25 Jan '12

25 Jan '12

On F16 at least, empty volume groups don't have a directory under /dev. The directory only appears once a logical volume is created. This tickles some behavior in BackendStablePath which ends with libvirt sleeping for 5 seconds while waiting for the directory to appear. This causes all sorts of problems for the virStorageVolLookupByPath API which virtinst uses, even if trying to resolve a path that is independent of the logical pool. In reality we don't even need to do that checking since logical pools always have a stable target path. Short circuit the polling in that case. Fixes bug 782261 --- src/storage/storage_backend.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d7394e0..306e487 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1347,6 +1347,10 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, if (!STRPREFIX(pool->def->target.path, "/dev")) goto ret_strdup; + /* Logical pools are under /dev but already have stable paths */ + if (pool->def->type == VIR_STORAGE_POOL_LOGICAL) + goto ret_strdup; + /* We loop here because /dev/disk/by-{id,path} may not have existed * before we started this operation, so we have to give it some time to * get created. -- 1.7.7.5

2 2

[libvirt] [PATCH] Replace hashing algorithm with murmurhash
by Daniel P. Berrange 25 Jan '12

25 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Recent discussions have illustrated the potential for DOS attacks with the hash table implementations used by most languages and libraries. https://lwn.net/Articles/474912/ libvirt has an internal hash table impl, and uses hash tables for a variety of purposes. The hash key generation code is pretty simple and thus not strongly collision resistant. This patch replaces the current libvirt hash key generator with the (public domain) Murmurhash3 code. In addition every hash table now gets a random seed value which is used to perturb the hashing code. This should make it impossible to mount any practical attack against libvirt hashing code. * src/Makefile.am: Add virhashcode.[ch] * src/util/util.c: Make virRandom() return a fixed 32 bit integer value. * src/util/hash.c, src/util/hash.h, src/util/cgroup.c: Replace hash code generation with a call to virHashCodeGen() * src/util/virhashcode.h, src/util/virhashcode.c: Add a new virHashCodeGen() API using the Murmurhash3 algorithm. --- src/Makefile.am | 1 + src/util/cgroup.c | 6 ++- src/util/hash.c | 24 ++++------ src/util/hash.h | 7 ++- src/util/util.c | 4 +- src/util/virhashcode.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virhashcode.h | 35 +++++++++++++ 7 files changed, 181 insertions(+), 21 deletions(-) create mode 100644 src/util/virhashcode.c create mode 100644 src/util/virhashcode.h diff --git a/src/Makefile.am b/src/Makefile.am index 0a1221a..dd5acc4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -89,6 +89,7 @@ UTIL_SOURCES = \ util/virpidfile.c util/virpidfile.h \ util/xml.c util/xml.h \ util/virterror.c util/virterror_internal.h \ + util/virhashcode.c util/virhashcode.h \ util/virkeycode.c util/virkeycode.h \ util/virkeymaps.h \ util/virnetdev.h util/virnetdev.c \ diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 25f2691..7623264 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -33,6 +33,7 @@ #include "logging.h" #include "virfile.h" #include "hash.h" +#include "virhashcode.h" #define CGROUP_MAX_VAL 512 @@ -1636,9 +1637,10 @@ cleanup: } -static unsigned long virCgroupPidCode(const void *name) +static int32_t virCgroupPidCode(const void *name, int32_t seed) { - return (unsigned long)name; + unsigned long pid = (unsigned long)name; + return virHashCodeGen(&pid, sizeof(pid), seed); } static bool virCgroupPidEqual(const void *namea, const void *nameb) { diff --git a/src/util/hash.c b/src/util/hash.c index 665bcce..e765a6c 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -28,6 +28,8 @@ #include "hash.h" #include "memory.h" #include "logging.h" +#include "virhashcode.h" +#include "util.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -57,6 +59,7 @@ struct _virHashEntry { */ struct _virHashTable { virHashEntryPtr *table; + uint32_t seed; int size; int nbElems; /* True iff we are iterating over hash entries. */ @@ -70,20 +73,11 @@ struct _virHashTable { virHashKeyFree keyFree; }; -static unsigned long virHashStrCode(const void *name) + + +static int32_t virHashStrCode(const void *name, int32_t seed) { - const char *str = name; - unsigned long value = 0L; - char ch; - - if (str != NULL) { - value += 30 * (*str); - while ((ch = *str++) != 0) { - value = - value ^ ((value << 5) + (value >> 3) + (unsigned long) ch); - } - } - return value; + return virHashCodeGen(name, strlen(name), seed); } static bool virHashStrEqual(const void *namea, const void *nameb) @@ -101,11 +95,10 @@ static void virHashStrFree(void *name) VIR_FREE(name); } - static unsigned long virHashComputeKey(virHashTablePtr table, const void *name) { - unsigned long value = table->keyCode(name); + uint32_t value = table->keyCode(name, table->seed); return (value % table->size); } @@ -139,6 +132,7 @@ virHashTablePtr virHashCreateFull(int size, return NULL; } + table->seed = virRandom(INT32_MAX); table->size = size; table->nbElems = 0; table->dataFree = dataFree; diff --git a/src/util/hash.h b/src/util/hash.h index 1ba12b9..c415844 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -55,12 +55,15 @@ typedef int (*virHashSearcher) (const void *payload, const void *name, /** * virHashKeyCode: * @name: the hash key + * @seed: random seed * - * Compute the hash code corresponding to the key @name + * Compute the hash code corresponding to the key @name, using + * @seed to perturb the hashing algorithm * * Returns the hash code */ -typedef unsigned long (*virHashKeyCode)(const void *name); +typedef int32_t (*virHashKeyCode)(const void *name, + int32_t seed); /** * virHashKeyEqual: * @namea: the first hash key diff --git a/src/util/util.c b/src/util/util.c index 8663c4d..c8588b5 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2115,7 +2115,7 @@ int virRandomInitialize(unsigned int seed) return 0; } -int virRandom(int max) +int32_t virRandom(int32_t max) { int32_t ret; @@ -2123,7 +2123,7 @@ int virRandom(int max) random_r(&randomData, &ret); virMutexUnlock(&randomLock); - return (int) ((double)max * ((double)ret / (double)RAND_MAX)); + return (int32_t) ((double)max * ((double)ret / (double)RAND_MAX)); } diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c new file mode 100644 index 0000000..50b46f4 --- /dev/null +++ b/src/util/virhashcode.c @@ -0,0 +1,125 @@ +/* + * virhashcode.c: hash code generation + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby: + * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp + * + * We use only the 32 bit variant because the 2 produce different result while + * we need to produce the same result regardless of the architecture as + * clients can be both 64 or 32 bit at the same time. + */ + +#include <config.h> + +#include "virhashcode.h" + +static uint32_t rotl(uint32_t x, int8_t r) +{ + return (x << r) | (x >> (32 - r)); +} + +/* slower than original but is endian neutral and handles platforms that + * do only aligned reads */ +__attribute__((always_inline)) +static uint32_t getblock(const uint8_t *p, int i) +{ + uint32_t r; + size_t size = sizeof(uint32_t); + + memcpy(&r, &p[i * size], size); + + return le32toh(r); +} + +/* + * Finalization mix - force all bits of a hash block to avalanche + */ +__attribute__((always_inline)) +static uint32_t fmix(uint32_t h) +{ + h ^= h >> 16; + h *= 0x85ebca6b; + h ^= h >> 13; + h *= 0xc2b2ae35; + h ^= h >> 16; + + return h; +} + + +uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) +{ + const uint8_t *blocks; + const uint8_t *tail; + size_t nblocks; + uint32_t h1; + uint32_t k1; + uint32_t c1; + uint32_t c2; + size_t i; + + blocks = (const uint8_t *)key; + nblocks = len / 4; + h1 = seed; + c1 = 0xcc9e2d51; + c2 = 0x1b873593; + + /* body */ + + for (i = 0; i < nblocks; i++) { + + k1 = getblock(blocks, i); + + k1 *= c1; + k1 = rotl(k1, 15); + k1 *= c2; + + h1 ^= k1; + h1 = rotl(h1, 13); + h1 = h1 * 5 + 0xe6546b64; + } + + /* tail */ + + tail = (const uint8_t *)key + nblocks * 4; + + k1 = 0; + + switch (len & 3) { + case 3: + k1 ^= tail[2] << 16; + case 2: + k1 ^= tail[1] << 8; + case 1: + k1 ^= tail[0]; + k1 *= c1; + k1 = rotl(k1, 15); + k1 *= c2; + h1 ^= k1; + default: + break; + } + + /* finalization */ + + h1 ^= len; + h1 = fmix(h1); + + return h1; +} diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h new file mode 100644 index 0000000..867e04e --- /dev/null +++ b/src/util/virhashcode.h @@ -0,0 +1,35 @@ +/* + * virhashcode.h: hash code generation + * + * Copyright (C) 2012 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby: + * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp + * + * We use only the 32 bit variant because the 2 produce different result while + * we need to produce the same result regardless of the architecture as + * clients can be both 64 or 32 bit at the same time. + */ + +#ifndef __VIR_HASH_CODE_H__ +# define __VIR_HASH_CODE_H__ + +# include "internal.h" + +extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); + +#endif /* __VIR_HASH_CODE_H__ */ -- 1.7.7.5

2 6

[libvirt] [PATCH] lxc: export container=lxc-libvirt for systemd
by Eric Blake 25 Jan '12

25 Jan '12

Systemd detects containers based on whether they have an environment variable starting with 'container=lxc'; using a longer name fits the expectations, while also allowing detection of who created the container. Requested by Lennart Poettering, in response to https://bugs.freedesktop.org/show_bug.cgi?id=45175 * src/lxc/lxc_container.c (lxcContainerBuildInitCmd): Add another env-var. --- src/lxc/lxc_container.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c1ec9c4..70f6908 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 Red Hat, Inc. + * Copyright (C) 2008-2012 Red Hat, Inc. * Copyright (C) 2008 IBM Corp. * * lxc_container.c: file description @@ -124,6 +124,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); + virCommandAddEnvString(cmd, "container=lxc-libvirt"); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); if (vmDef->os.cmdline) -- 1.7.7.5

3 3

[libvirt] [PATCH] schema: Relax schema for domain name
by Peter Krempa 25 Jan '12

25 Jan '12

The domain schema enforced restrictions on the domain name string that the code doesn't. This patch relaxes the check, leaving the restrictions on the driver or hypervisor. --- And maybe we should consider adding some restrictions on the qemu driver, as the daemon is competely fine with creating a domain with the name "../../../../../../../test" that has its configuration stored in "/test.xml" then. docs/schemas/domaincommon.rng | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2041dfb..1922cd6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3003,9 +3003,7 @@ </data> </define> <define name="domainName"> - <data type="string"> - <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> - </data> + <data type="string" /> </define> <define name="diskSerial"> <data type="string"> -- 1.7.3.4

3 3

[libvirt] [PATCH] Add support for forcing a private network namespace for LXC guests
by Daniel P. Berrange 25 Jan '12

25 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If no <interface> elements are included in an LXC guest XML description, then the LXC guest will just see the host's network interfaces. It is desirable to be able to hide the host interfaces, without having to define any guest interfaces. This patch introduces a new feature flag <privnet/> to allow forcing of a private network namespace for LXC. In the future I also anticipate that we will add <privuser/> to force a private user ID namespace. * src/conf/domain_conf.c, src/conf/domain_conf.h: Add support for <privnet/> feature. Auto-set <privnet> if any <interface> devices are defined * src/lxc/lxc_container.c: Honour request for private network namespace --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 11 +++++++---- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1d0211d..b7ad638 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -843,6 +843,7 @@ <acpi/> <apic/> <hap/> + <privnet/> </features> ...</pre> @@ -870,6 +871,12 @@ <dd>Enable Viridian hypervisor extensions for paravirtualizing guest operating systems </dd> + <dt><code>privnet</code></dt> + <dd>Always create a private network namespace. This is + automatically set if any interface devices are defined. + This feature is only relevant for container based + virtualization drivers eg LXC. + </dd> </dl> <h3><a name="elementsTime">Time keeping</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2f655a9..9f12a6d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2530,6 +2530,11 @@ <empty/> </element> </optional> + <optional> + <element name="privnet"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e872396..66d7f39 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -103,7 +103,8 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "apic", "pae", "hap", - "viridian") + "viridian", + "privnet") VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3b522a9..2131ff9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1221,6 +1221,7 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_PAE, VIR_DOMAIN_FEATURE_HAP, VIR_DOMAIN_FEATURE_VIRIDIAN, + VIR_DOMAIN_FEATURE_PRIVNET, VIR_DOMAIN_FEATURE_LAST }; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index dcd65ef..0820a0e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -254,7 +254,8 @@ int lxcContainerWaitForContinue(int control) * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, +static int lxcContainerRenameAndEnableInterfaces(bool privNet, + unsigned int nveths, char **veths) { int rc = 0; @@ -282,7 +283,7 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, } /* enable lo device only if there were other net devices */ - if (veths) + if (veths || privNet) rc = virNetDevSetOnline("lo", true); error_out: @@ -1277,7 +1278,8 @@ static int lxcContainerChild( void *data ) VIR_DEBUG("Received container continue message"); /* rename and enable interfaces */ - if (lxcContainerRenameAndEnableInterfaces(argv->nveths, + if (lxcContainerRenameAndEnableInterfaces(vmDef->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET), + argv->nveths, argv->veths) < 0) { goto cleanup; } @@ -1386,7 +1388,8 @@ int lxcContainerStart(virDomainDefPtr def, cflags |= CLONE_NEWUSER; } - if (def->nets != NULL) { + if (def->nets != NULL || + (def->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET))) { VIR_DEBUG("Enable network namespaces"); cflags |= CLONE_NEWNET; } -- 1.7.7.5

2 1

[libvirt] [PATCH] Add missing docs for <viridian/> feature flag
by Daniel P. Berrange 25 Jan '12

25 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- docs/formatdomain.html.in | 4 ++++ docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dfb010d..1d0211d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -866,6 +866,10 @@ <dd>Enable use of Hardware Assisted Paging if available in the hardware. </dd> + <dt><code>viridian</code></dt> + <dd>Enable Viridian hypervisor extensions for paravirtualizing + guest operating systems + </dd> </dl> <h3><a name="elementsTime">Time keeping</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4fa968d..2f655a9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2525,6 +2525,11 @@ <empty/> </element> </optional> + <optional> + <element name="viridian"> + <empty/> + </element> + </optional> </interleave> </element> </optional> -- 1.7.7.5

2 1

[libvirt] [PATCH v2 0/3] nwfilter: Compare filters for equality when updating
by Stefan Berger 25 Jan '12

25 Jan '12

When a filter is updated, compare it and the original one for equality so that unnecessary instantiations of rules can be avoided. v2: - added a test case for testing virHashEqual Regards, Stefan

3 10

[libvirt] [PATCH] qemu: Emit bootindex even for direct boot
by Jiri Denemark 25 Jan '12

25 Jan '12

Direct boot (using kernel, initrd, and command line) is used by virt-install/virt-manager for network install. While any bootindex has no direct effect since -kernel is always first, we need it as a hint for SeaBIOS to present disks in the same order as they will be presented during normal boot. --- src/qemu/qemu_command.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index aaccf62..9b69ad0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4334,8 +4334,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) { int bootCD = 0, bootFloppy = 0, bootDisk = 0; - if ((qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex) && - !def->os.kernel) { + if ((qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) { /* bootDevs will get translated into either bootindex=N or boot=on * depending on what qemu supports */ for (i = 0 ; i < def->os.nBootDevs ; i++) { -- 1.7.8.4

2 2

[libvirt] [PATCH v2] Add two NUMA tuning python bindings APIs
by Guannan Ren 25 Jan '12

25 Jan '12

*virDomainSetNumaParameters *virDomainGetNumaParameters --- python/libvirt-override-api.xml | 13 +++ python/libvirt-override.c | 186 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 704fee9..e09290c 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to numa tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='virTypedParameterPtr' info='the numa tunables value or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..27ad1d8 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1000,6 +1000,190 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_INT_FAIL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + PyObject *key, *val; + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + params[i].value.i = (int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_UINT: + params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_LLONG: + params[i].value.l = (long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_ULLONG: + params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_DOUBLE: + params[i].value.d = (double)PyFloat_AsDouble(val); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } + break; + + case VIR_TYPED_PARAM_STRING: + params[i].value.s = PyString_AsString(val); + break; + + default: + free(params); + return VIR_PY_INT_FAIL; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + free(params); + return VIR_PY_INT_SUCCESS; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tuple of long objects */ + if ((info = PyDict_New()) == NULL) { + free(params); + return VIR_PY_NONE; + } + + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromLongLong((long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + free(params); + Py_DECREF(info); + return VIR_PY_NONE; + } + + key = libvirt_constcharPtrWrap(params[i].field); + PyDict_SetItem(info, key, val); + } + free(params); + return(info); +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5162,6 +5346,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 4

[libvirt] [PATCH][RFC] adding a title to the domain description informations
by Daniel Veillard 25 Jan '12

25 Jan '12

The idea is that currently we have only the domain name usable as a description for the domain. It is not really a good human readable identifier, as the kind of string allowed is limited (no space for example). The idea would then be to extend the existing <description> field in the domain XML to keep 40 or less character string to describe a domain and provide that information later for example in an extended virsh list command or for other interfaces. While the idea is simple, see attached patch for this, it becomes more complex when one tries to make accessors to set/get that title for a domain, since it's mutable and possibly could be coming from the hypervisor itself (is there anything like this in VMWare or VirtualBox?) it should to be implemented down at the driver level. Is that worth the effort ? If we go that route should we do this for other objects (network, storage, etc ...) too in the end ? here is a basic patch for just the XML side to give an idea, but adding APIs is far more work. Opinions ? Daniel Provide a title attribute on domain descriptions Allow to provide a title attribute to domain descriptions useful when presenting the domain in an user interface. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index de9b480..ad5ffb0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -58,7 +58,13 @@ <dd>The content of the <code>description</code> element provides a human readable description of the virtual machine. This data is not used by libvirt in any way, it can contain any information the user - wants. <span class="since">Since 0.7.2</span></dd> + wants. <span class="since">Since 0.7.2</span>. It is also possible + to provide an human readable title for the virtual machine, by + providing it as a <code>title<code> attribute on the + <code>description</code> element, this can be useful to provide an + human description when listing virtual machines (<span class="since" + >Since 0.9.10</span>)</dd> + </dl> <h3><a name="elementsOS">Operating system booting</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2041dfb..78ba67c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -10,6 +10,11 @@ --> <define name="description"> <element name="description"> + <optional> + <attribute name="title"> + <ref name="title-value"/> + </attribute> + </optional> <text/> </element> </define> @@ -3115,4 +3120,9 @@ </element> <empty/> </define> + <define name="title-value"> + <data type="string"> + <param name="pattern">.{0,40}</param> + </data> + </define> </grammar> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f97014e..0e1ff44 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1478,6 +1478,7 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->cpumask); VIR_FREE(def->emulator); VIR_FREE(def->description); + VIR_FREE(def->title); virBlkioDeviceWeightArrayClear(def->blkio.devices, def->blkio.ndevices); @@ -7092,6 +7093,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, /* Extract documentation if present */ def->description = virXPathString("string(./description[1])", ctxt); + def->title = virXPathString("string(./description[1]/@title)", ctxt); /* analysis of security label, done early even though we format it * late, so devices can refer to this for defaults */ @@ -11417,8 +11419,16 @@ virDomainDefFormatInternal(virDomainDefPtr def, virUUIDFormat(uuid, uuidstr); virBufferAsprintf(buf, " <uuid>%s</uuid>\n", uuidstr); - virBufferEscapeString(buf, " <description>%s</description>\n", - def->description); + if (def->title || def->description) { + virBufferAddLit(buf, " <description"); + if (def->title) + virBufferEscapeString(buf, " title='%s'", def->title); + if (def->description) + virBufferEscapeString(buf, ">%s</description>\n", + def->description); + else + virBufferAddLit(buf, "/>"); + } virBufferAsprintf(buf, " <memory>%lu</memory>\n", def->mem.max_balloon); virBufferAsprintf(buf, " <currentMemory>%lu</currentMemory>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b121f9c..45d70e6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1421,6 +1421,7 @@ struct _virDomainDef { unsigned char uuid[VIR_UUID_BUFLEN]; char *name; char *description; + char *title; struct { unsigned int weight; -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] docs: fix a few small typos in formatdomain.html.in
by Laine Stump 25 Jan '12

25 Jan '12

--- Pushed under the trivial rule. docs/formatdomain.html.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dca9a81..dfb010d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2275,8 +2275,8 @@ <pre> ... <devices> - <mac address='52:54:00:6d:90:01'> <interface type='mcast'> + <mac address='52:54:00:6d:90:01'> <source address='230.0.0.1' port='5558'/> </interface> </devices> @@ -2297,13 +2297,13 @@ ... <devices> <interface type='server'> - <mac address='52:54:00:22:c9:42'> + <mac address='52:54:00:22:c9:42'> <source address='192.168.0.1' port='5558'/> </interface> ... <interface type='client'> - <mac address='52:54:00:8b:c9:51'> - <source address='192.168.0.1' port='5558'/> + <mac address='52:54:00:8b:c9:51'> + <source address='192.168.0.1' port='5558'/> </interface> </devices> ...</pre> @@ -2470,7 +2470,7 @@ qemu-kvm -net nic,model=? /dev/null ...</pre> <p> - For hypervisors which support this, you can set exact NIC which should + For hypervisors which support this, you can set a specific NIC to be used for network boot. The <code>order</code> attribute determines the order in which devices will be tried during boot sequence. The per-device <code>boot</code> elements cannot be used together with -- 1.7.7.5

1 0

[libvirt] Allow custom metadata in domain configuration XML
by Zeeshan Ali (Khattak) 25 Jan '12

25 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Applications can now insert custom nodes and hierarchies into domain cofiguration XML. Although currently not enforced, application are required to use their own namespaces on every custom node they insert. --- docs/formatdomain.html.in | 18 +++++++++ docs/schemas/domaincommon.rng | 26 +++++++++++++ src/conf/domain_conf.c | 24 ++++++++++++ src/conf/domain_conf.h | 3 ++ tests/domainsnapshotxml2xmlout/metadata.xml | 38 ++++++++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 4 ++ tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 29 +++++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 29 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 10 files changed, 174 insertions(+), 0 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlout/metadata.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index de9b480..fa7dc7c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3548,6 +3548,24 @@ qemu-kvm -net nic,model=? /dev/null sub-element <code>label</code> are supported. </p> + <h3><a name="customMetadata">Custom metadata</a></h3> + +<pre> + ... + <metadata> + <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo> + <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar> + </metadata> + ...</pre> + + <dl> + <dt><code>metadata</code></dt> + <dd><code>metadata</code> node could be used by applications to + store custom metadata in the form of XML nodes/trees. Applications + must use custom namespaces on their XML nodes/trees. + <span class="since">Since 0.9.9</span></dd> + </dl> + <h2><a name="examples">Example configs</a></h2> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2041dfb..b42d758 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -43,6 +43,9 @@ <ref name="seclabel"/> </optional> <optional> + <ref name="metadata"/> + </optional> + <optional> <ref name='qemucmdline'/> </optional> </interleave> @@ -2942,6 +2945,29 @@ </element> </define> + <define name="metadata"> + <element name="metadata"> + <zeroOrMore> + <ref name="customElement"/> + </zeroOrMore> + </element> + </define> + + <define name="customElement"> + <element> + <anyName/> + <zeroOrMore> + <choice> + <attribute> + <anyName/> + </attribute> + <text/> + <ref name="customElement"/> + </choice> + </zeroOrMore> + </element> + </define> + <!-- Type library diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8eed85b..fb78d93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1500,6 +1500,9 @@ void virDomainDefFree(virDomainDefPtr def) if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); + if (def->metadata) + xmlFreeNode(def->metadata); + VIR_FREE(def); } @@ -8072,6 +8075,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->os.smbios_mode = VIR_DOMAIN_SMBIOS_NONE; /* not present */ } + /* Extract custom metadata */ + if ((node = virXPathNode("./metadata[1]", ctxt)) != NULL) { + def->metadata = xmlCopyNode (node, 1); + } + /* we have to make a copy of all of the callback pointers here since * we won't have the virCaps structure available during free */ @@ -11833,6 +11841,22 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto cleanup; } + /* Custom metadata comes at the end */ + if (def->metadata) { + xmlBufferPtr xmlbuf; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, 4, 1) < 0) { + xmlBufferFree(xmlbuf); + goto cleanup; + } + virBufferAdjustIndent(buf, 2); + virBufferAdd(buf, (char *) xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + virBufferAdjustIndent(buf, -2); + xmlBufferFree(xmlbuf); + virBufferAddLit(buf, "\n"); + } + virBufferAddLit(buf, "</domain>\n"); if (virBufferError(buf)) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a49795c..3b522a9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1525,6 +1525,9 @@ struct _virDomainDef { void *namespaceData; virDomainXMLNamespace ns; + + /* Application-specific custom metadata */ + xmlNodePtr metadata; }; enum virDomainTaintFlags { diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml new file mode 100644 index 0000000..45180c9 --- /dev/null +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -0,0 +1,38 @@ +<domainsnapshot> + <name>my snap name</name> + <description>!@#$%^</description> + <state>running</state> + <parent> + <name>earlier_snap</name> + </parent> + <creationTime>1272917631</creationTime> + <domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> + </domain> +</domainsnapshot> diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index 90ff9bb..5c2e670 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -109,6 +109,7 @@ mymain(void) DO_TEST("noparent_nodescription_noactive", NULL, 0); DO_TEST("noparent_nodescription", NULL, 1); DO_TEST("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", 0); + DO_TEST("metadata", "c7a5fdbd-edaf-9455-926a-d65c16db1809", 0); virCapabilitiesFree(driver.caps); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args new file mode 100644 index 0000000..651793d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor,\ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 293c2a7..df317fd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -210,6 +210,8 @@ mymain(void) DO_TEST_DIFFERENT("graphics-listen-network2"); DO_TEST_DIFFERENT("graphics-spice-timeout"); + DO_TEST_DIFFERENT("metadata"); + virCapabilitiesFree(driver.caps); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 1.7.7.5

2 5

[libvirt] [RFC] virCommandProcessIO(): make poll() usage more robust
by Laszlo Ersek 24 Jan '12

24 Jan '12

POLLIN and POLLHUP are not mutually exclusive. Currently the following seems possible: the child writes 3K to its stdout or stderr pipe, and immediately closes it. We get POLLIN|POLLHUP (I'm not sure that's possible on Linux, but SUSv4 seems to allow it). We read 1K and throw away the rest. When poll() returns and we're about to check the /revents/ member in a given array element, let's map all the revents bits to two (independent) ideas: "let's attempt to read()", and "let's attempt to write()". This should cover all errors, EOFs, and normal conditions; the read()/write() call should report any pending error. Under this approach, both POLLHUP and POLLERR are mapped to "needs read()" if we're otherwise prepared for POLLIN. POLLERR also maps to "needs write()" if we're otherwise prepared for POLLOUT. The rest of the mappings (POLLPRI etc.) would be easy, but probably useless for pipes. Additionally, SUSv4 doesn't appear to forbid POLLIN|POLLERR (or POLLOUT|POLLERR) set simultaneously. One could argue that the read() or write() call would return without blocking in these cases (with an error), so POLLIN / POLLOUT would be justified beside POLLERR. The code now penalizes POLLIN|POLLERR differently from plain POLLERR. The former (ie. read() returning -1) is terminal and we jump to cleanup, while plain POLLERR masks only the affected file descriptor for the future. Let's unify those. Build tested only. Please keep me CC'd, I'm not subscribed. Thanks. Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- src/util/command.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index f05493e..dc3cfc5 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1710,7 +1710,7 @@ virCommandProcessIO(virCommandPtr cmd) } for (i = 0; i < nfds ; i++) { - if (fds[i].revents & POLLIN && + if (fds[i].revents & (POLLIN | POLLHUP | POLLERR) && (fds[i].fd == errfd || fds[i].fd == outfd)) { char data[1024]; char **buf; @@ -1751,7 +1751,7 @@ virCommandProcessIO(virCommandPtr cmd) } } - if (fds[i].revents & POLLOUT && + if (fds[i].revents & (POLLOUT | POLLERR) && fds[i].fd == infd) { int done; @@ -1777,19 +1777,6 @@ virCommandProcessIO(virCommandPtr cmd) } } } - - if (fds[i].revents & (POLLHUP | POLLERR)) { - if (fds[i].fd == errfd) { - VIR_DEBUG("hangup on stderr"); - errfd = -1; - } else if (fds[i].fd == outfd) { - VIR_DEBUG("hangup on stdout"); - outfd = -1; - } else { - VIR_DEBUG("hangup on stdin"); - infd = -1; - } - } } } -- 1.7.1

2 1