- Devel - libvirt List Archives

[libvirt] [nicsysco.com] Weird Libvirt Behavior
by nico 30 Jan '19

30 Jan '19

Hi folks, First time contributor, but I felt that what I discovered was (probably) a very rare situation. I'm running a Centos server (my only Linux deployment) to which customers all over the U.S. connect to process their micro-lender businesses. There are several VM's, among other one which runs the fortress system, called a2. In the beginning the .raw file was about 10GB, which was a 5X overkill in terms of capacity, at the time. For years we had no problems and the CentOS box would tick over day after day without as much as a hiccup. About three months ago a2 started to slow down, almost to the point of timing out when applications and users log on. The band-aid was to copy an earlier a2.raw backup over the current one on a regular basis, and it would rectify the problem. At first applying this band-aid on Sunday nights, would suffice. But, later we had to increase it to twice a week and these last couple of weeks we had to do it almost every night. The system also sent alerts that a "Degraded Array event had been detected on md device /dev/md1". Inspecting the drives showed no crisis. Today it folded completely and brought the system down, with clients' "our computers are down" response to their customers walking into their stores. Restarting the box just brought a2 to a paused state, never recovering. We had to killall to get rid of it. Having nowhere else to go with it, I decided to rebuild a2 in another, separate drive to at least address the degraded array alerts. As I edited the .xml file, I saw the following: <source file='/var/lib/libvirt/:machines/a2/a2-disk1.raw'/> What the hell was that colon doing there? I checked the size of the .raw file. It has grown to over 96GB. Just to check the sanity-box, I checked the other VM's .xml files and they didn't have a colon, as I expected. I removed the colon and virsh-started a2, which fired up immediately, with the rest of the system following suit. No doubt that ":" was the culprit! My question is: Would that colon cause an append-action to the .raw file? We have no idea when it got in there or how. We haven't worked on that xml file for a long time. Why would a2 even fire up at all? It would be great to hear what the guru's think about that. Thanks Nico van Niekerk Agoura Hills, CA 91301

2 1

[libvirt] [PATCH] qemu: Rework setting process affinity
by Michal Privoznik 30 Jan '19

30 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1503284 The way we currently start qemu from CPU affinity POV is as follows: 1) the child process is set affinity to all online CPUs (unless some vcpu pinning was given in the domain XML) 2) Once qemu is running, cpuset cgroup is configured taking memory pinning into account Problem is that we let qemu allocate its memory just anywhere in 1) and then rely in 2) to be able to move the memory to configured NUMA nodes. This might not be always possible (e.g. qemu might lock some parts of its memory) and is very suboptimal (copying large memory between NUMA nodes takes significant amount of time). The solution is to set the affinity correctly from the beginning and then possibly refine it later via cgroups. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 152 ++++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 69 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9ccc3601a2..a4668f6773 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2435,6 +2435,44 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, } +static int +qemuProcessGetAllCpuAffinity(pid_t pid, + virBitmapPtr *cpumapRet) +{ + VIR_AUTOPTR(virBitmap) cpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + int hostcpus; + + *cpumapRet = NULL; + + if (!virHostCPUHasBitmap()) + return 0; + + if (!(hostcpumap = virHostCPUGetOnlineBitmap()) || + !(cpumap = virProcessGetAffinity(pid))) + return -1; + + if (!virBitmapEqual(hostcpumap, cpumap)) { + /* setaffinity fails if you set bits for CPUs which + * aren't present, so we have to limit ourselves */ + if ((hostcpus = virHostCPUGetCount()) < 0) + return -1; + + if (hostcpus > QEMUD_CPUMASK_LEN) + hostcpus = QEMUD_CPUMASK_LEN; + + virBitmapFree(cpumap); + if (!(cpumap = virBitmapNew(hostcpus))) + return -1; + + virBitmapSetAll(cpumap); + } + + VIR_STEAL_PTR(*cpumapRet, cpumap); + return 0; +} + + /* * To be run between fork/exec of QEMU only */ @@ -2443,9 +2481,9 @@ static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { int ret = -1; - virBitmapPtr cpumap = NULL; virBitmapPtr cpumapToSet = NULL; - virBitmapPtr hostcpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; if (!vm->pid) { @@ -2454,59 +2492,36 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return -1; } - if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - VIR_DEBUG("Set CPU affinity with advisory nodeset from numad"); - cpumapToSet = priv->autoCpuset; + /* Here is the deal, we can't set cpuset.mems before qemu is + * started as it clashes with KVM allocation. Therefore we + * used to let qemu allocate its memory anywhere as we would + * then move the memory to desired NUMA node via CGroups. + * However, that might not be always possible because qemu + * might lock some parts of its memory (e.g. due to VFIO). + * Solution is to set some temporary affinity now and then + * fix it later, once qemu is already running. */ + if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 && + virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && + mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + if (virDomainNumatuneMaybeGetNodeset(vm->def->numa, + priv->autoNodeset, + &cpumapToSet, + -1) < 0) + goto cleanup; + } else if (vm->def->cputune.emulatorpin) { + cpumapToSet = vm->def->cputune.emulatorpin; } else { - VIR_DEBUG("Set CPU affinity with specified cpuset"); - if (vm->def->cpumask) { - cpumapToSet = vm->def->cpumask; - } else { - /* You may think this is redundant, but we can't assume libvirtd - * itself is running on all pCPUs, so we need to explicitly set - * the spawned QEMU instance to all pCPUs if no map is given in - * its config file */ - int hostcpus; - - if (virHostCPUHasBitmap()) { - hostcpumap = virHostCPUGetOnlineBitmap(); - cpumap = virProcessGetAffinity(vm->pid); - } - - if (hostcpumap && cpumap && virBitmapEqual(hostcpumap, cpumap)) { - /* we're using all available CPUs, no reason to set - * mask. If libvirtd is running without explicit - * affinity, we can use hotplugged CPUs for this VM */ - ret = 0; - goto cleanup; - } else { - /* setaffinity fails if you set bits for CPUs which - * aren't present, so we have to limit ourselves */ - if ((hostcpus = virHostCPUGetCount()) < 0) - goto cleanup; - - if (hostcpus > QEMUD_CPUMASK_LEN) - hostcpus = QEMUD_CPUMASK_LEN; - - virBitmapFree(cpumap); - if (!(cpumap = virBitmapNew(hostcpus))) - goto cleanup; - - virBitmapSetAll(cpumap); - - cpumapToSet = cpumap; - } - } + if (qemuProcessGetAllCpuAffinity(vm->pid, &hostcpumap) < 0) + goto cleanup; + cpumapToSet = hostcpumap; } - if (virProcessSetAffinity(vm->pid, cpumapToSet) < 0) + if (cpumapToSet && + virProcessSetAffinity(vm->pid, cpumapToSet) < 0) goto cleanup; ret = 0; - cleanup: - virBitmapFree(cpumap); - virBitmapFree(hostcpumap); return ret; } #else /* !defined(HAVE_SCHED_GETAFFINITY) && !defined(HAVE_BSD_CPU_AFFINITY) */ @@ -2586,7 +2601,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; - virBitmapPtr use_cpumask; + virBitmapPtr use_cpumask = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; @@ -2598,12 +2614,21 @@ qemuProcessSetupPid(virDomainObjPtr vm, } /* Infer which cpumask shall be used. */ - if (cpumask) + if (cpumask) { use_cpumask = cpumask; - else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) + } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { use_cpumask = priv->autoCpuset; - else + } else if (vm->def->cpumask) { use_cpumask = vm->def->cpumask; + } else if (virHostCPUHasBitmap()) { + /* You may think this is redundant, but we can't assume libvirtd + * itself is running on all pCPUs, so we need to explicitly set + * the spawned QEMU instance to all pCPUs if no map is given in + * its config file */ + if (qemuProcessGetAllCpuAffinity(pid, &hostcpumap) < 0) + goto cleanup; + use_cpumask = hostcpumap; + } /* * If CPU cgroup controller is not initialized here, then we need @@ -2628,13 +2653,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuSetupCgroupCpusetCpus(cgroup, use_cpumask) < 0) goto cleanup; - /* - * Don't setup cpuset.mems for the emulator, they need to - * be set up after initialization in order for kvm - * allocations to succeed. - */ - if (nameval != VIR_CGROUP_THREAD_EMULATOR && - mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) + if (mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) goto cleanup; } @@ -6634,12 +6653,7 @@ qemuProcessLaunch(virConnectPtr conn, /* This must be done after cgroup placement to avoid resetting CPU * affinity */ - if (!vm->def->cputune.emulatorpin && - qemuProcessInitCpuAffinity(vm) < 0) - goto cleanup; - - VIR_DEBUG("Setting emulator tuning/settings"); - if (qemuProcessSetupEmulator(vm) < 0) + if (qemuProcessInitCpuAffinity(vm) < 0) goto cleanup; VIR_DEBUG("Setting cgroup for external devices (if required)"); @@ -6708,10 +6722,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessUpdateAndVerifyCPU(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Setting up post-init cgroup restrictions"); - if (qemuSetupCpusetMems(vm) < 0) - goto cleanup; - VIR_DEBUG("setting up hotpluggable cpus"); if (qemuDomainHasHotpluggableStartupVcpus(vm->def)) { if (qemuDomainRefreshVcpuInfo(driver, vm, asyncJob, false) < 0) @@ -6737,6 +6747,10 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0) goto cleanup; + VIR_DEBUG("Setting emulator tuning/settings"); + if (qemuProcessSetupEmulator(vm) < 0) + goto cleanup; + VIR_DEBUG("Setting global CPU cgroup (if required)"); if (qemuSetupGlobalCpuCgroup(vm) < 0) goto cleanup; -- 2.19.2

2 1

[libvirt] [PATCH v5 0/9] Allow adding mountOpts to the storage pool mount command
by John Ferlan 29 Jan '19

29 Jan '19

v4: https://www.redhat.com/archives/libvir-list/2019-January/msg00614.html NB: Still keeping same subject for cover to keep the same context even though the contents are very different from the original. Changes since v4: * Alter patch1 to make the addition of mount options more generic to "fs" and "netfs" pools. Tested/generated the output for all the various pools by modifying the sources, using VIR_TEST_REGENERATE_OUTPUT and having specific "linux" or "freebsd" output. * Alter patch2 to rephrase the news article and add the R-by * Alter patch3 to add the R-by * Alter patch4 to account for changes in patch1 and to only add the nfsvers=%u to/for NETFS type pools passing that argument along to the called methods. Left off the R-by since I changed things. * Alter patch5 and patch6 to add the R-by * Combine patch7 and patch8 into one larger patch accounting for review comments mostly from the former patch8. Modify the docs to indicate lack of support guarantees, changed the "netfs:" to be just "fs:", fixed the comments in storage_pool_fs, and changed methods/structs to use FS and not NetFS. Left off the R-by since I changed things. * Modify patch9 to use the new struct names and add a taint VIR_WARN message. Theoretically this could be combined with the previous too if we really desired to make one large patch. Left off the R-by since I changed things. * Modify patch10 to add the taint message and fix the poorly cut-n-paste'd code that neglected to rename the new struct to use "Config" instead of "Mount". Left off the R-by since I changed things. John Ferlan (9): storage: Add default mount options for fs/netfs storage pools docs: Add news mention of default fs/netfs storage pool mount options conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace storage: Add infrastructure to manage XML namespace options storage: Add storage pool namespace options to fs and netfs command lines rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 129 +++++++++++++ docs/news.xml | 11 ++ docs/schemas/storagepool.rng | 53 ++++++ src/conf/storage_conf.c | 73 +++++++- src/conf/storage_conf.h | 27 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 132 ++++++++++++++ src/storage/storage_backend_rbd.c | 169 +++++++++++++++++- src/storage/storage_util.c | 81 ++++++++- src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-fs-freebsd.argv | 1 + .../pool-fs-linux.argv | 1 + .../pool-netfs-auto-freebsd.argv | 1 + .../pool-netfs-auto-linux.argv | 1 + .../pool-netfs-cifs-freebsd.argv | 1 + .../pool-netfs-cifs-linux.argv | 1 + .../pool-netfs-freebsd.argv | 1 + .../pool-netfs-gluster-freebsd.argv | 2 + .../pool-netfs-gluster-linux.argv | 2 + .../pool-netfs-linux.argv | 1 + .../pool-netfs-ns-mountopts-freebsd.argv | 2 + .../pool-netfs-ns-mountopts-linux.argv | 2 + .../pool-netfs-ns-mountopts.argv | 1 + .../pool-netfs-protocol-ver-freebsd.argv | 1 + .../pool-netfs-protocol-ver-linux.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 57 +++++- .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 8 + tools/virsh-pool.c | 12 +- tools/virsh.pod | 5 + 37 files changed, 903 insertions(+), 23 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-fs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-fs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

2 14

[libvirt] [PATCH 0/3] bhyve: implement support for commandline args
by Roman Bogorodskiy 29 Jan '19

29 Jan '19

Roman Bogorodskiy (3): bhyve: implement support for commandline args docs: bhyve: document commandline element news: document bhyve custom commandline support docs/drvbhyve.html.in | 20 ++++ docs/news.xml | 11 ++ docs/schemas/domaincommon.rng | 17 +++ src/bhyve/bhyve_command.c | 9 ++ src/bhyve/bhyve_conf.c | 15 +++ src/bhyve/bhyve_conf.h | 9 ++ src/bhyve/bhyve_domain.c | 107 +++++++++++++++++- src/bhyve/bhyve_domain.h | 1 + .../bhyvexml2argv-commandline.args | 9 ++ .../bhyvexml2argv-commandline.ldargs | 3 + .../bhyvexml2argv-commandline.xml | 27 +++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-commandline.xml | 37 ++++++ tests/bhyvexml2xmltest.c | 1 + 14 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml -- 2.20.1

4 12

[libvirt] [PATCH 0/2] A couple of GCC 9 fixes.
by Richard W.M. Jones 29 Jan '19

29 Jan '19

I'm not 100% confident about either of these patches, so please take care with them. I also think the second patch is probaby best fixed by disabling the warning, or else a much more fundamental rewrite of the test. Rich.

4 11

[libvirt] [PATCH v4 00/10] Allow adding mountOpts to the storage pool mount command
by John Ferlan 29 Jan '19

29 Jan '19

v3: https://www.redhat.com/archives/libvir-list/2019-January/msg00467.html NB: Kept same subject for cover to keep the same context; however, it's now more of a series of a few things... Add default NFS Server options, add nfsvers, and add support for XML namespaces in storage pools which are used by NFS and RBD storage pools. Changes since v3: Remove patch 1 and 3. Rework patch 2 to make the nodev, nosuid, and noexec be the "default options" for the NFS Storage Pool. Created a virStorageBackendFileSystemMountNFSAddOptions in order to add those options for NFS pools using format NFS (and not 'cifs' or 'gluster'). Everything else just gets adjusted/merged based on how the first patch works. John Ferlan (10): storage: Add default mount options for NFS Storage Pools docs: Add news mention of NFS Storage Pool mount options conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool namespace options to command line rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 123 +++++++++++++ docs/news.xml | 11 ++ docs/schemas/storagepool.rng | 50 ++++++ src/conf/storage_conf.c | 73 +++++++- src/conf/storage_conf.h | 27 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 128 ++++++++++++++ src/storage/storage_backend_rbd.c | 166 +++++++++++++++++- src/storage/storage_util.c | 52 ++++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-auto-freebsd.argv | 1 + .../pool-netfs-auto-linux.argv | 1 + .../pool-netfs-freebsd.argv | 1 + .../pool-netfs-linux.argv | 1 + .../pool-netfs-ns-mountopts-freebsd.argv | 2 + .../pool-netfs-ns-mountopts-linux.argv | 2 + .../pool-netfs-ns-mountopts.argv | 1 + .../pool-netfs-protocol-ver-freebsd.argv | 1 + .../pool-netfs-protocol-ver-linux.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 49 +++++- .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 8 + tools/virsh-pool.c | 12 +- tools/virsh.pod | 5 + 31 files changed, 851 insertions(+), 14 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

2 25

[libvirt] [PATCH] docs: Format bit shift notation for bitwise flag enums
by Peter Krempa 29 Jan '19

29 Jan '19

Big number itself does not make much sense in some cases. Format the bitshift format as well. Changes our web page docs from: VIR_MIGRATE_POSTCOPY = 32768 : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 : Setting the VIR_MIGRATE_TLS flag... to: VIR_MIGRATE_POSTCOPY = 32768 (1<<15) : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 (1<<16) : Setting the VIR_MIGRATE_TLS flag... Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/apibuild.py | 4 ++++ docs/libvirt.css | 4 ++++ docs/newapi.xsl | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 3ef5d0f554..a57f995189 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2123,6 +2123,10 @@ class docBuilder: except: val = info[0] output.write(" value='%s'" % (val)) + valuestr = re.sub("<", "<", info[0]) + valuestr = re.sub("[]", "", valuestr) + output.write(" valuestr='%s'" % valuestr) + if info[2] is not None and info[2] != '': output.write(" type='%s'" % info[2]) if info[1] is not None and info[1] != '': diff --git a/docs/libvirt.css b/docs/libvirt.css index e590b33cfb..c5fe27fa3f 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -537,3 +537,7 @@ dl.mail dt a:hover { color: rgb(255, 230, 0); text-decoration: none; } + +td.enumvalue { + white-space: nowrap; +} diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 8d4c032c03..0a3658c9a5 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -288,6 +288,17 @@ </xsl:choose> </xsl:template> + <xsl:template name="enumvalue"> + <xsl:param name="value" select="@value"/> + <xsl:param name="valuestr" select="@valuestr"/> + <xsl:value-of select="@value"/> + <xsl:if test="$value != $valuestr"> + <xsl:text> (</xsl:text> + <xsl:value-of select="@valuestr"/> + <xsl:text>)</xsl:text> + </xsl:if> + </xsl:template> + <xsl:template match="typedef[@type = 'enum']"> <xsl:variable name="name" select="string(@name)"/> <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> @@ -306,7 +317,7 @@ <td><xsl:text> = </xsl:text></td> <xsl:choose> <xsl:when test="@info != ''"> - <td><xsl:value-of select="@value"/></td> + <td class="enumvalue"><xsl:call-template name="enumvalue"/></td> <td> <div class="comment"> <xsl:call-template name="dumptext"> @@ -316,7 +327,7 @@ </td> </xsl:when> <xsl:otherwise> - <td colspan="2"><xsl:value-of select="@value"/></td> + <td colspan="2" class="enumvalue"><xsl:call-template name="enumvalue"/></td> </xsl:otherwise> </xsl:choose> </tr> -- 2.20.1

3 4

[libvirt] question: about iothreads count restrict in virDomainDefCheckABIStabilityFlags
by WangJie (Pluto) 29 Jan '19

29 Jan '19

Hi, Migrate feature have a restrict: target domain iothreads count must match source The relevant code as follows: ------------------------------------ if (src->niothreadids != dst->niothreadids) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain iothreads count %zu does not " "match source %zu"), dst->niothreadids, src->niothreadids); goto error; } ------------------------------------ I tried to remove the restrict, and perform migrate in that case: "target domain iothreads count does not match source" , Anything is normal! So, can we remove the restrict to support this case?

2 1

Re: [libvirt] [Qemu-devel] [PATCH v4 03/14] audio: -audiodev command line option: documentation
by Thomas Huth 29 Jan '19

29 Jan '19

On 2019-01-28 23:43, Kővágó, Zoltán wrote: > This patch adds documentation of an -audiodev command line option, that > deprecates the old QEMU_* environment variables for audio backend > configuration. It's syntax is similar to existing options (-netdev, > -device, etc): > > -audiodev driver_name,property=value,... > > Although now it's possible to specify multiple -audiodev options on > command line, multiple audio backends are not supported yet. > > Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu(a)gmail.com> > --- > qemu-options.hx | 222 +++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 219 insertions(+), 3 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 521511ec13..a12931899b 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -416,14 +416,230 @@ The default is @code{en-us}. > ETEXI > > > +HXCOMM Deprecated by -audiodev > DEF("audio-help", 0, QEMU_OPTION_audio_help, > - "-audio-help print list of audio drivers and their options\n", > + "-audio-help show -audiodev equivalent of the currently specified audio settings\n", > QEMU_ARCH_ALL) Note that if you want to deprecate a parameter "officially" (in the sense that it could be removed in a future release), you also have to add an entry to qemu-deprecated.texi. But that could also be done in an additional patch later, so no need to respin just because of this. Thomas

1 0

[libvirt] [PATCH 0/5] Block job handling related fixes (blockdev-add saga)
by Peter Krempa 28 Jan '19

28 Jan '19

Fix the generated documentation and clean up a few corner cases in qemu's block job handling. Peter Krempa (5): lib: Fix docs generated for enum virDomainBlockJobType qemu: blockjob: Make sure that internal states are not reported as event qemu: blockjob: Mark job as started only when it's new qemu: Clear block copy mirror state explicitly qemu: Don't double-free disk->mirror if block commit initialization fails include/libvirt/libvirt-domain.h | 3 ++- src/qemu/qemu_blockjob.c | 7 ++++++- src/qemu/qemu_driver.c | 34 ++++++++++++++------------------ 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.20.1

2 6

[libvirt] [PATCH] qmp: Deprecate query-nodes option of query-blockstats
by Anton Kuchin 28 Jan '19

28 Jan '19

This option is broken since a6baa60807 in v2.9 and returns mostly zeroes instead of real stats because actual querring of BlockStats that resides in blk is missing. And it makes no sense because with this option BlockDriverState-s are iterated but BlockAcctStats belong to BlockBackend and not BDS since 7f0e9da6f13 in v2.5 Signed-off-by: Anton Kuchin <antonkuchin(a)yandex-team.ru> --- block/qapi.c | 26 +++++++------------------- qapi/block-core.json | 8 +------- qemu-deprecated.texi | 5 +++++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index c66f949db8..19d4b4ee42 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -502,8 +502,7 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) &ds->x_flush_latency_histogram); } -static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, - bool blk_level) +static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs) { BlockStats *s = NULL; @@ -517,7 +516,7 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, /* Skip automatically inserted nodes that the user isn't aware of in * a BlockBackend-level command. Stay at the exact node for a node-level * command. */ - while (blk_level && bs->drv && bs->implicit) { + while (bs->drv && bs->implicit) { bs = backing_bs(bs); assert(bs); } @@ -531,12 +530,12 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level); + s->parent = bdrv_query_bds_stats(bs->file->bs); } - if (blk_level && bs->backing) { + if (bs->backing) { s->has_backing = true; - s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level); + s->backing = bdrv_query_bds_stats(bs->backing->bs); } return s; @@ -577,21 +576,10 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, { BlockStatsList *head = NULL, **p_next = &head; BlockBackend *blk; - BlockDriverState *bs; /* Just to be safe if query_nodes is not always initialized */ if (has_query_nodes && query_nodes) { - for (bs = bdrv_next_node(NULL); bs; bs = bdrv_next_node(bs)) { - BlockStatsList *info = g_malloc0(sizeof(*info)); - AioContext *ctx = bdrv_get_aio_context(bs); - - aio_context_acquire(ctx); - info->value = bdrv_query_bds_stats(bs, false); - aio_context_release(ctx); - - *p_next = info; - p_next = &info->next; - } + error_setg(errp, "Option query_nodes is deprecated"); } else { for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) { BlockStatsList *info; @@ -604,7 +592,7 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, } aio_context_acquire(ctx); - s = bdrv_query_bds_stats(blk_bs(blk), true); + s = bdrv_query_bds_stats(blk_bs(blk)); s->has_device = true; s->device = g_strdup(blk_name(blk)); diff --git a/qapi/block-core.json b/qapi/block-core.json index 91685be6c2..2dd5f6032c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -892,13 +892,7 @@ # # Query the @BlockStats for all virtual block devices. # -# @query-nodes: If true, the command will query all the block nodes -# that have a node name, in a list which will include "parent" -# information, but not "backing". -# If false or omitted, the behavior is as before - query all the -# device backends, recursively including their "parent" and -# "backing". Filter nodes that were created implicitly are -# skipped over in this mode. (Since 2.3) +# @query-nodes: deprecated since 3.2 # # Returns: A list of @BlockStats for each virtual block devices. # diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836..e1e04ced7d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -112,6 +112,11 @@ Use ``device_add'' for hotplugging vCPUs instead of ``cpu-add''. See documentation of ``query-hotpluggable-cpus'' for additional details. +@subsection query-blockstats (since 3.2) + +"query-nodes" parameter is not supported anymore because blockstats +are not a prorerty of node. + @section Human Monitor Protocol (HMP) commands @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) -- 2.19.1

5 7

[libvirt] [PATCH] conf: Add check to avoid a NULL compare for SysfsPath
by Cheng Lin 28 Jan '19

28 Jan '19

If the two sysfs_path are both NULL, there may be an incorrect object returned for virNodeDeviceObjListFindBySysfsPath(). This check exists in old interface virNodeDeviceFindBySysfsPath(). e.g. virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, const char *sysfs_path) { ... if ((devs->objs[i]->def->sysfs_path != NULL) && (STREQ(devs->objs[i]->def->sysfs_path, sysfs_path))) { ... } Signed-off-by: Cheng Lin <cheng.lin130(a)zte.com.cn> --- src/conf/virnodedeviceobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c8ad131..2e40de5 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -207,7 +207,8 @@ virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, int want = 0; virObjectLock(obj); - if (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path)) + if ((obj->def->sysfs_path != NULL) && + (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path))) want = 1; virObjectUnlock(obj); return want; -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: Assume migration with iscsi migration is safe
by Michal Privoznik 28 Jan '19

28 Jan '19

If a domain has a disk that is type='network' and protocol='iscsi' then there is no need to require @cache or UNSAFE migration flag. iscsi is a block device not a filesystem after all. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52aa665640..9a7077f710 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1249,7 +1249,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, else if (rc == 1) continue; } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD || + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)) { continue; } -- 2.19.2

2 1

[libvirt] [PATCH] lib: Use more of VIR_STEAL_PTR()
by Michal Privoznik 28 Jan '19

28 Jan '19

From: Your Name <you(a)example.com> We have this very handy macro called VIR_STEAL_PTR() which steals one pointer into the other and sets the other to NULL. The following coccinelle patch was used to create this commit: @ rule1 @ identifier a, b; @@ - b = a; ... - a = NULL; + VIR_STEAL_PTR(b, a); Some places were clean up afterwards to make syntax-check happy (e.g. some curly braces were removed where the body become a one liner). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 6 ++---- src/conf/domain_conf.c | 21 +++++++-------------- src/conf/secret_conf.c | 3 +-- src/conf/storage_conf.c | 3 +-- src/conf/virnetworkobj.c | 3 +-- src/conf/virsecretobj.c | 3 +-- src/libvirt-domain.c | 12 ++++-------- src/phyp/phyp_driver.c | 3 +-- src/qemu/qemu_domain.c | 6 ++---- src/qemu/qemu_driver.c | 12 ++++-------- src/qemu/qemu_migration.c | 12 ++++-------- src/security/virt-aa-helper.c | 3 +-- src/storage/storage_driver.c | 6 ++---- src/test/test_driver.c | 3 +-- src/util/virdbus.c | 18 ++++++------------ src/util/virrotatingfile.c | 3 +-- src/util/virstoragefile.c | 6 ++---- src/vz/vz_driver.c | 14 ++++---------- src/vz/vz_sdk.c | 6 ++---- tests/networkxml2conftest.c | 3 +-- tools/virsh-domain.c | 3 +-- tools/virsh-snapshot.c | 3 +-- 22 files changed, 50 insertions(+), 102 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 618fce44f0..04c4e6d7e1 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1757,8 +1757,7 @@ virDomainVirtioSerialAddrSetCreateFromDomain(virDomainDefPtr def) addrs) < 0) goto cleanup; - ret = addrs; - addrs = NULL; + VIR_STEAL_PTR(ret, addrs); cleanup: virDomainVirtioSerialAddrSetFree(addrs); return ret; @@ -2095,8 +2094,7 @@ virDomainUSBAddressHubNew(size_t nports) goto cleanup; hub->nports = nports; - ret = hub; - hub = NULL; + VIR_STEAL_PTR(ret, hub); cleanup: virDomainUSBAddressHubFree(hub); return ret; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22979e6c4e..9409d93c23 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7900,8 +7900,7 @@ virDomainNetIPParseXML(xmlNodePtr node) goto cleanup; } - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: VIR_FREE(prefixStr); @@ -13482,10 +13481,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!address) { - address = addressCompat; - addressCompat = NULL; - } + if (!address) + VIR_STEAL_PTR(address, addressCompat); } if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { @@ -13497,10 +13494,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!socketPath) { - socketPath = socketCompat; - socketCompat = NULL; - } + if (!socketPath) + VIR_STEAL_PTR(socketPath, socketCompat); } if (address && address[0] && @@ -14747,8 +14742,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: ctxt->node = save; VIR_FREE(tmp); @@ -16187,8 +16181,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, } } - ret = iommu; - iommu = NULL; + VIR_STEAL_PTR(ret, iommu); cleanup: ctxt->node = save; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 3a5aa72563..ca6cc194a2 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -193,8 +193,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) if (virXPathNode("./usage", ctxt) != NULL && virSecretDefParseUsage(ctxt, def) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: VIR_FREE(prop); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 55db7a96f5..ba5b1f1783 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -587,8 +587,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, node) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: virStoragePoolSourceFree(def); xmlFreeDoc(doc); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e6b01388f5..3749dda751 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -602,8 +602,7 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr nets, obj->persistent = !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virNetworkObjEndAPI(&obj); diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 78911c0908..c4e7b06eca 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -394,8 +394,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, virObjectRef(obj); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virSecretObjEndAPI(&obj); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 75c9014c0e..d919a44803 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3046,9 +3046,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p flags=0x%x", dconn, destflags); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsReplaceString(&params, &nparams, @@ -3111,9 +3110,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Perform3 %p uri=%s", domain->conn, uri); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; /* dconnuri not relevant in non-P2P modes, so left NULL here */ if (useParams) { @@ -3150,9 +3148,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsGetString(params, nparams, @@ -3227,9 +3224,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, if (notify_source) { VIR_DEBUG("Confirm3 %p ret=%d domain=%p", domain->conn, ret, domain); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { ret = domain->conn->driver->domainMigrateConfirm3Params diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4acc6ce734..4ffa08ff43 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1468,8 +1468,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, if (VIR_STRDUP(backing_device, char_ptr) < 0) goto cleanup; } else { - backing_device = ret; - ret = NULL; + VIR_STEAL_PTR(backing_device, ret); } char_ptr = strchr(backing_device, '\n'); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f42903a343..6eeabe0df1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11645,8 +11645,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } VIR_FREE(devTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } if (qemuDomainCreateDeviceRecursive(target, data, @@ -12601,8 +12600,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, } VIR_FREE(fileTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } data.target = target; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d8e4618bd..5387150bbd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6655,11 +6655,9 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virFreeError(err); /* use the user provided XML */ - ret = newdef; - newdef = NULL; + VIR_STEAL_PTR(ret, newdef); } else { - ret = newdef_migr; - newdef_migr = NULL; + VIR_STEAL_PTR(ret, newdef_migr); } cleanup: @@ -12705,10 +12703,8 @@ qemuDomainMigratePerform(virDomainPtr dom, goto cleanup; } - if (flags & VIR_MIGRATE_PEER2PEER) { - dconnuri = uri; - uri = NULL; - } + if (flags & VIR_MIGRATE_PEER2PEER) + VIR_STEAL_PTR(dconnuri, uri); /* Do not output cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 950d9cd615..6c66ff6648 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4170,9 +4170,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p", dconn); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { if (!(st = virStreamNew(dconn, 0))) @@ -4239,9 +4238,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri)); qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { ret = qemuMigrationSrcPerformTunnel(driver, vm, st, persist_xml, @@ -4281,9 +4279,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { @@ -4362,9 +4359,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Confirm3 %p cancelled=%d vm=%p", sconn, cancelled, vm); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; ret = qemuMigrationSrcConfirmPhase(driver, vm, cookiein, cookieinlen, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 56d7cfadf1..8e22e9978a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -355,8 +355,7 @@ create_profile(const char *profile, const char *profile_name, if (!(tmp = virStringReplace(pcontent, template_end, replace_files))) goto clean_all; VIR_FREE(pcontent); - pcontent = tmp; - tmp = NULL; + VIR_STEAL_PTR(pcontent, tmp); } /* write the file */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4a13e90481..878a40cac5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1936,8 +1936,7 @@ storageVolCreateXML(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: @@ -2130,8 +2129,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1d81772a46..568c52aa28 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5595,8 +5595,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, if (VIR_STRDUP(dev->parentName, def->parent) < 0) goto cleanup; - ret = dev; - dev = NULL; + VIR_STEAL_PTR(ret, dev); cleanup: virNodeDeviceObjEndAPI(&obj); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 691f182387..6725e0edb0 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -762,8 +762,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; narray = (size_t)va_arg(args, int); @@ -789,8 +788,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, VIR_FREE(newiter); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -821,8 +819,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; @@ -1059,8 +1056,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; if (arrayref) { @@ -1090,8 +1086,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, VIR_DEBUG("Push failed"); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -1118,8 +1113,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index d7dc3bd1ce..7a268319a6 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -406,8 +406,7 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) } VIR_FREE(nextpath); - nextpath = thispath; - thispath = NULL; + VIR_STEAL_PTR(nextpath, thispath); } } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..70fe551e5f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1233,8 +1233,7 @@ virStorageFileGetMetadataFromFD(const char *path, * update the metadata.*/ meta->type = VIR_STORAGE_TYPE_DIR; meta->format = VIR_STORAGE_FILE_DIR; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); goto cleanup; } @@ -1256,8 +1255,7 @@ virStorageFileGetMetadataFromFD(const char *path, else if (S_ISBLK(sb.st_mode)) meta->type = VIR_STORAGE_TYPE_BLOCK; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); cleanup: virStorageSourceFree(meta); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 7e9ef932dc..e86a788b09 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -182,12 +182,8 @@ vzDestroyDriverConnection(void) vzConnPtr privconn_list; virMutexLock(&vz_driver_lock); - driver = vz_driver; - vz_driver = NULL; - - privconn_list = vz_conn_list; - vz_conn_list = NULL; - + VIR_STEAL_PTR(driver, vz_driver); + VIR_STEAL_PTR(privconn_list, vz_conn_list); virMutexUnlock(&vz_driver_lock); while (privconn_list) { @@ -3203,9 +3199,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, VIR_MIGRATE_PARAM_DEST_XML, dom_xml) < 0) goto done; - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; virObjectUnlock(dom); ret = dconn->driver->domainMigratePrepare3Params @@ -3226,9 +3221,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, } VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (vzDomainMigratePerformStep(dom, driver, params, nparams, cookiein, cookieinlen, flags) < 0) { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 63d013deac..b9fd03c0d2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -928,8 +928,7 @@ prlsdkParseNetAddress(char *addr) goto cleanup; ip->prefix = nbits; - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: if (!ret) @@ -4768,8 +4767,7 @@ prlsdkParseSnapshotTree(const char *treexml) goto cleanup; } - ret = snapshots; - snapshots = NULL; + VIR_STEAL_PTR(ret, snapshots); cleanup: virDomainSnapshotObjListFree(snapshots); diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 367e30b994..c362149c29 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -51,8 +51,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr "except-interface=lo\n"))) goto fail; VIR_FREE(actual); - actual = tmp; - tmp = NULL; + VIR_STEAL_PTR(actual, tmp); #endif if (virTestCompareToFile(actual, outconf) < 0) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e63fc028b9..34f9e6b5c6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8423,8 +8423,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(desc); - desc = desc_edited; - desc_edited = NULL; + VIR_STEAL_PTR(desc, desc_edited); } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e3d4cda0fc..6d8e2b299b 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1356,8 +1356,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virshSnapSorter); snaplist->nsnaps -= deleted; - ret = snaplist; - snaplist = NULL; + VIR_STEAL_PTR(ret, snaplist); cleanup: virshSnapshotListFree(snaplist); -- 2.19.2

3 3

[libvirt] [PATCH] virfile: Detect ceph as shared FS
by Michal Privoznik 28 Jan '19

28 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1665553 Ceph can be mounted just like any other filesystem and in fact is a shared and cluster filesystem. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 9 ++++++++- src/util/virfile.h | 1 + src/util/virstoragefile.c | 3 ++- tests/virfiledata/mounts3.txt | 2 ++ tests/virfilemock.c | 5 +++++ tests/virfiletest.c | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 263c92667c..271bf5e796 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 # endif +# ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00C36400 +# endif # define PROC_MOUNTS "/proc/mounts" @@ -3607,6 +3610,9 @@ virFileIsSharedFSType(const char *path, if ((fstypes & VIR_FILE_SHFS_CIFS) && (f_type == CIFS_SUPER_MAGIC)) return 1; + if ((fstypes & VIR_FILE_SHFS_CEPH) && + (f_type == CEPH_SUPER_MAGIC)) + return 1; return 0; } @@ -3769,7 +3775,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_OCFS | VIR_FILE_SHFS_AFS | VIR_FILE_SHFS_SMB | - VIR_FILE_SHFS_CIFS); + VIR_FILE_SHFS_CIFS | + VIR_FILE_SHFS_CEPH); } diff --git a/src/util/virfile.h b/src/util/virfile.h index 93484e5444..65432da13a 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -220,6 +220,7 @@ enum { VIR_FILE_SHFS_AFS = (1 << 3), VIR_FILE_SHFS_SMB = (1 << 4), VIR_FILE_SHFS_CIFS = (1 << 5), + VIR_FILE_SHFS_CEPH = (1 << 6), }; int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..895c8f90de 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1359,7 +1359,8 @@ int virStorageFileIsClusterFS(const char *path) */ return virFileIsSharedFSType(path, VIR_FILE_SHFS_GFS2 | - VIR_FILE_SHFS_OCFS); + VIR_FILE_SHFS_OCFS | + VIR_FILE_SHFS_CEPH); } #ifdef LVS diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt index 134c6e8f81..68eded048c 100644 --- a/tests/virfiledata/mounts3.txt +++ b/tests/virfiledata/mounts3.txt @@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255, dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0 host:/gv0 /gluster fuse.glusterfs rw 0 0 root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 +192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 +192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index fb6bd5e699..499135d773 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -86,6 +86,9 @@ setmntent(const char *filename, const char *type) #ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 #endif +#ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00c36400 +#endif static int @@ -132,6 +135,8 @@ statfs_mock(const char *mtab, ftype = CIFS_SUPER_MAGIC; } else if (STRPREFIX(mb.mnt_type, "fuse")) { ftype = FUSE_SUPER_MAGIC; + } else if (STRPREFIX(mb.mnt_type, "ceph")) { + ftype = CEPH_SUPER_MAGIC; } else { /* Everything else is EXT4. We don't care really for other paths. */ ftype = EXT4_SUPER_MAGIC; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index b1cb831bfd..6cc599a81b 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -455,6 +455,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.19.2

2 2

[libvirt] [PATCH 0/2] add debugcon-isa chardev guest interface
by Nikolay Shirokovskiy 28 Jan '19

28 Jan '19

It corresponds to QEMU's isa-debugcon device. It can be used to output debug info by firmware at least. I do not introduce capability to test for the device because it was supported long before current minimal 1.5.0 version. Nikolay Shirokovskiy (2): conf: add debugcon-isa chardev guest interface qemu: implement debugcon-isa chardev docs/formatdomain.html.in | 11 ++++++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 6 +++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 13 +++++++ src/qemu/qemu_domain.c | 20 +++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.args | 29 ++++++++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.xml | 34 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/channel-debugcon-isa.xml | 41 +++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.args create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.xml create mode 100644 tests/qemuxml2xmloutdata/channel-debugcon-isa.xml -- 1.8.3.1

6 13

[libvirt] [PATCH 0/3] Facilitate running libvirt builds via docker including cross-compilation
by Daniel P. Berrangé 28 Jan '19

28 Jan '19

For a while QEMU has provided simple make rules for building QEMU inside standard docker container environments. This provides an equivalent mechanism for libvirt inspired by QEMU's. This series depends on the cross compiler images defined by: https://www.redhat.com/archives/libvir-list/2019-January/msg01039.html QEMU actually builds the container images on developer's machines locally. Libvirt already hosts pre-built images on quay.io, so that is used directly as it is quicker to download these than build them locally each time. Daniel P. Berrangé (3): tests: add targets for building libvirt inside docker containers tests: add cross compiler images to CI test help output tests: perform cross compiler builds on GitLab CI .gitignore | 1 + .gitlab-ci.yml | 38 ++++++++++++ Makefile.am | 2 + tests/Makefile.ci.inc | 134 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 tests/Makefile.ci.inc -- 2.20.1

1 4

[libvirt] [PATCH v2 0/1] qemu_hotplug.c: check address before hotplug
by Daniel Henrique Barboza 26 Jan '19

26 Jan '19

Changes in v2: - removed the function to check for alias - added a new function to check for address in the VM definition Daniel Henrique Barboza (1): qemu_hotplug.c: check disk address before hotplug src/qemu/qemu_hotplug.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.20.1

2 5

[libvirt] [PATCH 0/3] Fixes for GPL / LGPL statements
by Thomas Huth 25 Jan '19

25 Jan '19

Here are some fixes for files in libvirt where the GPL or LGPL statements are slightly wrong. Thomas Huth (3): bootstrap.conf: Fix LGPL information tools/virt-xml-validate: Fix GPL information docs/governance: Clarify the version number of the LGPL bootstrap.conf | 2 +- docs/governance.html.in | 2 +- tools/virt-xml-validate.in | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] virjson improvements [incremental backup saga]
by Eric Blake 25 Jan '19

25 Jan '19

Upstream qemu stabilized the QMP command block-dirty-bitmap-merge to take an array of strings as the sources to merge into a destination bitmap; this is a lot nicer for libvirt, compared to the alternative where qemu 3.1 x-block-dirty-bitmap-merge had to be called multiple times with the potential for some odd cleanup after partial failure scenarios. This series prepares virjson for use in my incremental backup work. Eric Blake (2): virjson: always raise vir error on append failures virjson: add convenience wrapper for appending string to array src/util/virjson.h | 2 ++ src/libvirt_private.syms | 1 + src/util/virjson.c | 28 +++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] tools: Document completer callback
by Michal Privoznik 24 Jan '19

24 Jan '19

Strictly speaking, this should go near vshCompleter typedef declaration. However, I find it more useful near actual completer implementations. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index cfbfeae328..7a637a0cfa 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -35,6 +35,38 @@ #include "virxml.h" +/** + * A completer callback is a function that accepts three arguments: + * + * @ctl: virsh control structure + * @cmd: parsed input + * @flags: optional flags to alter completer's behaviour + * + * The @ctl contains connection to the daemon (should completer + * need it). Any completer that requires connection must check + * whether connection is still alive. + * + * The @cmd then holds parsed user input which might be missing + * some arguments (user is still typing the command), but may + * already contain important data. For instance if completer + * needs domain XML it may inspect @cmd to find --domain. Using + * existing wrappers is advised. If @cmd does not contain all + * necessary bits, completer might return sensible defaults (i.e. + * generic values not tailored to specific use case) or return + * NULL (i.e. no strings are offered to the user for completion). + * + * The @flags then contain .completer_flags value defined for + * each use or 0 if no .completer_flags were specified. If a + * completer is generic enough @flags can be used to alter it's + * behaviour. For instance, a completer to fetch names of domains + * can use @flags to return names of only domains in particular + * state that the command accepts. + * + * Under no circumstances a completer can output anything. Nor to + * stdout nor to stderr. This would harm the user experience. + */ + + char ** virshDomainNameCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, -- 2.19.2

2 1

[libvirt] [PATCH v2 0/3] Rebase LXC network definition to support version 3.0
by Julio Faracco 24 Jan '19

24 Jan '19

The series propose a new way to define NICs inside LXC native. It is needed because LXC version 3.X uses indexes to define NICs and the current algorithm is not able to support them. At least, if you consider settings defined using a random logic. v1-v2: Includes Michal's suggestions. Julio Faracco (3): lxc: refactoring LXC network definition with a sparse array. tests: Change legacy network configs to version 3.0 with indexes. tests: Include a random network testcase to test indexes. src/lxc/lxc_native.c | 195 ++++++++++++------ .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-miscnetwork-v3.config | 38 ++-- .../lxcconf2xml-physnetwork-v3.config | 14 +- .../lxcconf2xml-simple-v3.config | 18 +- .../lxcconf2xml-vlannetwork-v3.config | 10 +- tests/lxcconf2xmltest.c | 1 + 9 files changed, 187 insertions(+), 125 deletions(-) -- 2.19.1

3 6

[libvirt] [PATCH] virPortAllocatorSetUsed: ignore port 0
by Ján Tomko 24 Jan '19

24 Jan '19

Similar to what commit 86dba8f3 did for virPortAllocatorRelease, ignore port 0 in virPortAllocatorSetUsed. For all the reasonable use cases the callers already check that the port is non-zero, however if the port from the XML overflows unsigned short and turns into 0, it can be set as used by virPortAllocatorSetUsed but not released by virPortAllocatorRelease. Also skip port '0' in virPortAllocatorSetUsed to make this behavior symmetric. The serenity was disturbed by commit 5dbda5e9 which started using virPortAllocatorRelease instead of virPortAllocatorSetUsed (false). https://bugzilla.redhat.com/show_bug.cgi?id=1591645 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/util/virportallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index db95a601c7..d48963c1ff 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -294,6 +294,9 @@ virPortAllocatorSetUsed(unsigned short port) if (!pa) return -1; + if (!port) + return 0; + virObjectLock(pa); if (virBitmapIsBitSet(pa->bitmap, port) || -- 2.16.4

2 1

[libvirt] [PATCH] docs: Add more iscsi-direct references to storage pages
by John Ferlan 24 Jan '19

24 Jan '19

Found that it was missing in formatstorage and had a few typos in the storage driver page. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- noted while working on other stuff... Also although <initiator> is supported by the "iscsi" pool as well, it's not something ever documented since commit 6aabcb5bd (0.7.5). I could add a note that it's optional to use with the "iscsi" pool if desired. docs/formatstorage.html.in | 20 ++++++++++++++++---- docs/storage.html.in | 8 ++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index b6bf3edbd2..979e170c08 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -18,7 +18,9 @@ The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>, <code>netfs</code>, <code>disk</code>, - <code>iscsi</code>, <code>logical</code>, <code>scsi</code> + <code>iscsi</code>, + <code>iscsi-direct</code>(<span class="since">since 4.7.0</span>), + <code>logical</code>, <code>scsi</code> (all <span class="since">since 0.4.1</span>), <code>mpath</code> (<span class="since">since 0.7.1</span>), <code>rbd</code> (<span class="since">since 0.9.13</span>), <code>sheepdog</code> @@ -125,11 +127,12 @@ <dt><code>device</code></dt> <dd>Provides the source for pools backed by physical devices (pool types <code>fs</code>, <code>logical</code>, <code>disk</code>, - <code>iscsi</code>, <code>zfs</code>, <code>vstorage</code>). + <code>iscsi</code>, <code>iscsi-direct</code>, <code>zfs</code>, + <code>vstorage</code>). May be repeated multiple times depending on backend driver. Contains a required attribute <code>path</code> which is either the fully qualified path to the block device node or for <code>iscsi</code> - the iSCSI Qualified Name (IQN). + or <code>iscsi-direct</code> the iSCSI Qualified Name (IQN). <span class="since">Since 0.4.1</span> <p>An optional attribute <code>part_separator</code> for each <code>path</code> may be supplied. Valid values for the attribute @@ -334,6 +337,7 @@ <dt><code>host</code></dt> <dd>Provides the source for pools backed by storage from a remote server (pool types <code>netfs</code>, <code>iscsi</code>, + <code>iscsi-direct</code>, <code>rbd</code>, <code>sheepdog</code>, <code>gluster</code>). Will be used in combination with a <code>directory</code> or <code>device</code> element. Contains an attribute <code>name</code> @@ -348,11 +352,19 @@ server. See the <a href="storage.html">storage driver page</a> for any restrictions for specific storage backends. <span class="since">Since 0.4.1</span></dd> + <dt><code>initiator</code></dt> + <dd>Required by the <code>iscsi-direct</code> pool in order to provide + the iSCSI Qualified Name (IQN) to communicate with the pool's + <code>device</code> target IQN. There is one sub-element + <code>iqn</code> with the <code>name</code> attribute to describe + the IQN for the initiator. + <span class="since">Since 4.7.0</span></dd> <dt><code>auth</code></dt> <dd>If present, the <code>auth</code> element provides the authentication credentials needed to access the source by the setting of the <code>type</code> attribute (pool - types <code>iscsi</code>, <code>rbd</code>). The <code>type</code> + types <code>iscsi</code>, <code>iscsi-direct</code>, <code>rbd</code>). + The <code>type</code> must be either "chap" or "ceph". Use "ceph" for Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP (Challenge-Handshake Authentication Protocol) iSCSI diff --git a/docs/storage.html.in b/docs/storage.html.in index 9adcc2a87f..c8617aace5 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -437,9 +437,9 @@ <h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2> <p> - This is a variant of the iSCSI pool. Instead of unsing iscsiadm, it uses + This is a variant of the iSCSI pool. Instead of using iscsiadm, it uses libiscsi. - It require a host, a path which is the target iqn and an initiator iqn. + It requires a host, a path which is the target IQN, and an initiator IQN. </p> <h3>Example pool input</h3> @@ -457,12 +457,12 @@ <h3>Valid pool format types</h3> <p> - The iSCSI volume pool does not use the pool format type element. + The iSCSI direct volume pool does not use the pool format type element. </p> <h3>Valid volume format types</h3> <p> - The iSCSI volume pool does not use the volume format type element. + The iSCSI direct volume pool does not use the volume format type element. </p> <h2><a id="StorageBackendSCSI">SCSI pool</a></h2> -- 2.20.1

2 1

[libvirt] [PATCH v3 00/11] Allow adding mountOpts to the storage pool mount command
by John Ferlan 24 Jan '19

24 Jan '19

v2: https://www.redhat.com/archives/libvir-list/2019-January/msg00164.html Changes since v2: * Split out the noexec, nodev, nosuid, and (new) ro into the first 3 patches as "known" or "supported" mount options that can be added. I avoided just adding them noexec, nodev, and nosuid by default. * Add patches 4-6 to essentially support the nfsvers option * The rest of the patches are reworked to add support for namespace at the pool level (as opposed to the v2 at the source level). John Ferlan (11): conf: Add some defined NFS Storage Pool mount options storage: Add mountOpts to the storage pool mount command line virsh: Add source-mount-opts for pool commands conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool namespace options to command line rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 137 +++++++++++++++ docs/schemas/storagepool.rng | 70 ++++++++ src/conf/storage_conf.c | 120 ++++++++++++- src/conf/storage_conf.h | 40 +++++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 128 ++++++++++++++ src/storage/storage_backend_rbd.c | 166 +++++++++++++++++- src/storage/storage_util.c | 47 +++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-mountopts.argv | 1 + .../pool-netfs-ns-mountopts.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 6 + .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 9 + tools/virsh-pool.c | 44 ++++- tools/virsh.pod | 10 ++ 25 files changed, 977 insertions(+), 8 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

3 15