- Devel - libvirt List Archives

[libvirt] gnulib compiler warning detection broken on RHEL5 autoconf
by Daniel P. Berrange 27 Jul '11

27 Jul '11

I was wondering why I didn't see any compile warnings from the broken gnutls code on RHEL5 when I noticed that we were building without any compiler warning flags at all. It seems configure fails on RHEL5 vintage autoconf checking whether compiler handles -Wall... ./configure: line 75468: ${$as_gl_Warn+set}: bad substitution I'm guessing it is the gl_WARN_ADD() macro that is at fault somehow. 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 :|

2 6

[libvirt] [libvirt-test-API][PATCH 1/2] add remoteAccess directory and tls authentication testcase
by Guannan Ren 27 Jul '11

27 Jul '11

--- repos/remoteAccess/tls_setup.py | 374 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 374 insertions(+), 0 deletions(-) create mode 100644 repos/remoteAccess/__init__.py create mode 100644 repos/remoteAccess/tls_setup.py diff --git a/repos/remoteAccess/__init__.py b/repos/remoteAccess/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py new file mode 100644 index 0000000..f703ee3 --- /dev/null +++ b/repos/remoteAccess/tls_setup.py @@ -0,0 +1,374 @@ +#!/usr/bin/env python +""" Setup tls authentication between two hosts and configure libvirt + to use it for connection. + remoteAccess:tls_setup + target_machine + xx.xx.xx.xx + username + root + password + xxxxxx +""" + +__author__ = 'Guannan Ren: gren(a)redhat.com' +__date__ = 'Mon July 25, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage'] + +import os +import re +import sys +import pexpect +import string +import commands +import shutil + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from utils.Python import utils +from exception import LibvirtAPI + +CERTTOOL = "/usr/bin/certtool" +CP = "/bin/cp" +MKDIR = "/bin/mkdir" +CA_FOLDER = "/etc/pki/CA" +PRIVATE_KEY_FOLDER = "/etc/pki/libvirt/private" +CERTIFICATE_FOLDER = "/etc/pki/libvirt" + +TEMP_TLS_FOLDER = "/tmp/libvirt_test_API_tls" +CAKEY = os.path.join(TEMP_TLS_FOLDER, 'cakey.pem') +CACERT = os.path.join(TEMP_TLS_FOLDER, 'cacert.pem') +SERVERKEY = os.path.join(TEMP_TLS_FOLDER, 'serverkey.pem') +SERVERCERT = os.path.join(TEMP_TLS_FOLDER, 'servercert.pem') +CLIENTKEY = os.path.join(TEMP_TLS_FOLDER, 'clientkey.pem') +CLIENTCERT = os.path.join(TEMP_TLS_FOLDER, 'clientcert.pem') + +def check_params(params): + """check out the arguments requried for migration""" + logger = params['logger'] + keys = ['target_machine', 'username', 'password'] + for key in keys: + if key not in params: + logger.error("Argument %s is required" % key) + return 1 + return 0 + +def CA_setting_up(util, logger): + """ setting up a Certificate Authority """ + # Create a private key for CA + logger.info("generate CA certificates") + + cakey_fd = open(CAKEY, 'w') + ret, out = util.exec_cmd([CERTTOOL, '--generate-privkey'], outfile=cakey_fd) + cakey_fd.close() + if ret != 0: + logger.error("failed to create CA private key") + return 1 + + + # ca.info file + cainfo = os.path.join(TEMP_TLS_FOLDER, 'ca.info') + cainfo_fd = open(cainfo, 'w') + cainfo_str = "cn = Libvirt_test_API\n" + \ + "ca\n" + \ + "cert_signing_key\n" + + cainfo_fd.write(cainfo_str) + cainfo_fd.close() + + # Generate cacert.pem + cacert_args = [CERTTOOL, '--generate-self-signed', '--load-privkey', CAKEY, '--template', cainfo] + cacert_fd = open(CACERT, 'w') + ret, out = util.exec_cmd(cacert_args, outfile=cacert_fd) + cacert_fd.close() + if ret != 0: + logger.error("failed to create cacert.pem") + return 1 + + logger.info("done the CA certificates job") + return 0 + +def tls_server_cert(target_machine, util, logger): + """ generating server certificates """ + # Create tls server key + logger.info("generate server certificates") + + serverkey_fd = open(SERVERKEY, 'w') + ret, out = util.exec_cmd([CERTTOOL, '--generate-privkey'], outfile=serverkey_fd) + serverkey_fd.close() + if ret != 0: + logger.error("failed to create server key") + return 1 + + # server.info + serverinfo = os.path.join(TEMP_TLS_FOLDER, 'server.info') + serverinfo_fd = open(serverinfo, 'w') + serverinfo_str = "organization = Libvirt_test_API\n" + \ + "cn = %s\n" % target_machine + \ + "tls_www_server\n" + \ + "encryption_key\n" + \ + "signing_key\n" + + serverinfo_fd.write(serverinfo_str) + serverinfo_fd.close() + + # Generate servercert.pem + servercert_args = [CERTTOOL, + '--generate-certificate', + '--load-privkey', SERVERKEY, + '--load-ca-certificate', CACERT, + '--load-ca-privkey', CAKEY, + '--template', serverinfo + ] + servercert_fd = open(SERVERCERT, 'w') + ret, out = util.exec_cmd(servercert_args, outfile=servercert_fd) + servercert_fd.close() + if ret != 0: + logger.error("failed to create servercert.pem") + return 1 + + logger.info("done the server certificates job") + return 0 + +def tls_client_cert(local_machine, util, logger): + """ generating client certificates """ + # Create tls client key + logger.info("generate client certificates") + + clientkey_fd = open(CLIENTKEY, 'w') + ret, out = util.exec_cmd([CERTTOOL, '--generate-privkey'], outfile=clientkey_fd) + clientkey_fd.close() + if ret != 0: + logger.error("failed to create client key") + return 1 + + # client.info + clientinfo = os.path.join(TEMP_TLS_FOLDER, 'client.info') + clientinfo_fd = open(clientinfo, 'w') + clientinfo_str = "country = xxx\n" + \ + "state = xxx\n" + \ + "locality = xxx\n" + \ + "organization = Libvirt_test_API\n" + \ + "cn = %s\n" % local_machine + \ + "tls_www_client\n" + \ + "encryption_key\n" + \ + "signing_key\n" + + clientinfo_fd.write(clientinfo_str) + clientinfo_fd.close() + + # Generate clientcert.pem + clientcert_args = [CERTTOOL, + '--generate-certificate', + '--load-privkey', CLIENTKEY, + '--load-ca-certificate', CACERT, + '--load-ca-privkey', CAKEY, + '--template', clientinfo, + ] + + clientcert_fd = open(CLIENTCERT, 'w') + ret, out = util.exec_cmd(clientcert_args, outfile=clientcert_fd) + clientcert_fd.close() + if ret != 0: + logger.error("failed to create client certificates") + return 1 + + logger.info("done the client certificates job") + return 0 + +def deliver_cert(target_machine, username, password, util, logger): + """ deliver CA, server and client certificates """ + # transmit cacert.pem to remote host + logger.info("deliver CA, server and client certificates to both local and remote server") + ret = util.scp_file(target_machine, username, password, CA_FOLDER, CACERT) + if ret: + logger.error("scp cacert.pem to %s error" % target_machine) + return 1 + + # copy cacert.pem to local CA folder + cacert_cp = [CP, '-f', CACERT, CA_FOLDER] + ret, out = util.exec_cmd(cacert_cp) + if ret: + logger.error("copying cacert.pem to %s error" % CA_FOLDER) + return 1 + + # mkdir /etc/pki/libvirt/private on remote host + libvirt_priv_cmd = "mkdir -p %s" % PRIVATE_KEY_FOLDER + ret = util.remote_exec_pexpect(target_machine, username, password, libvirt_priv_cmd) + if ret: + logger.error("failed to make /etc/pki/libvirt/private on %s" % target_machine) + return 1 + + # transmit serverkey.pem to remote host + ret = util.scp_file(target_machine, username, password, PRIVATE_KEY_FOLDER, SERVERKEY) + if ret: + logger.error("failed to scp serverkey.pem to %s" % target_machine) + return 1 + + # transmit servercert.pem to remote host + ret = util.scp_file(target_machine, username, password, CERTIFICATE_FOLDER, SERVERCERT) + if ret: + logger.error("failed to scp servercert.pem to %s" % target_machine) + return 1 + + libvirt_priv_cmd_local = [MKDIR, '-p', PRIVATE_KEY_FOLDER] + ret, out = util.exec_cmd(libvirt_priv_cmd_local) + if ret: + logger.error("failed to make %s on local" % PRIVATE_KEY_FOLDER) + return 1 + + # copy clientkey.pem to local folder + clientkey_cp = [CP, '-f', CLIENTKEY, PRIVATE_KEY_FOLDER] + ret, out = util.exec_cmd(clientkey_cp) + if ret: + logger.error("failed to copy clientkey.pem to %s" % PRIVATE_KEY_FOLDER) + return 1 + + # copy clientcert.pem to local folder + clientcert_cp = [CP, '-f', CLIENTCERT, CERTIFICATE_FOLDER] + ret, out = util.exec_cmd(clientcert_cp) + if ret: + logger.error("failed to copy clientcert.pem to %s" % CERTIFICATE_FOLDER) + return 1 + + logger.info("done to delivery") + return 0 + +def tls_libvirtd_set(target_machine, username, password, util, logger): + """ configure libvirtd.conf on tls server """ + logger.info("setting libvirtd.conf on tls server") + # open libvirtd --listen option + listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> /etc/sysconfig/libvirtd" + ret = util.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) + if ret: + logger.error("failed to uncomment --listen in /etc/sysconfig/libvirtd") + return 1 + + listen_tcp_cmd = "echo \"listen_tcp = 1\" >> /etc/libvirt/libvirtd.conf" + ret = util.remote_exec_pexpect(target_machine, username, password, listen_tcp_cmd) + if ret: + logger.error("failed to uncomment listen_tcp in /etc/libvirt/libvirtd.conf") + return 1 + + # restart remote libvirtd service + libvirtd_restart_cmd = "service libvirtd restart" + ret = util.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) + if ret: + logger.error("failed to restart libvirtd service") + return 1 + + logger.info("done to libvirtd configuration") + return 0 + +def iptables_stop(target_machine, username, password, util, logger): + """ This is a temprory method in favor of migration """ + logger.info("stop local and remote iptables temprorily") + iptables_stop_cmd = "service iptables stop" + ret = util.remote_exec_pexpect(target_machine, username, password, iptables_stop_cmd) + if ret: + logger.error("failed to stop remote iptables service") + return 1 + + iptables_stop = ["service", "iptables", "stop"] + ret, out = util.exec_cmd(iptables_stop) + if ret: + logger.error("failed to stop local iptables service") + return 1 + + logger.info("done the iptables stop job") + return 0 + +def tls_setup(params): + """ generate tls certificates and configure libvirt """ + logger = params['logger'] + params_check_result = check_params(params) + if params_check_result: + return 1 + + target_machine = params['target_machine'] + username = params['username'] + password = params['password'] + + util = utils.Utils() + local_machine = util.get_local_hostname() + + logger.info("the hostname of server is %s" % target_machine) + logger.info("the hostname of local machine is %s" % local_machine) + + if not util.do_ping(target_machine, 0): + logger.error("failed to ping host %s" % target_machine) + return 1 + + if os.path.exists(TEMP_TLS_FOLDER): + shutil.rmtree(TEMP_TLS_FOLDER) + + os.mkdir(TEMP_TLS_FOLDER) + + if iptables_stop(target_machine, username, password, util, logger): + return 1 + + if CA_setting_up(util, logger): + return 1 + + if tls_server_cert(target_machine, util, logger): + return 1 + + if tls_client_cert(local_machine, util, logger): + return 1 + + if deliver_cert(target_machine, username, password, util, logger): + return 1 + + if tls_libvirtd_set(target_machine, username, password, util, logger): + return 1 + + uri = "qemu://%s/system" % target_machine + + try: + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + virconn.close() + logger.info("tls authentication success") + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("tls authentication failed") + return 1 + + return 0 + +def tls_setup_clean(params): + """ cleanup testing enviroment """ + if os.path.exists(TEMP_TLS_FOLDER): + shutil.rmtree(TEMP_TLS_FOLDER) + + logger = params['logger'] + target_machine = params['target_machine'] + username = params['username'] + password = params['password'] + + util = utils.Utils() + cacert_rm = "rm -f %s/cacert.pem" % CA_FOLDER + ret = util.remote_exec_pexpect(target_machine, username, password, cacert_rm) + if ret: + logger.error("failed to remove cacert.pem on remote machine") + + ca_libvirt_rm = "rm -rf %s" % CERTIFICATE_FOLDER + ret = util.remote_exec_pexpect(target_machine, username, password, ca_libvirt_rm) + if ret: + logger.error("failed to remove libvirt folder") + + os.remove("%s/cacert.pem" % CA_FOLDER) + shutil.rmtree(CERTIFICATE_FOLDER) + -- 1.7.1

3 5

[libvirt] [PATCH] daemon: Unlink unix sockets at daemon shutdown
by Osier Yang 27 Jul '11

27 Jul '11

--- daemon/libvirtd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9e044e2..61f5a2d 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1572,6 +1572,12 @@ cleanup: if (pid_file) unlink (pid_file); + if (sock_file && sock_file[0] != '@') + unlink(sock_file); + + if (sock_file_ro && sock_file_ro[0] != '@') + unlink(sock_file_ro); + VIR_FREE(sock_file); VIR_FREE(sock_file_ro); VIR_FREE(pid_file); -- 1.7.6

2 3

[libvirt] Fix for newer yajl
by Brecht Sanders 27 Jul '11

27 Jul '11

Hi, I just notices that compiling libvirt against yail version 2 there were some errors, mainly because yajl_parser_config is no longer used. The patch below fixed this for me. Regards Brecht Sanders --- src/util/json.c 2011-03-24 08:10:26 +0100 +++ src/util/json.c 2011-07-27 09:29:52 +0200 @@ -34,2 +34,3 @@ # include <yajl/yajl_parse.h> +# include <yajl/yajl_version.h> #endif @@ -896,3 +897,5 @@ { +#if YAJL_MAJOR < 2 yajl_parser_config cfg = { 1, 1 }; +#endif yajl_handle hand; @@ -903,3 +906,7 @@ +#if YAJL_MAJOR < 2 hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); +#else + hand = yajl_alloc(&parserCallbacks, NULL, &parser); +#endif @@ -1004,3 +1011,5 @@ { +#if YAJL_MAJOR < 2 yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMUcan't cope */ +#endif yajl_gen g; @@ -1012,3 +1021,7 @@ +#if YAJL_MAJOR < 2 g = yajl_gen_alloc(&conf, NULL); +#else + g = yajl_gen_alloc(NULL); +#endif

2 3

[libvirt] [PATCH] bandwidth: Integrate bandwidth into portgroups
by Michal Privoznik 27 Jul '11

27 Jul '11

Every DomainNetDef has a bandwidth, as does every portgroup. Whenever a DomainNetDef of type NETWORK is about to be used, a call is made to networkAllocateActualDevice(). This function chooses the "best" bandwidth object and places it in the DomainActualNetDef. >From that point on, whenever some code needs to use the bandwidth data for the interface, it's retrieved with virDomainNetGetActualBandwidth(), which will always return the "best" info as determined in the previous step. --- docs/formatnetwork.html.in | 2 + src/conf/domain_conf.c | 25 ++++++++++++++++++- src/conf/domain_conf.h | 3 ++ src/conf/network_conf.c | 10 +++++++ src/conf/network_conf.h | 1 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 19 +++++++++++++- src/util/network.c | 56 +++++++++++++++++++++++++++++++++++++++++++ src/util/network.h | 2 + 9 files changed, 116 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index f0ff703..ddfa77c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -129,6 +129,8 @@ numbers, The units for <code>average</code> and <code>peak</code> attributes are kilobytes per second, and for the <code>burst</code> just kilobytes. The rate is shared equally within domains connected to the network. + Moreover, <code>bandwidth</code> element can be included in + <code>portgroup</code> element. <span class="since">Since 0.9.4</span> </p> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 072c970..031862a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -753,6 +753,8 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) break; } + virBandwidthDefFree(def->bandwidth); + VIR_FREE(def); } @@ -2621,6 +2623,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, virDomainActualNetDefPtr actual = NULL; int ret = -1; xmlNodePtr save_ctxt = ctxt->node; + xmlNodePtr bandwidth_node = NULL; char *type = NULL; char *mode = NULL; @@ -2677,6 +2680,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } } + bandwidth_node = virXPathNode("./bandwidth", ctxt); + if (bandwidth_node && + !(actual->bandwidth = virBandwidthDefParseNode(bandwidth_node))) + goto error; + *def = actual; actual = NULL; ret = 0; @@ -8713,6 +8721,10 @@ virDomainActualNetDefFormat(virBufferPtr buf, default: break; } + + if (virBandwidthDefFormat(buf, def->bandwidth, " ") < 0) + goto error; + virBufferAddLit(buf, " </actual>\n"); ret = 0; @@ -8855,7 +8867,8 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, " </tune>\n"); } - if (virBandwidthDefFormat(buf, def->bandwidth, " ") < 0) + if (virBandwidthDefFormat(buf, virDomainNetGetActualBandwidth(def), + " ") < 0) return -1; if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) @@ -11383,3 +11396,13 @@ virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface) return NULL; return iface->data.network.actual->data.direct.virtPortProfile; } + +virBandwidthPtr +virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) +{ + if ((iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) && + iface->data.network.actual && iface->data.network.actual->bandwidth) { + return iface->data.network.actual->bandwidth; + } + return iface->bandwidth; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 212f0c5..715d995 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -362,6 +362,7 @@ struct _virDomainActualNetDef { virVirtualPortProfileParamsPtr virtPortProfile; } direct; } data; + virBandwidthPtr bandwidth; }; /* Stores the virtual network interface configuration */ @@ -1490,6 +1491,8 @@ char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface); int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface); virVirtualPortProfileParamsPtr virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); +virBandwidthPtr +virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 1ef80dc..6714c20 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -92,6 +92,8 @@ virPortGroupDefClear(virPortGroupDefPtr def) { VIR_FREE(def->name); VIR_FREE(def->virtPortProfile); + virBandwidthDefFree(def->bandwidth); + def->bandwidth = NULL; } static void @@ -771,6 +773,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, xmlNodePtr save; xmlNodePtr virtPortNode; + xmlNodePtr bandwidth_node; char *isDefault = NULL; int result = -1; @@ -790,6 +793,12 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, goto error; } + bandwidth_node = virXPathNode("./bandwidth", ctxt); + if (bandwidth_node && + !(def->bandwidth = virBandwidthDefParseNode(bandwidth_node))) { + goto error; + } + result = 0; error: if (result < 0) { @@ -1257,6 +1266,7 @@ virPortGroupDefFormat(virBufferPtr buf, } virBufferAddLit(buf, ">\n"); virVirtualPortProfileFormat(buf, def->virtPortProfile, " "); + virBandwidthDefFormat(buf, def->bandwidth, " "); virBufferAddLit(buf, " </portgroup>\n"); } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6d0845e..869085e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -123,6 +123,7 @@ struct _virPortGroupDef { char *name; bool isDefault; virVirtualPortProfileParamsPtr virtPortProfile; + virBandwidthPtr bandwidth; }; typedef struct _virNetworkDef virNetworkDef; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 853ee62..0fa26dd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -710,6 +710,7 @@ nlComm; # network.h +virBandwidthCopy; virBandwidthDefFormat; virBandwidthDefFree; virBandwidthDefParseNode; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b1c6b12..b8c6c97 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2811,6 +2811,7 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) (netdef->forwardType == VIR_NETWORK_FORWARD_VEPA) || (netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH)) { virVirtualPortProfileParamsPtr virtport = NULL; + virPortGroupDefPtr portgroup = NULL; /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. @@ -2839,11 +2840,10 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } /* Find the most specific virtportprofile and copy it */ + portgroup = virPortGroupFindByName(netdef, iface->data.network.portgroup); if (iface->data.network.virtPortProfile) { virtport = iface->data.network.virtPortProfile; } else { - virPortGroupDefPtr portgroup - = virPortGroupFindByName(netdef, iface->data.network.portgroup); if (portgroup) virtport = portgroup->virtPortProfile; else @@ -2859,6 +2859,21 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) */ *iface->data.network.actual->data.direct.virtPortProfile = *virtport; } + + /* Find the most specific bandwidth config and copy it */ + if (iface->bandwidth) { + if (virBandwidthCopy(&iface->data.network.actual->bandwidth, + iface->bandwidth) < 0) { + goto cleanup; + } + } else { + if (portgroup && + virBandwidthCopy(&iface->data.network.actual->bandwidth, + portgroup->bandwidth) < 0) { + goto cleanup; + } + } + /* If there is only a single device, just return it (caller will detect * any error if exclusive use is required but could not be acquired). */ diff --git a/src/util/network.c b/src/util/network.c index 5561012..314cabe 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -1263,3 +1263,59 @@ cleanup: virCommandFree(cmd); return ret; } + +/* + * virBandwidthCopy: + * @dest: destination + * @src: source + * + * Returns -1 on OOM error (which gets reported), + * 0 otherwise. + */ +int +virBandwidthCopy(virBandwidthPtr *dest, + const virBandwidthPtr src) +{ + int ret = -1; + + if (!dest) { + virSocketError(VIR_ERR_INVALID_ARG, "%s", + _("invalid argument supplied")); + return -1; + } + + if (!src) { + /* nothing to be copied */ + return 0; + } + + if (VIR_ALLOC(*dest) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (src->in) { + if (VIR_ALLOC((*dest)->in) < 0) { + virReportOOMError(); + goto cleanup; + } + memcpy((*dest)->in, src->in, sizeof(*src->in)); + } + + if (src->out) { + if (VIR_ALLOC((*dest)->out) < 0) { + virReportOOMError(); + goto cleanup; + } + memcpy((*dest)->out, src->out, sizeof(*src->out)); + } + + ret = 0; + +cleanup: + if (ret < 0) { + virBandwidthDefFree(*dest); + *dest = NULL; + } + return ret; +} diff --git a/src/util/network.h b/src/util/network.h index 139f6cc..6ceaa6d 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -158,4 +158,6 @@ int virBandwidthDefFormat(virBufferPtr buf, int virBandwidthEnable(virBandwidthPtr bandwidth, const char *iface); int virBandwidthDisable(const char *iface, bool may_fail); +int virBandwidthCopy(virBandwidthPtr *dest, const virBandwidthPtr src); + #endif /* __VIR_NETWORK_H__ */ -- 1.7.5.rc3

2 2

[libvirt] [PATCH] tools: format percent strings of nodecpustats
by ajia＠redhat.com 26 Jul '11

26 Jul '11

* tools/virsh.c: format strings display for virsh nodecpustats --percent. * how to reproduce? % virsh nodecpustats --percent usage: 2.0% user : 1.0% system: 1.0% idle : 98.0% iowait: 0.0% * after format strings % virsh nodecpustats --percent usage : 2.0% user : 1.0% system: 1.0% idle : 98.0% iowait: 0.0% Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e46da31..f1166a9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4459,11 +4459,11 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) usage = (user_time + sys_time) / total_time * 100; vshPrint(ctl, "%-15s %5.1lf%%\n", - _("usage:"), usage); + _("usage :"), usage); vshPrint(ctl, "%-15s %5.1lf%%\n", - _(" user :"), user_time / total_time * 100); + _("user :"), user_time / total_time * 100); vshPrint(ctl, "%-15s %5.1lf%%\n", - _(" system:"), sys_time / total_time * 100); + _("system:"), sys_time / total_time * 100); vshPrint(ctl, "%-15s %5.1lf%%\n", _("idle :"), idle_time / total_time * 100); vshPrint(ctl, "%-15s %5.1lf%%\n", -- 1.7.1

3 2

[libvirt] [PATCH] doc: Add doc for blockpull and blockjob commands
by Osier Yang 26 Jul '11

26 Jul '11

Commit b31abc6f0 introduce commands blockpull and blockjob, but forgot to add the docs meanwhile. --- tools/virsh.pod | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 5b7fa9c..02c98c8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -430,6 +430,27 @@ Get memory stats for a running domain. Get block device size info for a domain. +=item B<blockpull> I<domain> I<path> [I<bandwidth>] + +Populate a disk from its backing image. Once all data from its backing +image has been pulled, the disk no longer depends on the backing image. +It pulls data for the entire disk in the background, the process of the +operation can be checked with B<blockjob>. + +I<path> specifies fully-qualified path of the disk. +I<bandwidth> specifies copying bandwidth limit in Mbps. + +=item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] + +Manage active block operations. + +I<path> specifies fully-qualified path of the disk. +If I<--live> is specified, the active job on the specified disk will +be aborted. +If I<--info> is specified, the active job information on the specified +disk will be printed. +I<bandwidth> can be used to set bandwidth limit for the active job. + =item B<dominfo> I<domain-id> Returns basic information about the domain. -- 1.7.6

2 2

[libvirt] [PATCH] python: Properly report errors if virStreamRecv fails
by Cole Robinson 26 Jul '11

26 Jul '11

We only want to raise the special value -2. -1 should return None which tells the bindings to throw an exception. --- python/libvirt-override.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 70e0238..bdff0e9 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4138,8 +4138,10 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED, buf[ret > -1 ? ret : 0] = '\0'; DEBUG("StreamRecv ret=%d strlen=%d\n", ret, (int) strlen(buf)); - if (ret < 0) + if (ret == -2) return libvirt_intWrap(ret); + if (ret < 0) + return VIR_PY_NONE; return libvirt_charPtrSizeWrap((char *) buf, (Py_ssize_t) ret); } -- 1.7.4.4

2 2

[libvirt] FYI: qemu -M option deprecated upstream, removed from -help output
by Richard W.M. Jones 26 Jul '11

26 Jul '11

I guess this may affect the qemu driver in future ... Thanks to Markus Armbruster for bringing this to my/our attention. commit 80f52a6694423da7a40e2ec39e14a5817184c7ef Author: Jan Kiszka <> Date: Sat Jul 23 12:39:46 2011 +0200 Deprecate -M command line options Superseded by -machine. Therefore, this patch removes -M from the help list and pushes -machine at the same place in the output. commit 9052ea6bf4962b1342aa56d4341bb55176ed9e45 Author: Jan Kiszka <> Date: Sat Jul 23 12:38:37 2011 +0200 Generalize -machine command line option -machine somehow suggests that it selects the machine, but it doesn't. Fix that before this command is set in stone. Actually, -machine should supersede -M and allow to introduce arbitrary per-machine options to the command line. That will change the internal realization again, but we will be able to keep the user interface stable. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

3 4

[libvirt] [PATCH] Build: fix build if HAVE_AVAHI is not defined
by Stefan Berger 26 Jul '11

26 Jul '11

Fix the build if HAVE_AVAHI is not defined. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/rpc/virnetserver.c | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/src/rpc/virnetserver.c =================================================================== --- libvirt-acl.orig/src/rpc/virnetserver.c +++ libvirt-acl/src/rpc/virnetserver.c @@ -783,7 +783,9 @@ void virNetServerFree(virNetServerPtr sr VIR_FREE(srv->clients); VIR_FREE(srv->mdnsGroupName); +#if HAVE_AVAHI virNetServerMDNSFree(srv->mdns); +#endif #if HAVE_DBUS if (srv->sysbus)

2 2