- Devel - libvirt List Archives

[libvirt] [PATCH] Fix compliation with systemtap 1.3
by Matthias Bolte 29 Jun '11

29 Jun '11

Version 1.3 uses this macro #define STAP_CAST(t) (size_t)t that breaks if t is a function. For that to work it should probably look like this #define STAP_CAST(t) ((size_t)(t)) In systemtap 1.4 this was completely rewritten. Anyway, before commit df0b57a95a767c t was always a variable, but now also a function is used here, namely virNetSASLSessionGetIdentity. Use an intermediate variable to avoid this problem. --- daemon/remote.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9547702..9e6cf77 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1759,13 +1759,13 @@ remoteSASLFinish(virNetServerClientPtr client) if (virNetServerClientSetIdentity(client, identity) < 0) goto error; - virNetServerClientSetSASLSession(client, priv->sasl); VIR_DEBUG("Authentication successful %d", virNetServerClientGetFD(client)); + + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); virNetSASLSessionFree(priv->sasl); priv->sasl = NULL; @@ -1793,6 +1793,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + const char *identity; virMutexLock(&priv->lock); @@ -1856,9 +1857,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: @@ -1888,7 +1889,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - + const char *identity; virMutexLock(&priv->lock); @@ -1952,9 +1953,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: -- 1.7.0.4

2 2

[libvirt] [PATCH] build: fix mingw build
by Eric Blake 29 Jun '11

29 Jun '11

./autobuild.sh died on several messages resembling: ../../src/rpc/virnetsocket.c: In function 'virNetSocketNewListenTCP': ../../src/rpc/virnetsocket.c:231:9: error: implicit declaration of function 'bind_used_without_requesting_gnulib_module_bind' [-Wimplicit-function-declaration] ../../src/rpc/virnetsocket.c:231:9: error: nested extern declaration of 'bind_used_without_requesting_gnulib_module_bind' [-Wnested-externs] Basically, gnulib socket fds are not safe to pass to mingw socket functions unless we pull in those gnulib modules. * bootstrap.conf (gnulib_modules): Add modules to handle socket functions on mingw. --- Pushing under the build-breaker rule. bootstrap.conf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 7b2cd60..581d60b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -19,8 +19,10 @@ # gnulib modules used by this package. gnulib_modules=' +accept areadlink base64 +bind byteswap c-ctype c-strcase @@ -40,6 +42,8 @@ getaddrinfo getcwd-lgpl gethostname getpass +getpeername +getsockname gettext-h gettimeofday gitlog-to-changelog @@ -48,6 +52,7 @@ ignore-value inet_pton intprops ioctl +listen maintainer-makefile manywarnings mkstemp -- 1.7.4.4

1 0

[libvirt] [PATCH] sysinfo: fix parsing regression
by Eric Blake 29 Jun '11

29 Jun '11

Detected by gcc -O2, introduced in commit 532ce9c2. If dmidecode outputs a field unrecognized by the parsers, then the code would dereference an uninitialized eol variable. * src/util/sysinfo.c (virSysinfoParseBIOS) (virSysinfoParseSystem, virSysinfoParseProcessor) (virSysinfoParseMemory): Avoid uninitialized variable. --- I'm pushing this under the build-breaker rule. It introduces a merge conflict with the (unapplied) patch here: https://www.redhat.com/archives/libvir-list/2011-June/msg01356.html but that patch needs to be rebased anyways. src/util/sysinfo.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index bff1cb8..d32f7f0 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -130,7 +130,7 @@ virSysinfoRead(void) { static char * virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; @@ -157,7 +157,7 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -166,7 +166,7 @@ no_memory: static char * virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((base = strstr(base, "System Information")) == NULL) return 0; @@ -215,7 +215,7 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -229,6 +229,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) while((tmp_base = strstr(base, "Processor Information")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { goto no_memory; @@ -313,6 +314,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) goto no_memory; } + if (!eol) + break; base = eol + 1; } @@ -330,6 +333,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) while ((tmp_base = strstr(base, "Memory Device")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) { goto no_memory; @@ -411,6 +415,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) } next: + if (!eol) + break; base = eol + 1; } -- 1.7.4.4

1 0

[libvirt] [PATCH] build: Don't expect translatable strings in a dead file
by Jiri Denemark 29 Jun '11

29 Jun '11

daemon/remote_dispatch_bodies.h is no longer with us and shouldn't be searched for translatable strings. --- Pushed under the build-breaker rule. po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index a81fc55..1f226fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ daemon/libvirtd.c daemon/remote.c -daemon/remote_dispatch_bodies.h daemon/stream.c gnulib/lib/gai_strerror.c src/conf/cpu_conf.c -- 1.7.6

2 1

[libvirt] [PATCH] daemon: Fix build without polkit
by Jiri Denemark 29 Jun '11

29 Jun '11

--- Pushed under the build-breaker rule. daemon/libvirtd.c | 10 +++++----- daemon/remote.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 62f089d..d1f80e4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -874,7 +874,7 @@ static void daemonConfigFree(struct daemonConfig *data); static struct daemonConfig* -daemonConfigNew(bool privileged) +daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) { struct daemonConfig *data; char *localhost; @@ -1034,8 +1034,10 @@ daemonConfigLoad(struct daemonConfig *data, */ if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) { VIR_FREE(data->unix_sock_rw_perms); - if (!(data->unix_sock_rw_perms = strdup("0777"))) - goto no_memory; + if (!(data->unix_sock_rw_perms = strdup("0777"))) { + virReportOOMError(); + goto error; + } } #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0) @@ -1091,8 +1093,6 @@ daemonConfigLoad(struct daemonConfig *data, virConfFree (conf); return 0; -no_memory: - virReportOOMError(); error: virConfFree (conf); return -1; diff --git a/daemon/remote.c b/daemon/remote.c index 47e47e4..9547702 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2209,7 +2209,7 @@ authdeny: static int remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, + virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) -- 1.7.6

1 0

[libvirt] [PATCH] remote: fix uninitialized variable
by Eric Blake 29 Jun '11

29 Jun '11

Detected by gcc -O2: remote/remote_driver.c: In function 'doRemoteOpen': remote/remote_driver.c:2753:26: error: 'sasl' may be used uninitialized in this function [-Werror=uninitialized] * src/remote/remote_driver.c (remoteAuthSASL): Initialize sasl. --- Pushing under the build-breaker rule. src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2ac87c8..0e68bc5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2520,7 +2520,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int ret = -1; const char *mechlist; virNetSASLContextPtr saslCtxt; - virNetSASLSessionPtr sasl; + virNetSASLSessionPtr sasl = NULL; VIR_DEBUG("Client initialize SASL authentication"); -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make check' when pdwtags is available
by Eric Blake 29 Jun '11

29 Jun '11

Problem introduced in commit 6818cf86. * src/remote_protocol-structs: Delete unused struct. --- Pushing under the build-breaker rule. Normally, deleting a struct from remote_protocol-structs is a sign of an over-the-wire API breakage; but in this case, I've verified that the new RPC code manages to represent the same over-the-wire layout without needing this header struct. src/remote_protocol-structs | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index c07ba81..25979b4 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1615,11 +1615,3 @@ struct remote_domain_get_control_info_ret { u_int details; uint64_t stateTime; }; -struct remote_message_header { - u_int prog; - u_int vers; - int proc; - remote_message_type type; - u_int serial; - remote_message_status status; -}; -- 1.7.4.4

1 0

[libvirt] [PATCH 0/3] Improve flexibility of SELinux labelling
by Daniel P. Berrange 29 Jun '11

29 Jun '11

This patch series adds two new features - The ability to override 'system_u:system_r:svirt_t:s0' from /etc/selinux/targeted/contexts/virtual_domain_context using the guest XML - The ability to use dynamic relabelling of resources, in combo with static VM label assignment. The latter is useful for management applications which want to be in full control of assigning VM labels (so that they can be unique across an entire cluster of hosts for example), while still benefiting from automatic relabelling of resources in the XML.

3 10

[libvirt] [PATCH 0/4 v2] Automatic lease management for sanlock
by Daniel P. Berrange 29 Jun '11

29 Jun '11

This is an update to http://www.redhat.com/archives/libvir-list/2011-June/msg00813.html Changed in this v2 posting - Incorporated feedback from v1 - Removed the cron job. This should be manually setup by the admin on only one host - Added documentation to the website on how to deploy sanlock

2 11

[libvirt] [PATCH] network: add domain to unqalified names define with <host>
by Laine Stump 29 Jun '11

29 Jun '11

If a domain name is defined for a network, add the --expand-hosts option to the dnsmasq commandline. This results in the domain being added to any hostname that is defined in a dns <host> element and contains no '.' characters (i.e. it is an "unqualified" hostname). Since PTR records are automatically created for any name define in <host>, the result of a PTR request will change from the unqualified name to the qualified name. This also has the same effect on any hostnames that dnsmasq reads from the host's /etc/hosts file. Hosts. I want to make sure that everyone notices that previous paragraph and has a chance to object if they believe this change in existing behavior will be detrimental. Note that guests will still be able to query the unqualified name, with the same results as before; it is only when a reverse lookup of an IP address is done that the result will be different, e.g. it will return "f15.example.com" instead of "f15". (In the case of guest hostnames that were learned by dnsmasq via DHCP requests, they were already getting the domain name added on, even without --expand-hosts). --- src/network/bridge_driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f15a7a6..a9a0374 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,6 +614,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); + /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts file */ + if (network->def->domain) + virCommandAddArg(cmd, "--expand-hosts"); + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", -- 1.7.3.4

2 2