- Devel - libvirt List Archives

[libvirt] [PATCH] conf: Fix virtType check
by John Ferlan 29 Sep '15

29 Sep '15

Commit id '7383b8cc' changed virDomainDef 'virtType' to an enum, that caused a build failure on some archs due to comparing an unsigned value to < 0. Adjust the fetch of 'type' to be into temporary 'int virtType' and then assign that virtType to the def->virtType Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker src/conf/domain_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cdafb14..393ece7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14640,7 +14640,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; - int n; + int n, virtType; long id = -1; virDomainDefPtr def; bool uuid_generated = false; @@ -14678,11 +14678,12 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { + if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), tmp); goto error; } + def->virtType = virtType; VIR_FREE(tmp); def->os.bootloader = virXPathString("string(./bootloader)", ctxt); -- 2.1.0

2 1

[libvirt] [PATCH 0/4] improve virConnectListAllInterfaces()
by Laine Stump 29 Sep '15

29 Sep '15

There's a bit of background about this here: https://www.redhat.com/archives/augeas-devel/2015-September/msg00001.html In short, virt-manager is calling the virInterface APIs and that ties up a libvirt thread (and CPU core) for a very long time on hosts that have a large number of interfaces. These patches don't cure the problem (I don't know that there really is a cure other than "Don't DO that!"), but they do fix a couple of bugs I found while investigating, and make a substantial improvement in the amount of time used by virConnectListAllInterfaces(). One thing that I wondered about while investigating this - a big use of CPU by virConnectListAllInterfaces() comes from the need to retrieve the MAC address of every interface. The MAC addresses are both 1) returned to the caller in the interface objects and 2) sent to the policykit ACL checking to decide which interfaces to include in the list. I'm 90% confident that 1) most callers don't really care that they're getting the MAC address along with interface name (virt-manager, for example, follows up with a virInterfaceGetXMLDesc() anyway)), and 2) there is not even a single host *anywhere* that is using libvirt policykit ACLs to limit the list of host interfaces viewable by a client. So we could add a flag to not return MAC addresses, which would allow cutting down the time to list all devices to something < 1 second). But this would be at the expense of no longer having the possibility to limit the list with policykit according to MAC address. Since all host interface information is available to all users via the file system, for example, I don't see this as a huge issue, but it would change behavior, so I don't feel comfortable doing it. I don't like the idea of a single API call taking > 1 minute to return either, though. Does anyone have an opinion about this? Laine Stump (4): interface: fail on OOM from virGetInterface() interface: report correct interface count when not returning list interface: re-use name and mac address rather than re-retrieving interface: let netcf pre-filter for active vs. inactive src/interface/interface_backend_netcf.c | 56 +++++++++++++++------------------ 1 file changed, 25 insertions(+), 31 deletions(-) -- 2.4.3

4 15

[libvirt] [PATCH 0/2] Add support for gic-version machine option
by Pavel Fedin 29 Sep '15

29 Sep '15

qemu now supports gic-version option for the virt machine. This patch allows to use it in libvirt. I decided not to add a new capability because qemu correctly complains by itself if it does not have this option. Pavel Fedin (2): qemu: Add support for gic-version machine option qemu: Add test case for gic-version option src/qemu/qemu_command.c | 22 ++++++++---------- .../qemuxml2argv-aarch64-gicv3.args | 6 +++++ .../qemuxml2argv-aarch64-gicv3.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml -- 2.1.4

2 5

[libvirt] [libvirt-test-API] [PATCH] Add test cases for API defineXMLFlags
by Shanzhi Yu 29 Sep '15

29 Sep '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 22 +++++++++ repos/domain/definewithflags.py | 104 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 repos/domain/definewithflags.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 6315613..7dd9062 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -214,6 +214,28 @@ domain:define macaddr 54:52:00:45:c3:8a +domain:undefine + guestname + $defaultname + +domain:definewithflags + guestname + $defaultname + diskpath + /var/lib/libvirt/images/libvirt-test-api + vcpu + 1 + memory + 1048576 + hddriver + virtio + nicdriver + virtio + macaddr + 54:52:00:45:c3:8a + flags + validate + domain:start guestname $defaultname diff --git a/repos/domain/definewithflags.py b/repos/domain/definewithflags.py new file mode 100644 index 0000000..01a4f15 --- /dev/null +++ b/repos/domain/definewithflags.py @@ -0,0 +1,104 @@ +#!/usr/bin/evn python + +import os +import re +import sys +import commands +import string +import pexpect + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'diskpath', 'flags',) +optional_params = {'memory': 1048576, + 'vcpu': 1, + 'imageformat' : 'raw', + 'hddriver' : 'virtio', + 'nicdriver': 'virtio', + 'macaddr': '52:54:00:97:e4:28', + 'uuid' : '05867c1a-afeb-300e-e55e-2673391ae080', + 'username': None, + 'password': None, + 'virt_type': 'kvm', + 'xml': 'xmls/kvm_guest_define.xml', + 'guestarch': 'x86_64', + 'guestmachine': 'pc', + } + +def check_define_domain(guestname, virt_type, hostname, username, \ + password, logger): + """Check define domain result, if define domain is successful, + guestname.xml will exist under /etc/libvirt/qemu/ + and can use virt-xml-validate tool to check the file validity + """ + if "kvm" in virt_type: + path = "/etc/libvirt/qemu/%s.xml" % guestname + elif "xen" in virt_type: + path = "/etc/xen/%s" % guestname + else: + logger.error("unknown virt type") + + if hostname: + cmd = "ls %s" % path + ret, output = utils.remote_exec_pexpect(hostname, username, \ + password, cmd) + if ret: + logger.error("guest %s xml file doesn't exsits" % guestname) + return False + else: + return True + else: + if os.access(path, os.R_OK): + return True + else: + return False + +def definewithflags(params): + """Define a domain from xml""" + logger = params['logger'] + guestname = params['guestname'] + + xmlstr = params['xml'] + logger.debug("domain xml:\n%s" % xmlstr) + + conn = sharedmod.libvirtobj['conn'] + uri = conn.getURI() + + hostname = utils.parse_uri(uri)[1] + username = params.get('username', '') + password = params.get('password', '') + virt_type = params.get('virt_type', 'kvm') + + flags = params['flags'] + logger.info("The flags are %s" % flags) + flags_string = flags.split("|") + flags = 0 + + logger.info("define domain on %s" % uri) + + for flag in flags_string: + if flag == 'validate': + flags |= libvirt.VIR_DOMAIN_DEFINE_VALIDATE + else: + logger.error("unknow flags") + return 1 + + # Define domain from xml + try: + conn.defineXMLFlags(xmlstr, flags) + if check_define_domain(guestname, virt_type, hostname, \ + username, password, logger): + logger.info("define a domain from xml is successful") + else: + logger.error("fail to check define domain") + return 1 + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.8.3.1

1 0

[libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 28 Sep '15

28 Sep '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer is noticed by source qemu. The savevm state checks at runtime can fail at destination and cause qemu to error out. The source qemu cant notice it as the EPIPE is not propogated to it. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Changes from v1 -> v2: VIR_FORCE_CLOSE() was called twice for this use case which would log unneccessary warnings. So, move the fd close to qemuMigrationIOFunc so that there are no unnecessary duplicate attempts.(Would this trigger a Coverity error? I don't have a setup to check.) Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff89ab5..9602fb2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4012,6 +4012,7 @@ static void qemuMigrationIOFunc(void *arg) if (virStreamFinish(data->st) < 0) goto error; + VIR_FORCE_CLOSE(data->sock); VIR_FREE(buffer); return; @@ -4029,7 +4030,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer cant continue anymore. + * Don't copy the error for EPIPE as destination has the actual error. */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); } @@ -4397,7 +4402,6 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) ret = -1; } - VIR_FORCE_CLOSE(fd); if (priv->job.completed) { qemuDomainJobInfoUpdateTime(priv->job.completed);

3 7

[libvirt] [PATCH] virDomainDiskDef: Turn @device into enum
by Michal Privoznik 28 Sep '15

28 Sep '15

It's used as enum everywhere, so why store its value in an int? Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 9 +++------ src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 ++ src/vmx/vmx.c | 6 +++--- src/vmx/vmx.h | 2 +- src/xenconfig/xen_sxpr.c | 4 +++- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6df1618..8ccce89 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7211,11 +7211,13 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, device = virXMLPropString(node, "device"); if (device) { - if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) { + int dev = virDomainDiskDeviceTypeFromString(device); + if (dev < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk device '%s'"), device); goto error; } + def->device = dev; } else { def->device = VIR_DOMAIN_DISK_DEVICE_DISK; } @@ -18944,11 +18946,6 @@ virDomainDiskDefFormat(virBufferPtr buf, _("unexpected disk type %d"), def->src->type); return -1; } - if (!device) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk device %d"), def->device); - return -1; - } if (!bus) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected disk bus %d"), def->bus); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f043554..fe16c78 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -686,7 +686,7 @@ struct _virDomainDiskDef { virObjectPtr privateData; - int device; /* enum virDomainDiskDevice */ + virDomainDiskDevice device; int bus; /* enum virDomainDiskBus */ char *dst; int tray_status; /* enum virDomainDiskTray */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25f57f2..781fc4a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10135,6 +10135,8 @@ qemuBuildCommandLine(virConnectPtr conn, bootindex = bootDisk; bootDisk = 0; break; + case VIR_DOMAIN_DISK_DEVICE_LAST: + break; } virCommandAddArg(cmd, "-drive"); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 70cda2a..6d519b3 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1926,8 +1926,8 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr conf, - int device, int busType, int controllerOrBus, int unit, - virDomainDiskDefPtr *def, virDomainDefPtr vmdef) + virDomainDiskDevice device, int busType, int controllerOrBus, + int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef) { /* * device = {VIR_DOMAIN_DISK_DEVICE_DISK, @@ -3251,7 +3251,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe break; - default: + case VIR_DOMAIN_DISK_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported disk device type '%s'"), virDomainDiskDeviceTypeToString(def->disks[i]->device)); diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index e986124..16b616b 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -88,7 +88,7 @@ int virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int *virtualDev); int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, - virConfPtr conf, int device, int busType, + virConfPtr conf, virDomainDiskDevice device, int busType, int controllerOrBus, int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef); diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 1d43ec1..1b2ddc6 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2357,7 +2357,9 @@ xenFormatSxpr(virConnectPtr conn, virBufferEscapeSexpr(&buf, "'%s')", src); break; - default: + case VIR_DOMAIN_DISK_DEVICE_DISK: + case VIR_DOMAIN_DISK_DEVICE_LUN: + case VIR_DOMAIN_DISK_DEVICE_LAST: break; } } -- 2.4.6

4 3

[libvirt] Use of 'detach' flag with QMP command `migrate` in qemuMonitorJSONMigrate()
by Kashyap Chamarthy 28 Sep '15

28 Sep '15

The qmp-commands.hx file from QEMU says[1]: "The user Monitor's "detach" argument is invalid in QMP and should not be used" However, when live block migration is performed, I still see that libvirt sets the 'detach' boolean to 'true': [. . .] 2015-04-09 11:20:54.160+0000: 12152: debug : qemuMonitorJSONCommandWithFd:290 : Send command '{"execute":"migrate","arguments":{"detach":true,"blk":true,"inc":false,"uri":"fd:migrate"},"id":"libvirt-18"}' for write with FD -1 [. . .] Where 'detach' means: "not wait for completion" (reading hmp-commands.hx in QEMU source) or 'QEMU_MONITOR_MIGRATE_BACKGROUND' (reading qemuMonitorJSONMigrate() from qemu_monitor_json.c in libvirt source). Two questions: - Should the 'detach' flag be not passed in this case, because the documentation says it's not valid in QMP case? - _What_ exactly is setting the 'detach' flag explicitly in this case? Or is it default when using 'inc' flag ('--copy-storage-inc' in `virsh` parlance)? Contextual libvirtd.log from source, with log_filter for 'qemu' set[2]. Note that in the above case, live block migration _did_ succeed, I'm just asking this to educate myself. PS: If you're wondering why am I not using the new 'drive-mirror' based approach above, I performed this block migration via OpenStack Nova. Currently in Nova's case, live block migration falls back to the old approach of QMP `migrate` command (with 'inc' flag set to true -- it explicitly set by OpenStack Nova) via qemuMonitorJsonMigrate(), and not the new way of qemuMonitorJSONDriveMirror(). I was testing with: - libvirt-daemon-driver-qemu-1.2.13.1-2.fc22.x86_64 - qemu-system-x86-2.3.1-1.fc22.x86_64 [1] http://git.qemu.org/?p=qemu.git;a=blob;f=qmp-commands.hx#l643 [2] https://kashyapc.fedorapeople.org/virt/temp/live-blk-migration-libvirt-debu… -- /kashyap

2 2

[libvirt] [libvirt-test-API] [PATCH] change some cases order in conf file linux_domain.conf
by Shanzhi Yu 28 Sep '15

28 Sep '15

Some cases need guest agent running in domain, change some cases order to avoid the failure. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 5b216f9..6315613 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -78,6 +78,56 @@ domain:get_guest_network_info flags agent +domain:domain_fsfreeze + guestname + $defaultname + +domain:domain_fsthaw + guestname + $defaultname + +domain:domain_fsfreeze + guestname + $defaultname + mountpoint + / + +domain:domain_fsthaw + guestname + $defaultname + +domain:fsinfo + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + virconn:connection_getAllDomainStats stats state|cpu|balloon|vcpu|interface|block @@ -259,24 +309,6 @@ domain:open_graphicsfd flags skipauth -domain:domain_fsfreeze - guestname - $defaultname - -domain:domain_fsthaw - guestname - $defaultname - -domain:domain_fsfreeze - guestname - $defaultname - mountpoint - / - -domain:domain_fsthaw - guestname - $defaultname - virconn:connection_security_model guestname $defaultname @@ -311,38 +343,6 @@ domain:info_iothread conn qemu:///system -domain:fsinfo - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - -domain:set_user_passwd - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - -domain:set_user_passwd - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - flags - encrypted - domain:destroy guestname $defaultname -- 1.8.3.1

1 0

[libvirt] [PATCH] Remove unused variables.
by Martin Kletzander 25 Sep '15

25 Sep '15

I was playing with coccinelle tool the other day and just for the fun of it, I tried removing some useless things from our code. And look what came up. No functional change, and we're down in the number of lines by about a hundred. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/remote.c | 5 +--- src/bhyve/bhyve_driver.c | 38 +++++++++++-------------------- src/conf/storage_conf.c | 9 +++----- src/libxl/libxl_driver.c | 36 ++++++++++------------------- src/lxc/lxc_driver.c | 36 ++++++++++------------------- src/lxc/lxc_native.c | 5 +--- src/network/bridge_driver.c | 38 +++++++++---------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 21 ++++++++--------- src/qemu/qemu_command.c | 19 ++++++---------- src/qemu/qemu_driver.c | 14 ++++-------- src/qemu/qemu_migration.c | 9 +++----- src/qemu/qemu_process.c | 18 ++++----------- src/storage/storage_backend_iscsi.c | 5 +--- src/test/test_driver.c | 30 ++++++++---------------- src/util/virdbus.c | 5 +--- src/util/virfile.c | 4 +--- src/util/virhashcode.c | 4 +--- src/util/virstoragefile.c | 1 - src/vbox/vbox_storage.c | 8 ++----- src/vz/vz_network.c | 24 +++++++------------ src/xen/xen_hypervisor.c | 5 +--- src/xen/xend_internal.c | 6 +---- 22 files changed, 107 insertions(+), 233 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3a3eb0913088..289454315aca 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -6703,10 +6703,7 @@ get_nonnull_storage_pool(virConnectPtr conn, remote_nonnull_storage_pool pool) static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { - virStorageVolPtr ret; - ret = virGetStorageVol(conn, vol.pool, vol.name, vol.key, - NULL, NULL); - return ret; + return virGetStorageVol(conn, vol.pool, vol.name, vol.key, NULL, NULL); } static virSecretPtr diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 7f365b1f2446..5e1b9cb0c1ed 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -608,30 +608,24 @@ static int bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + virConnectListDomainsCheckACL, conn); } static int bhyveConnectNumOfDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int @@ -639,31 +633,28 @@ bhyveConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; memset(names, 0, sizeof(*names) * maxnames); - n = virDomainObjListGetInactiveNames(privconn->domains, names, - maxnames, virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->domains, names, + maxnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int bhyveConnectNumOfDefinedDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static char * @@ -730,17 +721,14 @@ bhyveConnectListAllDomains(virConnectPtr conn, unsigned int flags) { bhyveConnPtr privconn = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(privconn->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static virDomainPtr diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a39bb5b..b17f38399d22 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1995,14 +1995,11 @@ static int virStoragePoolSaveXML(const char *path, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - int ret = -1; virUUIDFormat(def->uuid, uuidstr); - ret = virXMLSaveFile(path, - virXMLPickShellSafeComment(def->name, uuidstr), - "pool-edit", xml); - - return ret; + return virXMLSaveFile(path, + virXMLPickShellSafeComment(def->name, uuidstr), + "pool-edit", xml); } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 504895754170..c941e8ef065e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -922,30 +922,24 @@ static int libxlConnectListDomains(virConnectPtr conn, int *ids, int nids) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int libxlConnectNumOfDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static virDomainPtr @@ -2677,29 +2671,26 @@ libxlConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int libxlConnectNumOfDefinedDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static int @@ -4689,17 +4680,14 @@ libxlConnectListAllDomains(virConnectPtr conn, unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } /* Which features are supported by this driver? */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a9f0005f55b3..30ebd8c25e21 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -387,59 +387,49 @@ static int lxcDomainIsUpdated(virDomainPtr dom) static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int lxcConnectNumOfDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int lxcConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } @@ -3596,16 +3586,14 @@ lxcConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virLXCDriverPtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 2f9559735a46..39e5261c6583 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -646,7 +646,6 @@ static int lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) { int status; - int result = -1; size_t i; lxcNetworkParseData data = {def, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, @@ -670,9 +669,7 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] = VIR_TRISTATE_SWITCH_ON; } - result = 0; - - return result; + return 0; error: for (i = 0; i < data.nips; i++) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c343e5bdd2dd..34decaba0a78 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2604,17 +2604,13 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn, static int networkConnectNumOfNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int nactive; if (virConnectNumOfNetworksEnsureACL(conn) < 0) return -1; - nactive = virNetworkObjListNumOfNetworks(driver->networks, - true, - virConnectNumOfNetworksCheckACL, - conn); - - return nactive; + return virNetworkObjListNumOfNetworks(driver->networks, true, + virConnectNumOfNetworksCheckACL, + conn); } static int networkConnectListNetworks(virConnectPtr conn, @@ -2622,48 +2618,36 @@ static int networkConnectListNetworks(virConnectPtr conn, int nnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - true, names, nnames, - virConnectListNetworksCheckACL, - conn); - - return got; + return virNetworkObjListGetNames(driver->networks, true, names, nnames, + virConnectListNetworksCheckACL, conn); } static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int ninactive = 0; if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) return -1; - ninactive = virNetworkObjListNumOfNetworks(driver->networks, - false, - virConnectNumOfDefinedNetworksCheckACL, - conn); - - return ninactive; + return virNetworkObjListNumOfNetworks(driver->networks, false, + virConnectNumOfDefinedNetworksCheckACL, + conn); } static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListDefinedNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - false, names, nnames, - virConnectListDefinedNetworksCheckACL, - conn); - return got; + return virNetworkObjListGetNames(driver->networks, false, names, nnames, + virConnectListDefinedNetworksCheckACL, + conn); } static int diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 423d069e1b26..04783576b661 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1770,18 +1770,17 @@ iptablesCreateRuleInstance(virFirewallPtr fw, chainPrefix[0] = 'H'; chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; - rc = _iptablesCreateRuleInstance(fw, - layer, - directionIn, - chainPrefix, - rule, - ifname, - vars, - matchState, true, - "RETURN", - maySkipICMP); - return rc; + return _iptablesCreateRuleInstance(fw, + layer, + directionIn, + chainPrefix, + rule, + ifname, + vars, + matchState, true, + "RETURN", + maySkipICMP); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb1835c2f5f1..9c96531a0ce7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6349,14 +6349,11 @@ qemuBuildSCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev, { virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - char *sg = NULL; - sg = (callbacks->qemuGetSCSIDeviceSgName)(NULL, - scsihostsrc->adapter, - scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); - return sg; + return (callbacks->qemuGetSCSIDeviceSgName)(NULL, scsihostsrc->adapter, + scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } static char * @@ -8961,17 +8958,15 @@ char * qemuBuildShmemBackendStr(virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - char *devstr = NULL; - if (!shmem->server.chr.data.nix.path && virAsprintf(&shmem->server.chr.data.nix.path, "/var/lib/libvirt/shmem-%s-sock", shmem->name) < 0) return NULL; - devstr = qemuBuildChrChardevStr(&shmem->server.chr, shmem->info.alias, qemuCaps); - - return devstr; + return qemuBuildChrChardevStr(&shmem->server.chr, + shmem->info.alias, + qemuCaps); } static int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2387cf3f9699..ab6b5cb2ee76 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1646,29 +1646,23 @@ static char *qemuConnectGetHostname(virConnectPtr conn) static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int qemuConnectNumOfDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3dd3718d0974..ea2f8d35ec6e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3520,8 +3520,6 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, const char *origname, unsigned long flags) { - int ret; - VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " "origname=%s, flags=%lx", @@ -3534,10 +3532,9 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, return -1; } - ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, - cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, flags); - return ret; + return qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, + cookieout, cookieoutlen, def, origname, st, + NULL, 0, false, NULL, 0, NULL, flags); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b961f400af1c..5e32d3cabe31 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2498,7 +2498,6 @@ qemuProcessSetEmulatorAffinity(virDomainObjPtr vm) { virBitmapPtr cpumask; virDomainDefPtr def = vm->def; - int ret = -1; if (def->cputune.emulatorpin) cpumask = def->cputune.emulatorpin; @@ -2507,8 +2506,7 @@ qemuProcessSetEmulatorAffinity(virDomainObjPtr vm) else return 0; - ret = virProcessSetAffinity(vm->pid, cpumask); - return ret; + return virProcessSetAffinity(vm->pid, cpumask); } /* Set CPU affinities for IOThreads threads. */ @@ -5113,8 +5111,6 @@ int qemuProcessStart(virConnectPtr conn, int qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { - int ret; - VIR_DEBUG("vm=%p name=%s pid=%llu flags=%x", vm, vm->def->name, (unsigned long long)vm->pid, flags); @@ -5133,10 +5129,8 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) return 0; } - ret = virProcessKillPainfully(vm->pid, - !!(flags & VIR_QEMU_PROCESS_KILL_FORCE)); - - return ret; + return virProcessKillPainfully(vm->pid, + !!(flags & VIR_QEMU_PROCESS_KILL_FORCE)); } @@ -5772,11 +5766,9 @@ int qemuProcessAutoDestroyAdd(virQEMUDriverPtr driver, int qemuProcessAutoDestroyRemove(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret; VIR_DEBUG("vm=%s", vm->def->name); - ret = virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuProcessAutoDestroy); - return ret; + return virCloseCallbacksUnset(driver->closeCallbacks, vm, + qemuProcessAutoDestroy); } bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver, diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 9e2d01e457fb..ba1cff2d87c0 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -241,7 +241,6 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, bool *isActive) { char *session = NULL; - int ret = -1; *isActive = false; @@ -268,9 +267,7 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, *isActive = true; VIR_FREE(session); } - ret = 0; - - return ret; + return 0; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d11cda1f7212..db5090bc1026 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1517,13 +1517,9 @@ testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned int ncpus, unsigned int flags) { - char *cpu; - virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); - cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); - - return cpu; + return cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); } static int testNodeGetInfo(virConnectPtr conn, @@ -3110,39 +3106,31 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, static int testConnectNumOfNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numActive; - numActive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return numActive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { testDriverPtr privconn = conn->privateData; - int n; - n = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, true, names, nnames, + NULL, conn); } static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numInactive; - numInactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return numInactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { testDriverPtr privconn = conn->privateData; - int n; - n = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, false, names, nnames, + NULL, conn); } static int diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 78fb7953dca2..41c7e3f95bb1 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1179,15 +1179,12 @@ virDBusMessageEncodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret = -1; memset(&iter, 0, sizeof(iter)); dbus_message_iter_init_append(msg, &iter); - ret = virDBusMessageIterEncode(&iter, types, args); - - return ret; + return virDBusMessageIterEncode(&iter, types, args); } diff --git a/src/util/virfile.c b/src/util/virfile.c index 2332589d0c4b..147215379c29 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -688,9 +688,7 @@ static int virFileLoopDeviceOpen(char **dev_name) # endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ /* Without the loop control device we just use the old technique. */ - loop_fd = virFileLoopDeviceOpenSearch(dev_name); - - return loop_fd; + return virFileLoopDeviceOpenSearch(dev_name); } int virFileLoopDeviceAssociate(const char *file, diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 357c05fe246a..10633a99feb3 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -115,7 +115,5 @@ uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) /* finalization */ h1 ^= len; - h1 = fmix(h1); - - return h1; + return fmix(h1); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90d6581..36fca68bccc3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1104,7 +1104,6 @@ virStorageFileResize(const char *path, { int fd = -1; int ret = -1; - int rc ATTRIBUTE_UNUSED; off_t offset ATTRIBUTE_UNUSED; off_t len ATTRIBUTE_UNUSED; diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 4367009f04f6..92a5a4a5691f 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -119,9 +119,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = hardDiskAccessible; - - return ret; + return hardDiskAccessible; } static int @@ -175,9 +173,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname } gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = numActive; - - return ret; + return numActive; } static virStorageVolPtr diff --git a/src/vz/vz_network.c b/src/vz/vz_network.c index 8c978124eddb..083d9b204659 100644 --- a/src/vz/vz_network.c +++ b/src/vz/vz_network.c @@ -364,12 +364,10 @@ int vzNetworkClose(virConnectPtr conn) static int vzConnectNumOfNetworks(virConnectPtr conn) { - int nactive; vzConnPtr privconn = conn->privateData; - nactive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return nactive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } static int vzConnectListNetworks(virConnectPtr conn, @@ -377,21 +375,17 @@ static int vzConnectListNetworks(virConnectPtr conn, int nnames) { vzConnPtr privconn = conn->privateData; - int got; - got = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); - return got; + return virNetworkObjListGetNames(privconn->networks, true, names, nnames, + NULL, conn); } static int vzConnectNumOfDefinedNetworks(virConnectPtr conn) { - int ninactive; vzConnPtr privconn = conn->privateData; - ninactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return ninactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } static int vzConnectListDefinedNetworks(virConnectPtr conn, @@ -399,11 +393,9 @@ static int vzConnectListDefinedNetworks(virConnectPtr conn, int nnames) { vzConnPtr privconn = conn->privateData; - int got; - got = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); - return got; + return virNetworkObjListGetNames(privconn->networks, false, names, nnames, + NULL, conn); } static int vzConnectListAllNetworks(virConnectPtr conn, diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 431c47abdf17..61e58e470e53 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2285,7 +2285,6 @@ xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) { struct guest_arch guest_arches[32]; size_t i = 0; - virCapsPtr caps = NULL; int pae, longmode; const char *hvm; @@ -2326,12 +2325,10 @@ xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) } } - caps = xenHypervisorBuildCapabilities(conn, + return xenHypervisorBuildCapabilities(conn, virArchFromHost(), pae, hvm, guest_arches, i); - - return caps; } #endif /* __sun */ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b743644..b8c31380636f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -809,11 +809,7 @@ xenDaemonListDomainsOld(virConnectPtr xend) int xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr) { - int ret; - - ret = xend_op(xend, "", "op", "create", "config", sexpr, NULL); - - return ret; + return xend_op(xend, "", "op", "create", "config", sexpr, NULL); } -- 2.5.3

4 4

[libvirt] [PATCH] virsh: Preserve startupPolicy in change-media command
by Michal Privoznik 25 Sep '15

25 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1250331 Even after my rework of startupPolicy handling, one command slipped my attention. The change-media command has a very unique approach to constructing disk XML. However, it will not preserve startupPolicy attribute. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fb138d5..456e273 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11534,6 +11534,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, xmlNodePtr source = NULL; char *device_type = NULL; char *ret = NULL; + char *startupPolicy = NULL; if (!disk_node) return NULL; @@ -11567,13 +11568,15 @@ virshUpdateDiskXML(xmlNodePtr disk_node, goto cleanup; } - if (type == VIRSH_UPDATE_DISK_XML_INSERT && source) { - vshError(NULL, _("The disk device '%s' already has media"), target); - goto cleanup; - } - - /* remove current source */ if (source) { + if (type == VIRSH_UPDATE_DISK_XML_INSERT) { + vshError(NULL, _("The disk device '%s' already has media"), target); + goto cleanup; + } + + startupPolicy = virXMLPropString(source, "startupPolicy"); + + /* remove current source */ xmlUnlinkNode(source); xmlFreeNode(source); source = NULL; @@ -11597,6 +11600,8 @@ virshUpdateDiskXML(xmlNodePtr disk_node, else xmlNewProp(source, BAD_CAST "file", BAD_CAST new_source); + if (startupPolicy) + xmlNewProp(source, BAD_CAST "startupPolicy", BAD_CAST startupPolicy); xmlAddChild(disk_node, source); } @@ -11607,6 +11612,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, cleanup: VIR_FREE(device_type); + VIR_FREE(startupPolicy); return ret; } -- 2.4.9

2 1

[libvirt] [PATCH 0/2] Update pool allocation with new values on volume creation
by Ján Tomko 25 Sep '15

25 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1163091 Ján Tomko (2): Update pool allocation with new values on volume creation Create a shallow copy for volume building only if supported src/storage/storage_driver.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.4.6

2 3

[libvirt] [PATCH 0/3] Introduce new virtType enum item
by Shivangi Dhir 25 Sep '15

25 Sep '15

These patches solve a BiteSizedTask - Introduce new virtType enum item[0] [0] http://wiki.libvirt.org/page/BiteSizedTasks#Introduce_new_virtType_enum_item Shivangi Dhir (3): conf: Add new VIR_DOMAIN_VIRT_NONE enum qemu: Make virtType of type virDomainVirtType conf: Change the description of virCapabilitiesDomainDataLookup() src/conf/capabilities.c | 6 +++--- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 3 ++- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_monitor_text.h | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/vircapstest.c | 32 ++++++++++++++++---------------- 11 files changed, 30 insertions(+), 28 deletions(-) -- 1.9.1

3 8

[libvirt] [PATCH] Use daemon log facility for journald
by Guido Günther 25 Sep '15

25 Sep '15

otherwise messages end up in /var/log/kern.log if journald forwards to syslog. Closes: #799633 --- src/util/virlog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index b45ee91..627f4cb 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -920,6 +920,7 @@ virLogOutputToJournald(virLogSourcePtr source, journalAddString(&state, "MESSAGE", rawstr); journalAddInt(&state, "PRIORITY", virLogPrioritySyslog(priority)); + journalAddInt(&state, "SYSLOG_FACILITY", LOG_DAEMON); journalAddString(&state, "LIBVIRT_SOURCE", source->name); if (filename) journalAddString(&state, "CODE_FILE", filename); -- 2.1.4

2 2

[libvirt] [PATCH 1/3] cpu_map.xml: add cmt feature to x86
by Qiaowei Ren 25 Sep '15

25 Sep '15

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced CMT (Cache Monitoring Technology) to measure the usage of cache by applications running on the platform. This patch add it into x86 part of cpu_map.xml. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- .gnulib | 2 +- src/cpu/cpu_map.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index f39477d..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f39477dba778e99392948dd3dd19ec0d46aee932 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..14ccbd8 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> -- 1.9.1

4 15

Re: [libvirt] [FIRST-PATCH] updated the negation STREQ to STRNEQ
by Lasya Venneti 25 Sep '15

25 Sep '15

Dear Sir, The cfg.mk link isn't working for me sir.. >From what I understand Makefile will have the following: target: dependency1 dependency2 ... [TAB] action1 [TAB] action2 Does the syntax-check rule have to be in place of 'actions' in the form of a shell command, and then raise an error whenever the shell command returns occurrences of the string !STREQ or !STRNEQ ? Request you to please elaborate a little. Sincerely, Lasya V On 21 September 2015 at 16:35, Michal Privoznik <mprivozn(a)redhat.com> wrote: > [You've got the wrong list. This is a libvirt patch and as such it > should have been sent to the libvir-list(a)redhat.com] > > On 19.09.2015 16:59, Lasya wrote: > > Hi, > > This is my first patch in QEMU. I have solved a bite-sized bug. I have > updated the !STREQ with STRNEQ in the following files. Thanks. > > > > --- > > src/bhyve/bhyve_driver.c | 2 +- > > src/conf/network_conf.c | 4 ++-- > > src/conf/nwfilter_conf.c | 2 +- > > src/conf/nwfilter_params.c | 2 +- > > src/conf/storage_conf.c | 2 +- > > src/lxc/lxc_fuse.c | 4 ++-- > > src/openvz/openvz_driver.c | 2 +- > > src/qemu/qemu_command.c | 6 +++--- > > src/qemu/qemu_domain.c | 2 +- > > src/qemu/qemu_hotplug.c | 2 +- > > src/security/security_manager.c | 2 +- > > src/security/security_selinux.c | 12 ++++++------ > > src/storage/storage_backend_logical.c | 2 +- > > src/util/virfile.c | 2 +- > > src/util/virsystemd.c | 2 +- > > src/vz/vz_driver.c | 2 +- > > src/vz/vz_sdk.c | 2 +- > > src/xen/xend_internal.c | 2 +- > > src/xenconfig/xen_sxpr.c | 2 +- > > tests/commandtest.c | 10 +++++----- > > tests/securityselinuxlabeltest.c | 2 +- > > tests/virauthconfigtest.c | 2 +- > > tests/virbitmaptest.c | 12 ++++++------ > > tests/vircgrouptest.c | 2 +- > > tests/virkeyfiletest.c | 8 ++++---- > > tests/virnetsockettest.c | 2 +- > > tests/virtypedparamtest.c | 2 +- > > tests/viruritest.c | 16 ++++++++-------- > > 28 files changed, 56 insertions(+), 56 deletions(-) > > Okay, you've got all the occurrences. However, the syntax-check rule is > missing. You may want to look at cfg.mk for some examples. syntax-check > is our make target that checks the code if it complies with our coding > standards. After this patch we want a rule that forbids !STREQ or !STRNEQ. > > Otherwise looking very good. Looking forward to v2. > > Michal >

2 1

[libvirt] [PATCH] tools: Link libvirt.la to libvirt_shell.a
by Michal Privoznik 25 Sep '15

25 Sep '15

So, our mingw build is broken. It's because while libvirt_shell library is using some of our internal APIs, e.g. virStrndup, it's not being linked with libvirt.la. Only subsequent users of the library, like virsh, do link to libvirt.la. In fact, I'm surprised Linux linker doesn't care, because how can it make a static library with missing symbols is mystery to me. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0a00cee..3cf70db 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -143,6 +143,7 @@ libvirt_shell_la_LDFLAGS = \ $(NULL) libvirt_shell_la_LIBADD = \ $(LIBXML_LIBS) \ + ../src/libvirt.la \ ../gnulib/lib/libgnu.la \ $(NULL) libvirt_shell_la_SOURCES = vsh.c vsh.h @@ -220,7 +221,6 @@ virsh_LDFLAGS = \ virsh_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ libvirt_shell.la \ -- 2.4.9

2 1

[libvirt] [PATCH] add compress stream support
by Vasiliy Tolstov 25 Sep '15

25 Sep '15

Some libvirt functions use streams, this patch add compress stream support. So VolumeDownload/VolumeUpload can greatly speedup by using compressed streams to save network bandtwidth and don't transfer zero bytes (in case of raw disk format) Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 2 ++ daemon/Makefile.am | 3 +++ include/libvirt/libvirt-stream.h | 3 +++ m4/virt-archive.m4 | 29 ++++++++++++++++++++++++++ src/Makefile.am | 17 +++++++++++----- src/datatypes.h | 7 +++++++ src/fdstream.c | 44 ++++++++++++++++++++++++++++++++++++++++ src/libvirt-stream.c | 15 ++++++++++++++ tools/Makefile.am | 17 ++++++++++++++-- 9 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 m4/virt-archive.m4 diff --git a/configure.ac b/configure.ac index 03463b0..58a15bb 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 +LIBVIRT_CHECK_LIBARCHIVE LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_WIRESHARK @@ -2892,6 +2893,7 @@ LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 +LIBVIRT_RESULT_LIBARCHIVE LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_WIRESHARK diff --git a/daemon/Makefile.am b/daemon/Makefile.am index be1b5a9..a4d63eb 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -177,17 +177,20 @@ libvirtd_CFLAGS = \ $(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" libvirtd_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(NULL) libvirtd_LDADD = \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ $(DBUS_LIBS) \ diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h index 831640d..c75f03e 100644 --- a/include/libvirt/libvirt-stream.h +++ b/include/libvirt/libvirt-stream.h @@ -31,10 +31,13 @@ typedef enum { VIR_STREAM_NONBLOCK = (1 << 0), + VIR_STREAM_COMPRESS_GZIP = (1 << 1), + VIR_STREAM_COMPRESS_XZ = (1 << 2), } virStreamFlags; virStreamPtr virStreamNew(virConnectPtr conn, unsigned int flags); + int virStreamRef(virStreamPtr st); int virStreamSend(virStreamPtr st, diff --git a/m4/virt-archive.m4 b/m4/virt-archive.m4 new file mode 100644 index 0000000..9770732 --- /dev/null +++ b/m4/virt-archive.m4 @@ -0,0 +1,29 @@ +dnl The libarchive.so library +dnl +dnl Copyright (C) 2012-2013 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_CHECK_LIBARCHIVE],[ + LIBVIRT_CHECK_PKG([LIBARCHIVE], [libarchive], [3.1.2]) + AC_SUBST(LIBARCHIVE_CFLAGS) + AC_SUBST(LIBARCHIVE_LIBS) + AC_SUBST(LIBARCHIVE_LDFLAGS) +]) + +AC_DEFUN([LIBVIRT_RESULT_LIBARCHIVE],[ + LIBVIRT_RESULT_LIB([LIBARCHIVE]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 060abe8..429c2c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,11 +25,11 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd) # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. Also keep GETTEXT_CPPFLAGS at the end. -INCLUDES = -I../gnulib/lib \ +INCLUDES = -I../gnulib/lib \ -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I../include \ - -I$(top_srcdir)/include \ + -I$(top_srcdir)/include \ -I$(srcdir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ @@ -37,14 +37,16 @@ INCLUDES = -I../gnulib/lib \ $(GETTEXT_CPPFLAGS) AM_CFLAGS = $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv @@ -1051,11 +1053,13 @@ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ $(SYSTEMD_DAEMON_CFLAGS) $(POLKIT_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ -I$(srcdir)/conf libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(POLKIT_LIBS) @@ -2214,6 +2218,7 @@ libvirt_lxc_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) @@ -2292,13 +2297,15 @@ libvirt_setuid_rpc_client_la_SOURCES = \ libvirt_setuid_rpc_client_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(SECDRIVER_LIBS) \ $(NULL) libvirt_setuid_rpc_client_la_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ + -I$(srcdir)/rpc \ $(AM_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(SECDRIVER_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) diff --git a/src/datatypes.h b/src/datatypes.h index be108fe..4c0c10d 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -29,6 +29,10 @@ # include "virobject.h" # include "viruuid.h" +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; extern virClassPtr virDomainSnapshotClass; @@ -520,6 +524,9 @@ struct _virStream { virStreamDriverPtr driver; void *privateData; +#ifdef WITH_LIBARCHIVE + struct archive *archive; +#endif }; /** diff --git a/src/fdstream.c b/src/fdstream.c index b8ea86e..9a71a9f 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -33,6 +33,10 @@ #include <netinet/in.h> #include <termios.h> +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + #include "fdstream.h" #include "virerror.h" #include "datatypes.h" @@ -319,6 +323,12 @@ virFDStreamCloseInt(virStreamPtr st, bool streamAbort) if (VIR_CLOSE(fdst->errfd) < 0) VIR_DEBUG("ignoring failed close on fd %d", fdst->errfd); +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_write_free(st->archive); + archive_read_free(st->archive); + } +#endif st->privateData = NULL; /* call the internal stream closing callback */ @@ -385,7 +395,16 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_write_open_fd(st->archive, fdst->fd); + ret = archive_write_data(st->archive, bytes, nbytes); + } else { + ret = write(fdst->fd, bytes, nbytes); + } +#else ret = write(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -397,7 +416,15 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) _("cannot write to stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); @@ -435,7 +462,16 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_read_open_fd(st->archive, fdst->fd, 4096); + ret = archive_read_data(st->archive, bytes, nbytes); + } else { + ret = read(fdst->fd, bytes, nbytes); + } +#else ret = read(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -447,7 +483,15 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) _("cannot read from stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index c16f586..0f09d9d 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -24,6 +24,10 @@ #include "viralloc.h" #include "virlog.h" +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + VIR_LOG_INIT("libvirt.stream"); #define VIR_FROM_THIS VIR_FROM_STREAMS @@ -45,6 +49,7 @@ VIR_LOG_INIT("libvirt.stream"); * * If a non-blocking data stream is required passed * VIR_STREAM_NONBLOCK for flags, otherwise pass 0. + * VIR_STREAM_COMPRESS_GZIP or VIR_STREAM_COMPRESS_XZ * * Returns the new stream, or NULL upon error */ @@ -66,6 +71,16 @@ virStreamNew(virConnectPtr conn, else virDispatchError(conn); + if ((flags & VIR_STREAM_COMPRESS_GZIP) || (flags & VIR_STREAM_COMPRESS_XZ)) { + st->archive = archive_write_new(); + + if (flags & VIR_STREAM_COMPRESS_GZIP) + archive_write_add_filter(st->archive, ARCHIVE_FILTER_GZIP); + + if (flags & VIR_STREAM_COMPRESS_XZ) + archive_write_add_filter(st->archive, ARCHIVE_FILTER_XZ); + } + return st; } diff --git a/tools/Makefile.am b/tools/Makefile.am index 03e9339..fa19a20 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,8 +25,12 @@ INCLUDES = \ AM_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) +AM_CFLAGS = \ + $(LIBARCHIVE_CFLAGS) + POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" ICON_FILES = \ @@ -140,15 +144,18 @@ virt_host_validate_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virt_host_validate_LDADD = \ ../src/libvirt.la \ - ../gnulib/lib/libgnu.la \ + ../gnulib/lib/libgnu.la \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virt_host_validate_CFLAGS = \ $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ @@ -165,15 +172,18 @@ virt_login_shell_SOURCES = \ virt_login_shell_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARHCIVE_LDFLAGS) \ $(NULL) virt_login_shell_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ ../src/libvirt-setuid-rpc-client.la \ + $(LIBARCHIVE_LDFLAGS) \ ../gnulib/lib/libgnu.la virt_login_shell_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ + $(LIBARCHIVE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ @@ -202,6 +212,7 @@ virsh_SOURCES = \ virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ @@ -209,14 +220,16 @@ virsh_LDADD = \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ - ../gnulib/lib/libgnu.la \ + ../gnulib/lib/libgnu.la \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(VIRSH_LIBS) virsh_CFLAGS = \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(READLINE_CFLAGS) BUILT_SOURCES = -- 2.5.0

2 8

[libvirt] [PATCH] maint: Remove control characters from LGPL license file
by Andrea Bolognani 25 Sep '15

25 Sep '15

--- COPYING.LESSER | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/COPYING.LESSER b/COPYING.LESSER index 4362b49..e5ab03e 100644 --- a/COPYING.LESSER +++ b/COPYING.LESSER @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest -- 2.4.2

2 2

[libvirt] [PATCH] domain: Fix migratable XML with graphics/@listen
by Jiri Denemark 24 Sep '15

24 Sep '15

As of commit 6992994, we set graphics/@listen attribute according to the first listen child element even if that element is of type='network'. This was done for backward compatibility with applications which only support the original listen attribute. However, by doing so we broke migration to older libvirt which tried to check that the listen attribute matches one of the listen child elements but which did not take type='network' elements into account. We are not concerned about compatibility with old applications when formatting domain XML for migration for two reasons. The XML is consumed only by libvirtd and the IP address associated with type='network' listen address on the source host is just useless on the destination host. Thus, we can safely avoid propagating the type='network' IP address to graphics/@listen attribute when creating migratable XML. https://bugzilla.redhat.com/show_bug.cgi?id=1265111 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c890977..033ae46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21020,19 +21020,17 @@ virDomainGraphicsDefFormat(virBufferPtr buf, * <graphics>. This is done to improve backward compatibility. */ for (i = 0; i < def->nListens; i++) { - virDomainGraphicsListenType listenType; - if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && def->listens[i].fromConfig) continue; - listenType = virDomainGraphicsListenGetType(def, i); - if (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || - (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { - if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) - break; - } + if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && + flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE | + VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) + continue; + + if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) + break; } virBufferAsprintf(buf, "<graphics type='%s'", type); -- 2.5.3

2 2

[libvirt] [PATCH] vsh: create a noinstall libvirt_shell library
by Erik Skultety 24 Sep '15

24 Sep '15

Instead of referencing vsh sources in all relevant client targets, create a library that the client can link against. --- tools/Makefile.am | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 03e9339..08aebec 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -129,6 +129,24 @@ virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(top_srcdir)/configure.ac && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi +noinst_LTLIBRARIES = libvirt_shell.la +libvirt_shell_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(READLINE_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(NULL) +libvirt_shell_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) +libvirt_shell_la_LIBADD = \ + $(LIBXML_LIBS) \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_shell_la_SOURCES = vsh.c vsh.h + virt_host_validate_SOURCES = \ virt-host-validate.c \ virt-host-validate-common.c virt-host-validate-common.h \ @@ -179,11 +197,7 @@ virt_login_shell_CFLAGS = \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) -virt_shell_SOURCES = \ - vsh.c vsh.h - virsh_SOURCES = \ - $(virt_shell_SOURCES) \ virsh.c virsh.h \ virsh-console.c virsh-console.h \ virsh-domain.c virsh-domain.h \ @@ -210,14 +224,13 @@ virsh_LDADD = \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ ../gnulib/lib/libgnu.la \ - $(LIBXML_LIBS) \ + libvirt_shell.la \ $(VIRSH_LIBS) virsh_CFLAGS = \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(READLINE_CFLAGS) + $(LIBXML_CFLAGS) BUILT_SOURCES = if WITH_WIN_ICON -- 2.4.3

2 2

[libvirt] [libvirt-test-api][PATCHv2] Add new test case for allocPages API
by Luyao Huang 24 Sep '15

24 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 10 ++++ repos/virconn/connection_allocPages.py | 84 ++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 repos/virconn/connection_allocPages.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 336b1ad..a4406bf 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -77,3 +77,13 @@ virconn:connection_getMemoryParameters virconn:connection_getMemoryStats conn qemu:///system + +virconn:connection_allocPages + conn + qemu:///system + +virconn:connection_allocPages + conn + qemu:///system + flags + pageset diff --git a/repos/virconn/connection_allocPages.py b/repos/virconn/connection_allocPages.py new file mode 100644 index 0000000..de3c071 --- /dev/null +++ b/repos/virconn/connection_allocPages.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = () +optional_params = {'conn': '', 'flags': ''} + +HOST_HUGEPAGE = '/sys/devices/system/node/node%d/hugepages/hugepages-%dkB/nr_hugepages' + +def get_host_pagesize(conn): + ret = [] + tree = lxml.etree.fromstring(conn.getCapabilities()) + + set = tree.xpath("/capabilities/host/cpu/pages") + for n in set: + ret.append(int(n.attrib['size'])) + + return ret + +def get_host_pagecount(pagesize): + try: + return int(open(HOST_HUGEPAGE % (0, pagesize)).read()) + except IOError: + return -1 + +def connection_allocPages(params): + """ + test API for allocPages in class virConnect + """ + logger = params['logger'] + fail=0 + + if 'flags' in params: + if params['flags'] == 'pageset': + flags = libvirt.VIR_NODE_ALLOC_PAGES_SET + else: + logger.error("Unknown flags name: %s" % params['flags']) + return 1 + else: + flags = 0 + + try: + if 'conn' in params: + conn=libvirt.open(params['conn']) + else: + conn=libvirt.open(optional_params['conn']) + logger.info("get connection to libvirtd") + list1 = get_host_pagesize(conn) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + for i in list1: + logger.info("test hugepage size %d" % i) + + if get_host_pagecount(i) == -1: + logger.info("Skip system page size %d" % i) + continue + + try: + cur_count = get_host_pagecount(i) + if flags == libvirt.VIR_NODE_ALLOC_PAGES_SET: + conn.allocPages({i : cur_count + 1}, 0, 1, flags) + else: + conn.allocPages({i : 1}, 0, 1, flags) + if get_host_pagecount(i) != cur_count + 1: + logger.error("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.split()[-1]) + + if tmp_count != get_host_pagecount(i): + logger.error("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + return fail -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH] Add a new test case for setUserPassword
by Luyao Huang 24 Sep '15

24 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 22 ++++++++ repos/domain/set_user_passwd.py | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 repos/domain/set_user_passwd.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 19daded..9a65cf3 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -299,6 +299,28 @@ domain:info_iothread conn qemu:///system +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + domain:destroy guestname $defaultname diff --git a/repos/domain/set_user_passwd.py b/repos/domain/set_user_passwd.py new file mode 100644 index 0000000..bf9bd06 --- /dev/null +++ b/repos/domain/set_user_passwd.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree +import crypt +from utils import utils + +required_params = ('guestname', 'username', 'userpassword',) +optional_params = {'conn': 'qemu:///system', 'flags': '',} + +def get_guest_mac(vm): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + set = tree.xpath("/domain/devices/interface/mac") + + for n in set: + return n.attrib['address'] + + return False + + +def check_agent_status(vm): + """ make sure agent is okay to use """ + + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + + set = tree.xpath("//channel[@type='unix']/target[@name='org.qemu.guest_agent.0']") + for n in set: + if n.attrib['state'] == 'connected': + return True + + return False + +def create_new_user(ipaddr, newusername, username, userpasswd, logger): + cmd = "useradd %s" % newusername + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + if ret == 0 or "already exists" in retinfo: + return 0 + else: + logger.error("Fail: cannot create a new user: %s" % retinfo) + return 1 + +def verify_cur_user(ipaddr, username, userpasswd): + cmd = "whoami" + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + + return ret + +def set_user_passwd(params): + """ + test API for setUserPassword in class virDomain + """ + + logger = params['logger'] + guest = params['guestname'] + username = params['username'] + userpasswd = params['userpassword'] + + if 'flags' in params: + if params['flags'] == 'encrypted': + flags = libvirt.VIR_DOMAIN_PASSWORD_ENCRYPTED + else: + flags = 0 + else: + flags = 0 + + try: + if 'conn' in params: + conn = libvirt.open(params['conn']) + else: + conn = libvirt.open(optional_params['conn']) + + logger.info("get connection to libvirtd") + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + if not check_agent_status(vm): + logger.error("guest agent is not connected") + return 1 + + mac = get_guest_mac(vm) + if not mac: + logger.error("cannot get guest interface mac") + return 1 + + ipaddr = utils.mac_to_ip(mac, 180) + if not ipaddr: + logger.error("cannot get guest IP") + return 1 + + if flags > 0: + passwd = crypt.crypt("123456", crypt.mksalt(crypt.METHOD_SHA512)) + else: + passwd = "123456" + + + if create_new_user(ipaddr, "usertestapi", username, userpasswd, logger) != 0: + return 1 + + vm.setUserPassword("usertestapi", passwd, flags) + + if verify_cur_user(ipaddr, "usertestapi", "123456") != 0: + logger.error("cannot login guest via new user") + return 1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH 1/2] introduce a new helper to parse mountinfo
by Luyao Huang 24 Sep '15

24 Sep '15

And will return list like this : [{'devminor': '25', 'mountdir': '/sys/fs/cgroup/cpuset', 'devmajor': '0', 'mounttype': 'cgroup'},...] Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- utils/utils.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/utils/utils.py b/utils/utils.py index a6e6965..6909fed 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -925,3 +925,40 @@ def param_to_tuple_nolength(paramlist): lengh = max(d) return param_to_tuple(paramlist, int(lengh) + 1) + +def parse_mountinfo(string): + """a helper to parse mountinfo in /proc/self/mountinfo + and return a list contains multiple dict + """ + + ret = [] + mount_list = string.split("\n") + for n in mount_list: + mount_dict = {} + if n.find("/") > 0: + tmp = n[:n.find("/")] + if len(tmp.split()) != 3: + continue + + if tmp.split()[2].find(":") < 0: + continue + + mount_dict['devmajor'] = tmp.split()[2].split(":")[0] + mount_dict['devminor'] = tmp.split()[2].split(":")[1] + + tmp = n[n.find("/") + 1:] + + mount_dict['mountdir'] = tmp.split()[0] + + if tmp.find(" - ") < 0: + continue + + tmp = tmp.split(" - ")[1] + + mount_dict['mounttype'] = tmp.split()[0] + if tmp.split()[1].find("/") > 0: + mount_dict['sourcedir'] = tmp.split()[1] + + ret.append(mount_dict) + + return ret -- 1.8.3.1

2 2

[libvirt] [libvirt-sandbox][PATCH] configure: Get static libs for static linking
by Michal Privoznik 24 Sep '15

24 Sep '15

So you wanna build libvirt-sandbox, right? And you think you have everything you need. Dang, you don't! Because we check for libz and liblzma for dynamic linking. However, libvirt-sandbox-init-qemu is linked statically. Therefore, we need to ask pkg-config to fetch us the list of libs for static linking. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Okay, I admit that this may be not as serious as I made it in the commit message. The only difference after this patch is -pthread added to LZMA libs: configure: Configuration summary configure: ===================== configure: configure: configure: Libraries: configure: configure: LZMA: -llzma -pthread configure: ZLIB: -lz configure: GOBJECT: -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -lgobject-2.0 -lglib-2.0 configure: LIBVIRT_GOBJECT: -pthread -I/usr/include/libvirt-gobject-1.0 -I/usr/include/libvirt-gconfig-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libxml2 -lvirt-gobject-1.0 -lgio-2.0 -lvirt-gconfig-1.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lvir configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 92d65f4..00c2d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,8 @@ AC_ARG_WITH([zlib], [add ZLIB support @<:@default=yes@:>@])]) m4_divert_text([DEFAULTS], [with_zlib=yes]) +orig_pkg_config="$PKG_CONFIG" +PKG_CONFIG="$PKG_CONFIG --static" if test "$with_zlib" = "yes" ; then PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) AC_DEFINE([WITH_ZLIB], [1], [Whether ZLIB support was enabled]) @@ -100,6 +102,7 @@ if test "$with_lzma" = "yes" ; then PKG_CHECK_MODULES(LZMA, liblzma >= $LZMA_REQUIRED) AC_DEFINE([WITH_LZMA], [1], [Whether LZMA support was enabled]) fi +PKG_CONFIG="$orig_pkg_config" LIBVIRT_SANDBOX_CAPNG LIBVIRT_SANDBOX_GETTEXT -- 2.4.9

2 1

[libvirt] [PATCH v2 0/4] Couple of 'virsh create' fixes
by Michal Privoznik 24 Sep '15

24 Sep '15

And this time 'virsh restore' too. The diff to v1 is that more drivers is fixed. Michal Privoznik (4): virDomainCreateXML: Don't remove persistent domains on error virDomainCreateXML: Make domain definition transient qemu: Move vm->persistent check into qemuDomainRemoveInactive virDomainRestore: Don't keep transient domains around src/bhyve/bhyve_driver.c | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 7 +++++-- src/openvz/openvz_driver.c | 1 + src/qemu/qemu_domain.c | 9 ++++++++- src/qemu/qemu_driver.c | 39 ++++++++++++++++----------------------- src/qemu/qemu_migration.c | 14 +++++--------- src/qemu/qemu_process.c | 12 ++++-------- src/test/test_driver.c | 15 +++++++++++++-- src/uml/uml_driver.c | 8 +++++--- src/vmware/vmware_driver.c | 7 +++++-- 11 files changed, 64 insertions(+), 50 deletions(-) -- 2.4.9

2 7