- Devel - libvirt List Archives

[libvirt] Coverity automatic detection
by Alex Jia 06 Dec '11

06 Dec '11

This email is automatically generated. The test result is based on the following git commit: d336dbd spec: fix sanlock dependency Analysis summary report: ------------------------ Files analyzed : 241 Total LoC input to cov-analyze : 328912 Functions analyzed : 7999 Paths analyzed : 923483 Defect occurrences found : 71 Total 7 ATOMICITY 3 CHECKED_RETURN 14 DEADCODE 7 FORWARD_NULL 13 LOCK 2 NEGATIVE_RETURNS 1 NULL_RETURNS 6 RESOURCE_LEAK 1 RETURN_LOCAL 12 REVERSE_INULL 3 UNINIT 2 UNUSED_VALUE Exceeded path limit of 5000 paths in 0.49% of functions (normally up to 5% of functions encounter this limitation) For details, please see attachment. Regards, Alex

1 0

[libvirt] [PATCH v4] Implement DNS SRV record into the bridge driver
by Michal Novotny 05 Dec '11

05 Dec '11

Hi, this is the fourth version of my SRV record for DNSMasq patch rebased for the current codebase to the bridge driver and libvirt XML file to include support for the SRV records in the DNS. The syntax is based on DNSMasq man page and tests for both xml2xml and xml2argv were added as well. This is basically un-reviewed version 3 of this patch rebased to the current codebase with changed version information to 0.9.9 as it's supposed to go in 0.9.9 or later because of current 0.9.8 features freeze. Also, the second part of this patch is fixing the networkxml2argv test to pass both checks, i.e. both unit tests and also syntax check. Please review, Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/formatnetwork.html.in | 12 ++ docs/schemas/network.rng | 26 ++++ src/conf/network_conf.c | 130 +++++++++++++++++++- src/conf/network_conf.h | 16 +++ src/network/bridge_driver.c | 43 +++++++ tests/networkxml2argvdata/isolated-network.argv | 14 ++- .../networkxml2argvdata/nat-network-dns-hosts.argv | 12 ++- .../nat-network-dns-srv-record-minimal.argv | 16 +++ .../nat-network-dns-srv-record-minimal.xml | 26 ++++ .../nat-network-dns-srv-record.argv | 16 +++ .../nat-network-dns-srv-record.xml | 26 ++++ .../nat-network-dns-txt-record.argv | 19 ++- tests/networkxml2argvdata/nat-network.argv | 19 ++- tests/networkxml2argvdata/netboot-network.argv | 17 ++- .../networkxml2argvdata/netboot-proxy-network.argv | 15 ++- tests/networkxml2argvdata/routed-network.argv | 8 +- tests/networkxml2argvtest.c | 14 ++- .../nat-network-dns-srv-record-minimal.xml | 26 ++++ .../nat-network-dns-srv-record.xml | 26 ++++ .../nat-network-dns-srv-record-minimal.xml | 26 ++++ .../nat-network-dns-srv-record.xml | 26 ++++ 21 files changed, 501 insertions(+), 32 deletions(-) create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.xml create mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml create mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-srv-record.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 02302fa..79cb4ce 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -345,6 +345,7 @@ <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <srv service="name" protocol="tcp" domain="test-domain-name" target="." port="1024" priority="10" weight="10"/> <host ip='192.168.122.2'> <hostname>myhost</hostname> <hostname>myhostalias</hostname> @@ -396,6 +397,17 @@ <span class="since">Since 0.9.3</span> </dd> </dl> + <dl> + <dt><code>srv</code></dt> + <dd>The <code>dns</code> element can have also 0 or more <code>srv</code> + record elements. Each <code>srv</code> record element defines a DNS SRV record + and has 2 mandatory and 5 optional attributes. The mandatory attributes + are service name and protocol (tcp, udp) and the optional attributes are + target, port, priority, weight and domain as defined in DNS server SRV + RFC (RFC 2782). + <span class="since">Since 0.9.9</span> + </dd> + </dl> </dd> <dt><code>ip</code></dt> <dd>The <code>address</code> attribute defines an IPv4 address in diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 937e180..fac0eda 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -138,6 +138,19 @@ </element> </zeroOrMore> <zeroOrMore> + <element name="srv"> + <attribute name="service"><text/></attribute> + <attribute name="protocol"><ref name="protocol"/></attribute> + <optional> + <attribute name="domain"><ref name="dnsName"/></attribute> + <attribute name="target"><text/></attribute> + <attribute name="port"><ref name="unsignedShort"/></attribute> + <attribute name="priority"><ref name="unsignedShort"/></attribute> + <attribute name="weight"><ref name="unsignedShort"/></attribute> + </optional> + </element> + </zeroOrMore> + <zeroOrMore> <element name="host"> <attribute name="ip"><ref name="ipv4Addr"/></attribute> <oneOrMore> @@ -217,6 +230,19 @@ </element> </define> + <define name='unsignedShort'> + <data type='integer'> + <param name="minInclusive">0</param> + <param name="maxInclusive">65535</param> + </data> + </define> + + <define name='protocol'> + <data type='string'> + <param name='pattern'>(tcp)|(udp)</param> + </data> + </define> + <define name='addr-family'> <data type='string'> <param name="pattern">(ipv4)|(ipv6)</param> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 1058b07..5b293f9 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -138,6 +138,15 @@ static void virNetworkDNSDefFree(virNetworkDNSDefPtr def) } } VIR_FREE(def->hosts); + if (def->nsrvrecords) { + while (def->nsrvrecords--) { + VIR_FREE(def->srvrecords[def->nsrvrecords].domain); + VIR_FREE(def->srvrecords[def->nsrvrecords].service); + VIR_FREE(def->srvrecords[def->nsrvrecords].protocol); + VIR_FREE(def->srvrecords[def->nsrvrecords].target); + } + } + VIR_FREE(def->srvrecords); VIR_FREE(def); } } @@ -553,8 +562,99 @@ error: } static int +virNetworkDNSSrvDefParseXML(virNetworkDNSDefPtr def, + xmlNodePtr cur, + xmlXPathContextPtr ctxt) +{ + char *domain; + char *service; + char *protocol; + char *target; + int port; + int priority; + int weight; + int ret = 0; + char xpath[1024] = { 0 }; + + if (!(service = virXMLPropString(cur, "service"))) { + virNetworkReportError(VIR_ERR_XML_DETAIL, + "%s", _("Missing required service attribute in dns srv record")); + goto error; + } + + if (strlen(service) > DNS_RECORD_LENGTH_SRV) { + virNetworkReportError(VIR_ERR_XML_DETAIL, + "%s", _("Service name is too long, limit is %d bytes"), DNS_RECORD_LENGTH_SRV); + goto error; + } + + if (!(protocol = virXMLPropString(cur, "protocol"))) { + virNetworkReportError(VIR_ERR_XML_DETAIL, + _("Missing required protocol attribute in dns srv record '%s'"), service); + goto error; + } + + /* Check whether protocol value is the supported one */ + if (STRNEQ(protocol, "tcp") && (STRNEQ(protocol, "udp"))) { + virNetworkReportError(VIR_ERR_XML_DETAIL, + _("Invalid protocol attribute value '%s'"), protocol); + goto error; + } + + if (VIR_REALLOC_N(def->srvrecords, def->nsrvrecords + 1) < 0) { + virReportOOMError(); + goto error; + } + + def->srvrecords[def->nsrvrecords].service = service; + def->srvrecords[def->nsrvrecords].protocol = protocol; + def->srvrecords[def->nsrvrecords].domain = NULL; + def->srvrecords[def->nsrvrecords].target = NULL; + def->srvrecords[def->nsrvrecords].port = 0; + def->srvrecords[def->nsrvrecords].priority = 0; + def->srvrecords[def->nsrvrecords].weight = 0; + + /* Following attributes are optional but we had to make sure their NULL above */ + if ((target = virXMLPropString(cur, "target")) && (domain = virXMLPropString(cur, "domain"))) { + snprintf(xpath, sizeof(xpath), "string(//network/dns/srv[@service='%s']/@port)", service); + if (virXPathInt(xpath, ctxt, &port)) + def->srvrecords[def->nsrvrecords].port = port; + + snprintf(xpath, sizeof(xpath), "string(//network/dns/srv[@service='%s']/@priority)", service); + if (virXPathInt(xpath, ctxt, &priority)) + def->srvrecords[def->nsrvrecords].priority = priority; + + snprintf(xpath, sizeof(xpath), "string(//network/dns/srv[@service='%s']/@weight)", service); + if (virXPathInt(xpath, ctxt, &weight)) + def->srvrecords[def->nsrvrecords].weight = weight; + + def->srvrecords[def->nsrvrecords].domain = domain; + def->srvrecords[def->nsrvrecords].target = target; + def->srvrecords[def->nsrvrecords].port = port; + def->srvrecords[def->nsrvrecords].priority = priority; + def->srvrecords[def->nsrvrecords].weight = weight; + } + + def->nsrvrecords++; + + goto cleanup; + +error: + VIR_FREE(domain); + VIR_FREE(service); + VIR_FREE(protocol); + VIR_FREE(target); + + ret = 1; + +cleanup: + return ret; +} + +static int virNetworkDNSDefParseXML(virNetworkDNSDefPtr *dnsdef, - xmlNodePtr node) + xmlNodePtr node, + xmlXPathContextPtr ctxt) { xmlNodePtr cur; int ret = -1; @@ -599,6 +699,11 @@ virNetworkDNSDefParseXML(virNetworkDNSDefPtr *dnsdef, name = NULL; value = NULL; } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "srv")) { + ret = virNetworkDNSSrvDefParseXML(def, cur, ctxt); + if (ret < 0) + goto error; + } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "host")) { ret = virNetworkDNSHostsDefParseXML(def, cur); if (ret < 0) @@ -887,7 +992,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) dnsNode = virXPathNode("./dns", ctxt); if (dnsNode != NULL) { - if (virNetworkDNSDefParseXML(&def->dns, dnsNode) < 0) + if (virNetworkDNSDefParseXML(&def->dns, dnsNode, ctxt) < 0) goto error; } @@ -1146,6 +1251,27 @@ virNetworkDNSDefFormat(virBufferPtr buf, def->txtrecords[i].value); } + for (i = 0 ; i < def->nsrvrecords ; i++) { + if (def->srvrecords[i].service && def->srvrecords[i].protocol) { + virBufferAsprintf(buf, " <srv service='%s' protocol='%s' ", + def->srvrecords[i].service, + def->srvrecords[i].protocol); + + if (def->srvrecords[i].domain) + virBufferAsprintf(buf, "domain='%s' ", def->srvrecords[i].domain); + if (def->srvrecords[i].target) + virBufferAsprintf(buf, "target='%s' ", def->srvrecords[i].target); + if (def->srvrecords[i].port) + virBufferAsprintf(buf, "port='%d' ", def->srvrecords[i].port); + if (def->srvrecords[i].priority) + virBufferAsprintf(buf, "priority='%d' ", def->srvrecords[i].priority); + if (def->srvrecords[i].weight) + virBufferAsprintf(buf, "weight='%d' ", def->srvrecords[i].weight); + + virBufferAsprintf(buf, "/>\n"); + } + } + if (def->nhosts) { int ii, j; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1be20f8..5ef4878 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -24,6 +24,8 @@ #ifndef __NETWORK_CONF_H__ # define __NETWORK_CONF_H__ +#define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */ + # include <libxml/parser.h> # include <libxml/tree.h> # include <libxml/xpath.h> @@ -69,6 +71,18 @@ struct _virNetworkDNSTxtRecordsDef { char *value; }; +typedef struct _virNetworkDNSSrvRecordsDef virNetworkDNSSrvRecordsDef; +typedef virNetworkDNSSrvRecordsDef *virNetworkDNSSrvRecordsDefPtr; +struct _virNetworkDNSSrvRecordsDef { + char *domain; + char *service; + char *protocol; + char *target; + int port; + int priority; + int weight; +}; + struct _virNetworkDNSHostsDef { virSocketAddr ip; int nnames; @@ -82,6 +96,8 @@ struct _virNetworkDNSDef { virNetworkDNSTxtRecordsDefPtr txtrecords; unsigned int nhosts; virNetworkDNSHostsDefPtr hosts; + unsigned int nsrvrecords; + virNetworkDNSSrvRecordsDefPtr srvrecords; }; typedef struct _virNetworkDNSDef *virNetworkDNSDefPtr; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 63338a2..0c0e7a7 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -527,6 +527,49 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, virCommandAddArgPair(cmd, "--txt-record", record); VIR_FREE(record); } + + 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) { + virReportOOMError(); + goto cleanup; + } + } + if (dns->srvrecords[i].priority) { + if (virAsprintf(&recordPriority, "%d", dns->srvrecords[i].priority) < 0) { + virReportOOMError(); + goto cleanup; + } + } + if (dns->srvrecords[i].weight) { + if (virAsprintf(&recordWeight, "%d", dns->srvrecords[i].weight) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + if (virAsprintf(&record, "%s.%s.%s,%s,%s,%s,%s", + dns->srvrecords[i].service, + dns->srvrecords[i].protocol, + dns->srvrecords[i].domain ? dns->srvrecords[i].domain : "", + dns->srvrecords[i].target ? dns->srvrecords[i].target : "", + recordPort ? recordPort : "", + recordPriority ? recordPriority : "", + recordWeight ? recordWeight : "") < 0) { + virReportOOMError(); + goto cleanup; + } + + virCommandAddArgPair(cmd, "--srv-host", record); + VIR_FREE(record); + } + } } /* diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 7ea2e94..4936d1b 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,6 +1,12 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ ---except-interface lo --dhcp-option=3 --no-resolv \ +/usr/sbin/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 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ ---dhcp-no-override\ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases \ +--dhcp-lease-max=253 \ +--dhcp-no-override diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 2158df8..bdf8376 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,3 +1,9 @@ -/usr/sbin/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\ +/usr/sbin/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 new file mode 100644 index 0000000..7005078 --- /dev/null +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -0,0 +1,16 @@ +/usr/sbin/dnsmasq \ +--strict-order \ +--bind-interfaces \ +--conf-file= \ +--except-interface lo \ +--srv-host=name.tcp.,,,, \ +--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 \ +--dhcp-range 192.168.122.2,192.168.122.254 \ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml new file mode 100644 index 0000000..e9b7680 --- /dev/null +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv new file mode 100644 index 0000000..ebb3942 --- /dev/null +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -0,0 +1,16 @@ +/usr/sbin/dnsmasq \ +--strict-order \ +--bind-interfaces \ +--conf-file= \ +--except-interface lo \ +--srv-host=name.tcp.test-domain-name,.,1024,10,10 \ +--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 \ +--dhcp-range 192.168.122.2,192.168.122.254 \ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.xml b/tests/networkxml2argvdata/nat-network-dns-srv-record.xml new file mode 100644 index 0000000..4be85b5 --- /dev/null +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index be6ba4b..5c35aae 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,9 +1,16 @@ -/usr/sbin/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 \ +/usr/sbin/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 \ ---listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ +--listen-address 2001:db8:ac10:fd01::1 \ +--listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d7faee2..e22de4c 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,8 +1,15 @@ -/usr/sbin/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 \ +/usr/sbin/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 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 78e873c..bf8ff5e 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,6 +1,15 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ +/usr/sbin/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 \ ---dhcp-lease-max=253 --dhcp-no-override --expand-hosts --enable-tftp \ ---tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--expand-hosts \ +--enable-tftp \ +--tftp-root /var/lib/tftproot \ +--dhcp-boot pxeboot.img diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 5fe1b8e..29935ea 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,6 +1,13 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ +/usr/sbin/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 \ ---dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ ---dhcp-boot pxeboot.img,,10.20.30.40\ +--dhcp-lease-max=253 \ +--dhcp-no-override \ +--expand-hosts \ +--dhcp-boot pxeboot.img,,10.20.30.40 diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index d059630..79c319b 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,2 +1,6 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ ---except-interface lo --listen-address 192.168.122.1\ +/usr/sbin/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 4a11d6f..4223cb7 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -18,6 +18,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; + char *actual_tmp = NULL; char *actual = NULL; int ret = -1; virNetworkDefPtr dev = NULL; @@ -47,9 +48,17 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, dctx) < 0) goto fail; - if (!(actual = virCommandToString(cmd))) + if (!(actual_tmp = virCommandToString(cmd))) goto fail; + if (VIR_ALLOC_N( actual, (strlen(actual_tmp) + 3) * sizeof(char) ) < 0) + goto fail; + + /* A little hack to make it working for both check and syntax-check */ + memcpy(actual, actual_tmp, strlen(actual_tmp)); + actual[ strlen(actual_tmp) ] = '\n'; + actual[ strlen(actual_tmp) + 1 ] = 0; + if (STRNEQ(outArgvData, actual)) { virtTestDifference(stderr, outArgvData, actual); goto fail; @@ -61,6 +70,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { free(inXmlData); free(outArgvData); free(actual); + free(actual_tmp); VIR_FREE(pidfile); virCommandFree(cmd); virNetworkObjFree(obj); @@ -120,6 +130,8 @@ mymain(void) DO_TEST("netboot-network"); DO_TEST("netboot-proxy-network"); DO_TEST("nat-network-dns-txt-record"); + DO_TEST("nat-network-dns-srv-record"); + DO_TEST("nat-network-dns-srv-record-minimal"); DO_TEST("nat-network-dns-hosts"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml new file mode 100644 index 0000000..e9b7680 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml new file mode 100644 index 0000000..4be85b5 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml new file mode 100644 index 0000000..e9b7680 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml new file mode 100644 index 0000000..4be85b5 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> -- 1.7.7.3

2 1

[libvirt] [PATCH 00/14] Add a virtlockd lock manager daemon
by Daniel P. Berrange 05 Dec '11

05 Dec '11

The lock manager infrastructure we recently added to QEMU only has two possible drivers at this time, 'nop' and 'sanlock'. The former does absolutely nothing, while the latter requires a 3rd party package installed and is a little heavy on disk I/O and storage requirements. This series adds a new daemon 'virtlockd' which is intended to be enabled by default on all hosts running 'libvirtd'. This daemon provides a service for disk locking based on the traditional fcntl() lock primitives. There is a new libvirt manager plugin which talks to this daemon over RPC. The reason for doing the locks in a separate process is that we want the locks to remain active, even if libvirtd crashes, or is restarted. The virtlockd daemon has this one single job so should be pretty reliable and selfcontained. This patch series really benefits from the new RPC APIs, requiring minimal code for the new daemon / client At this time, virtlockd does not lock the actual disk files, but instead creates a lockspace & leases under /var/lib/libvirt/lockd. The lockspace we use for disks is named org.libvirt.lockd.files, and lease names are based on a SHA256 checksum of the fully qualified disk name. eg /var/lib/libvirt/lockd/org.libvirt.lockd.files/adf94fc33a24da1abff7dd7374a9919bb51efee646da8c3ac464c10cd59750bd These leases are all zero-bytes long and no I/O is ever performed on them, only fcntl() is used. So there is material overhead. Whenever creating or deleting leases, we first acquire a lock on /var/lib/libvirt/lockd/org.libvirt.lockd.files/org.libvirt.lockd.index A non-root virtlockd will instead use $HOME/.libvirt/lockd By default we gain protection out of the box against - Starting two guests on the same host with the same disk image not marked with <shareable/> - libvirtd getting confused and forgetting a guest, allowing it to be started for a 2nd time If the admin mounts a shared filesytem (eg NFS) on /var/lib/libvirt/lockd then this protection is extended across all hosts sharing that mount volume. As part of this series, I also introduce support for systemd services for libvirtd and libvir-guests.

4 27

[libvirt] [PATCH] examples: Update event tests for shutdown event
by Jiri Denemark 05 Dec '11

05 Dec '11

--- examples/domain-events/events-c/event-test.c | 22 ++++++++++++++----- examples/domain-events/events-python/event-test.py | 6 +++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 648e6ea..f4938c4 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -40,7 +40,7 @@ void usage(const char *pname); const char *eventToString(int event) { const char *ret = ""; - switch(event) { + switch ((virDomainEventType) event) { case VIR_DOMAIN_EVENT_DEFINED: ret ="Defined"; break; @@ -59,13 +59,16 @@ const char *eventToString(int event) { case VIR_DOMAIN_EVENT_STOPPED: ret ="Stopped"; break; + case VIR_DOMAIN_EVENT_SHUTDOWN: + ret = "Shutdown"; + break; } return ret; } static const char *eventDetailToString(int event, int detail) { const char *ret = ""; - switch(event) { + switch ((virDomainEventType) event) { case VIR_DOMAIN_EVENT_DEFINED: if (detail == VIR_DOMAIN_EVENT_DEFINED_ADDED) ret = "Added"; @@ -77,7 +80,7 @@ static const char *eventDetailToString(int event, int detail) { ret = "Removed"; break; case VIR_DOMAIN_EVENT_STARTED: - switch (detail) { + switch ((virDomainEventStartedDetailType) detail) { case VIR_DOMAIN_EVENT_STARTED_BOOTED: ret = "Booted"; break; @@ -93,7 +96,7 @@ static const char *eventDetailToString(int event, int detail) { } break; case VIR_DOMAIN_EVENT_SUSPENDED: - switch (detail) { + switch ((virDomainEventSuspendedDetailType) detail) { case VIR_DOMAIN_EVENT_SUSPENDED_PAUSED: ret = "Paused"; break; @@ -115,7 +118,7 @@ static const char *eventDetailToString(int event, int detail) { } break; case VIR_DOMAIN_EVENT_RESUMED: - switch (detail) { + switch ((virDomainEventResumedDetailType) detail) { case VIR_DOMAIN_EVENT_RESUMED_UNPAUSED: ret = "Unpaused"; break; @@ -128,7 +131,7 @@ static const char *eventDetailToString(int event, int detail) { } break; case VIR_DOMAIN_EVENT_STOPPED: - switch (detail) { + switch ((virDomainEventStoppedDetailType) detail) { case VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN: ret = "Shutdown"; break; @@ -152,6 +155,13 @@ static const char *eventDetailToString(int event, int detail) { break; } break; + case VIR_DOMAIN_EVENT_SHUTDOWN: + switch ((virDomainEventShutdownDetailType) detail) { + case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: + ret = "Finished"; + break; + } + break; } return ret; } diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 60a9c34..0c75091 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -430,7 +430,8 @@ def eventToString(event): "Started", "Suspended", "Resumed", - "Stopped" ); + "Stopped", + "Shutdown" ); return eventStrings[event]; def detailToString(event, detail): @@ -440,7 +441,8 @@ def detailToString(event, detail): ( "Booted", "Migrated", "Restored", "Snapshot" ), ( "Paused", "Migrated", "IOError", "Watchdog" ), ( "Unpaused", "Migrated"), - ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot") + ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), + ( "Finished" ) ) return eventStrings[event][detail] -- 1.7.8

2 2

[libvirt] [libvirt-glib] Use gvir_error_set_literal in more places
by Christophe Fergeau 05 Dec '11

05 Dec '11

GVirConnection has some gvir_set_error uses that can be replaced by gvir_set_error_set_literal. When passing a single string, this is safer since we are guaranteed that unwanted printf-format sequences in the string won't cause issues. --- libvirt-gobject/libvirt-gobject-connection.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 50cd860..f478948 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -421,9 +421,9 @@ gboolean gvir_connection_open(GVirConnection *conn, if (!priv->uri) { char *uri = virConnectGetURI(priv->conn); if (!uri) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, - "%s", "Unable to get connection URI"); + "Unable to get connection URI"); virConnectClose(priv->conn); priv->conn = NULL; g_mutex_unlock(priv->lock); @@ -618,9 +618,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, g_mutex_lock(priv->lock); if (!priv->conn) { - g_set_error(err, GVIR_CONNECTION_ERROR, - 0, - "Connection is not open"); + g_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); g_mutex_unlock(priv->lock); goto cleanup; } @@ -633,9 +633,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, goto cleanup; if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - "Unable to count domains"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to count domains"); goto cleanup; } if (nactive) { @@ -644,9 +644,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, active = g_new(gint, nactive); if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - "Unable to list domains"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to list domains"); goto cleanup; } } -- 1.7.7.3

2 2

[libvirt] Add <console> support
by Christophe Fergeau 05 Dec '11

05 Dec '11

Hi, This patch series adds support for setting <console> nodes as has been discussed in the "[PATCH libvirt-glib 02/15] Add objects for dealing with <console> devices" thread. It introduces a GVirConfigDomainChardev which derives from GVirConfigDomainDevice. The actual classes to create <console>, <serial>, <parallel> nodes will inherit from this parent class. Then we have GVirConfigDomainChardevSource which derives from GVirConfigObject (with a dummy root node name) and from which derives GVirConfigDomainChardevSourcePty. A GVirConfigDomainChardevSourcePty is associated to a GVirConfigDomainConsole object through GVirConfigDomainChardev::add_source. Maybe it should be ::set_source, I'm unsure... The code from ::add_source directly messes with the xml nodes so a careful review won't hurt :) At this point I consider this to be at least 50% RFC so we can still redesign the whole thing. Christophe

2 8

[libvirt] [PATCH 00/10] Console coruption with two or more clients series
by Peter Krempa 05 Dec '11

05 Dec '11

This series fixes anoying console corruption if two clients try to connect at same time to the console. The current state of this is, that two/more of libvirt iohelpers are spawned on the same time that compete for data from the pty. This causes that each of the consoles get scrambled and unusable. Patches fdstream: Emit stream abort callback even if poll() doesnt. virnetclientstream: Propagate stream error messages to callback daemon: Subscribe the stream event callback for error events. add the ability to abort a stream from the daemon side. fdstream: Add internal function to check if a fdstream is open This patch adds a helper function that checks internally if a fdstream is open and working. virsh: fix console stream error reporting Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_FORCE flag This patches add instrumentation to virsh that supports the new ability to abort streams from the daemon side and adapts the console callback to handle this. These patches also add a new flag set for virDomainOpenConsole API call that allow users to control the if the existing console connection should be left in place or killed in favor of the new one qemu: Add ability to abort existing console while creating new one lxc: Add ability to abort existing console when creating a new one uml: Add ability to abort existing console when creating a new one These patches modify the hypervisor drivers so that they are aware of existing console connections and refuse to create a new one (or kill the old). The xen driver also supports console in a similar way like the previously mentioned drivers, but lacks the means to store a stream reference permanently. I'll look in if it's possible to modify this driver to support this new functionality. For convinience, to review these patches: git checkout -b console_corruption 33b55fd85ae5435bda53c3cfcbe1385074befd01 git pull git://aeon.pipo.sk/libvirt.git console_corruption Peter Peter Krempa (10): fdstream: Emit stream abort callback even if poll() doesnt. virnetclientstream: Propagate stream error messages to callback daemon: Subscribe the stream event callback for error events. fdstream: Add internal function to check if a fdstream is open virsh: fix console stream error reporting Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_FORCE flag qemu: Add ability to abort existing console while creating new one lxc: Add ability to abort existing console when creating a new one uml: Add ability to abort existing console when creating a new one daemon/stream.c | 2 +- include/libvirt/libvirt.h.in | 12 +++++++- src/fdstream.c | 61 ++++++++++++++++++++++++++++++++++++++--- src/fdstream.h | 2 + src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 28 ++++++++++++++++++- src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 23 +++++++++++++++- src/rpc/virnetclientstream.c | 12 +++++--- src/uml/uml_driver.c | 28 ++++++++++++++++++- tools/console.c | 27 ++++++++++++------ tools/console.h | 2 +- tools/virsh.c | 18 +++++++++--- 14 files changed, 192 insertions(+), 29 deletions(-) -- 1.7.3.4

3 21

[libvirt] KVM call agenda for 12/6 (Tuesday) @ 10am US/Eastern
by Juan Quintela 05 Dec '11

05 Dec '11

Hi Please send in any agenda items you are interested in covering. Proposal (from Anthony): > 1. A short introduction to each of the guest agents, what guests they > support, and what verbs they support. > 2. A short description of key requirements from each party (oVirt, > libvirt, QEMU) for a guest agent > 3. An open discussion about possible ways to collaborate/converge. Notice that guest integration will take more than one week (Anthony estimation also). For libvirt and ovirt folks, please contact me or Chris for details of the call. Thanks, Juan.

1 0

[libvirt] [PATCH] Fix incorrect symbols for virtime.h module breaking Mingw32
by Daniel P. Berrange 05 Dec '11

05 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Mingw32 linker highlighted that the symbols for virtime.h declared in libvirt_private.syms were incorrect * src/libvirt_private.syms: Fix virtime.h symbols --- src/libvirt_private.syms | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) Pushing as a build-breaker fix diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a6ab07..99a1099 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1387,13 +1387,16 @@ virKeycodeValueTranslate; # virtime.h -virTimeMillisNow; virTimeFieldsNow; +virTimeFieldsNowRaw; virTimeFieldsThen; +virTimeFieldsThenRaw; +virTimeMillisNow; +virTimeMillisNowRaw; virTimeStringNow; +virTimeStringNowRaw; virTimeStringThen; -virTimeStringNewNow; -virTimeStringNewThen; +virTimeStringThenRaw; # xml.h -- 1.7.6.4

1 0

[libvirt] [PATCH] qemu: Rework handling of shutdown event
by Jiri Denemark 05 Dec '11

05 Dec '11

When QEMU guest finishes its shutdown sequence, qemu stops virtual CPUs and when started with -no-shutdown waits for us to kill it using SGITERM. Since QEMU is flushing its internal buffers, some time may pass before QEMU actually dies. We mistakenly used "paused" state (and events) for this which is quite confusing since users may see a domain going to pause while they expect it to shutdown. Since we already have "shutdown" state with "the domain is being shut down" semantics, we should use it for this state. However, the state didn't have a corresponding event so I created one and called its detail as VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED (guest OS finished its shutdown sequence) with the intent to add VIR_DOMAIN_EVENT_SHUTDOWN_STARTED in the future if we have a sufficiently capable guest agent that can notify us when guest OS starts to shutdown. --- include/libvirt/libvirt.h.in | 10 +++ src/qemu/qemu_process.c | 126 ++++++++++++++++++++++++++++++------------ 2 files changed, 100 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index d01d1bc..8d4a049 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2288,6 +2288,7 @@ typedef enum { VIR_DOMAIN_EVENT_SUSPENDED = 3, VIR_DOMAIN_EVENT_RESUMED = 4, VIR_DOMAIN_EVENT_STOPPED = 5, + VIR_DOMAIN_EVENT_SHUTDOWN = 6, } virDomainEventType; /** @@ -2363,6 +2364,15 @@ typedef enum { /** + * virDomainEventShutdownDetailType: + * + * Details about the 'shutdown' lifecycle event + */ +typedef enum { + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ +} virDomainEventShutdownDetailType; + +/** * virConnectDomainEventCallback: * @conn: virConnect connection * @dom: The domain on which the event occurred diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab0cb2b..5e8a20a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -431,19 +431,13 @@ cleanup: static void -qemuProcessShutdownOrReboot(virDomainObjPtr vm) +qemuProcessShutdownOrReboot(struct qemud_driver *driver, + virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - if (priv->gotShutdown) { - VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", - vm->def->name); - return; - } - - priv->gotShutdown = true; if (priv->fakeReboot) { - qemuDomainSetFakeReboot(qemu_driver, vm, false); + qemuDomainSetFakeReboot(driver, vm, false); virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, @@ -464,11 +458,47 @@ static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { + struct qemud_driver *driver = qemu_driver; + qemuDomainObjPrivatePtr priv; + virDomainEventPtr event = NULL; + VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); - qemuProcessShutdownOrReboot(vm); + + priv = vm->privateData; + if (priv->gotShutdown) { + VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", + vm->def->name); + goto unlock; + } + priv->gotShutdown = true; + + VIR_DEBUG("Transitioned guest %s to shutdown state", + vm->def->name); + virDomainObjSetState(vm, + VIR_DOMAIN_SHUTDOWN, + VIR_DOMAIN_SHUTDOWN_UNKNOWN); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + + qemuProcessShutdownOrReboot(driver, vm); + +unlock: virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + return 0; } @@ -479,22 +509,20 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, { struct qemud_driver *driver = qemu_driver; virDomainEventPtr event = NULL; - virDomainPausedReason reason = VIR_DOMAIN_PAUSED_UNKNOWN; virDomainObjLock(vm); if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { qemuDomainObjPrivatePtr priv = vm->privateData; if (priv->gotShutdown) { - VIR_DEBUG("Got STOP event after SHUTDOWN, assuming we are stopping" - " for shutdown"); - reason = VIR_DOMAIN_PAUSED_SHUTTING_DOWN; + VIR_DEBUG("Ignoring STOP event after SHUTDOWN"); + goto unlock; } - VIR_DEBUG("Transitioned guest %s to paused state, reason=%s", - vm->def->name, virDomainPausedReasonTypeToString(reason)); + VIR_DEBUG("Transitioned guest %s to paused state", + vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); @@ -509,12 +537,13 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm->def->name); } } + +unlock: virDomainObjUnlock(vm); if (event) { qemuDriverLock(driver); - if (event) - qemuDomainEventQueue(driver, event); + qemuDomainEventQueue(driver, event); qemuDriverUnlock(driver); } @@ -2338,7 +2367,10 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; virDomainState state; virDomainPausedReason reason; + virDomainState newState = VIR_DOMAIN_NOSTATE; + int newReason; bool running; + char *msg = NULL; int ret; qemuDomainObjEnterMonitorWithDriver(driver, vm); @@ -2351,19 +2383,40 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) state = virDomainObjGetState(vm, NULL); if (state == VIR_DOMAIN_PAUSED && running) { - VIR_DEBUG("Domain %s was unpaused while its monitor was disconnected;" - " changing state to running", vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_UNPAUSED); + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_UNPAUSED; + msg = strdup("was unpaused"); } else if (state == VIR_DOMAIN_RUNNING && !running) { - VIR_DEBUG("Domain %s was paused (%s) while its monitor was" - " disconnected; changing state to paused", - vm->def->name, virDomainPausedReasonTypeToString(reason)); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); + if (reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { + newState = VIR_DOMAIN_SHUTDOWN; + newReason = VIR_DOMAIN_SHUTDOWN_UNKNOWN; + msg = strdup("shutdown"); + } else { + newState = VIR_DOMAIN_PAUSED; + newReason = reason; + virAsprintf(&msg, "was paused (%s)", + virDomainPausedReasonTypeToString(reason)); + } } else if (state == VIR_DOMAIN_SHUTOFF && running) { - VIR_DEBUG("Domain %s finished booting; changing state to running", - vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_BOOTED; + msg = strdup("finished booting"); + } + + if (newState != VIR_DOMAIN_NOSTATE) { + if (!msg) { + virReportOOMError(); + return -1; + } + + VIR_DEBUG("Domain %s %s while its monitor was disconnected;" + " changing state to %s (%s)", + vm->def->name, + msg, + virDomainStateTypeToString(newState), + virDomainStateReasonToString(newState, newReason)); + VIR_FREE(msg); + virDomainObjSetState(vm, newState, newReason); } return 0; @@ -2637,15 +2690,16 @@ qemuProcessReconnect(void *opaque) &priv->qemuCaps) < 0) goto error; - /* In case the domain was paused for shutdown while we were not running, + /* In case the domain shutdown while we were not running, * we need to finish the shutdown process. And we need to do it after * we have qemuCaps filled in. */ - if (state == VIR_DOMAIN_PAUSED - && reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { - VIR_DEBUG("Domain %s shut down while we were not running;" - " finishing shutdown sequence", obj->def->name); - qemuProcessShutdownOrReboot(obj); + if (state == VIR_DOMAIN_SHUTDOWN || + (state == VIR_DOMAIN_PAUSED && + reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN)) { + VIR_DEBUG("Finishing shutdown sequence for domain %s", + obj->def->name); + qemuProcessShutdownOrReboot(driver, obj); goto endjob; } -- 1.7.8.rc4

3 3

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..0470b4d 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + if (err) + *err = gvir_error_new_literal(GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ 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); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

2 1

[libvirt] [PATCH] Introduce gvir_set_error (and friends) & convert all code
by Daniel P. Berrange 05 Dec '11

05 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The pattern GError **error; .... *err = gvir_error_new(...) is dangerous because 'err' could be NULL, and it is tedious to expect everyone to check. Introduce a new set of APIs for setting errors gvir_set_error(err, ...) and convert all callers to this new pattern --- libvirt-gconfig/libvirt-gconfig-helpers-private.h | 7 +- libvirt-gconfig/libvirt-gconfig-helpers.c | 48 +++++++--- libvirt-gconfig/libvirt-gconfig-object.c | 15 ++- libvirt-glib/libvirt-glib-error.c | 91 +++++++++++++++++++ libvirt-glib/libvirt-glib-error.h | 18 ++++ libvirt-glib/libvirt-glib.sym | 3 + libvirt-gobject/libvirt-gobject-connection.c | 88 ++++++++---------- libvirt-gobject/libvirt-gobject-domain-disk.c | 7 +- libvirt-gobject/libvirt-gobject-domain-interface.c | 7 +- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 6 +- libvirt-gobject/libvirt-gobject-domain.c | 95 +++++++++----------- libvirt-gobject/libvirt-gobject-interface.c | 7 +- libvirt-gobject/libvirt-gobject-network-filter.c | 7 +- libvirt-gobject/libvirt-gobject-network.c | 7 +- libvirt-gobject/libvirt-gobject-node-device.c | 7 +- libvirt-gobject/libvirt-gobject-secret.c | 7 +- libvirt-gobject/libvirt-gobject-storage-pool.c | 47 +++++------ libvirt-gobject/libvirt-gobject-storage-vol.c | 7 +- libvirt-gobject/libvirt-gobject-stream.c | 14 ++-- 19 files changed, 295 insertions(+), 193 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 6277cbd..087085e 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -30,8 +30,11 @@ G_BEGIN_DECLS -GError *gvir_xml_error_new(GQuark domain, gint code, - const gchar *format, ...); +GError *gvir_config_xml_error_new(GQuark domain, gint code, + const gchar *format, ...); +void gvir_config_set_xml_error(GError **err, + GQuark domain, gint code, + const gchar *format, ...); xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index 7bba594..f4f82e9 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -36,9 +36,9 @@ gvir_config_object_error_quark(void) return g_quark_from_static_string("gvir-config-object"); } -static GError *gvir_xml_error_new_literal(GQuark domain, - gint code, - const gchar *message) +static GError *gvir_config_xml_error_new_literal(GQuark domain, + gint code, + const gchar *message) { xmlErrorPtr xerr = xmlGetLastError(); @@ -59,10 +59,10 @@ static GError *gvir_xml_error_new_literal(GQuark domain, } -GError *gvir_xml_error_new(GQuark domain, - gint code, - const gchar *format, - ...) +GError *gvir_config_xml_error_new(GQuark domain, + gint code, + const gchar *format, + ...) { GError *err; va_list args; @@ -72,13 +72,34 @@ GError *gvir_xml_error_new(GQuark domain, message = g_strdup_vprintf(format, args); va_end(args); - err = gvir_xml_error_new_literal(domain, code, message); + err = gvir_config_xml_error_new_literal(domain, code, message); g_free(message); return err; } + +void gvir_config_set_xml_error(GError **err, + GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; + gchar *message; + + if (!err) + return; + + va_start(args, format); + message = g_strdup_vprintf(format, args); + va_end(args); + + *err = gvir_config_xml_error_new_literal(domain, code, message); + + g_free(message); +} + + xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) { @@ -94,17 +115,18 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) doc = xmlParseMemory(xml, strlen(xml)); if (!doc) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "Unable to parse configuration"); return NULL; } if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { - *err = g_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "XML data has no '%s' node", - root_node); + g_set_error(err, + GVIR_CONFIG_OBJECT_ERROR, + 0, + "XML data has no '%s' node", + root_node); xmlFreeDoc(doc); return NULL; } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 5e973d5..3a55387 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -202,7 +202,8 @@ void gvir_config_object_validate(GVirConfigObject *config, xmlSetStructuredErrorFunc(NULL, gvir_xml_structured_error_nop); if (!priv->node) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "No XML document associated with this config object"); @@ -211,7 +212,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rngParser = xmlRelaxNGNewParserCtxt(priv->schema); if (!rngParser) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to create RNG parser for %s", priv->schema); @@ -220,7 +222,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rng = xmlRelaxNGParse(rngParser); if (!rng) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to parse RNG %s", priv->schema); @@ -231,7 +234,8 @@ void gvir_config_object_validate(GVirConfigObject *config, rngValid = xmlRelaxNGNewValidCtxt(rng); if (!rngValid) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "Unable to create RNG validation context %s", priv->schema); @@ -240,7 +244,8 @@ void gvir_config_object_validate(GVirConfigObject *config, } if (xmlRelaxNGValidateDoc(rngValid, priv->node->doc) != 0) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, + gvir_config_set_xml_error(err, + GVIR_CONFIG_OBJECT_ERROR, 0, "%s", "Unable to validate doc"); diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index b4d1f93..4a44216 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -126,3 +126,94 @@ GError *gvir_error_new_valist(GQuark domain, return err; } + + +/** + * gvir_set_error: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @Varargs: parameters for message format + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError with the given @domain and @code, + * and a message formatted with @format, and stores it + * in @error. + */ +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...) +{ + va_list args; + gchar *message; + + if (!error) + return; + + va_start(args, format); + message = g_strdup_vprintf(format, args); + va_end(args); + + *error = gvir_error_new_literal(domain, code, message); + + g_free(message); +} + + +/** + * gvir_set_error_literal: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @message: error message + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError and stores it in @error; unlike + * gvir_set_error(), @message is not a printf()-style + * format string. Use this function if @message contains + * text you don't have control over, that could include + * printf() escape sequences. + */ +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message) +{ + if (!error) + return; + + *error = gvir_error_new_literal(domain, code, message); +} + + +/** + * gvir_set_error_valist: (skip) + * @error: pointer to error location + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @args: #va_list of parameters for the message format + * + * If @error is NULL this does nothing. Otherwise it + * creates a new #GError with the given @domain and @code, + * and a message formatted with @format, and stores it + * in @error. + */ +void gvir_set_error_valist(GError **error, + GQuark domain, + gint code, + const gchar *format, + va_list args) +{ + gchar *message; + if (!error) + return; + + message = g_strdup_vprintf(format, args); + *error = gvir_error_new_literal(domain, code, message); + + g_free(message); +} diff --git a/libvirt-glib/libvirt-glib-error.h b/libvirt-glib/libvirt-glib-error.h index cfb5b95..9e44383 100644 --- a/libvirt-glib/libvirt-glib-error.h +++ b/libvirt-glib/libvirt-glib-error.h @@ -42,6 +42,24 @@ GError *gvir_error_new_valist(GQuark domain, const gchar *format, va_list args); +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...); + +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message); + +void gvir_set_error_valist(GError **error, + GQuark domain, + gint code, + const gchar *format, + va_list args); + + G_END_DECLS #endif /* __LIBVIRT_GLIB_ERROR_H__ */ diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index cd41cb9..289dbee 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -7,6 +7,9 @@ LIBVIRT_GLIB_0.0.1 { gvir_error_new; gvir_error_new_valist; gvir_error_new_literal; + gvir_set_error; + gvir_set_error_valist; + gvir_set_error_literal; local: *; diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 9d3ab10..50cd860 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -401,21 +401,19 @@ gboolean gvir_connection_open(GVirConnection *conn, g_mutex_lock(priv->lock); if (priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection %s is already open", - priv->uri); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection %s is already open", + priv->uri); g_mutex_unlock(priv->lock); return FALSE; } if (!(priv->conn = virConnectOpen(priv->uri))) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to open %s", - priv->uri); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to open %s", + priv->uri); g_mutex_unlock(priv->lock); return FALSE; } @@ -423,10 +421,9 @@ gboolean gvir_connection_open(GVirConnection *conn, if (!priv->uri) { char *uri = virConnectGetURI(priv->conn); if (!uri) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "%s", "Unable to get connection URI"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "%s", "Unable to get connection URI"); virConnectClose(priv->conn); priv->conn = NULL; g_mutex_unlock(priv->lock); @@ -570,10 +567,9 @@ static gchar ** fetch_list(virConnectPtr vconn, gint i; if ((n = count_func(vconn)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count %s", name); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to count %s", name); goto error; } @@ -583,10 +579,9 @@ static gchar ** fetch_list(virConnectPtr vconn, lst = g_new(gchar *, n); if ((n = list_func(vconn, lst, n)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list %s %d", name, n); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to list %s %d", name, n); goto error; } } @@ -623,10 +618,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, g_mutex_lock(priv->lock); if (!priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection is not open"); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); g_mutex_unlock(priv->lock); goto cleanup; } @@ -639,10 +633,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, goto cleanup; if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count domains"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to count domains"); goto cleanup; } if (nactive) { @@ -651,10 +644,9 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, active = g_new(gint, nactive); if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - if (err) - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list domains"); + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to list domains"); goto cleanup; } } @@ -755,10 +747,9 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, g_mutex_lock(priv->lock); if (!priv->conn) { - if (err) - *err = g_error_new(GVIR_CONNECTION_ERROR, - 0, - "Connection is not open"); + g_set_error(err, GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); g_mutex_unlock(priv->lock); goto cleanup; } @@ -1238,10 +1229,9 @@ GVirDomain *gvir_connection_create_domain(GVirConnection *conn, handle = virDomainDefineXML(priv->conn, xml); g_free(xml); if (!handle) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - 0, - "Failed to create domain"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); return NULL; } @@ -1286,10 +1276,9 @@ GVirDomain *gvir_connection_start_domain(GVirConnection *conn, handle = virDomainCreateXML(priv->conn, xml, flags); g_free(xml); if (!handle) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - 0, - "Failed to create domain"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Failed to create domain"); return NULL; } @@ -1331,10 +1320,9 @@ GVirStoragePool *gvir_connection_create_storage_pool g_return_val_if_fail(xml != NULL, NULL); if (!(handle = virStoragePoolDefineXML(priv->conn, xml, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_CONNECTION_ERROR, - flags, - "Failed to create storage pool"); + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + flags, + "Failed to create storage pool"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index ab9b29f..f98d816 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -175,10 +175,9 @@ GVirDomainDiskStats *gvir_domain_disk_get_stats(GVirDomainDisk *self, GError **e handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); if (virDomainBlockStats(handle, priv->path, &stats, sizeof (stats)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_DISK_ERROR, - 0, - "Unable to get domain disk stats"); + gvir_set_error_literal(err, GVIR_DOMAIN_DISK_ERROR, + 0, + "Unable to get domain disk stats"); goto end; } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 223a663..0917e03 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -175,10 +175,9 @@ GVirDomainInterfaceStats *gvir_domain_interface_get_stats(GVirDomainInterface *s handle = gvir_domain_device_get_domain_handle(GVIR_DOMAIN_DEVICE(self)); if (virDomainInterfaceStats(handle, priv->path, &stats, sizeof (stats)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_INTERFACE_ERROR, - 0, - "Unable to get domain interface stats"); + gvir_set_error_literal(err, GVIR_DOMAIN_INTERFACE_ERROR, + 0, + "Unable to get domain interface stats"); goto end; } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 36dd15b..e68321d 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -196,9 +196,9 @@ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config gchar *xml; if (!(xml = virDomainSnapshotGetXMLDesc(priv->handle, flags))) { - *err = gvir_error_new_literal(GVIR_DOMAIN_SNAPSHOT_ERROR, - 0, - "Unable to get domain_snapshot XML config"); + gvir_set_error_literal(err, GVIR_DOMAIN_SNAPSHOT_ERROR, + 0, + "Unable to get domain_snapshot XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 56694a8..7bfb0ae 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -279,10 +279,9 @@ gint gvir_domain_get_id(GVirDomain *dom, gint ret; if ((ret = virDomainGetID(priv->handle)) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get ID for domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get ID for domain"); } return ret; } @@ -305,10 +304,9 @@ gboolean gvir_domain_start(GVirDomain *dom, else ret = virDomainCreate(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to start domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to start domain"); return FALSE; } @@ -327,10 +325,9 @@ gboolean gvir_domain_resume(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainResume(priv->handle) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to resume domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to resume domain"); return FALSE; } @@ -354,10 +351,9 @@ gboolean gvir_domain_stop(GVirDomain *dom, else ret = virDomainDestroy(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to stop domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to stop domain"); return FALSE; } @@ -381,10 +377,9 @@ gboolean gvir_domain_delete(GVirDomain *dom, else ret = virDomainUndefine(priv->handle); if (ret < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to delete domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to delete domain"); return FALSE; } @@ -403,10 +398,9 @@ gboolean gvir_domain_shutdown(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainShutdown(priv->handle) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to shutdown domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to shutdown domain"); return FALSE; } @@ -425,10 +419,9 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainPrivate *priv = dom->priv; if (virDomainReboot(priv->handle, flags) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to reboot domain"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to reboot domain"); return FALSE; } @@ -449,10 +442,9 @@ GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, gchar *xml; if (!(xml = virDomainGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get domain XML config"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get domain XML config"); return NULL; } @@ -496,10 +488,9 @@ gboolean gvir_domain_set_config(GVirDomain *domain, g_return_val_if_fail(xml != NULL, FALSE); if ((conn = virDomainGetConnect(priv->handle)) == NULL) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to get domain connection"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to get domain connection"); g_free (xml); return FALSE; @@ -509,11 +500,10 @@ gboolean gvir_domain_set_config(GVirDomain *domain, g_free (xml); if (handle == NULL) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to set " - "domain configuration"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to set " + "domain configuration"); return FALSE; } @@ -521,11 +511,10 @@ gboolean gvir_domain_set_config(GVirDomain *domain, virDomainFree(handle); if (g_strcmp0 (uuid, priv->uuid) != 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Failed to set " - "domain configuration"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to set " + "domain configuration"); return FALSE; } @@ -546,10 +535,9 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GVirDomainInfo *ret; if (virDomainGetInfo(priv->handle, &info) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to get domain info"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to get domain info"); return NULL; } @@ -591,10 +579,9 @@ gchar *gvir_domain_screenshot(GVirDomain *dom, st, monitor_id, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_DOMAIN_ERROR, - 0, - "Unable to take a screenshot"); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to take a screenshot"); goto end; } end: diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 1413abf..7e6e9b0 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -185,10 +185,9 @@ GVirConfigInterface *gvir_interface_get_config(GVirInterface *iface, gchar *xml; if (!(xml = virInterfaceGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_INTERFACE_ERROR, - 0, - "Unable to get interface XML config"); + gvir_set_error_literal(err, GVIR_INTERFACE_ERROR, + 0, + "Unable to get interface XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 2ac8236..f0fd024 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -211,10 +211,9 @@ GVirConfigNetworkFilter *gvir_network_filter_get_config gchar *xml; if (!(xml = virNWFilterGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NETWORK_FILTER_ERROR, - 0, - "Unable to get network_filter XML config"); + gvir_set_error_literal(err, GVIR_NETWORK_FILTER_ERROR, + 0, + "Unable to get network_filter XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 5f40a77..847c236 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -207,10 +207,9 @@ GVirConfigNetwork *gvir_network_get_config(GVirNetwork *network, gchar *xml; if (!(xml = virNetworkGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NETWORK_ERROR, - 0, - "Unable to get network XML config"); + gvir_set_error_literal(err, GVIR_NETWORK_ERROR, + 0, + "Unable to get network XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index e21d1db..59fe84b 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -186,10 +186,9 @@ GVirConfigNodeDevice *gvir_node_device_get_config(GVirNodeDevice *device, gchar *xml; if (!(xml = virNodeDeviceGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_NODE_DEVICE_ERROR, - 0, - "Unable to get node_device XML config"); + gvir_set_error_literal(err, GVIR_NODE_DEVICE_ERROR, + 0, + "Unable to get node_device XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 7521b73..0c81921 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -197,10 +197,9 @@ GVirConfigSecret *gvir_secret_get_config(GVirSecret *secret, gchar *xml; if (!(xml = virSecretGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_SECRET_ERROR, - 0, - "Unable to get secret XML config"); + gvir_set_error_literal(err, GVIR_SECRET_ERROR, + 0, + "Unable to get secret XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index e267dff..76970db 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -239,10 +239,9 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, gchar *xml; if (!(xml = virStoragePoolGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to get storage_pool XML config"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to get storage_pool XML config"); return NULL; } @@ -297,9 +296,9 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, gint i; if ((n = count_func(vpool)) < 0) { - *err = gvir_error_new(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to count %s", name); + gvir_set_error(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to count %s", name); goto error; } @@ -309,9 +308,9 @@ static gchar ** fetch_list(virStoragePoolPtr vpool, lst = g_new(gchar *, n); if ((n = list_func(vpool, lst, n)) < 0) { - *err = gvir_error_new(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to list %s %d", name, n); + gvir_set_error(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to list %s %d", name, n); goto error; } } @@ -347,10 +346,9 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, vpool = priv->handle; if (virStoragePoolRefresh(vpool, 0) < 0) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Unable to refresh storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to refresh storage pool"); goto cleanup; } @@ -539,10 +537,9 @@ GVirStorageVol *gvir_storage_pool_create_volume g_return_val_if_fail(xml != NULL, NULL); if (!(handle = virStorageVolCreateXML(priv->handle, xml, 0))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to create volume"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to create volume"); return NULL; } @@ -574,10 +571,9 @@ gboolean gvir_storage_pool_build (GVirStoragePool *pool, GError **err) { if (virStoragePoolBuild(pool->priv->handle, flags)) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to build storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to build storage pool"); return FALSE; } @@ -679,10 +675,9 @@ gboolean gvir_storage_pool_start (GVirStoragePool *pool, GError **err) { if (virStoragePoolCreate(pool->priv->handle, flags)) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, - 0, - "Failed to start storage pool"); + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to start storage pool"); return FALSE; } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..103d402 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -212,10 +212,9 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, gchar *xml; if (!(xml = virStorageVolGetXMLDesc(priv->handle, flags))) { - if (err) - *err = gvir_error_new_literal(GVIR_STORAGE_VOL_ERROR, - 0, - "Unable to get storage_vol XML config"); + gvir_set_error_literal(err, GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to get storage_vol XML config"); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 7baf515..c1ae765 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -372,10 +372,9 @@ gvir_stream_receive_all(GVirStream *self, r = virStreamRecvAll(self->priv->handle, stream_sink, &helper); if (r < 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_STREAM_ERROR, - 0, - "Unable to perform RecvAll"); + gvir_set_error_literal(err, GVIR_STREAM_ERROR, + 0, + "Unable to perform RecvAll"); } return r; @@ -476,10 +475,9 @@ gvir_stream_send_all(GVirStream *self, r = virStreamSendAll(self->priv->handle, stream_source, &helper); if (r < 0) { - if (err != NULL) - *err = gvir_error_new_literal(GVIR_STREAM_ERROR, - 0, - "Unable to perform SendAll"); + gvir_set_error_literal(err, GVIR_STREAM_ERROR, + 0, + "Unable to perform SendAll"); } return r; -- 1.7.6.4

2 2

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..e7a7581 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + g_set_error (err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ 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); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

2 2

[libvirt] [PATCH] Adapt libvirt's Qemu version parser for Qemu 1.0
by Stefan Berger 05 Dec '11

05 Dec '11

Qemu 1.0 does not show a micro version like 0.15.50 did. Adapt the Qemu version parser to handle this. --- src/qemu/qemu_capabilities.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: libvirt-tpm/src/qemu/qemu_capabilities.c =================================================================== --- libvirt-tpm.orig/src/qemu/qemu_capabilities.c +++ libvirt-tpm/src/qemu/qemu_capabilities.c @@ -1147,15 +1147,24 @@ int qemuCapsParseHelpStr(const char *qem ++p; minor = virParseNumber(&p); - if (minor == -1 || *p != '.') + if (minor == -1) goto fail; + if (major == 0 && *p != '.') + goto fail; + + if (major > 0 && *p != '.') { + micro = 0; + goto skip_micro; + } + ++p; micro = virParseNumber(&p); if (micro == -1) goto fail; +skip_micro: SKIP_BLANKS(p); if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) {

3 5

[libvirt] [PATCH] remote_driver: don't fail if keepalive check fails
by Guido Günther 05 Dec '11

05 Dec '11

Otherwise connections to older libvirt abort with: $ virsh -c qemu+ssh://host.example.com/system list error: invalid connection pointer in virDrvSupportsFeature error: failed to connect to the hypervisor Tested against 0.8.3 and 0.9.8. --- src/remote/remote_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) Cheers, -- Guido diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 556c90c..1fb0eca 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -678,10 +678,8 @@ doRemoteOpen (virConnectPtr conn, rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE, (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args, (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret); - if (rc == -1) - goto failed; - if (ret.supported) { + if (rc != -1 && ret.supported) { priv->serverKeepAlive = true; } else { VIR_INFO("Disabling keepalive protocol since it is not supported" -- 1.7.7.3

2 2

[libvirt] [libvirt-glib] Add gvir_xml_set_error
by Christophe Fergeau 05 Dec '11

05 Dec '11

This mirrors g_set_error, but uses gvir_xml_error_new. The main benefit of using gvxr_xml_set_error over gvir_xml_error_new is that it handles NULL GError **. --- libvirt-gconfig/libvirt-gconfig-helpers-private.h | 2 + libvirt-gconfig/libvirt-gconfig-helpers.c | 40 ++++++++++++++++----- libvirt-gconfig/libvirt-gconfig-object.c | 32 ++++++---------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 0a35595..b5b4878 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -32,6 +32,8 @@ G_BEGIN_DECLS GError *gvir_xml_error_new(GQuark domain, gint code, const gchar *format, ...); +void gvir_xml_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...); xmlNodePtr gvir_config_xml_parse(const char *xml, const char *root_node, GError **err); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index 722fe3d..bfdcfc3 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -59,6 +59,22 @@ static GError *gvir_xml_error_new_literal(GQuark domain, } +static GError *gvir_xml_error_new_va(GQuark domain, + gint code, + const gchar *format, + va_list args) +{ + GError *err; + gchar *message; + + message = g_strdup_vprintf(format, args); + err = gvir_xml_error_new_literal(domain, code, message); + + g_free(message); + + return err; +} + GError *gvir_xml_error_new(GQuark domain, gint code, const gchar *format, @@ -66,17 +82,25 @@ GError *gvir_xml_error_new(GQuark domain, { GError *err; va_list args; - gchar *message; va_start(args, format); - message = g_strdup_vprintf(format, args); + err = gvir_xml_error_new_va(domain, code, format, args); va_end(args); - err = gvir_xml_error_new_literal(domain, code, message); + return err; +} - g_free(message); +void gvir_xml_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; - return err; + if (error == NULL) + return; + + va_start(args, format); + *error = gvir_xml_error_new_va(domain, code, format, args); + va_end(args); } xmlNodePtr @@ -94,10 +118,8 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) doc = xmlParseMemory(xml, strlen(xml)); if (!doc) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "Unable to parse configuration"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, + 0, "%s", "Unable to parse configuration"); return NULL; } if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 03c7d5a..e2597f5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -202,28 +202,23 @@ void gvir_config_object_validate(GVirConfigObject *config, xmlSetStructuredErrorFunc(NULL, gvir_xml_structured_error_nop); if (!priv->node) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "No XML document associated with this config object"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, "%s", + "No XML document associated with this config object"); return; } rngParser = xmlRelaxNGNewParserCtxt(priv->schema); if (!rngParser) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to create RNG parser for %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to create RNG parser for %s", + priv->schema); return; } rng = xmlRelaxNGParse(rngParser); if (!rng) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to parse RNG %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to parse RNG %s", priv->schema); xmlRelaxNGFreeParserCtxt(rngParser); return; } @@ -231,19 +226,16 @@ void gvir_config_object_validate(GVirConfigObject *config, rngValid = xmlRelaxNGNewValidCtxt(rng); if (!rngValid) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "Unable to create RNG validation context %s", - priv->schema); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "Unable to create RNG validation context %s", + priv->schema); xmlRelaxNGFree(rng); return; } if (xmlRelaxNGValidateDoc(rngValid, priv->node->doc) != 0) { - *err = gvir_xml_error_new(GVIR_CONFIG_OBJECT_ERROR, - 0, - "%s", - "Unable to validate doc"); + gvir_xml_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, + "%s", "Unable to validate doc"); xmlRelaxNGFreeValidCtxt(rngValid); xmlRelaxNGFree(rng); return; -- 1.7.7.3

2 2

[libvirt] [PATCH 0/2] Expose virNodeGetCPUStats and virNodeGetMemoryStats in python
by Peter Krempa 05 Dec '11

05 Dec '11

These patches add two API functions to the libvirt python bindings, that were missing. The constants denoting a summary stat value instead of a separate per-node values was declared using a preprocessor macro: ... #define VIR_NODE_MEMORY_STATS_ALL_CELLS (-1) #define VIR_NODE_CPU_STATS_ALL_CPUS (-1) ... This inhibits automatic generation of these constants in the automaticaly generated python library code. If this change is too controversial, there's another option: Including these constants in the python library (using libvirt-override.py). Please let me know which of those options you prefer. Thanks Peter Peter Krempa (2): python: Expose binding for virNodeGetCPUStats() python: Expose binding for virNodeGetMemoryStats() include/libvirt/libvirt.h.in | 12 +++-- - change macro definitions to enums python/libvirt-override-api.xml | 14 ++++++ - add doc's about newly added functions python/libvirt-override.c | 95 +++++++++++++++++++++++++++++++++++++++ - add code for calling those functions and reclaiming return values. 3 files changed, 117 insertions(+), 4 deletions(-) -- 1.7.3.4

2 8

[libvirt] [libvirt-glib 1/2] Add gvir_set_error[_literal]
by Christophe Fergeau 05 Dec '11

05 Dec '11

They mirror g_set_error[_literal] functionality but append the error reported by libvirt to the error message. --- libvirt-glib/libvirt-glib-error.c | 49 +++++++++++++++++++++++++++++++++++++ libvirt-glib/libvirt-glib-error.h | 11 ++++++++ libvirt-glib/libvirt-glib.sym | 2 + 3 files changed, 62 insertions(+), 0 deletions(-) diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index b4d1f93..1fd32f0 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -126,3 +126,52 @@ GError *gvir_error_new_valist(GQuark domain, return err; } + +/** + * gvir_set_error: (skip) + * @error: a return location for a #GError, or #NULL + * @domain: error domain + * @code: error code + * @format: printf()-style format for error message + * @Varargs: parameters for message format + * + * Does nothing if @error is #NULL; if @error is non-#NULL, then *@error + * must be #NULL. A new #GError is created and assigned to *@error. + */ +void gvir_set_error(GError **error, GQuark domain, gint code, + const gchar *format, ...) +{ + va_list args; + + if (error == NULL) { + return; + } + + va_start(args, format); + *error = gvir_error_new_valist(domain, code, format, args); + va_end(args); +} + +/** + * gvir_set_error_literal: (skip) + * @error: a return location for a #GError, or #NULL + * @domain: error domain + * @code: error code + * @message: error message + * + * Does nothing if @error is #NULL; if @error is non-#NULL, then *@error + * must be #NULL. A new #GError is created and assigned to *@error. + * Unlike g_set_error(), message is not a printf()-style format string. Use + * this function if message contains text you don't have control over, that + * could include printf() escape sequences. + */ + +void gvir_set_error_literal(GError **error, GQuark domain, gint code, + const gchar *message) +{ + if (error == NULL) { + return; + } + + *error = gvir_error_new_literal(domain, code, message); +} diff --git a/libvirt-glib/libvirt-glib-error.h b/libvirt-glib/libvirt-glib-error.h index cfb5b95..aa581e5 100644 --- a/libvirt-glib/libvirt-glib-error.h +++ b/libvirt-glib/libvirt-glib-error.h @@ -42,6 +42,17 @@ GError *gvir_error_new_valist(GQuark domain, const gchar *format, va_list args); +void gvir_set_error(GError **error, + GQuark domain, + gint code, + const gchar *format, + ...); + +void gvir_set_error_literal(GError **error, + GQuark domain, + gint code, + const gchar *message); + G_END_DECLS #endif /* __LIBVIRT_GLIB_ERROR_H__ */ diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index cd41cb9..dca7dbb 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -7,6 +7,8 @@ LIBVIRT_GLIB_0.0.1 { gvir_error_new; gvir_error_new_valist; gvir_error_new_literal; + gvir_set_error; + gvir_set_error_literal; local: *; -- 1.7.7.3

2 2

[libvirt] [libvirt-glib] Add gvir_config_domain_set_lifecycle
by Christophe Fergeau 05 Dec '11

05 Dec '11

This is used to control what happens (restart, stop, ...) to the VM when it crashes, shuts down, ... --- libvirt-gconfig/libvirt-gconfig-domain.c | 20 ++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 18 ++++++++++++++++++ libvirt-gconfig/libvirt-gconfig.sym | 3 +++ libvirt-gconfig/tests/test-domain-create.c | 4 ++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 2f34c1b..9a723cb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -300,6 +300,26 @@ void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, GVIR_CONFIG_OBJECT(seclabel)); } +void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, + GVirConfigDomainLifecycleEvent event, + GVirConfigDomainLifecycleAction action) +{ + const char *event_str; + const char *action_str; + + g_return_if_fail((event == GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_CRASH) || + ((action != GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_DESTROY) && + (action != GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_RESTART))); + + event_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DOMAIN_LIFECYCLE_EVENT, event); + g_return_if_fail(event_str != NULL); + action_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DOMAIN_LIFECYCLE_ACTION, action); + g_return_if_fail(action_str != NULL); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), + event_str, action_str); +} + /** * gvir_config_domain_set_devices: * @devices: (in) (element-type LibvirtGConfig.DomainDevice): diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 7b40f99..b96aae0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -69,6 +69,21 @@ typedef enum { GVIR_CONFIG_DOMAIN_VIRT_LXC, } GVirConfigDomainVirtType; +typedef enum { + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, /*< nick=on_poweroff >*/ + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_REBOOT, /*< nick=on_reboot >*/ + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_CRASH /*< nick=on_crash >*/ +} GVirConfigDomainLifecycleEvent; + +typedef enum { + GVIR_CONFIG_DOMAIN_LIFECYCLE_DESTROY, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RESTART, + GVIR_CONFIG_DOMAIN_LIFECYCLE_PRESERVE, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RENAME_RESTART, + GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_DESTROY, + GVIR_CONFIG_DOMAIN_LIFECYCLE_COREDUMP_RESTART +} GVirConfigDomainLifecycleAction; + GType gvir_config_domain_get_type(void); GVirConfigDomain *gvir_config_domain_new_from_xml(const gchar *xml, GError **error); @@ -95,6 +110,9 @@ void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); void gvir_config_domain_add_device(GVirConfigDomain *domain, GVirConfigDomainDevice *device); +void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, + GVirConfigDomainLifecycleEvent event, + GVirConfigDomainLifecycleAction action); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 9b6d420..c5726b9 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -9,12 +9,15 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_add_device; gvir_config_domain_get_type; + gvir_config_domain_lifecycle_action_get_type; + gvir_config_domain_lifecycle_event_get_type; gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; gvir_config_domain_set_devices; gvir_config_domain_get_features; gvir_config_domain_set_features; + gvir_config_domain_set_lifecycle; gvir_config_domain_get_memory; gvir_config_domain_set_memory; gvir_config_domain_get_name; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 0e52e9e..59aa5b0 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -60,6 +60,10 @@ int main(void) } g_strfreev(feat); + gvir_config_domain_set_lifecycle(domain, + GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, + GVIR_CONFIG_DOMAIN_LIFECYCLE_RESTART); + /* clock node */ GVirConfigDomainClock *klock; -- 1.7.7.3

2 1

[libvirt] [libvirt-glib] Add wrapper for volume deletion API
by Zeeshan Ali (Khattak) 05 Dec '11

05 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-vol.c | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 15ae404..e7a7581 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -252,3 +252,28 @@ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, return ret; } + +/** + * gvir_storage_vol_delete: + * @vol: the storage volume to delete + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Deletes the storage volume @vol. + * + * Returns: %TRUE on success, %FALSE otherwise + */ +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err) +{ + if (virStorageVolDelete(vol->priv->handle, flags) < 0) { + g_set_error (err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to delete storage volume"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 717ef4a..db63865 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -80,6 +80,10 @@ 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); +gboolean gvir_storage_vol_delete(GVirStorageVol *vol, + guint flags, + GError **err); + GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c0d2e19..3727fb7 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -117,6 +117,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_storage_vol_get_path; gvir_storage_vol_get_config; gvir_storage_vol_get_info; + gvir_storage_vol_delete; gvir_connection_handle_get_type; -- 1.7.7.3

3 4

[libvirt] [FW: [Qemu-devel] [ANNOUNCE] QEMU 1.0 release]
by Daniel P. Berrange 05 Dec '11

05 Dec '11

----- Forwarded message from Anthony Liguori <aliguori(a)us.ibm.com> ----- > Date: Thu, 01 Dec 2011 15:23:37 -0600 > From: Anthony Liguori <aliguori(a)us.ibm.com> > To: qemu-devel <qemu-devel(a)nongnu.org> > Subject: [Qemu-devel] [ANNOUNCE] QEMU 1.0 release > On behalf of the QEMU Team, I'd like to announce the availability of > QEMU 1.0! > ChangeLog: > > == General == > * i386-softmmu is no longer named ''qemu'' but instead referred to as > ''qemu-system-i386'' for better consistency with other targets. A new tool is > likely to be introduced that uses the ''qemu'' name so distributions are advised > to not undo this change. We need to update libvirt to look for qemu-system-i386. We don't want to stop lookiing for 'qemu', but to cope with the scenario where QEMU guys introduce a new binary called 'qemu', we need to make sure we prefer the 'qemu-system-i386' binary. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] domjobabort return the same error in distinct cases
by Shahar Havivi 05 Dec '11

05 Dec '11

Hi, I am using the python api: domain.abortjob(), if there is no job I get exception with error code: VIR_ERR_OPERATION_INVALID with the error message: 'Requested operation is not valid: no job is active on the domain' when there is a job I get the same exception code with the same error message, in addition I get another exception: libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: operation failed: migration job: canceled by client the migration thread is throwing as well: libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: operation failed: migration job: canceled by client Should the same error should be for this two cases?

1 1

[libvirt] implementing locking with libvirt on ubuntu
by Upendra Moturi 05 Dec '11

05 Dec '11

Hi I am trying to implement locking i,e two vms are not started with same disk on ubuntu. Using libvirt 0.9.7 (Installed it from source) qemu-kvm 0.14.1 kernel 3.0.0-13-server Steps followed while installing from source cd libvirt-0.9.7 ./configure make make install I found that sanlock or virtlockd (fcntl) daemons can do that,but not able implement it. I dont find virtlockd daemon running. >From below link http://www.redhat.com/archives/libvir-list/2011-July/msg00337.html it is said to create lockd directory under /var/lib/libvirt I dont find this directory after installation from source Am i missing something ? Please guide me in implementing locking on ubuntu. -- Thanks and Regards, Upendra.M

2 2

[libvirt] [PATCH] maint: fix improper use of 'an'
by Eric Blake 04 Dec '11

04 Dec '11

https://bugzilla.redhat.com/show_bug.cgi?id=648855 mentioned a misuse of 'an' where 'a' is proper; that has since been fixed, but a search found other problems (some were a spelling error for 'and', while most were fixed by 'a'). * daemon/stream.c: Fix grammar. * src/conf/domain_conf.c: Likewise. * src/conf/domain_event.c: Likewise. * src/esx/esx_driver.c: Likewise. * src/esx/esx_vi.c: Likewise. * src/rpc/virnetclient.c: Likewise. * src/rpc/virnetserverprogram.c: Likewise. * src/storage/storage_backend_fs.c: Likewise. * src/util/conf.c: Likewise. * src/util/dnsmasq.c: Likewise. * src/util/iptables.c: Likewise. * src/xen/xen_hypervisor.c: Likewise. * src/xen/xend_internal.c: Likewise. * src/xen/xs_internal.c: Likewise. * tools/virsh.c: Likewise. --- Pushing under the trivial rule. daemon/stream.c | 4 ++-- src/conf/domain_conf.c | 2 +- src/conf/domain_event.c | 2 +- src/esx/esx_driver.c | 2 +- src/esx/esx_vi.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/util/conf.c | 6 +++--- src/util/dnsmasq.c | 4 ++-- src/util/iptables.c | 4 ++-- src/xen/xen_hypervisor.c | 32 ++++++++++++++++---------------- src/xen/xend_internal.c | 2 +- src/xen/xs_internal.c | 2 +- tools/virsh.c | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/daemon/stream.c b/daemon/stream.c index 50f8fd4..bb66f75 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -1,7 +1,7 @@ /* * stream.c: APIs for managing client streams * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009, 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 @@ -556,7 +556,7 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, /* - * Process an finish handshake from the client. + * Process a finish handshake from the client. * * Returns a VIR_NET_OK confirmation if successful, or a VIR_NET_ERROR * if there was a stream error diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 75f21dc..75e51a0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4555,7 +4555,7 @@ error: } -/* Parse the XML definition for an hub device */ +/* Parse the XML definition for a hub device */ static virDomainHubDefPtr virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags) { diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index a04b9d0..614ab97 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1070,7 +1070,7 @@ virDomainEventQueuePop(virDomainEventQueuePtr evtQueue) * @evtQueue: the dom event queue * @event: the event to add * - * Internal function to push onto the back of an virDomainEventQueue + * Internal function to push onto the back of a virDomainEventQueue * * Returns: 0 on success, -1 on failure */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f8b3c7a..1e424eb 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -267,7 +267,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) /* - * This function does the inverse of esxParseVMXFileName. It takes an file name + * This function does the inverse of esxParseVMXFileName. It takes a file name * in datastore path format or in absolute format and converts it to a file * name that can be used in a .vmx file. * diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 80f337b..99f25f8 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1800,7 +1800,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (ctx->hasSessionIsActive) { /* * Use SessionIsActive to check if there is an active session for this - * connection an re-login in there isn't. + * connection and re-login in there isn't. */ if (esxVI_SessionIsActive(ctx, ctx->session->key, ctx->session->userName, &active) < 0) { diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index ec06f45..7f9a332 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1701,7 +1701,7 @@ static int virNetClientSendInternal(virNetClientPtr client, if (expectReply && nonBlock) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Attempt to send an non-blocking message with a synchronous reply")); + _("Attempt to send a non-blocking message with a synchronous reply")); return -1; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index bbd2d65..d2ede6b 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -340,7 +340,7 @@ cleanup: * @client: the unlocked client object * @msg: the complete incoming method call, with header already decoded * - * This method is used to dispatch an message representing an + * This method is used to dispatch a message representing an * incoming method call from a client. It decodes the payload * to obtain method call arguments, invokves the method and * then sends a reply packet with the return values diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index b5acd20..d8dc29c 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -880,7 +880,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { /* The backing file is currently unavailable, the capacity, * allocation, owner, group and mode are unknown. Just log the - * error an continue. + * error and continue. * Unfortunately virStorageBackendProbeTarget() might already * have logged a similar message for the same problem, but only * if AUTO format detection was used. */ diff --git a/src/util/conf.c b/src/util/conf.c index c8dcc7f..502dafb 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -698,7 +698,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) * Parse the subset of the Python language needed to handle simple * Xen configuration files. * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * read or parse the file, use virConfFree() to free the data. */ static virConfPtr @@ -745,7 +745,7 @@ error: * * Reads a configuration file. * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * read or parse the file, use virConfFree() to free the data. */ virConfPtr @@ -780,7 +780,7 @@ virConfReadFile(const char *filename, unsigned int flags) * Reads a configuration file loaded in memory. The string can be * zero terminated in which case @len can be 0 * - * Returns an handle to lookup settings or NULL if it failed to + * Returns a handle to lookup settings or NULL if it failed to * parse the content, use virConfFree() to free the data. */ virConfPtr diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index b5f90a6..dcb7195 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2011 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH <satoru.satoh(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -461,7 +461,7 @@ dnsmasqContextNew(const char *network_name, * dnsmasqContextFree: * @ctx: pointer to the dnsmasq context * - * Free the resources associated with an dnsmasq context + * Free the resources associated with a dnsmasq context */ void dnsmasqContextFree(dnsmasqContext *ctx) diff --git a/src/util/iptables.c b/src/util/iptables.c index 452d717..3023900 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-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 @@ -891,7 +891,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx, * @iface: the interface name * @port: the UDP port to match * - * Add an rule to the mangle table's POSTROUTING chain that fixes up the + * Add a rule to the mangle table's POSTROUTING chain that fixes up the * checksum of packets with the given destination @port. * the given @iface interface for TCP packets. * diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 6c71b65..941686f 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -556,7 +556,7 @@ typedef struct xen_v0_domainop xen_v0_domainop; #define XEN_V2_OP_UNPAUSEDOMAIN 4 /* - * The information for an setmaxmem system hypercall + * The information for a setmaxmem system hypercall */ #define XEN_V0_OP_SETMAXMEM 28 #define XEN_V1_OP_SETMAXMEM 28 @@ -580,7 +580,7 @@ struct xen_v2d5_setmaxmem { typedef struct xen_v2d5_setmaxmem xen_v2d5_setmaxmem; /* - * The information for an setmaxvcpu system hypercall + * The information for a setmaxvcpu system hypercall */ #define XEN_V0_OP_SETMAXVCPU 41 #define XEN_V1_OP_SETMAXVCPU 41 @@ -599,7 +599,7 @@ struct xen_v2_setmaxvcpu { typedef struct xen_v2_setmaxvcpu xen_v2_setmaxvcpu; /* - * The information for an setvcpumap system hypercall + * The information for a setvcpumap system hypercall * Note that between 1 and 2 the limitation to 64 physical CPU was lifted * hence the difference in structures */ @@ -647,7 +647,7 @@ struct xen_v2d5_setvcpumap { typedef struct xen_v2d5_setvcpumap xen_v2d5_setvcpumap; /* - * The information for an vcpuinfo system hypercall + * The information for a vcpuinfo system hypercall */ #define XEN_V0_OP_GETVCPUINFO 43 #define XEN_V1_OP_GETVCPUINFO 43 @@ -866,8 +866,8 @@ virXenErrorFunc(virErrorNumber error, const char *func, const char *info, * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor operation though the old interface, - * this leads to an hypervisor call through ioctl. + * Do a hypervisor operation though the old interface, + * this leads to a hypervisor call through ioctl. * * Returns 0 in case of success and -1 in case of error. */ @@ -908,7 +908,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor v1 operation, this leads to an hypervisor call through + * Do a hypervisor v1 operation, this leads to a hypervisor call through * ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -951,7 +951,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor operation structure * - * Do an hypervisor v2 system operation, this leads to an hypervisor + * Do a hypervisor v2 system operation, this leads to a hypervisor * call through ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -994,7 +994,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op) * @handle: the handle to the Xen hypervisor * @op: pointer to the hypervisor domain operation structure * - * Do an hypervisor v2 domain operation, this leads to an hypervisor + * Do a hypervisor v2 domain operation, this leads to a hypervisor * call through ioctl. * * Returns 0 in case of success and -1 in case of error. @@ -3155,7 +3155,7 @@ xenHypervisorGetMaxMemory(virDomainPtr domain) * @id: the domain ID * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -3238,7 +3238,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) * @domain: pointer to the domain block * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -3382,7 +3382,7 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *free * xenHypervisorPauseDomain: * @domain: pointer to the domain block * - * Do an hypervisor call to pause the given domain + * Do a hypervisor call to pause the given domain * * Returns 0 in case of success, -1 in case of error. */ @@ -3409,7 +3409,7 @@ xenHypervisorPauseDomain(virDomainPtr domain) * xenHypervisorResumeDomain: * @domain: pointer to the domain block * - * Do an hypervisor call to resume the given domain + * Do a hypervisor call to resume the given domain * * Returns 0 in case of success, -1 in case of error. */ @@ -3437,7 +3437,7 @@ xenHypervisorResumeDomain(virDomainPtr domain) * @domain: pointer to the domain block * @flags: an OR'ed set of virDomainDestroyFlagsValues * - * Do an hypervisor call to destroy the given domain + * Do a hypervisor call to destroy the given domain * * Calling this function with no @flags set (equal to zero) * is equivalent to calling xenHypervisorDestroyDomain. @@ -3471,7 +3471,7 @@ xenHypervisorDestroyDomainFlags(virDomainPtr domain, * @domain: pointer to the domain block * @memory: the max memory size in kilobytes. * - * Do an hypervisor call to change the maximum amount of memory used + * Do a hypervisor call to change the maximum amount of memory used * * Returns 0 in case of success, -1 in case of error. */ @@ -3563,7 +3563,7 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu, * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. * The memory allocated to cpumaps must be (maxinfo * maplen) bytes diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 16165fe..0c0b6cb 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2369,7 +2369,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. * The memory allocated to cpumaps must be (maxinfo * maplen) bytes diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 21018fd..a28e6cc 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -355,7 +355,7 @@ xenStoreClose(virConnectPtr conn) * @domain: pointer to the domain block * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain information. + * Do a hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ diff --git a/tools/virsh.c b/tools/virsh.c index be4df58..d02be5c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13233,7 +13233,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; - /* add an separate container around the xml */ + /* add a separate container around the xml */ virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); if (virBufferError(&buf)) goto no_memory; -- 1.7.7.3

1 0

[libvirt] [PATCH 0/2] patch pings
by Eric Blake 03 Dec '11

03 Dec '11

These are random patches in my tree that I've previously posted with no review, but which I think are useful for inclusion in 0.9.8. Eric Blake (2): command: handle empty buffer argument correctly build: require more tools from maintainers bootstrap.conf | 15 +++++++++++++++ src/util/command.c | 13 ++++++++++++- tests/commanddata/test9.log | 4 +++- tests/commandtest.c | 13 ++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-) -- 1.7.7.3

2 6

[libvirt] [PATCH] build: fix build at -O2 on rawhide
by Eric Blake 02 Dec '11

02 Dec '11

I had previously tested commit 059d746 with -O intentionally omitted from my CFLAGS; but that means that I missed out on this warning from gcc 4.6.2 when optimizations are enabled: util/buf.c: In function 'virBufferGetIndent': util/buf.c:86:1: error: function might be candidate for attribute 'pure' [-Werror=suggest-attribute=pure] While it is probably a good idea to add the attributes and silence this warning, it's also invasive; 'make -k' found more than 75 such complaints. And it doesn't help that gcc 4.6.2 is still buggy (coreutils reported a case where gcc 4.6.2 incorrectly suggested marking a function pure that incremented a global variable; fixed in gcc 4.7). So the best fix for now is to disable the warning. It also doesn't help that I stumbled across another problem - gcc documents that -Wsuggest-attribute=pure only warns if you use -O, or if you use -fipa-pure-const. But in practice, when I omitted -O but added -fipa-pure-const, the warnings are fickle - I got warnings for simple compilation that disappeared when I also added -fPIC. And the way libtool compiles things is with -fPIC first, then without -fPIC but with errors sent to /dev/null - which meant that without disabling -Wsuggest-attribute=pure, I got a compile error with no message. :( See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10197 * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Silence -Wsuggest-attribute warnings for now. --- Pushing under the build-breaker rule. m4/virt-compile-warnings.m4 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 213b3db..34a89c9 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -116,2 +116,2 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ gl_WARN_ADD([-fdiagnostics-show-option]) gl_WARN_ADD([-funit-at-a-time]) + # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure + # fire even without -O. + gl_WARN_ADD([-fipa-pure-const]) + # We should eventually enable this, but right now there are at + # least 75 functions triggering warnings. + gl_WARN_ADD([-Wno-suggest-attribute=pure]) + gl_WARN_ADD([-Wno-suggest-attribute=const]) + if test "$enable_compile_warnings" = "error" then gl_WARN_ADD([-Werror]) -- 1.7.7.3

1 0

[libvirt] [PATCH 1/1] apparmor: allow tunnelled migrations.
by Serge Hallyn 02 Dec '11

02 Dec '11

The pathname for the pipe for tunnelled migration is unresolvable. The libvirt apparmor driver therefore refuses access, causing migration to fail. If we can't resolve the path, the worst that can happen is that we should have given permission to the file but didn't. Otherwise (especially since this is a /proc/$$/fd/N file) the file is already open and libvirt won't be refused access by apparmor anyway. Also adjust virt-aa-helper to allow access to the *.tunnelmigrate.dest.name files. Changelog: Dec 2: per jdstrand comment, also change the Error to a VIR_WARN. For more information, see https://launchpad.net/bugs/869553. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/security/security_apparmor.c | 6 +++--- src/security/virt-aa-helper.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 299dcc6..5e68da8 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -791,9 +791,9 @@ AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, } if (virFileResolveLink(proc, &fd_path) < 0) { - virSecurityReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("could not find path for descriptor")); - return rc; + /* it's a deleted file, presumably. Ignore? */ + VIR_WARN("could not find path for descriptor %s, skipping", proc); + return 0; } return reload_profile(mgr, vm, fd_path, true); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 14399cc..4561bb9 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1220,6 +1220,10 @@ main(int argc, char **argv) LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"/run/libvirt/**/%s.pid\" rwk,\n", ctl->def->name); + virBufferAsprintf(&buf, " \"%s/run/libvirt/**/*.tunnelmigrate.dest.%s\" rw,\n", + LOCALSTATEDIR, ctl->def->name); + virBufferAsprintf(&buf, " \"/run/libvirt/**/*.tunnelmigrate.dest.%s\" rw,\n", + ctl->def->name); if (ctl->files) virBufferAdd(&buf, ctl->files, -1); } -- 1.7.5.4

3 2

[libvirt] [PATCH] [TCK] nwfilter:Follow changes to clean-traffic filter
by Stefan Berger 02 Dec '11

02 Dec '11

Follow the changes to the clean-traffic filter to pass the nwfilter tests. --- scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat | 33 +++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat @@ -3,34 +3,31 @@ #ebtables -t nat -L POSTROUTING | grep vnet0 | grep -v "^Bridge" | grep -v "^$" -o vnet0 -j libvirt-O-vnet0 #ebtables -t nat -L libvirt-I-vnet0 | grep -v "^Bridge" | grep -v "^$" --p IPv4 -j I-vnet0-ipv4 --p ARP -j I-vnet0-arp +-j I-vnet0-mac +-p IPv4 -j I-vnet0-ipv4-ip +-p IPv4 -j ACCEPT +-p ARP -j I-vnet0-arp-mac +-p ARP -j I-vnet0-arp-ip +-p ARP -j ACCEPT -p 0x8035 -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP #ebtables -t nat -L libvirt-O-vnet0 | grep -v "^Bridge" | grep -v "^$" -p IPv4 -j O-vnet0-ipv4 --p ARP -j O-vnet0-arp +-p ARP -j ACCEPT -p 0x8035 -j O-vnet0-rarp -j DROP -#ebtables -t nat -L I-vnet0-ipv4 | grep -v "^Bridge" | grep -v "^$" --s ! 52:54:0:9f:33:da -j DROP --p IPv4 --ip-src ! 10.1.1.1 -j DROP +#ebtables -t nat -L I-vnet0-ipv4-ip | grep -v "^Bridge" | grep -v "^$" +-p IPv4 --ip-src 0.0.0.0 --ip-proto udp --ip-sport 68 -j ACCEPT +-p IPv4 --ip-src 10.1.1.1 -j RETURN +-j DROP #ebtables -t nat -L O-vnet0-ipv4 | grep -v "^Bridge" | grep -v "^$" -j ACCEPT -#ebtables -t nat -L I-vnet0-arp | grep -v "^Bridge" | grep -v "^$" --s ! 52:54:0:9f:33:da -j DROP --p ARP --arp-mac-src ! 52:54:0:9f:33:da -j DROP --p ARP --arp-ip-src ! 10.1.1.1 -j DROP --p ARP --arp-op Request -j ACCEPT --p ARP --arp-op Reply -j ACCEPT +#ebtables -t nat -L I-vnet0-arp-mac | grep -v "^Bridge" | grep -v "^$" +-p ARP --arp-mac-src 52:54:0:9f:33:da -j RETURN -j DROP -#ebtables -t nat -L O-vnet0-arp | grep -v "^Bridge" | grep -v "^$" --p ARP --arp-gratuitous -j ACCEPT --p ARP --arp-op Reply --arp-mac-dst ! 52:54:0:9f:33:da -j DROP --p ARP --arp-ip-dst ! 10.1.1.1 -j DROP --p ARP --arp-op Request -j ACCEPT --p ARP --arp-op Reply -j ACCEPT +#ebtables -t nat -L I-vnet0-arp-ip | grep -v "^Bridge" | grep -v "^$" +-p ARP --arp-ip-src 10.1.1.1 -j RETURN -j DROP #ip6tables -L FI-vnet0 -n Chain FI-vnet0 (1 references)

2 2

[libvirt] [PATCH] client: Check if other thread claims it has the buck before claiming it.
by Peter Krempa 02 Dec '11

02 Dec '11

Originaly, the code checked if another client is the queue and infered ownership of the buck from that. Commit fa9595003d043df9f2efe95521c008 added a separate variable to track the buck. That caused, that a new call might enter claiming it has the buck, while another thread was signalled to take the buck. This ends in two threads claiming they hold the buck and entering poll(). This happens due to a race on waking up threads on the client lock mutex. This caused multi-threaded clients to hang, most prominently visible and reproducible on python based clients, like virt-manager. This patch causes threads, that have been signalled to take the buck to re-check if buck is held by another thread. --- src/rpc/virnetclient.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 5165c8d..07d8a60 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1545,6 +1545,7 @@ static int virNetClientIO(virNetClientPtr client, virNetClientCallQueue(&client->waitDispatch, thiscall); /* Check to see if another thread is dispatching */ +recheck: if (client->haveTheBuck) { char ignore = 1; @@ -1592,7 +1593,13 @@ static int virNetClientIO(virNetClientPtr client, goto cleanup; } - /* Grr, someone passed the buck onto us ... */ + /* Grr, someone might have passed the buck onto us ... */ + + /* We need to re-check if the buck has been passed to this thread + * as this thread might have been signalled to wake up, but the another + * call might acquire the lock before this thread manages to wake up. + * This could cause that two threads claim they have the buck */ + goto recheck; } VIR_DEBUG("We have the buck %p %p", client->waitDispatch, thiscall); -- 1.7.3.4

2 2

[libvirt] [RFC v3 PATCH 0/5] PowerPC : Extend libvirt for the PowerPC-KVM platform
by Prerna Saxena 02 Dec '11

02 Dec '11

Recent development in KVM for 64-bit Power ISA Book3S machines, allows users to run multiple KVM guest instances on POWER7 and PPC970 processor based systems. Also qemu-system-ppc64 has been enhanced to support a new machine type "pseries" suitable for Power Book3S machines. This addition effectively brings the KVM+qemu combination to run multiple guest instances on a Power Book3S machine. Libvirt continues to be the key interface to configure and manage the KVM guest instances on x86. This patch set is an effort to enable libvirt to support KVM guest configuration and management on Power Book3S machines. Based on community discussion around the earlier version, this patch series augments the present 'kvm' driver to support PowerPC-KVM based guests.Since some of the supported devices vary between architectures, libvirt must be capable of choosing supported device backends and defaults for each architecture in qemu. To check if qemu supports a certain feature, libvirt at present parses the -help string which is generated by running the qemu binary with the '-h' argument. This approach is gated by QEMU's inherent limitation. When generating the list of allowed options with the '-h' flags, qemu today blindly lists all options defined for any architecture/platform instead of doing any arch-specific checking. This tricks libvirt into assuming a much bigger set of host capabilities than is actually available. Ideally, it would be good to have qemu specify a list of devices for a given architecture and platform which libvirt can parse to understand supported capabilities for that guest. As a part of this patchset, there is an attempt to cleanly bifurcate libvirt code and to remove x86-specific assumptions from generic qemu commandline code. Series Description: ------------------- This patch series consists of 5 patches : Patch 1/5 : Use sysfs to gather host topology in place of /proc/cpuinfo. Patch 2/5 : Add PowerPC CPU Driver Patch 3/5 : Add support for qemu-system-ppc64 Patch 4/5 : Clean up x86-specific assumptions from generic qemu code. Patch 5/5 : Add address family "spapr-vio" Changelog: --------- ** v1->v2 : * Patches 1,2,3 unchanged ; The hacks in Patch 4 of v1 replaced by a new patch to neatly select arch-specific features. ** v2->v3 : * Patches 1,2,3 have minor cleanups ; Patch 4 no longer has an arch-specific handler routine. It is now replaced by a much simpler patch that merely removes x86/pc-specific assumptions from libvirt. ** v3->v4 : * Patches 1,2,3,4 unchanged ; patch 5 is a new addition from Michael Ellerman that adds a new device-tree based addressing mechanism for the 'pseries' guest. -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

5 24

[libvirt] [RFC v4 PATCH 0/5] PowerPC : Extend libvirt to use PowerPC-KVM platform
by Prerna Saxena 02 Dec '11

02 Dec '11

Libvirt continues to be the key interface to configure and manage the KVM guest instances on x86. This patch set is an effort to enable libvirt to support KVM guest configuration and management on Power Book3S machines. Based on community discussion around the earlier version, this patch series augments the present 'kvm' driver to support PowerPC-KVM based guests. With the CPU driver for PowerPC already merged, this patch series adds on clean-ups, and some test cases as suggested. This series mostly focuses on cleanup and addition of testcases for base- powerpc patches. The patches for enabling spapr-vio based addressing would be sent out shortly, with the right domain schema additions. Series description: ------------------- Patch 1/5 : Use sysfs to decipher cpu topology information. Patch 2/5 : Modify the tests/nodeinfotest.c to use sysfs in addition to proc/cpuinfo. Patch 3/5 : Add support for ppc64 qemu Patch 4/5 : Clean up qemuBuildCommandLine to remove x86-specific assumptions. Patch 5/5 : Add ppc64 specific definitions to domain.rng Changelog: ---------- ** v1->v2 : * Patches 1,2,3 unchanged ; The hacks in Patch 4 of v1 replaced by a new patch to neatly select arch-specific features. ** v2->v3 : * Patches 1,2,3 have minor cleanups ; Patch 4 no longer has an arch-specific handler routine. It is now replaced by a much simpler patch that merely removes x86/pc-specific assumptions from libvirt. Patch 5 is a new addition from Michael Ellerman that adds a new device-tree based addressing mechanism for the 'pseries' guest. ** v3->v4 : * Patch 1 has minor cleanups, Patch 2 is a new addition that introduces test cases for patch 1. Patch 3,4 also have minor cleanups Patch 5 is a new addition, it contains ppc64 specific definitions to domain.rng -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 13

[libvirt] [PATCH] nwfilter: Update of filters to handle multiple IP addresses
by Stefan Berger 02 Dec '11

02 Dec '11

With fragments borrowed from David Steven's previous submission and some further modifications: A set of modifications to existing filters to handle multiple IP addresses (and MAC addresses) per interface. Also: - enable DHCP traffic from VM to any DHCP server - will require an update to a libvirt-tck data file Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- examples/xml/nwfilter/Makefile.am | 2 + examples/xml/nwfilter/clean-traffic.xml | 12 +++++++- examples/xml/nwfilter/no-arp-ip-spoofing.xml | 9 ++++++ examples/xml/nwfilter/no-arp-mac-spoofing.xml | 7 ++++ examples/xml/nwfilter/no-arp-spoofing.xml | 38 ++------------------------ examples/xml/nwfilter/no-ip-spoofing.xml | 17 ++++++++--- examples/xml/nwfilter/no-mac-spoofing.xml | 11 +++++-- 7 files changed, 52 insertions(+), 44 deletions(-) Index: libvirt-acl/examples/xml/nwfilter/Makefile.am =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/Makefile.am +++ libvirt-acl/examples/xml/nwfilter/Makefile.am @@ -9,6 +9,8 @@ FILTERS = \ allow-ipv4.xml \ clean-traffic.xml \ no-arp-spoofing.xml \ + no-arp-ip-spoofing.xml \ + no-arp-mac-spoofing.xml \ no-ip-multicast.xml \ no-ip-spoofing.xml \ no-mac-broadcast.xml \ Index: libvirt-acl/examples/xml/nwfilter/no-arp-ip-spoofing.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/no-arp-ip-spoofing.xml @@ -0,0 +1,9 @@ +<filter name='no-arp-ip-spoofing' chain='arp-ip' priority='-510'> +  +  + <rule action='return' direction='out' priority='400' > + <arp match='yes' arpsrcipaddr='$IP' /> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> Index: libvirt-acl/examples/xml/nwfilter/no-arp-mac-spoofing.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/no-arp-mac-spoofing.xml @@ -0,0 +1,7 @@ +<filter name='no-arp-mac-spoofing' chain='arp-mac' priority='-520'> + <rule action='return' direction='out' priority='350' > + <arp match='yes' arpsrcmacaddr='$MAC'/> + </rule> +  + <rule action='drop' direction='out' priority='1000' /> +</filter> Index: libvirt-acl/examples/xml/nwfilter/clean-traffic.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/clean-traffic.xml +++ libvirt-acl/examples/xml/nwfilter/clean-traffic.xml @@ -1,4 +1,4 @@ -<filter name='clean-traffic'> +<filter name='clean-traffic' chain='root'>  @@ -6,11 +6,21 @@  <filterref filter='no-ip-spoofing'/> + + <rule direction='out' action='accept' priority='-650'> + <mac protocolid='ipv4'/> + </rule> + <filterref filter='allow-incoming-ipv4'/>  <filterref filter='no-arp-spoofing'/> +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> +  <filterref filter='no-other-l2-traffic'/> Index: libvirt-acl/examples/xml/nwfilter/no-mac-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-mac-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-mac-spoofing.xml @@ -1,5 +1,10 @@ -<filter name='no-mac-spoofing' chain='ipv4'> - <rule action='drop' direction='out' priority='10'> - <mac match='no' srcmacaddr='$MAC' /> +<filter name='no-mac-spoofing' chain='mac' priority='-800'> +  + <rule direction='out' action='return'> + <mac srcmacaddr='$MAC'/> + </rule> +  + <rule direction='out' action='drop'> + <mac/> </rule> </filter> Index: libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-arp-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml @@ -1,36 +1,4 @@ -<filter name='no-arp-spoofing' chain='arp'> - <uuid>f88f1932-debf-4aa1-9fbe-f10d3aa4bc95</uuid> - <rule action='drop' direction='out' priority='300' > - <mac match='no' srcmacaddr='$MAC'/> - </rule> - -  -  - <rule action='drop' direction='out' priority='350' > - <arp match='no' arpsrcmacaddr='$MAC'/> - </rule> - <rule action='drop' direction='out' priority='400' > - <arp match='no' arpsrcipaddr='$IP' /> - </rule> -  - <rule action='accept' direction='in' priority='425'> - <arp gratuitous='true'/> - </rule> -  - <rule action='drop' direction='in' priority='450' > - <arp match='no' arpdstmacaddr='$MAC'/> - <arp opcode='reply'/> - </rule> - <rule action='drop' direction='in' priority='500' > - <arp match='no' arpdstipaddr='$IP' /> - </rule> -  - <rule action='accept' direction='inout' priority='600' > - <arp opcode='request'/> - </rule> - <rule action='accept' direction='inout' priority='650' > - <arp opcode='reply'/> - </rule> -  - <rule action='drop' direction='inout' priority='1000' /> +<filter name='no-arp-spoofing' chain='root'> + <filterref filter='no-arp-mac-spoofing'/> + <filterref filter='no-arp-ip-spoofing'/> </filter> Index: libvirt-acl/examples/xml/nwfilter/no-ip-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-ip-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-ip-spoofing.xml @@ -1,7 +1,14 @@ -<filter name='no-ip-spoofing' chain='ipv4'> +<filter name='no-ip-spoofing' chain='ipv4-ip' priority='-710'> +  + <rule action='accept' direction='out' priority='100'> + <ip srcipaddr='0.0.0.0' protocol='udp' srcportstart='68' srcportend='68'/> + </rule> -  - <rule action='drop' direction='out'> - <ip match='no' srcipaddr='$IP' /> - </rule> +  + <rule direction='out' action='return' priority='500'> + <ip srcipaddr='$IP'/> + </rule> + +  + <rule direction='out' action='drop' priority='1000'/> </filter>

2 3

[libvirt] [PATCH] virsh: translate net-info help
by Eric Blake 01 Dec '11

01 Dec '11

Reported by kato.tomoyuki(a)jp.fujitsu.com at https://bugzilla.redhat.com/show_bug.cgi?id=749564 * tools/virsh.c (info_network_info): Mark string for translation. --- Pushing under the trivial rule. tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ff9cc42..be4df58 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6650,7 +6650,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_network_info[] = { {"help", N_("network information")}, - {"desc", "Returns basic information about the network"}, + {"desc", N_("Returns basic information about the network")}, {NULL, NULL} }; -- 1.7.7.3

1 0

[libvirt] [PATCH] maint: typo fixes
by Eric Blake 01 Dec '11

01 Dec '11

Many of these were mentioned by Yuri Chornoivan in: https://bugzilla.redhat.com/show_bug.cgi?id=669506 * src/esx/esx_vi.c (esxVI_WaitForTaskCompletion): Fix spelling. * src/conf/netdev_vport_profile_conf.c (virNetDevVPortProfileParse): Likewise. * src/xen/xend_internal.c (xenDaemonDomainSetVcpusFlags): Likewise. * src/xen/xm_internal.c (xenXMDomainSetVcpusFlags): Likewise. * src/esx/esx_util.c (esxUtil_ResolveHostname): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendFileSystemBuild): Likewise. * daemon/libvirtd.conf: Likewise. * src/util/logging.c (virLogMessage): Likewise. * src/uml/uml_conf.c (umlBuildCommandLineNet): Likewise. * src/vmx/vmx.c (virVMXFormatEthernet): Likewise. --- Pushing under the trivial rule. daemon/libvirtd.conf | 4 ++-- src/conf/netdev_vport_profile_conf.c | 2 +- src/esx/esx_util.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/uml/uml_conf.c | 4 ++-- src/util/logging.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index f218454..3eab2be 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -284,7 +284,7 @@ # Logging controls # -# Logging level: 4 errors, 3 warnings, 2 informations, 1 debug +# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible #log_level = 3 @@ -309,7 +309,7 @@ # the event layer. # Logging outputs: -# An output is one of the places to save logging informations +# An output is one of the places to save logging information # The format for an output can be: # x:stderr # output goes to stderr diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 861ad34..b48b2cb 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -167,7 +167,7 @@ virNetDevVPortProfileParse(xmlNodePtr node) } } else { virNetDevError(VIR_ERR_XML_ERROR, "%s", - _("profileid parameter is missing for 802.1Qbh descripion")); + _("profileid parameter is missing for 802.1Qbh description")); goto error; } break; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 1925802..2c5ac1a 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -2,7 +2,7 @@ /* * esx_util.c: utility functions for the VMware ESX driver * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -384,7 +384,7 @@ esxUtil_ResolveHostname(const char *hostname, if (errcode != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Formating IP address for host '%s' failed: %s"), hostname, + _("Formatting IP address for host '%s' failed: %s"), hostname, gai_strerror(errcode)); freeaddrinfo(result); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 21892a0..80f337b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3955,7 +3955,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, if (taskInfo->cancelable == esxVI_Boolean_True) { if (esxVI_CancelTask(ctx, task) < 0 && blocked) { VIR_ERROR(_("Cancelable task is blocked by an " - "unanswered question but cancelation " + "unanswered question but cancellation " "failed")); } } else if (blocked) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3473435..b5acd20 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -706,7 +706,7 @@ error: /** * @conn connection to report errors against * @pool storage pool to build - * @flags controls the pool formating behaviour + * @flags controls the pool formatting behaviour * * Build a directory or FS based storage pool. * diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index a576047..b878622 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -188,12 +188,12 @@ umlBuildCommandLineNet(virConnectPtr conn, } if (def->data.ethernet.ipaddr) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("IP address not supported for ethernet inteface")); + _("IP address not supported for ethernet interface")); goto error; } if (def->data.ethernet.script) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("script execution not supported for ethernet inteface")); + _("script execution not supported for ethernet interface")); goto error; } break; diff --git a/src/util/logging.c b/src/util/logging.c index f550503..8d60280 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -677,7 +677,7 @@ virLogVersionString(char **msg) * @fmt: the string format * @...: the arguments * - * Call the libvirt logger with some informations. Based on the configuration + * Call the libvirt logger with some information. Based on the configuration * the message may be stored, sent to output or just discarded */ void virLogMessage(const char *category, int priority, const char *funcname, diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9ba06e5..c250aee 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3513,7 +3513,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'devices/interfase/model' " + _("Expecting domain XML entry 'devices/interface/model' " "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " "or 'e1000' but found '%s'"), def->model); return -1; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 2318565..16165fe 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2217,7 +2217,7 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, flags |= VIR_DOMAIN_VCPU_MAXIMUM; if ((max = xenDaemonDomainGetVcpusFlags(domain, flags)) < 0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); return -1; } if (vcpus > max) { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a250b6f..9c376fb 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -728,7 +728,7 @@ xenXMDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, /* Hypervisor maximum. */ if ((max = xenUnifiedGetMaxVcpus(domain->conn, NULL)) < 0) { xenXMError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); goto cleanup; } /* Can't specify a current larger than stored maximum; but -- 1.7.7.3

1 0

[libvirt] [PATCH] conf: Improve incorrect root element error messages
by Michal Privoznik 01 Dec '11

01 Dec '11

When user pass wrong root element, it is not 'internal error' and we can give him hint what we are expecting. --- src/conf/domain_conf.c | 12 ++++++++---- src/conf/interface_conf.c | 6 ++++-- src/conf/network_conf.c | 6 ++++-- src/conf/node_device_conf.c | 6 ++++-- src/conf/secret_conf.c | 6 ++++-- src/security/virt-aa-helper.c | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f04e477..bb504f9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7932,8 +7932,10 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, virDomainDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "domain")) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virDomainReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <domain>"), + root->name); goto cleanup; } @@ -7963,8 +7965,10 @@ virDomainObjParseNode(virCapsPtr caps, virDomainObjPtr obj = NULL; if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virDomainReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <domstatus>"), + root->name); goto cleanup; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index fd8d1ae..59f74a1 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -838,8 +838,10 @@ virInterfaceDefPtr virInterfaceDefParseNode(xmlDocPtr xml, virInterfaceDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "interface")) { - virInterfaceReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virInterfaceReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <interface>"), + root->name); return NULL; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 10afcde..1058b07 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1107,8 +1107,10 @@ virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, virNetworkDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "network")) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virNetworkReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <network>"), + root->name); return NULL; } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fc284e0..084121f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1204,8 +1204,10 @@ virNodeDeviceDefParseNode(xmlDocPtr xml, virNodeDeviceDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "device")) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virNodeDeviceReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s> " + "expecting <device>"), + root->name); return NULL; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index a51fc69..6e80733 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -126,8 +126,10 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) char *uuidstr = NULL; if (!xmlStrEqual(root->name, BAD_CAST "secret")) { - virSecretReportError(VIR_ERR_XML_ERROR, "%s", - _("incorrect root element")); + virSecretReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <secret>"), + root->name); goto cleanup; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ad06974..14399cc 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -644,7 +644,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) } if (!xmlStrEqual(ctxt->node->name, BAD_CAST "domain")) { - vah_error(NULL, 0, _("incorrect root element")); + vah_error(NULL, 0, _("unexpected root element, expecting <domain>")); goto cleanup; } -- 1.7.3.4

3 5

[libvirt] [PATCH 0/2] gnulib update
by Eric Blake 01 Dec '11

01 Dec '11

The latest gnulib update accidentally reintroduced -Wformat-nonliteral (by virtue of adding -Wformat=2, understood only by newer gcc), I almost got sucked into the rathole of fixing all our problems before I realized the real issue, but by then, I had already written patch 1. I'd like to get this in before the freeze, and then (hopefully) not touch .gnulib until after the release (we've been burned too many times by a .gnulib update after rc1). Eric Blake (2): error: drop old-style error reporting build: import latest gnulib, for mingw and syntax-check fixes .gnulib | 2 +- gnulib/local/lib/openpty.c.diff | 26 ------ gnulib/local/lib/pty.in.h.diff | 13 --- m4/virt-compile-warnings.m4 | 8 ++- src/fdstream.c | 2 +- src/libvirt_private.syms | 1 - src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/conf.c | 22 ++--- src/util/virterror.c | 2 +- src/util/virterror_internal.h | 8 -- src/xen/xen_hypervisor.c | 170 ++++++++++++++++----------------------- src/xenapi/xenapi_utils.c | 2 +- tests/testutils.c | 4 +- tools/virsh.c | 12 ++-- 15 files changed, 98 insertions(+), 178 deletions(-) delete mode 100644 gnulib/local/lib/openpty.c.diff delete mode 100644 gnulib/local/lib/pty.in.h.diff -- 1.7.7.3

1 5

[libvirt] [PATCH] Avoid crash in shunloadtest
by Daniel P. Berrange 01 Dec '11

01 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> For unknown reasons, the shunloadtest will crash on Fedora 16 inside dlopen() (gdb) bt #0 0x00000000000050e6 in ?? () #1 0x00007ff61a77b9d5 in floor () from /lib64/libm.so.6 #2 0x00007ff61e522963 in _dl_relocate_object () from /lib64/ld-linux-x86-64.so.2 #3 0x00007ff61e5297e6 in dl_open_worker () from /lib64/ld-linux-x86-64.so.2 #4 0x00007ff61e525006 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 #5 0x00007ff61e52917a in _dl_open () from /lib64/ld-linux-x86-64.so.2 #6 0x00007ff61e0f6f26 in dlopen_doit () from /lib64/libdl.so.2 #7 0x00007ff61e525006 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 #8 0x00007ff61e0f752f in _dlerror_run () from /lib64/libdl.so.2 #9 0x00007ff61e0f6fc1 in dlopen@@GLIBC_2.2.5 () from /lib64/libdl.so.2 #10 0x0000000000400a15 in main (argc=<optimized out>, argv=<optimized out>) at shunloadtest.c:105 Changing from RTLD_NOW to RTLD_LAZY avoids this problem, but quite possibly does not fix the root cause. * shunloadtest.c: s/NOW/LAZY/ --- tests/shunloadtest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index 2cdb8b8..ab6e56f 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -102,7 +102,7 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv) fprintf(stderr, " .%*s 1 ", 39, ""); signal(SIGSEGV, sigHandler); - if (!(lib = dlopen("./.libs/libshunload.so", RTLD_NOW))) { + if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) { fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); return 1; } -- 1.7.7.3

2 3

[libvirt] [PATCH] build: properly skip tests
by Eric Blake 01 Dec '11

01 Dec '11

I got this failure on FreeBSD: shunloadtest.c: In function 'main': shunloadtest.c:150: error: 'EXIT_AM_SKIP' undeclared (first use in this function) but inspection showed several other problems, all fixed here. * tests/domainsnapshotxml2xmltest.c [!WITH_QEMU]: Ensure EXIT_AM_SKIP is defined. * tests/esxutilstest.c [!WITH_ESX]: Likewise. * tests/openvzutilstest.c [!WITH_OPENVZ]: Likewise. * tests/qemuargv2xmltest.c [!WITH_QEMU]: Likewise. * tests/qemuhelptest.c [!WITH_QEMU]: Likewise. * tests/qemuxml2argvtest.c [!WITH_QEMU]: Likewise. * tests/qemuxml2xmltest.c [!WITH_QEMU]: Likewise. * tests/qemuxmlnstest.c [!WITH_QEMU]: Likewise. * tests/shunloadtest.c [!linux]: Likewise. * tests/vmx2xmltest.c [!WITH_VMX]: Likewise. * tests/xml2vmxtest.c [!WITH_VMX]: Likewise. --- Pushing under the build-breaker rule. tests/domainsnapshotxml2xmltest.c | 1 + tests/esxutilstest.c | 1 + tests/openvzutilstest.c | 1 + tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tests/qemuxmlnstest.c | 1 + tests/shunloadtest.c | 1 + tests/vmx2xmltest.c | 1 + tests/xml2vmxtest.c | 1 + 11 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index c2266f4..90ff9bb 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -118,6 +118,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 8241ecd..201b930 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -279,6 +279,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index f04ddbb..7f5ddc9 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -160,6 +160,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index a20df06..cb3cafd 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -243,6 +243,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index df677cc..cc9f1ad 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -578,6 +578,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e75d55e..228d052 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -669,6 +669,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 623e72c..35bfdce 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -211,6 +211,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index ee3ad1b..86cf974 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -284,6 +284,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index ab6e56f..8113ef3 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -144,6 +144,7 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv) } #else +# include "testutils.h" int main(void) { diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 5c0018a..3c566f8 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -289,6 +289,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 5530b45..f4e4ed6 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -301,6 +301,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { -- 1.7.7.3

1 0

[libvirt] [PATCH] build: fix 'make dist' without dtrace
by Eric Blake 01 Dec '11

01 Dec '11

probes.h can only be generated on Linux, and then only with dtrace installed. If it is part of the tarball, then either 'make dist' will fail if you don't have that setup, or we would have to start keeping probes.h in libvirt.git. Since we only need it to be generated when dtrace is in use, it's better to avoid shipping it in the first place, and avoid tracking it in git. Meanwhile, there is a build dependency - since the RPC code is generated, it can be built early; but when dtrace is enabled, we must ensure probes.h is built even earlier. Commit 1afcfbdd tried to fix this, but did so in a way that added probes.h into the tarball, and broke VPATH as well. Commit ecbca767 fixed VPATH, but didn't fix the more fundamental problem. This patch solves the issue by adding a dependency instead. Tested with 'make dist' in a clean VPATH builds, for both './configure --without-dtrace' and './configure --with-dtrace'; all configurations were able to correctly build a tarball, and the dtrace configuration no longer sticks probes.h in the tarball. * src/Makefile.am (REMOTE_DRIVER_GENERATED): Don't ship probes.h; rather, make it a dependency. --- Pushing under the build-breaker rule, since I reproduced a failure with './configure --without-dtrace && make dist' without this patch. src/Makefile.am | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4c98397..93bf54c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -202,11 +202,6 @@ REMOTE_DRIVER_GENERATED = \ $(srcdir)/remote/qemu_protocol.h \ $(srcdir)/remote/qemu_client_bodies.h -# The remote RPC driver needs probes.h -if WITH_DTRACE -REMOTE_DRIVER_GENERATED += probes.h -endif - REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL) @@ -646,7 +641,6 @@ libvirt_driver_remote_la_LDFLAGS += -module -avoid-version endif libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) - $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED) endif WITH_REMOTE @@ -1283,6 +1277,9 @@ if WITH_DTRACE libvirt_la_BUILT_LIBADD += probes.o libvirt_la_DEPENDENCIES += probes.o nodist_libvirt_la_SOURCES = probes.h +if WITH_REMOTE +$(REMOTE_DRIVER_GENERATED): probes.h +endif WITH_REMOTE BUILT_SOURCES += probes.h libvirt_probes.stp libvirt_functions.stp -- 1.7.7.3

2 1

[libvirt] [PATCH] Don't use undocumented __isleap macro
by Daniel P. Berrange 01 Dec '11

01 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushing under build-breaker (mingw32) rule The glibc time.h header has an undocumented __isleap macro that we are using. Since it is undocumented & does not appear on any other OS, stop using it and just define the macro in libvirt code instead. * src/util/virtime.c: Remove __isleap usage --- src/util/virtime.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index 25c2317..92b6cdd 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -113,6 +113,9 @@ const unsigned short int __mon_yday[2][13] = { { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } }; +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + /** * virTimeFieldsThenRaw: * @when: the time to convert in milliseconds @@ -152,7 +155,7 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) fields->tm_wday += 7; y = 1970; - while (days < 0 || days >= (__isleap (y) ? 366 : 365)) { + while (days < 0 || days >= (is_leap_year(y) ? 366 : 365)) { /* Guess a corrected year, assuming 365 days per year. */ long int yg = y + days / 365 - (days % 365 < 0); @@ -165,7 +168,7 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) fields->tm_year = y - 1900; fields->tm_yday = days; - ip = __mon_yday[__isleap(y)]; + ip = __mon_yday[is_leap_year(y)]; for (y = 11; days < (long int) ip[y]; --y) continue; days -= ip[y]; -- 1.7.6.4

2 1

[libvirt] [PATCH libvirt-glib 00/15] More misc improvements
by Daniel P. Berrange 01 Dec '11

01 Dec '11

This series has three functional improvements - Support for <console> - Support for <memballoon> - Support containers The rest of it is a series of code style cleanups. Finally it adds the 'make syntax-check' capability from gnulib to keep code style clean hereafter

2 33

[libvirt] [PATCH] Fix a logic error for setting block I/O
by Lei Li 01 Dec '11

01 Dec '11

Fix a logic error, the initial value of ret = -1, if just set --config, it will goto endjob directly without doing its really job here. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed90c66..8ea6f48 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11234,8 +11234,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info); qemuDomainObjExitMonitorWithDriver(driver, vm); } - if (ret < 0) - goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { sa_assert(persistentDef && idx >= 0); -- 1.7.1

2 1

[libvirt] libvirt-php 0.4.5 and php 5.4
by Remi Collet 01 Dec '11

01 Dec '11

Hi, I'm working on updating PHP to 5.4.0 (probably a fedora 17 feature). libvirt 0.4.5 doesn't build because function_entry have been removed See http://news.php.net/php.pecl.dev/7123 Fix is trivial : s/function_entry/zend_function_entry/ Attcached patch solves this issue and also fixes a lot of compiler warning (unused variable, unset, ...) There is still a lot of warning... (most are trivial to fix) I Hope this helps. Remi. P.S. Here is the full log (with -Wall) Making all in src make[3]: Entering directory `/dev/shm/libvirt-php-0.4.5/src' gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -c -o libvirt-php.o libvirt-php.c -I/usr/include/libxml2 -DHAVE_CONFIG_H rm -f *.o libvirt-php.c: In function 'zif_libvirt_domain_send_keys': libvirt-php.c:3002:2: warning: pointer targets in passing argument 3 of 'vnc_send_keys' differ in signedness [-Wpointer-sign] libvirt-php.h:200:5: note: expected 'unsigned char *' but argument is of type 'char *' libvirt-php.c: In function 'zif_libvirt_image_create': libvirt-php.c:1674:8: warning: ignoring return value of 'system', declared with attribute warn_unused_result [-Wunused-result] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -c -o vncfunc.o vncfunc.c -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/libxml2 -DHAVE_CONFIG_H vncfunc.c: In function 'vnc_parse_fb_params': vncfunc.c:178:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:178:2: warning: pointer targets in passing argument 1 of '__strdup' differ in signedness [-Wpointer-sign] /usr/include/bits/string2.h:1303:14: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:178:21: warning: pointer targets in assignment differ in signedness [-Wpointer-sign] vncfunc.c:141:17: warning: unused variable 'name' [-Wunused-variable] vncfunc.c:139:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_send_key': vncfunc.c:205:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_connect': vncfunc.c:438:2: warning: implicit declaration of function 'connect_socket' [-Wimplicit-function-declaration] vncfunc.c: In function 'vnc_get_dimensions': vncfunc.c:511:2: warning: pointer targets in passing argument 1 of 'vnc_parse_fb_params' differ in signedness [-Wpointer-sign] vncfunc.c:137:17: note: expected 'unsigned char *' but argument is of type 'char *' vncfunc.c:525:2: warning: implicit declaration of function 'socket_has_data' [-Wimplicit-function-declaration] vncfunc.c:526:3: warning: implicit declaration of function 'socket_read' [-Wimplicit-function-declaration] vncfunc.c:484:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:484:9: warning: unused variable 'skip_next' [-Wunused-variable] vncfunc.c:484:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_send_keys': vncfunc.c:569:2: warning: pointer targets in passing argument 1 of 'vnc_parse_fb_params' differ in signedness [-Wpointer-sign] vncfunc.c:137:17: note: expected 'unsigned char *' but argument is of type 'char *' vncfunc.c:572:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:572:2: warning: format '%d' expects argument of type 'int', but argument 5 has type 'size_t' [-Wformat] vncfunc.c:573:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:580:3: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:600:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:600:2: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat] vncfunc.c:547:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c: In function 'vnc_send_pointer_event': vncfunc.c:627:16: warning: unused variable 'end' [-Wunused-variable] vncfunc.c:625:26: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:625:22: warning: unused variable 'ok' [-Wunused-variable] vncfunc.c:625:19: warning: unused variable 'i' [-Wunused-variable] vncfunc.c:625:11: warning: unused variable 'j' [-Wunused-variable] vncfunc.c: In function 'vnc_refresh_screen': vncfunc.c:697:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:697:9: warning: unused variable 'skip_next' [-Wunused-variable] vncfunc.c:697:6: warning: unused variable 'i' [-Wunused-variable] In file included from /usr/include/string.h:642:0, from /usr/include/php/main/../main/php_config.h:2440, from /usr/include/php/Zend/zend_config.h:1, from /usr/include/php/Zend/zend.h:51, from /usr/include/php/main/php.h:34, from libvirt-php.h:44, from vncfunc.c:10: In function 'memset', inlined from 'vnc_send_client_pointer' at vncfunc.c:252:8: /usr/include/bits/string3.h:85:3: warning: call to __builtin___memset_chk will always overflow destination buffer [enabled by default] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -c -o sockets.o sockets.c -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/libxml2 -DHAVE_CONFIG_H sockets.c: In function 'socket_has_data': sockets.c:118:10: warning: unused variable 'result' [-Wunused-variable] sockets.c: In function 'socket_read': sockets.c:177:7: warning: ignoring return value of 'read', declared with attribute warn_unused_result [-Wunused-result] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -shared -lvirt -rdynamic -o libvirt-php.so vncfunc.o sockets.o libvirt-php.o -ldl -lvirt -lxml2 echo "Extension compiled as libvirt-php.so" Extension compiled as libvirt-php.so

2 2

[libvirt] [PATCH libvirt-glib v2 0/8] More APIs in libvirt-gconfig
by Daniel P. Berrange 01 Dec '11

01 Dec '11

An update to: https://www.redhat.com/archives/libvir-list/2011-November/msg01812.html New in v2: - All Christophe's comments included - Cleanup include headers - Fix file descriptions

2 10

[libvirt] [libvirt-glib 1/2] Wrap storage pool info API
by Zeeshan Ali (Khattak) 01 Dec '11

01 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-pool.c | 44 ++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 21 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 67 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index da8ada5..3c30a3d 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -189,6 +189,21 @@ gvir_storage_pool_handle_free(GVirStoragePoolHandle *src) G_DEFINE_BOXED_TYPE(GVirStoragePoolHandle, gvir_storage_pool_handle, gvir_storage_pool_handle_copy, gvir_storage_pool_handle_free) +static GVirStoragePoolInfo * +gvir_storage_pool_info_copy(GVirStoragePoolInfo *info) +{ + return g_slice_dup(GVirStoragePoolInfo, info); +} + +static void +gvir_storage_pool_info_free(GVirStoragePoolInfo *info) +{ + g_slice_free(GVirStoragePoolInfo, info); +} + +G_DEFINE_BOXED_TYPE(GVirStoragePoolInfo, gvir_storage_pool_info, + gvir_storage_pool_info_copy, gvir_storage_pool_info_free) + const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool) { GVirStoragePoolPrivate *priv = pool->priv; @@ -237,6 +252,35 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, return conf; } +/** + * gvir_storage_pool_get_info: + * @pool: the storage_pool + * Returns: (transfer full): the info + */ +GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, + GError **err) +{ + GVirStoragePoolPrivate *priv = pool->priv; + virStoragePoolInfo info; + GVirStoragePoolInfo *ret; + + if (virStoragePoolGetInfo(priv->handle, &info) < 0) { + if (err) + *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to get storage pool info"); + return NULL; + } + + ret = g_slice_new(GVirStoragePoolInfo); + ret->state = info.state; + ret->capacity = info.capacity; + ret->allocation = info.allocation; + ret->available = info.available; + + return ret; +} + typedef gint (* CountFunction) (virStoragePoolPtr vpool); typedef gint (* ListFunction) (virStoragePoolPtr vpool, gchar **lst, gint max); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index d95bb19..436238b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -36,6 +36,7 @@ G_BEGIN_DECLS #define GVIR_IS_STORAGE_POOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_STORAGE_POOL)) #define GVIR_STORAGE_POOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolClass)) +#define GVIR_TYPE_STORAGE_POOL_INFO (gvir_storage_pool_info_get_type()) #define GVIR_TYPE_STORAGE_POOL_HANDLE (gvir_storage_pool_handle_get_type()) typedef struct _GVirStoragePool GVirStoragePool; @@ -58,8 +59,25 @@ struct _GVirStoragePoolClass gpointer padding[20]; }; +typedef enum { + GVIR_STORAGE_POOL_STATE_INACTIVE = 0, /* Not running */ + GVIR_STORAGE_POOL_STATE_BUILDING = 1, /* Initializing pool, not available */ + GVIR_STORAGE_POOL_STATE_RUNNING = 2, /* Running normally */ + GVIR_STORAGE_POOL_STATE_DEGRADED = 3, /* Running degraded */ + GVIR_STORAGE_POOL_STATE_INACCESSIBLE = 4, /* Running, but not accessible */ +} GVirStoragePoolState; + +typedef struct _GVirStoragePoolInfo GVirStoragePoolInfo; +struct _GVirStoragePoolInfo +{ + GVirStoragePoolState state; /* the state */ + guint64 capacity; /* Logical size bytes */ + guint64 allocation; /* Current allocation bytes */ + guint16 available; /* Remaining free space bytes */ +}; GType gvir_storage_pool_get_type(void); +GType gvir_storage_pool_info_get_type(void); GType gvir_storage_pool_handle_get_type(void); const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool); @@ -69,6 +87,9 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, guint flags, GError **err); +GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, + GError **err); + gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, GCancellable *cancellable, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 61a3a31..55c515b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -91,10 +91,12 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_secret_get_config; gvir_storage_pool_get_type; + gvir_storage_pool_info_get_type; gvir_storage_pool_handle_get_type; gvir_storage_pool_get_name; gvir_storage_pool_get_uuid; gvir_storage_pool_get_config; + gvir_storage_pool_get_info; gvir_storage_pool_refresh; gvir_storage_pool_refresh_async; gvir_storage_pool_refresh_finish; -- 1.7.7.3

3 4

[libvirt] [PATCH libvirt-glib 0/5] More APIs in libvirt-gconfig
by Daniel P. Berrange 01 Dec '11

01 Dec '11

This adds support for - <filesystem> - <display/> type=vnc|sdl - <os> kernel, ramdisk, cmdline & init child elements - Top level virt type - Fixed a bug with NULL URIs in GVirConnection

2 14

[libvirt] [PATCH] virsh: Allow other escape characters for console
by Michal Privoznik 01 Dec '11

01 Dec '11

Currently virsh supports only ^] as escape character for console. However, some users might want to use something else. This patch creates such ability by specifying '-e' switch on virsh command line. --- Okay, this patch is meant as RFC mainly but if it got enough ACKs I will not hesitate to push it. My biggest concern is the way of telling virsh customized sequence. I am not big fan of new switch, however we lack virsh.conf in $conf_dir. Maybe it is the right time for creating it. Another approach is to pass the sequence as parameter directly to 'console' command. What's your opinion? tools/console.c | 28 +++++++++++++++++++++++----- tools/console.h | 4 +++- tools/virsh.c | 20 ++++++++++++++++---- tools/virsh.pod | 5 +++++ 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/tools/console.c b/tools/console.c index 0f85bc7..db2e17e 100644 --- a/tools/console.c +++ b/tools/console.c @@ -43,9 +43,13 @@ # include "memory.h" # include "virterror_internal.h" - -/* ie Ctrl-] as per telnet */ -# define CTRL_CLOSE_BRACKET '\35' +/* + * Convert given character to control character. + * Basically, we take lower 5 bits unless given + * character is DEL (represented by '?'). Then + * we return 127 + */ +# define CONTROL(c) ((c) == '?' ? ((c) | 0x40) : ((c) & 0x1f)) # define VIR_FROM_THIS VIR_FROM_NONE @@ -66,6 +70,8 @@ struct virConsole { struct virConsoleBuffer streamToTerminal; struct virConsoleBuffer terminalToStream; + + char escapeChar; }; static int got_signal = 0; @@ -215,7 +221,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, virConsoleShutdown(con); return; } - if (con->terminalToStream.data[con->terminalToStream.offset] == CTRL_CLOSE_BRACKET) { + if (con->terminalToStream.data[con->terminalToStream.offset] == con->escapeChar) { virConsoleShutdown(con); return; } @@ -278,7 +284,18 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, } -int vshRunConsole(virDomainPtr dom, const char *dev_name) +static char +vshGetEscapeChar(const char *s) +{ + if (*s == '^') + return CONTROL(s[1]); + + return *s; +} + +int vshRunConsole(virDomainPtr dom, + const char *dev_name, + const char *escape_seq) { int ret = -1; struct termios ttyattr, rawattr; @@ -326,6 +343,7 @@ int vshRunConsole(virDomainPtr dom, const char *dev_name) goto cleanup; } + con->escapeChar = vshGetEscapeChar(escape_seq); con->st = virStreamNew(virDomainGetConnect(dom), VIR_STREAM_NONBLOCK); if (!con->st) diff --git a/tools/console.h b/tools/console.h index 9b05ff1..8cca08f 100644 --- a/tools/console.h +++ b/tools/console.h @@ -25,7 +25,9 @@ # ifndef WIN32 -int vshRunConsole(virDomainPtr dom, const char *dev_name); +int vshRunConsole(virDomainPtr dom, + const char *dev_name, + const char *escape_seq); # endif /* !WIN32 */ diff --git a/tools/virsh.c b/tools/virsh.c index 89fb4e7..1b84980 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -75,6 +75,9 @@ static char *progname; ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \ ((int) ((T)->tv_usec - (U)->tv_usec))) / 1000.0) +/* Default escape char Ctrl-] as per telnet */ +#define CTRL_CLOSE_BRACKET "^]" + /** * The log configuration */ @@ -249,6 +252,7 @@ typedef struct __vshControl { virDomainGetState is not supported */ bool useSnapshotOld; /* cannot use virDomainSnapshotGetParent or virDomainSnapshotNumChildren */ + const char *escapeChar; /* Escape character for domain console */ } __vshControl; typedef struct vshCmdGrp { @@ -796,8 +800,8 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name) } vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); - vshPrintExtra(ctl, "%s", _("Escape character is ^]\n")); - if (vshRunConsole(dom, name) == 0) + vshPrintExtra(ctl, _("Escape character is %s\n"), ctl->escapeChar); + if (vshRunConsole(dom, name, ctl->escapeChar) == 0) ret = true; cleanup: @@ -16817,6 +16821,7 @@ vshDeinit(vshControl *ctl) vshReadlineDeinit(ctl); vshCloseLogFile(ctl); VIR_FREE(ctl->name); + VIR_FREE(ctl->escapeChar); if (ctl->conn) { int ret; if ((ret = virConnectClose(ctl->conn)) != 0) { @@ -16848,7 +16853,8 @@ vshUsage(void) " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" " -v | --version[=short] program version\n" - " -V | --version=long version and full options\n\n" + " -V | --version=long version and full options\n" + " -e | --escape <char> set escape sequence for console\n\n" " commands (non interactive mode):\n\n"), progname, progname); for (grp = cmdGroups; grp->name; grp++) { @@ -17009,13 +17015,14 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) {"connect", required_argument, NULL, 'c'}, {"readonly", no_argument, NULL, 'r'}, {"log", required_argument, NULL, 'l'}, + {"escape", required_argument, NULL, 'e'}, {NULL, 0, NULL, 0} }; /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:", opt, NULL)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { @@ -17050,6 +17057,9 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) case 'l': ctl->logfile = vshStrdup(ctl, optarg); break; + case 'e': + ctl->escapeChar = vshStrdup(ctl, optarg); + break; default: vshError(ctl, _("unsupported option '-%c'. See --help."), arg); exit(EXIT_FAILURE); @@ -17091,6 +17101,8 @@ main(int argc, char **argv) ctl->imode = true; /* default is interactive mode */ ctl->log_fd = -1; /* Initialize log file descriptor */ ctl->debug = VSH_DEBUG_DEFAULT; + ctl->escapeChar = vshStrdup(ctl, CTRL_CLOSE_BRACKET); + if (!setlocale(LC_ALL, "")) { perror("setlocale"); diff --git a/tools/virsh.pod b/tools/virsh.pod index db872dd..08b761d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -92,6 +92,11 @@ option of the B<connect> command. Output elapsed time information for each command. +=item B<-e>, B<--escape> I<string> + +Set alternative escape sequence for I<console> command. By default, +telnet's ^] is used. + =back =head1 NOTES -- 1.7.3.4

2 5

[libvirt] [PATCH] bridge_driver: Don't define network if XML contains more IPv4 adreses.
by Peter Krempa 01 Dec '11

01 Dec '11

Only one IPv4 DHCP definition is supported. Originaly the code checked for a multiple definition and returned an error, but the new domain definition was already added to networks. This patch moves the check before the newly defined network is added to active networks. *src/network/bridge_driver.c: networkDefine(): - move multiple IPv4 adresses check before definition is used. --- src/network/bridge_driver.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c49c25b..0c1563a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2261,70 +2261,71 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { if (!(def = virNetworkDefParseString(xml))) goto cleanup; if (virNetworkObjIsDuplicate(&driver->networks, def, 0) < 0) goto cleanup; /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ if (def->forwardType == VIR_NETWORK_FORWARD_NONE || def->forwardType == VIR_NETWORK_FORWARD_NAT || def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { if (virNetworkSetBridgeName(&driver->networks, def, 1)) goto cleanup; virNetworkSetBridgeMacAddr(def); } - if (!(network = virNetworkAssignDef(&driver->networks, - def))) - goto cleanup; - freeDef = false; - - network->persistent = 1; - - if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { - virNetworkRemoveInactive(&driver->networks, network); - network = NULL; - goto cleanup; - } - /* We only support dhcp on one IPv4 address per defined network */ for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii)); ii++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { networkReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple dhcp sections found. dhcp is supported only for a single IPv4 address on each network")); goto cleanup; } else { ipv4def = ipdef; } } } } - if (ipv4def) { + + if (!(network = virNetworkAssignDef(&driver->networks, + def))) + goto cleanup; + freeDef = false; + + network->persistent = 1; + + if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { + virNetworkRemoveInactive(&driver->networks, network); + network = NULL; + goto cleanup; + } + + if (ipv4def) { dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR); if (dctx == NULL || networkBuildDnsmasqHostsfile(dctx, ipv4def, def->dns) < 0 || dnsmasqSave(dctx) < 0) goto cleanup; } VIR_INFO("Defining network '%s'", def->name); ret = virGetNetwork(conn, def->name, def->uuid); cleanup: if (freeDef) virNetworkDefFree(def); dnsmasqContextFree(dctx); if (network) virNetworkObjUnlock(network); networkDriverUnlock(driver); return ret; } -- 1.7.3.4

2 2

[libvirt] [PATCHv6 0/7] block io throttle via per-device block IO tuning
by Eric Blake 01 Dec '11

01 Dec '11

Here's the latest state of Lei's patch series with all my comments folded in. I may have a few more tweaks to make now that I'm at the point of testing things with both old qemu (graceful rejection) and new qemu (sensical return values), so it may be a day or two (or even a weekend, since this is a holiday weekend for me) before I actually push this, so it wouldn't hurt if anyone else wants to review in the meantime. Lei Li (7): Add new API virDomain{Set, Get}BlockIoTune Add virDomain{Set, Get}BlockIoTune support to the remote driver Support block I/O throttle in XML Implement virDomain{Set, Get}BlockIoTune for the qemu driver Enable the blkdeviotune command in virsh Support virDomain{Set, Get}BlockIoTune in the python API Add tests for blkdeviotune daemon/remote.c | 64 ++++ docs/formatdomain.html.in | 39 +++ docs/schemas/domaincommon.rng | 122 +++++-- include/libvirt/libvirt.h.in | 63 ++++ python/generator.py | 2 + python/libvirt-override-api.xml | 16 + python/libvirt-override.c | 178 ++++++++++ src/conf/domain_conf.c | 90 +++++- src/conf/domain_conf.h | 14 + src/driver.h | 20 ++ src/libvirt.c | 148 +++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_command.c | 31 ++ src/qemu/qemu_driver.c | 340 ++++++++++++++++++++ src/qemu/qemu_monitor.c | 33 ++ src/qemu/qemu_monitor.h | 8 + src/qemu/qemu_monitor_json.c | 176 ++++++++++ src/qemu/qemu_monitor_json.h | 8 + src/qemu/qemu_monitor_text.c | 151 +++++++++- src/qemu/qemu_monitor_text.h | 8 + src/remote/remote_driver.c | 57 ++++ src/remote/remote_protocol.x | 27 ++- src/remote_protocol-structs | 24 ++ .../qemuxml2argv-blkdeviotune.args | 7 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 30 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 1 + tools/virsh.c | 244 ++++++++++++++ tools/virsh.pod | 30 ++ 29 files changed, 1900 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml -- 1.7.7.3

5 24

[libvirt] [PATCH] spec: mark directories in /var/run as ghosts
by Eric Blake 01 Dec '11

01 Dec '11

We have several directories that are created on the fly, and which only contain state relevant to a running libvirtd process (all located in /var/run). Since the directories are created as needed, and make no sense without a running libvirtd, we want them deleted if libvirt is uninstalled. And in F15 and newer, /var/run is on tmpfs (forcing us to recreate on the fly); which means that someone trying to verify a complete rpm will fail if the directory does not currently exist because libvirtd has not been started since boot. The solution, then, is to mark the directories as %ghost, so that rpm knows that we own them and will clean it up if libvirt is uninstalled, but will no longer create the directory for us at install, nor complain at verify time if the directory does not exist. See https://bugzilla.redhat.com/show_bug.cgi?id=656611. * libvirt.spec.in (%files): Add %ghost to temporary directories that we don't install, but want cleaned up on libvirt removal. --- libvirt.spec.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f61a243..06c949b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1082,7 +1082,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_datadir}/libvirt/networks/default.xml %endif -%dir %{_localstatedir}/run/libvirt/ +%ghost %dir %{_localstatedir}/run/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ @@ -1090,24 +1090,24 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} -%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ +%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} -%dir %{_localstatedir}/run/libvirt/lxc/ +%ghost %dir %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ %endif %if %{with_uml} -%dir %{_localstatedir}/run/libvirt/uml/ +%ghost %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %endif %if %{with_libxl} -%dir %{_localstatedir}/run/libvirt/libxl/ +%ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %endif %if %{with_network} -%dir %{_localstatedir}/run/libvirt/network/ +%ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %endif -- 1.7.7.3

2 1