- Devel - libvirt List Archives

[libvirt] [PATCH] rbd: Allow shrinking and deltas when resizing RBD volumes
by Wido den Hollander 06 Feb '16

06 Feb '16

Modify virCheckFlags that it accepts both VIR_STORAGE_VOL_RESIZE_DELTA and VIR_STORAGE_VOL_RESIZE_SHRINK as valid flags for resizing RBD volumes. This still does not solve the problem where RBD volumes can't be shrinked using libvirt. The allocation and capacity of RBD volumes are equal for a RBD volume and this makes libvirt think the volume is fully allocated and therefor can't be shrinked. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 80a1d33..88b613a 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -1041,7 +1041,8 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, int ret = -1; int r = 0; - virCheckFlags(0, -1); + virCheckFlags(VIR_STORAGE_VOL_RESIZE_DELTA | + VIR_STORAGE_VOL_RESIZE_SHRINK, -1); if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; -- 1.9.1

3 6

[libvirt] [PATCH] util: Fix virCgroupNewMachine ATTRIBUTE_NONNULL args
by John Ferlan 06 Feb '16

06 Feb '16

Commit id 'c3bd0019c0' removed arg3, but forgot to adjust the numbers for NONNULL - caused build failure for coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker src/util/vircgroup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index bec88dc..46d3ace 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -110,7 +110,7 @@ int virCgroupNewMachine(const char *name, int controllers, virCgroupPtr *group) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(3); int virCgroupTerminateMachine(const char *name) ATTRIBUTE_NONNULL(1); -- 2.5.0

1 0

[libvirt] [PATCH] bhyve: fix preprocessor indentation
by Roman Bogorodskiy 06 Feb '16

06 Feb '16

Syntax-check fails with: cppi: src/bhyve/bhyve_driver.h: line 26: not properly indented cppi: src/bhyve/bhyve_driver.h: line 27: not properly indented maint.mk: incorrect preprocessor indentation Fix by properly indenting '#include's. Pushed as trivial. --- src/bhyve/bhyve_driver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index a290c4a..fb57d28 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -23,8 +23,8 @@ #ifndef __BHYVE_DRIVER_H__ # define __BHYVE_DRIVER_H__ -#include "capabilities.h" -#include "bhyve_utils.h" +# include "capabilities.h" +# include "bhyve_utils.h" int bhyveRegister(void); -- 2.4.6

1 0

[libvirt] [PATCH] bhyve: Fix the build
by Michal Privoznik 06 Feb '16

06 Feb '16

After 1036ddadb276e we use bhyveDriverGetCapabilities from other sources too, not only from bhyve_driver.c. However, the function was static so not properly expose to other files. In order to expose it, we need to move couple of #include-s too. Then, there has been a copy paste error in virBhyveProcessReconnect: s/privconn/data->driver/. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. src/bhyve/bhyve_driver.c | 4 +--- src/bhyve/bhyve_driver.h | 5 +++++ src/bhyve/bhyve_process.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index f486f86..9219890 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -30,7 +30,6 @@ #include "datatypes.h" #include "virbuffer.h" #include "viruuid.h" -#include "capabilities.h" #include "configmake.h" #include "viralloc.h" #include "network_conf.h" @@ -58,7 +57,6 @@ #include "bhyve_command.h" #include "bhyve_domain.h" #include "bhyve_process.h" -#include "bhyve_utils.h" #include "bhyve_capabilities.h" #define VIR_FROM_THIS VIR_FROM_BHYVE @@ -127,7 +125,7 @@ bhyveAutostartDomains(bhyveConnPtr driver) * * Returns: a reference to a virCapsPtr instance or NULL */ -static virCapsPtr ATTRIBUTE_NONNULL(1) +virCapsPtr ATTRIBUTE_NONNULL(1) bhyveDriverGetCapabilities(bhyveConnPtr driver) { diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index 221d5a0..a290c4a 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -23,10 +23,15 @@ #ifndef __BHYVE_DRIVER_H__ # define __BHYVE_DRIVER_H__ +#include "capabilities.h" +#include "bhyve_utils.h" + int bhyveRegister(void); unsigned bhyveDriverGetCaps(virConnectPtr conn); unsigned bhyveDriverGetGrubCaps(virConnectPtr conn); +virCapsPtr bhyveDriverGetCapabilities(bhyveConnPtr driver); + #endif /* __BHYVE_DRIVER_H__ */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9763d71..14588a9 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -32,6 +32,7 @@ #include <net/if_tap.h> #include "bhyve_device.h" +#include "bhyve_driver.h" #include "bhyve_command.h" #include "bhyve_monitor.h" #include "bhyve_process.h" @@ -375,7 +376,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (!vm->pid) return 0; - caps = bhyveDriverGetCapabilities(privconn); + caps = bhyveDriverGetCapabilities(data->driver); if (!caps) return -1; -- 2.4.10

2 1

[libvirt] [PATCH v3 00/13] vcpu info storage refactors - part 2
by Peter Krempa 05 Feb '16

05 Feb '16

Rest of the series was pushed. Patches with no explicit note were already ACKed but depend on the rest of the series. Peter Krempa (13): cgroup: Prepare for sparse vCPU topologies in virCgroupGetPercpuStats qemu: Differentiate error codes when VM exits in qemuDomainDetectVcpuPids qemu: Reuse qemuDomainDetectVcpuPids in cpu hot(un)plug conf: Don't copy def->cpumask into cpu pinning info conf: Store cpu pinning data in def->vcpus conf: remove unused cpu pinning helpers and data structures conf: Extract code that formats <cputune> conf: Don't store vcpusched orthogonally to other vcpu info conf: Fix how iothread scheduler info is stored qemu: vcpu: Aggregate code to set vCPU tuning qemu: vcpu: Reuse qemuProcessSetupVcpu in vcpu hotplug qemu: iothread: Aggregate code to set IOThread tuning qemu: iothread: Reuse qemuProcessSetupIOThread in iothread hotplug src/conf/domain_conf.c | 835 ++++++++++----------- src/conf/domain_conf.h | 41 +- src/libvirt_private.syms | 7 - src/libxl/libxl_domain.c | 20 +- src/libxl/libxl_driver.c | 38 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_cgroup.c | 195 ----- src/qemu/qemu_cgroup.h | 2 - src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_driver.c | 380 +++------- src/qemu/qemu_process.c | 401 ++++++---- src/qemu/qemu_process.h | 6 + src/test/test_driver.c | 45 +- src/util/vircgroup.c | 16 +- src/util/vircgroup.h | 3 +- src/vz/vz_sdk.c | 16 +- .../qemuxml2xmlout-cputune-iothreadsched.xml | 3 +- tests/vircgrouptest.c | 2 +- 18 files changed, 823 insertions(+), 1193 deletions(-) -- 2.6.2

2 16

[libvirt] [PATCH] virSystemdGetMachineNameByPID: Initialize @reply
by Michal Privoznik 05 Feb '16

05 Feb '16

I've noticed that variable @reply is not initialized and if something at the beginning of the function fails, e.g. virDBusGetSystemBus(), the control jump straight to cleanup label where dbus_message_unref() is then called over this uninitialized variable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virsystemd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 37007aa..6677798 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -181,7 +181,7 @@ char * virSystemdGetMachineNameByPID(pid_t pid) { DBusConnection *conn; - DBusMessage *reply; + DBusMessage *reply = NULL; char *name = NULL, *object = NULL; if (virDBusIsServiceEnabled("org.freedesktop.machine1") < 0) -- 2.4.10

1 0

[libvirt] [PATCH] virnetdevbandwidth: Compute quantum value
by Michal Privoznik 05 Feb '16

05 Feb '16

I've noticed couple of warning in dmesg while debugging something: [ 9683.973754] HTB: quantum of class 10001 is big. Consider r2q change. [ 9683.976460] HTB: quantum of class 10002 is big. Consider r2q change. I've read the HTB documentation and linux kernel code to find out what's wrong. Basically we need to pass another argument to our tc cmd line because the default computed by HTB does not always work in which case the warning message is printed out. You can read more details here: http://luxik.cdi.cz/~devik/qos/htb/manual/userg.htm#sharing Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevbandwidth.c | 39 +++++++++++++++++++++++++++++++++++++++ tests/virnetdevbandwidthtest.c | 4 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index da3a0d3..a74cb1d 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -43,6 +43,36 @@ virNetDevBandwidthFree(virNetDevBandwidthPtr def) VIR_FREE(def); } +static int +virNetDevBandwidthSetOptimalQuantum(virCommandPtr cmd, + const virNetDevBandwidthRate *rate) +{ + const unsigned long long mtu = 1500; + unsigned long long r2q; + char *r2q_str; + + /* When two or more classes compete for unused bandwidth they are each + * given some number of bytes before serving other competing class. This + * number is called quantum. It's advised in HTB docs that the number + * should be equal to MTU. The class quantum is computed from its rate + * divided by global r2q parameter. However, if rate is too small the + * default value will not suffice and thus we must provide our own value. + * */ + + r2q = rate->average * 1024 / 8 / mtu; + if (!r2q) + r2q = 1; + + if (r2q != 10) { + if (virAsprintf(&r2q_str, "%llu", r2q) < 0) + return -1; + virCommandAddArgList(cmd, "quantum", r2q_str, NULL); + VIR_FREE(r2q_str); + } + + return 0; +} + /** * virNetDevBandwidthManipulateFilter: * @ifname: interface to operate on @@ -280,6 +310,8 @@ virNetDevBandwidthSet(const char *ifname, virCommandAddArgList(cmd, "class", "add", "dev", ifname, "parent", "1:", "classid", "1:1", "htb", "rate", average, "ceil", peak ? peak : average, NULL); + if (virNetDevBandwidthSetOptimalQuantum(cmd, bandwidth->in) < 0) + goto cleanup; if (virCommandRun(cmd, NULL) < 0) goto cleanup; } @@ -295,6 +327,9 @@ virNetDevBandwidthSet(const char *ifname, if (burst) virCommandAddArgList(cmd, "burst", burst, NULL); + if (virNetDevBandwidthSetOptimalQuantum(cmd, bandwidth->in) < 0) + goto cleanup; + if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -549,6 +584,8 @@ virNetDevBandwidthPlug(const char *brname, virCommandAddArgList(cmd, "class", "add", "dev", brname, "parent", "1:1", "classid", class_id, "htb", "rate", floor, "ceil", ceil, NULL); + if (virNetDevBandwidthSetOptimalQuantum(cmd, bandwidth->in) < 0) + goto cleanup; if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -672,6 +709,8 @@ virNetDevBandwidthUpdateRate(const char *ifname, virCommandAddArgList(cmd, "class", "change", "dev", ifname, "classid", class_id, "htb", "rate", rate, "ceil", ceil, NULL); + if (virNetDevBandwidthSetOptimalQuantum(cmd, bandwidth->in) < 0) + goto cleanup; if (virCommandRun(cmd, NULL) < 0) goto cleanup; diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 5a3f02c..b29318e 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -137,7 +137,7 @@ mymain(void) (TC " qdisc del dev eth0 root\n" TC " qdisc del dev eth0 ingress\n" TC " qdisc add dev eth0 root handle 1: htb default 1\n" - TC " class add dev eth0 parent 1: classid 1:1 htb rate 1024kbps\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 1024kbps quantum 87\n" TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" TC " filter add dev eth0 parent 1:0 protocol all prio 1 handle 1 fw flowid 1\n")); @@ -157,7 +157,7 @@ mymain(void) (TC " qdisc del dev eth0 root\n" TC " qdisc del dev eth0 ingress\n" TC " qdisc add dev eth0 root handle 1: htb default 1\n" - TC " class add dev eth0 parent 1: classid 1:1 htb rate 1kbps ceil 2kbps burst 4kb\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 1kbps ceil 2kbps burst 4kb quantum 1\n" TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" TC " filter add dev eth0 parent 1:0 protocol all prio 1 handle 1 fw flowid 1\n" TC " qdisc add dev eth0 ingress\n" -- 2.4.10

2 2

[libvirt] [PATCH 0/4] Display thin lv's from a logical vg
by John Ferlan 05 Feb '16

05 Feb '16

While I know not the preferred mechanism for Jan, these patches provide a means to display thin lv data from a volume group including the source thin-pool name and thin-pool capacity. Since a thin-pool and a thin lv are just members of the vg, it just feels natural to display whatever is in the volume group because a logical pool comprises all the volumes within the vg. Even if not accepted, some concepts can be used as a bases for a single thin-pool to libvirt pool relationship. There are no changes to virsh vol-list --details or virsh vol-info to display the thin-pool capacity. If one self adds all the capacity values in the vol-list --details display, they will determine that the sum is larger than the virsh pool-info output for the volume group. Although that's even true prior to these patches since the thin data is not displayed in the vol-list output, but is accounted for in the pool-info output, thus the sum of the vol-list capacity details are less. John Ferlan (4): vol: Add new elements to _virStorageVolSource for thin lv logical: Add capability to get the thin pool name logical: Add thin-pool look-aside list logical: Display thin lv's found in a libvirt managed volume group docs/formatstorage.html.in | 9 ++- docs/schemas/storagevol.rng | 14 ++++ src/conf/storage_conf.c | 11 +++ src/conf/storage_conf.h | 15 ++++ src/storage/storage_backend_logical.c | 100 +++++++++++++++++++----- tests/storagevolxml2xmlin/vol-logical-thin.xml | 20 +++++ tests/storagevolxml2xmlout/vol-logical-thin.xml | 17 ++++ tests/storagevolxml2xmltest.c | 1 + 8 files changed, 166 insertions(+), 21 deletions(-) create mode 100644 tests/storagevolxml2xmlin/vol-logical-thin.xml create mode 100644 tests/storagevolxml2xmlout/vol-logical-thin.xml -- 2.5.0

4 8

[libvirt] [PATCH] conf: add caps to virDomainSnapshotDefFormat
by Joao Martins 05 Feb '16

05 Feb '16

The virDomainSnapshotDefFormat calls into virDomainDefFormat, so should be providing a non-NULL virCapsPtr instance. On the qemu driver we change qemuDomainSnapshotWriteMetadata to also include caps since it calls virDomainSnapshotDefFormat. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/conf/snapshot_conf.c | 3 ++- src/conf/snapshot_conf.h | 1 + src/esx/esx_driver.c | 2 +- src/qemu/qemu_domain.c | 5 +++-- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 16 ++++++++++------ src/test/test_driver.c | 3 ++- src/vbox/vbox_common.c | 4 ++-- tests/domainsnapshotxml2xmltest.c | 2 +- 9 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index ffa1bf2..1eda7c2 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -659,6 +659,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf, char *virDomainSnapshotDefFormat(const char *domain_uuid, virDomainSnapshotDefPtr def, + virCapsPtr caps, unsigned int flags, int internal) { @@ -702,7 +703,7 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid, virBufferAddLit(&buf, "</disks>\n"); } if (def->dom) { - if (virDomainDefFormatInternal(def->dom, NULL, flags, &buf) < 0) { + if (virDomainDefFormatInternal(def->dom, caps, flags, &buf) < 0) { virBufferFreeAndReset(&buf); return NULL; } diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 4f0d096..fcf7a1e 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -113,6 +113,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def); char *virDomainSnapshotDefFormat(const char *domain_uuid, virDomainSnapshotDefPtr def, + virCapsPtr caps, unsigned int flags, int internal); int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot, diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index ce5f799..00d0e0a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4292,7 +4292,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virUUIDFormat(snapshot->domain->uuid, uuid_string); - xml = virDomainSnapshotDefFormat(uuid_string, &def, + xml = virDomainSnapshotDefFormat(uuid_string, &def, priv->caps, virDomainDefFormatConvertXMLFlags(flags), 0); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a70b866..0b02c68 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2605,6 +2605,7 @@ qemuFindQemuImgBinary(virQEMUDriverPtr driver) int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virDomainSnapshotObjPtr snapshot, + virCapsPtr caps, char *snapshotDir) { char *newxml = NULL; @@ -2615,7 +2616,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virUUIDFormat(vm->def->uuid, uuidstr); newxml = virDomainSnapshotDefFormat( - uuidstr, snapshot->def, + uuidstr, snapshot->def, caps, virDomainDefFormatConvertXMLFlags(QEMU_DOMAIN_FORMAT_LIVE_FLAGS), 1); if (newxml == NULL) @@ -2775,7 +2776,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, snap->def->parent); } else { parentsnap->def->current = true; - if (qemuDomainSnapshotWriteMetadata(vm, parentsnap, + if (qemuDomainSnapshotWriteMetadata(vm, parentsnap, driver->caps, cfg->snapshotDir) < 0) { VIR_WARN("failed to set parent snapshot '%s' as current", snap->def->parent); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6a8cf70..7cabf10 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -375,6 +375,7 @@ const char *qemuFindQemuImgBinary(virQEMUDriverPtr driver); int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virDomainSnapshotObjPtr snapshot, + virCapsPtr caps, char *snapshotDir); int qemuDomainSnapshotForEachQcow2(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d623831..2e283a9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14908,6 +14908,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, if (update_current) { vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, + driver->caps, cfg->snapshotDir) < 0) goto endjob; vm->current_snapshot = NULL; @@ -14956,7 +14957,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, endjob: if (snapshot && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - if (qemuDomainSnapshotWriteMetadata(vm, snap, + if (qemuDomainSnapshotWriteMetadata(vm, snap, driver->caps, cfg->snapshotDir) < 0) { /* if writing of metadata fails, error out rather than trying * to silently carry on without completing the snapshot */ @@ -15275,6 +15276,7 @@ static char * qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; @@ -15293,7 +15295,7 @@ qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virUUIDFormat(snapshot->domain->uuid, uuidstr); - xml = virDomainSnapshotDefFormat(uuidstr, snap->def, + xml = virDomainSnapshotDefFormat(uuidstr, snap->def, driver->caps, virDomainDefFormatConvertXMLFlags(flags), 0); @@ -15474,7 +15476,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (vm->current_snapshot) { vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, - cfg->snapshotDir) < 0) + driver->caps, cfg->snapshotDir) < 0) goto endjob; vm->current_snapshot = NULL; /* XXX Should we restore vm->current_snapshot after this point @@ -15709,7 +15711,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, cleanup: if (ret == 0) { - if (qemuDomainSnapshotWriteMetadata(vm, snap, + if (qemuDomainSnapshotWriteMetadata(vm, snap, driver->caps, cfg->snapshotDir) < 0) ret = -1; else @@ -15736,6 +15738,7 @@ struct _virQEMUSnapReparent { virQEMUDriverConfigPtr cfg; virDomainSnapshotObjPtr parent; virDomainObjPtr vm; + virCapsPtr caps; int err; virDomainSnapshotObjPtr last; }; @@ -15764,7 +15767,7 @@ qemuDomainSnapshotReparentChildren(void *payload, if (!snap->sibling) rep->last = snap; - rep->err = qemuDomainSnapshotWriteMetadata(rep->vm, snap, + rep->err = qemuDomainSnapshotWriteMetadata(rep->vm, snap, rep->caps, rep->cfg->snapshotDir); } @@ -15833,7 +15836,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (rem.current) { if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) { snap->def->current = true; - if (qemuDomainSnapshotWriteMetadata(vm, snap, + if (qemuDomainSnapshotWriteMetadata(vm, snap, driver->caps, cfg->snapshotDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to set snapshot '%s' as current"), @@ -15850,6 +15853,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, rep.vm = vm; rep.err = 0; rep.last = NULL; + rep.caps = driver->caps; virDomainSnapshotForEachChild(snap, qemuDomainSnapshotReparentChildren, &rep); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 89973f6..fde5e2d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6087,6 +6087,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; + testDriverPtr privconn = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); @@ -6098,7 +6099,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virUUIDFormat(snapshot->domain->uuid, uuidstr); - xml = virDomainSnapshotDefFormat(uuidstr, snap->def, + xml = virDomainSnapshotDefFormat(uuidstr, snap->def, privconn->caps, virDomainDefFormatConvertXMLFlags(flags), 0); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index cf38d2a..d1eb09a 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5221,7 +5221,7 @@ vboxSnapshotRedefine(virDomainPtr dom, VIR_FREE(currentSnapshotXmlFilePath); if (virAsprintf(&currentSnapshotXmlFilePath, "%s%s.xml", machineLocationPath, snapshotMachineDesc->currentSnapshot) < 0) goto cleanup; - char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, VIR_DOMAIN_DEF_FORMAT_SECURE, 0); + char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, data->caps, VIR_DOMAIN_DEF_FORMAT_SECURE, 0); if (snapshotContent == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to get snapshot content")); @@ -6146,7 +6146,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virUUIDFormat(dom->uuid, uuidstr); memcpy(def->dom->uuid, dom->uuid, VIR_UUID_BUFLEN); - ret = virDomainSnapshotDefFormat(uuidstr, def, + ret = virDomainSnapshotDefFormat(uuidstr, def, data->caps, virDomainDefFormatConvertXMLFlags(flags), 0); diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index cf91447..714d64f 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -100,7 +100,7 @@ testCompareXMLToXMLFiles(const char *inxml, flags))) goto cleanup; - if (!(actual = virDomainSnapshotDefFormat(uuid, def, + if (!(actual = virDomainSnapshotDefFormat(uuid, def, driver.caps, VIR_DOMAIN_DEF_FORMAT_SECURE, internal))) goto cleanup; -- 2.1.4

2 1

[libvirt] [PATCH v3 0/8 RESEND] add close callback for drivers with persistent connection
by Nikolay Shirokovskiy 05 Feb '16

05 Feb '16

Rebase on master. Currently close callback API can only inform us of closing the connection between remote driver and daemon. But what if a driver running in the daemon itself can have another persistent connection? In this case we want to be informed of that connection changes state too. This patch series extends meaning of current close callback API so that now it notifies of closing of any internal persistent connection. The overall approach is to move close callback support to drivers. Changes from v2: Split patches further to make it more comprehensible. Nikolay Shirokovskiy (8): factor out virConnectCloseCallbackDataPtr methods virConnectCloseCallbackData: fix connection object refcount virConnectCloseCallbackData: factor out callback disarming close callback API: remove unnecessary locks virConnectCloseCallbackDataDispose: remove unnecessary locks close callback: move it to driver daemon: add connection close rpc vz: implement connection close notification daemon/libvirtd.h | 1 + daemon/remote.c | 84 ++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + src/datatypes.c | 113 +++++++++++++++++++++++++++++++++---------- src/datatypes.h | 11 +++++ src/driver-hypervisor.h | 12 +++++ src/libvirt-host.c | 46 ++---------------- src/remote/remote_driver.c | 106 ++++++++++++++++++++++++++++++++-------- src/remote/remote_protocol.x | 24 ++++++++- src/remote_protocol-structs | 6 +++ src/vz/vz_driver.c | 39 +++++++++++++++ src/vz/vz_sdk.c | 4 ++ src/vz/vz_utils.h | 3 ++ 13 files changed, 363 insertions(+), 87 deletions(-) -- 1.8.3.1

2 17

[libvirt] [PATCH] bhyve: fix build
by Roman Bogorodskiy 05 Feb '16

05 Feb '16

Fix build fail introduced as a side effect of commit d239a54. Pushed under the build breaker rule. --- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 337a29e..f486f86 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -488,7 +488,7 @@ bhyveDomainGetOSType(virDomainPtr dom) static char * bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { - bhyveConnPtr privconn = conn->privateData; + bhyveConnPtr privconn = domain->conn->privateData; virDomainObjPtr vm; virCapsPtr caps = NULL; char *ret = NULL; -- 2.4.6

1 0

[libvirt] [PATCH] libxl: support <hap> feature
by Jim Fehlig 04 Feb '16

04 Feb '16

Even though the libxl driver advertises <hap> in capabilities, it is ignored when set in domXML. Enable hap in the libxl_domain_create_info struct when <hap> is specified in domXML. The xm/xl <-> domXML parser/formatter already supports hap but lacked a test with hap enabled. Add a hap test. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 8 ++++-- tests/xlconfigdata/test-fullvirt-hap.cfg | 27 ++++++++++++++++++++ tests/xlconfigdata/test-fullvirt-hap.xml | 42 ++++++++++++++++++++++++++++++++ tests/xlconfigtest.c | 1 + 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6320421..a531fdb 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -507,10 +507,14 @@ libxlMakeDomCreateInfo(libxl_ctx *ctx, libxl_domain_create_info_init(c_info); - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { c_info->type = LIBXL_DOMAIN_TYPE_HVM; - else + libxl_defbool_set(&c_info->hap, + def->features[VIR_DOMAIN_FEATURE_HAP] == + VIR_TRISTATE_SWITCH_ON); + } else { c_info->type = LIBXL_DOMAIN_TYPE_PV; + } if (VIR_STRDUP(c_info->name, def->name) < 0) goto error; diff --git a/tests/xlconfigdata/test-fullvirt-hap.cfg b/tests/xlconfigdata/test-fullvirt-hap.cfg new file mode 100644 index 0000000..aa1d79f --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-hap.cfg @@ -0,0 +1,27 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +hap = 1 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] +parallel = "none" +serial = "none" +builder = "hvm" +boot = "d" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy" ] diff --git a/tests/xlconfigdata/test-fullvirt-hap.xml b/tests/xlconfigdata/test-fullvirt-hap.xml new file mode 100644 index 0000000..f50b672 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-hap.xml @@ -0,0 +1,42 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + <hap/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index bad69ca..3962e70 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -209,6 +209,7 @@ mymain(void) DO_TEST("vif-rate"); DO_TEST("paravirt-cmdline"); + DO_TEST("fullvirt-hap"); DO_TEST_FORMAT("paravirt-cmdline-extra-root"); DO_TEST_FORMAT("paravirt-cmdline-bogus-extra-root"); -- 2.1.4

2 5

[libvirt] [PATCH v3 0/3] libxl: p2p migration support
by Joao Martins 04 Feb '16

04 Feb '16

Hey, This series adds support for p2p migration: Patch 2 and 3 are new in this series and it's purpose is to take the LIBXL_JOB_MODIFY as mentioned in the last review. Changelog in individual patches. Thanks, Joao Joao Martins (3): libxl: add p2p migration libxl: move begin phase job handling libxl: begin job on perform phase src/libxl/libxl_driver.c | 36 +++++++- src/libxl/libxl_migration.c | 219 +++++++++++++++++++++++++++++++++++++++++--- src/libxl/libxl_migration.h | 11 +++ 3 files changed, 250 insertions(+), 16 deletions(-) -- 2.1.4

2 11

[libvirt] [PATCH] conf: add caps to virDomainObjFormat/SaveStatus
by Daniel P. Berrange 04 Feb '16

04 Feb '16

The virDomainObjFormat and virDomainSaveStatus methods both call into virDomainDefFormat, so should be providing a non-NULL virCapsPtr instance. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/bhyve/bhyve_process.c | 15 +++++++++++-- src/conf/domain_conf.c | 10 +++++---- src/conf/domain_conf.h | 4 +++- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 14 ++++++------ src/libxl/libxl_migration.c | 4 ++-- src/lxc/lxc_driver.c | 12 +++++------ src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_driver.c | 52 ++++++++++++++++++++++----------------------- src/qemu/qemu_migration.c | 6 +++--- src/qemu/qemu_process.c | 36 +++++++++++++++---------------- 13 files changed, 90 insertions(+), 75 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 42255d2..9763d71 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -115,11 +115,15 @@ virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr privconn = conn->privateData; bhyveDomainObjPrivatePtr priv = vm->privateData; int ret = -1, rc; + virCapsPtr caps = NULL; if (virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name) < 0) return -1; + caps = bhyveDriverGetCapabilities(privconn); + if (!caps) + goto cleanup; if ((logfd = open(logfile, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR)) < 0) { @@ -215,12 +219,13 @@ virBhyveProcessStart(virConnectPtr conn, if (virDomainSaveStatus(driver->xmlopt, BHYVE_STATE_DIR, - vm) < 0) + vm, caps) < 0) goto cleanup; ret = 0; cleanup: + virObjectUnref(caps); if (devicemap != NULL) { rc = unlink(devmap_file); if (rc < 0 && errno != ENOENT) @@ -362,6 +367,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, char *expected_proctitle = NULL; bhyveDomainObjPrivatePtr priv = vm->privateData; int ret = -1; + virCapsPtr caps = NULL; if (!virDomainObjIsActive(vm)) return 0; @@ -369,6 +375,10 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (!vm->pid) return 0; + caps = bhyveDriverGetCapabilities(privconn); + if (!caps) + return -1; + virObjectLock(vm); kp = kvm_getprocs(data->kd, KERN_PROC_PID, vm->pid, &nprocs); @@ -397,9 +407,10 @@ virBhyveProcessReconnect(virDomainObjPtr vm, VIR_DOMAIN_SHUTOFF_UNKNOWN); ignore_value(virDomainSaveStatus(data->driver->xmlopt, BHYVE_STATE_DIR, - vm)); + vm, caps)); } + virObjectUnref(caps); virObjectUnlock(vm); VIR_FREE(expected_proctitle); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 035e5e1..187495c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22516,6 +22516,7 @@ virDomainDefFormat(virDomainDefPtr def, virCapsPtr caps, unsigned int flags) char * virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virDomainObjPtr obj, + virCapsPtr caps, unsigned int flags) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -22540,7 +22541,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, xmlopt->privateData.format(&buf, obj) < 0) goto error; - if (virDomainDefFormatInternal(obj->def, NULL, flags, &buf) < 0) + if (virDomainDefFormatInternal(obj->def, caps, flags, &buf) < 0) goto error; virBufferAdjustIndent(&buf, -2); @@ -22746,7 +22747,8 @@ virDomainSaveConfig(const char *configDir, int virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, const char *statusDir, - virDomainObjPtr obj) + virDomainObjPtr obj, + virCapsPtr caps) { unsigned int flags = (VIR_DOMAIN_DEF_FORMAT_SECURE | VIR_DOMAIN_DEF_FORMAT_STATUS | @@ -22757,7 +22759,7 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, int ret = -1; char *xml; - if (!(xml = virDomainObjFormat(xmlopt, obj, flags))) + if (!(xml = virDomainObjFormat(xmlopt, obj, caps, flags))) goto cleanup; if (virDomainSaveXML(statusDir, obj->def, xml)) @@ -23906,7 +23908,7 @@ virDomainObjSetMetadata(virDomainObjPtr vm, if (virDomainDefSetMetadata(vm->def, type, metadata, key, uri) < 0) return -1; - if (virDomainSaveStatus(xmlopt, stateDir, vm) < 0) + if (virDomainSaveStatus(xmlopt, stateDir, vm, caps) < 0) return -1; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8843cbd..79060bc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2738,6 +2738,7 @@ char *virDomainDefFormat(virDomainDefPtr def, unsigned int flags); char *virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virDomainObjPtr obj, + virCapsPtr caps, unsigned int flags); int virDomainDefFormatInternal(virDomainDefPtr def, virCapsPtr caps, @@ -2912,7 +2913,8 @@ int virDomainSaveConfig(const char *configDir, virDomainDefPtr def); int virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, const char *statusDir, - virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; + virDomainObjPtr obj, + virCapsPtr caps) ATTRIBUTE_RETURN_CHECK; typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cf27ec4..1133c8b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1086,7 +1086,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto cleanup_dom; if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d2114ca..2a6c2de 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1139,7 +1139,7 @@ libxlDomainSuspend(virDomainPtr dom) VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto endjob; ret = 0; @@ -1198,7 +1198,7 @@ libxlDomainResume(virDomainPtr dom) VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto endjob; ret = 0; @@ -2231,7 +2231,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = 0; if (flags & VIR_DOMAIN_VCPU_LIVE) { - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) { VIR_WARN("Unable to save status on vm %s after changing vcpus", vm->def->name); } @@ -2392,7 +2392,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, ret = 0; if (flags & VIR_DOMAIN_AFFECT_LIVE) { - ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm); + ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps); } else if (flags & VIR_DOMAIN_AFFECT_CONFIG) { ret = virDomainSaveConfig(cfg->configDir, cfg->caps, targetDef); } @@ -3742,7 +3742,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, * update domain status forcibly because the domain status may be * changed even if we attach the device failed. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto endjob; } @@ -3850,7 +3850,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, * update domain status forcibly because the domain status may be * changed even if we attach the device failed. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto endjob; } @@ -3957,7 +3957,7 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, * update domain status forcibly because the domain status may be * changed even if we attach the device failed. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) ret = -1; } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 93eaa87..641bd4e 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -564,7 +564,7 @@ libxlDomainMigrationFinish(virConnectPtr dconn, event = NULL; } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto cleanup; dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); @@ -607,7 +607,7 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, VIR_DOMAIN_PAUSED_MIGRATION); event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); - ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps)); } goto cleanup; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 58c9bb4..b3399d9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -765,7 +765,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, } vm->def->mem.cur_balloon = newmem; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; } @@ -2022,7 +2022,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; @@ -3402,7 +3402,7 @@ static int lxcDomainSuspend(virDomainPtr dom) VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; ret = 0; @@ -3452,7 +3452,7 @@ static int lxcDomainResume(virDomainPtr dom) VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; ret = 0; @@ -5075,7 +5075,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom, * changed even if we failed to attach the device. For example, * a new controller may be created. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { ret = -1; goto cleanup; } @@ -5317,7 +5317,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, * changed even if we failed to attach the device. For example, * a new controller may be created. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { ret = -1; goto cleanup; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 3ee3b13..2ece14b 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -767,7 +767,7 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED } virDomainAuditInit(vm, initpid, inode); - if (virDomainSaveStatus(lxc_driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(lxc_driver->xmlopt, cfg->stateDir, vm, lxc_driver->caps) < 0) VIR_WARN("Cannot update XML with PID for LXC %s", vm->def->name); virObjectUnlock(vm); @@ -1469,7 +1469,7 @@ int virLXCProcessStart(virConnectPtr conn, /* Write domain status to disk for the controller to * read when it starts */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; /* Allow the child to exec the controller */ diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index f14e70b..83a5a3f 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -185,7 +185,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, } if (save) { - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Unable to save status on vm %s after block job", vm->def->name); if (persistDisk && virDomainSaveConfig(cfg->configDir, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a70b866..9d08f4f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1489,7 +1489,7 @@ qemuDomainObjSaveJob(virQEMUDriverPtr driver, virDomainObjPtr obj) virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); if (virDomainObjIsActive(obj)) { - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, obj) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, obj, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", obj->def->name); } @@ -2905,7 +2905,7 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver, priv->fakeReboot = value; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d623831..9f38ce2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1932,7 +1932,7 @@ static int qemuDomainSuspend(virDomainPtr dom) eventDetail); } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; ret = 0; @@ -1995,7 +1995,7 @@ static int qemuDomainResume(virDomainPtr dom) VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; ret = 0; @@ -2549,7 +2549,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, } def->memballoon->period = period; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } @@ -4143,7 +4143,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, } cleanup: - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); } @@ -4177,7 +4177,7 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, if (qemuDomainRemoveDevice(driver, vm, &dev) < 0) goto endjob; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("unable to save domain status after removing device %s", devAlias); @@ -4545,7 +4545,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, dev.data.chr->state = newstate; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("unable to save status of domain %s after updating state of " "channel %s", vm->def->name, devAlias); @@ -5084,7 +5084,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } @@ -5263,7 +5263,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, def->cputune.nvcpupin = newVcpuPinNum; newVcpuPin = NULL; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH, @@ -5480,7 +5480,7 @@ qemuDomainPinEmulator(virDomainPtr dom, if (!(def->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) goto endjob; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; str = virBitmapFormat(pcpumap); @@ -5967,7 +5967,7 @@ qemuDomainPinIOThread(virDomainPtr dom, } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH, @@ -6277,7 +6277,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, goto endjob; } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } @@ -6835,7 +6835,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, "%s", _("failed to resume domain")); goto cleanup; } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Failed to save status on vm %s", vm->def->name); goto cleanup; } @@ -8610,7 +8610,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, * changed even if we failed to attach the device. For example, * a new controller may be created. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { ret = -1; goto endjob; } @@ -8736,7 +8736,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, * changed even if we failed to attach the device. For example, * a new controller may be created. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { ret = -1; goto endjob; } @@ -8856,7 +8856,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, * changed even if we failed to attach the device. For example, * a new controller may be created. */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { ret = -1; goto endjob; } @@ -9387,7 +9387,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } if (ret < 0) @@ -9975,7 +9975,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, #undef QEMU_SET_MEM_PARAMETER if (flags & VIR_DOMAIN_AFFECT_LIVE && - virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG && @@ -10244,7 +10244,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, -1, mode, nodeset) < 0) goto endjob; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } @@ -10607,7 +10607,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, } } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; if (eventNparams) { @@ -11389,7 +11389,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, goto endjob; } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto endjob; } @@ -14521,7 +14521,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, } if (ret == 0 || !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) { - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0 || + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 || (persist && virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef) < 0)) ret = -1; @@ -16527,7 +16527,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, * effort to save it now. But we can ignore failure, since there * will be further changes when the event marks completion. */ if (save) - ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps)); /* With synchronous block cancel, we must synthesize an event, and * we silently ignore the ABORT_ASYNC flag. With asynchronous @@ -16649,7 +16649,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; - ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps)); virObjectUnref(cfg); } endjob: @@ -16902,7 +16902,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY; QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob = true; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); @@ -17301,7 +17301,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); mirror = NULL; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Unable to save status on vm %s after block job", vm->def->name); virObjectUnref(cfg); @@ -17789,7 +17789,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto endjob; vm->def->disks[idx]->blkdeviotune = info; - ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm); + ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps); if (ret < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Saving live XML config failed")); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2f5b368..b98757d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2128,7 +2128,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, } diskPriv->migrating = true; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Failed to save status on vm %s", vm->def->name); goto cleanup; } @@ -4012,7 +4012,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); } - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); } @@ -5954,7 +5954,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (virDomainObjIsActive(vm) && - virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); /* Guest is successfully running, so cancel previous auto destroy */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 58f8f4f..8ed6c3a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -504,7 +504,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); virObjectUnlock(vm); @@ -571,7 +571,7 @@ qemuProcessFakeReboot(void *opaque) VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); } @@ -675,7 +675,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_SHUTDOWN, VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); } @@ -728,7 +728,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); } @@ -781,7 +781,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } VIR_FREE(priv->lockState); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name); } @@ -825,7 +825,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, offset += vm->def->clock.data.variable.adjustment0; vm->def->clock.data.variable.adjustment = offset; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("unable to save domain status with RTC change"); } @@ -868,7 +868,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after watchdog event", vm->def->name); } @@ -951,7 +951,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Unable to save status on vm %s after IO error", vm->def->name); } virObjectUnlock(vm); @@ -1133,7 +1133,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, else if (reason == VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE) disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after tray moved event", vm->def->name); } @@ -1173,7 +1173,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_WAKEUP); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after wakeup event", vm->def->name); } @@ -1211,7 +1211,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after suspend event", vm->def->name); } @@ -1245,7 +1245,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm->def->mem.cur_balloon, actual); vm->def->mem.cur_balloon = actual; - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("unable to save domain status with balloon change"); virObjectUnlock(vm); @@ -1280,7 +1280,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED_DISK); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after suspend event", vm->def->name); } @@ -2901,7 +2901,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, return -1; cfg = virQEMUDriverGetConfig(driver); - ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm); + ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps); virObjectUnref(cfg); return ret; @@ -3605,7 +3605,7 @@ qemuProcessReconnect(void *opaque) goto error; /* update domain state XML with possibly updated state in virDomainObj */ - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, obj) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, obj, driver->caps) < 0) goto error; /* Run an hook to allow admins to do some magic */ @@ -4854,7 +4854,7 @@ qemuProcessLaunch(virConnectPtr conn, } VIR_DEBUG("Writing early domain status to disk"); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; VIR_DEBUG("Waiting for handshake from child"); @@ -5066,7 +5066,7 @@ qemuProcessFinishStartup(virConnectPtr conn, } VIR_DEBUG("Writing domain status to disk"); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto cleanup; if (qemuProcessStartHook(driver, vm, @@ -5699,7 +5699,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_DEBUG("Writing domain status to disk"); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) goto error; /* Run an hook to allow admins to do some magic */ -- 2.5.0

2 1

[libvirt] [PATCH] Fix build after recent patches
by Peter Krempa 04 Feb '16

04 Feb '16

Few build breaking mistakes in less-popular parts of our code. --- Pushed under the build-breaker rule. src/security/security_apparmor.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 2cf333d..af2b639 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -181,7 +181,7 @@ load_profile(virSecurityManagerPtr mgr, const char *probe = virSecurityManagerGetAllowDiskFormatProbing(mgr) ? "1" : "0"; - xml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE); + xml = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE); if (!xml) goto cleanup; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index c4f33b9..f75f138 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1402,7 +1402,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) xen_vm vm = NULL; xen_vm_set *vms; xen_string_string_map *result = NULL; - struct _xenapiPrivate *priv = conn->privateData; + struct _xenapiPrivate *priv = dom->conn->privateData; xen_session *session = priv->session; virDomainDefPtr defPtr = NULL; char *boot_policy = NULL; -- 2.6.2

1 0

[libvirt] [PATCH RFC v2 0/5] conf: add net device prefix capability
by Joao Martins 04 Feb '16

04 Feb '16

Hey, Back in the pre 1.3.0 release [0] we had a regression when migrating domains in libxl (introduced by the reverted commit d2e5538b1). The chosen solution to address this problem was to introduce a capability to be used by the virDomainNetDefFormat() and virDomainNetDefParseXML() routines. RFCv1 implemented this by "caching" netprefix in the domain definition[1]; as suggested in the review[1] v2 implements it by adding the virCapsPtr to the relevant APIs and also propagating the API change to all drivers. It is divided as follows: Patch 1: Adds prefix to capabilites Patch 2: Add prefix to NetDefParseXML Patch 3,4: API changes to include virCapsPtr and netprefix (New) Patch 5: set prefix on libxl (Acked) Having this series and the reverted commit applied, I can successfully migrate a domain without seeing the same interface name on both source and destination node with libxl. Note: I haven't been able to compile-test all drivers, specifically bhyve, vz and hyperv. Testing was made with libxl. Thanks! Joao [0] https://www.redhat.com/archives/libvir-list/2015-December/msg00279.html [1] https://www.redhat.com/archives/libvir-list/2016-January/msg00886.html Joao Martins (5): conf: add net device prefix to capabilities conf: add prefix in virDomainNetDefParseXML conf: add caps to virDomainDefFormat* conf: add caps to virDomainSaveConfig libxl: set net device prefix src/bhyve/bhyve_driver.c | 11 +++++++++-- src/conf/capabilities.c | 22 +++++++++++++++++++++ src/conf/capabilities.h | 4 ++++ src/conf/domain_conf.c | 42 +++++++++++++++++++++++++++------------- src/conf/domain_conf.h | 4 ++++ src/conf/snapshot_conf.c | 2 +- src/esx/esx_driver.c | 5 +++-- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 3 +++ src/libxl/libxl_conf.h | 4 ++++ src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 24 +++++++++++++---------- src/libxl/libxl_migration.c | 2 +- src/lxc/lxc_driver.c | 24 +++++++++++++---------- src/lxc/lxc_process.c | 12 ++++++------ src/network/bridge_driver.c | 4 ++-- src/openvz/openvz_driver.c | 5 +++-- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_blockjob.c | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 47 +++++++++++++++++++++++++-------------------- src/qemu/qemu_migration.c | 3 ++- src/qemu/qemu_process.c | 5 +++-- src/test/test_driver.c | 6 ++++-- src/uml/uml_driver.c | 4 ++-- src/vbox/vbox_common.c | 3 ++- src/vmware/vmware_driver.c | 5 +++-- src/vz/vz_driver.c | 3 ++- src/xen/xen_driver.c | 4 ++-- src/xenapi/xenapi_driver.c | 5 +++-- tests/lxcconf2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuhotplugtest.c | 3 ++- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 2 +- tests/vmx2xmltest.c | 3 ++- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- 39 files changed, 184 insertions(+), 97 deletions(-) -- 2.1.4

2 13

[libvirt] [PATCH v3 0/4] Some logical pool/volume changes
by John Ferlan 04 Feb '16

04 Feb '16

v2: http://www.redhat.com/archives/libvir-list/2016-January/msg01249.html Adjustments here Patches 1-3 are based off of review comments from patch2 of v2. The changes for patch2 of v2 are dropped. Patch 4 is a combination of patches 3 and 6 (mostly).... A couple of minor adjustments to utilize "attrs[0] == 'V'" and checking whether the 'devices' field to be parsed is neither NULL nor an empty string. Patches 4&5 from v2 are dropped. The resulting output will then be: <volume type='block'> <name>lv_test_thin</name> ... <source> </source> ... John Ferlan (4): logical: Use VIR_APPEND_ELEMENT instead of VIR_REALLOC_N logical: Use 'stripes' value for mirror/raid segtype logical: Clean up allocation when building regex on the fly logical: Display thin lv's found in a libvirt managed volume group src/conf/storage_conf.h | 2 +- src/storage/storage_backend_logical.c | 60 ++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 23 deletions(-) -- 2.5.0

3 15

[libvirt] [PATCH v3] systemd: Modernize machine naming
by Martin Kletzander 04 Feb '16

04 Feb '16

So, systemd-machined has this philosophy that machine names are like hostnames and hence should follow the same rules. But we always allowed international characters in domain names. Thus we need to modify the machine name we are passing to systemd. In order to change some machine names that we will be passing to systemd, we also need to call TerminateMachine at the end of a lifetime of a domain. Even for domains that were started with older libvirt. That can be achieved thanks to virSystemdGetMachineNameByPID(). And because we can change machine names, we can get rid of the inconsistent and pointless escaping of domain names when creating machine names. So this patch modifies the naming in the following way. It creates the name as <drivername>-<id>-<name> where invalid hostname characters are stripped out of the name and if the resulting name is longer, it truncates it to 64 characters. That way we can start domains we couldn't start before. Well, at least on systemd. To make it work all together, the machineName (which is needed only with systemd) is saved in domain's private data. That way the generation is moved to the driver and we don't need to pass various unnecessary arguments to cgroup functions. The only thing this complicates a bit is the scope generation when validating a cgroup where we must check both old and new naming, so a slight modification was needed there. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_cgroup.c | 13 +++++++-- src/lxc/lxc_domain.h | 1 + src/lxc/lxc_process.c | 20 +++++++++---- src/qemu/qemu_cgroup.c | 28 +++++++++++++----- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 4 +-- src/util/vircgroup.c | 59 ++++++++++++++++++++++++-------------- src/util/vircgroup.h | 12 ++++---- src/util/virsystemd.c | 75 +++++++++++++++++++++++++++++++++---------------- src/util/virsystemd.h | 13 ++++----- tests/virsystemdtest.c | 67 +++++++++++++++++++++++++------------------ 12 files changed, 191 insertions(+), 104 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index ad254e4934fc..31489466cfbf 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -29,6 +29,7 @@ #include "viralloc.h" #include "vircgroup.h" #include "virstring.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -483,6 +484,13 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, int *nicindexes) { virCgroupPtr cgroup = NULL; + char *machineName = virSystemdMakeMachineName("lxc", + def->id, + def->name, + true); + + if (!machineName) + goto cleanup; if (def->resource->partition[0] != '/') { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -491,9 +499,8 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, goto cleanup; } - if (virCgroupNewMachine(def->name, + if (virCgroupNewMachine(machineName, "lxc", - true, def->uuid, NULL, initpid, @@ -517,6 +524,8 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, } cleanup: + VIR_FREE(machineName); + return cgroup; } diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 2119c7899007..39c6e7def9ce 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -64,6 +64,7 @@ struct _virLXCDomainObjPrivate { pid_t initpid; virCgroupPtr cgroup; + char *machineName; }; extern virDomainXMLNamespace virLXCDriverDomainXMLNamespace; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f7e2b810b74b..9b3981eab20d 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -233,8 +233,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for * the bug we are working around here. */ - virSystemdTerminateMachine(vm->def->name, "lxc", true); - + virCgroupTerminateMachine(priv->machineName); /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -1494,8 +1493,9 @@ int virLXCProcessStart(virConnectPtr conn, * point so lets detect that first, since it gives us a * more reliable way to kill everything off if something * goes wrong from here onwards ... */ - if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - -1, &priv->cgroup) < 0) + if (virCgroupNewDetectMachine(vm->def->name, "lxc", + vm->def->id, true, + vm->pid, -1, &priv->cgroup) < 0) goto cleanup; if (!priv->cgroup) { @@ -1505,6 +1505,11 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } + /* Get the machine name so we can properly delete it through + * systemd later */ + if (!(priv->machineName = virSystemdGetMachineNameByPID(vm->pid))) + virResetLastError(); + /* And we can get the first monitor connection now too */ if (!(priv->monitor = virLXCProcessConnectMonitor(driver, vm))) { /* Intentionally overwrite the real monitor error message, @@ -1677,8 +1682,8 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, if (!(priv->monitor = virLXCProcessConnectMonitor(driver, vm))) goto error; - if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - -1, &priv->cgroup) < 0) + if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->def->id, true, + vm->pid, -1, &priv->cgroup) < 0) goto error; if (!priv->cgroup) { @@ -1688,6 +1693,9 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, goto error; } + if (!(priv->machineName = virSystemdGetMachineNameByPID(vm->pid))) + virResetLastError(); + if (virLXCUpdateActiveUSBHostdevs(driver, vm->def) < 0) goto error; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e41f4617c455..12c81d9eb70b 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -36,6 +36,7 @@ #include "virfile.h" #include "virtypedparam.h" #include "virnuma.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -772,9 +773,19 @@ qemuInitCgroup(virQEMUDriverPtr driver, goto cleanup; } - if (virCgroupNewMachine(vm->def->name, + /* + * We need to do this because of systemd-machined, because + * CreateMachine requires the name to be a valid hostname. + */ + priv->machineName = virSystemdMakeMachineName("qemu", + vm->def->id, + vm->def->name, + virQEMUDriverIsPrivileged(driver)); + if (!priv->machineName) + goto cleanup; + + if (virCgroupNewMachine(priv->machineName, "qemu", - true, vm->def->uuid, NULL, vm->pid, @@ -888,11 +899,17 @@ qemuConnectCgroup(virQEMUDriverPtr driver, if (virCgroupNewDetectMachine(vm->def->name, "qemu", + vm->def->id, + virQEMUDriverIsPrivileged(driver), vm->pid, cfg->cgroupControllers, &priv->cgroup) < 0) goto cleanup; + priv->machineName = virSystemdGetMachineNameByPID(vm->pid); + if (!priv->machineName) + virResetLastError(); + qemuRestoreCgroupState(vm); done: @@ -1264,17 +1281,14 @@ qemuSetupCgroupForIOThreads(virDomainObjPtr vm) } int -qemuRemoveCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuRemoveCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; if (priv->cgroup == NULL) return 0; /* Not supported, so claim success */ - if (virCgroupTerminateMachine(vm->def->name, - "qemu", - virQEMUDriverIsPrivileged(driver)) < 0) { + if (virCgroupTerminateMachine(priv->machineName) < 0) { if (!virCgroupNewIgnoreError()) VIR_DEBUG("Failed to terminate cgroup for %s", vm->def->name); } diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 2bcf071d3792..347d126f7394 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -56,7 +56,7 @@ int qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup, virBitmapPtr cpumask); int qemuSetupCgroupForVcpu(virDomainObjPtr vm); int qemuSetupCgroupForIOThreads(virDomainObjPtr vm); int qemuSetupCgroupForEmulator(virDomainObjPtr vm); -int qemuRemoveCgroup(virQEMUDriverPtr driver, virDomainObjPtr vm); +int qemuRemoveCgroup(virDomainObjPtr vm); int qemuAddToCgroup(virDomainObjPtr vm); #endif /* __QEMU_CGROUP_H__ */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6a8cf705d8af..ab798faf0fb0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -203,6 +203,7 @@ struct _qemuDomainObjPrivate { bool signalIOError; /* true if the domain condition should be signalled on I/O error */ + char *machineName; }; # define QEMU_DOMAIN_DISK_PRIVATE(disk) \ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b09ba73896b..b3f8c93d1a93 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4610,7 +4610,7 @@ qemuProcessLaunch(virConnectPtr conn, /* Ensure no historical cgroup for this VM is lying around bogus * settings */ VIR_DEBUG("Ensuring no historical cgroup is lying around"); - qemuRemoveCgroup(driver, vm); + qemuRemoveCgroup(vm); VIR_DEBUG("Setting up ports for graphics"); if (qemuProcessSetupGraphics(driver, vm) < 0) @@ -5405,7 +5405,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, } retry: - if ((ret = qemuRemoveCgroup(driver, vm)) < 0) { + if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); goto retry; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index da0df7ae7a5e..e62793e31e2f 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -243,12 +243,17 @@ static bool virCgroupValidateMachineGroup(virCgroupPtr group, const char *name, const char *drivername, + int id, + bool privileged, bool stripEmulatorSuffix) { size_t i; bool valid = false; - char *partname; - char *scopename; + char *partname = NULL; + char *scopename_old = NULL; + char *scopename_new = NULL; + char *machinename = virSystemdMakeMachineName(drivername, id, + name, privileged); if (virAsprintf(&partname, "%s.libvirt-%s", name, drivername) < 0) @@ -257,10 +262,21 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (virCgroupPartitionEscape(&partname) < 0) goto cleanup; - if (!(scopename = virSystemdMakeScopeName(name, drivername))) + if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true))) goto cleanup; - if (virCgroupPartitionEscape(&scopename) < 0) + /* We should keep trying even if this failed */ + if (!machinename) + virResetLastError(); + else if (!(scopename_new = virSystemdMakeScopeName(machinename, + drivername, false))) + goto cleanup; + + if (virCgroupPartitionEscape(&scopename_old) < 0) + goto cleanup; + + if (scopename_new && + virCgroupPartitionEscape(&scopename_new) < 0) goto cleanup; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -290,12 +306,15 @@ virCgroupValidateMachineGroup(virCgroupPtr group, tmp++; if (STRNEQ(tmp, name) && + STRNEQ_NULLABLE(tmp, machinename) && STRNEQ(tmp, partname) && - STRNEQ(tmp, scopename)) { + STRNEQ(tmp, scopename_old) && + STRNEQ_NULLABLE(tmp, scopename_new)) { VIR_DEBUG("Name '%s' for controller '%s' does not match " - "'%s', '%s' or '%s'", + "'%s', '%s', '%s', '%s' or '%s'", tmp, virCgroupControllerTypeToString(i), - name, partname, scopename); + name, machinename, partname, + scopename_old, scopename_new); goto cleanup; } } @@ -304,7 +323,9 @@ virCgroupValidateMachineGroup(virCgroupPtr group, cleanup: VIR_FREE(partname); - VIR_FREE(scopename); + VIR_FREE(scopename_old); + VIR_FREE(scopename_new); + VIR_FREE(machinename); return valid; } @@ -1555,6 +1576,8 @@ virCgroupNewDetect(pid_t pid, int virCgroupNewDetectMachine(const char *name, const char *drivername, + int id, + bool privileged, pid_t pid, int controllers, virCgroupPtr *group) @@ -1565,7 +1588,8 @@ virCgroupNewDetectMachine(const char *name, return -1; } - if (!virCgroupValidateMachineGroup(*group, name, drivername, true)) { + if (!virCgroupValidateMachineGroup(*group, name, drivername, + id, privileged, true)) { VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'", name, drivername); virCgroupFree(group); @@ -1582,7 +1606,6 @@ virCgroupNewDetectMachine(const char *name, static int virCgroupNewMachineSystemd(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -1602,7 +1625,6 @@ virCgroupNewMachineSystemd(const char *name, VIR_DEBUG("Trying to setup machine '%s' via systemd", name); if ((rv = virSystemdCreateMachine(name, drivername, - privileged, uuid, rootdir, pidleader, @@ -1690,11 +1712,9 @@ virCgroupNewMachineSystemd(const char *name, /* * Returns 0 on success, -1 on fatal error */ -int virCgroupTerminateMachine(const char *name, - const char *drivername, - bool privileged) +int virCgroupTerminateMachine(const char *name) { - return virSystemdTerminateMachine(name, drivername, privileged); + return virSystemdTerminateMachine(name); } @@ -1749,7 +1769,6 @@ virCgroupNewMachineManual(const char *name, int virCgroupNewMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -1766,7 +1785,6 @@ virCgroupNewMachine(const char *name, if ((rv = virCgroupNewMachineSystemd(name, drivername, - privileged, uuid, rootdir, pidleader, @@ -4241,6 +4259,8 @@ virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED, int virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, const char *drivername ATTRIBUTE_UNUSED, + int id ATTRIBUTE_UNUSED, + bool privileged ATTRIBUTE_UNUSED, pid_t pid ATTRIBUTE_UNUSED, int controllers ATTRIBUTE_UNUSED, virCgroupPtr *group ATTRIBUTE_UNUSED) @@ -4251,9 +4271,7 @@ virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, } -int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED, - const char *drivername ATTRIBUTE_UNUSED, - bool privileged ATTRIBUTE_UNUSED) +int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform")); @@ -4264,7 +4282,6 @@ int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED, int virCgroupNewMachine(const char *name ATTRIBUTE_UNUSED, const char *drivername ATTRIBUTE_UNUSED, - bool privileged ATTRIBUTE_UNUSED, const unsigned char *uuid ATTRIBUTE_UNUSED, const char *rootdir ATTRIBUTE_UNUSED, pid_t pidleader ATTRIBUTE_UNUSED, diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index d754b1f3bd7a..bec88dc84e72 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -91,13 +91,15 @@ int virCgroupNewDetect(pid_t pid, int virCgroupNewDetectMachine(const char *name, const char *drivername, + int id, + bool privileged, pid_t pid, int controllers, - virCgroupPtr *group); + virCgroupPtr *group) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int virCgroupNewMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -110,10 +112,8 @@ int virCgroupNewMachine(const char *name, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); -int virCgroupTerminateMachine(const char *name, - const char *drivername, - bool privileged) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int virCgroupTerminateMachine(const char *name) + ATTRIBUTE_NONNULL(1); bool virCgroupNewIgnoreError(void); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 9e85e24b2c4b..37007aa915ec 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -27,6 +27,7 @@ #include "virsystemd.h" #include "viratomic.h" +#include "virbuffer.h" #include "virdbus.h" #include "virstring.h" #include "viralloc.h" @@ -78,15 +79,17 @@ static void virSystemdEscapeName(virBufferPtr buf, #undef VALID_CHARS } - char *virSystemdMakeScopeName(const char *name, - const char *drivername) + const char *drivername, + bool legacy_behaviour) { virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "machine-"); - virSystemdEscapeName(&buf, drivername); - virBufferAddLit(&buf, "\\x2d"); + if (legacy_behaviour) { + virSystemdEscapeName(&buf, drivername); + virBufferAddLit(&buf, "\\x2d"); + } virSystemdEscapeName(&buf, name); virBufferAddLit(&buf, ".scope"); @@ -113,10 +116,42 @@ char *virSystemdMakeSliceName(const char *partition) return virBufferContentAndReset(&buf); } +#define HOSTNAME_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-" + +static void +virSystemdAppendValidMachineName(virBufferPtr buf, + const char *name) +{ + bool skip_dot = false; + + for (; *name; name++) { + if (strlen(virBufferCurrentContent(buf)) >= 64) + break; + + if (*name == '.') { + if (!skip_dot) + virBufferAddChar(buf, *name); + skip_dot = true; + continue; + } + + skip_dot = false; + + if (!strchr(HOSTNAME_CHARS, *name)) + continue; + + virBufferAddChar(buf, *name); + } +} + +#undef HOSTNAME_CHARS -char *virSystemdMakeMachineName(const char *name, - const char *drivername, - bool privileged) +char * +virSystemdMakeMachineName(const char *drivername, + int id, + const char *name, + bool privileged) { char *machinename = NULL; char *username = NULL; @@ -131,7 +166,8 @@ char *virSystemdMakeMachineName(const char *name, virBufferAsprintf(&buf, "%s-%s-", username, drivername); } - virSystemdEscapeName(&buf, name); + virBufferAsprintf(&buf, "%d-", id); + virSystemdAppendValidMachineName(&buf, name); machinename = virBufferContentAndReset(&buf); cleanup: @@ -212,7 +248,6 @@ virSystemdGetMachineNameByPID(pid_t pid) */ int virSystemdCreateMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -223,7 +258,6 @@ int virSystemdCreateMachine(const char *name, { int ret; DBusConnection *conn; - char *machinename = NULL; char *creatorname = NULL; char *slicename = NULL; static int hasCreateWithNetwork = 1; @@ -239,8 +273,6 @@ int virSystemdCreateMachine(const char *name, return -1; ret = -1; - if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) - goto cleanup; if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) goto cleanup; @@ -318,7 +350,7 @@ int virSystemdCreateMachine(const char *name, "org.freedesktop.machine1.Manager", "CreateMachineWithNetwork", "sayssusa&ia(sv)", - machinename, + name, 16, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], @@ -360,7 +392,7 @@ int virSystemdCreateMachine(const char *name, "org.freedesktop.machine1.Manager", "CreateMachine", "sayssusa(sv)", - machinename, + name, 16, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], @@ -381,20 +413,19 @@ int virSystemdCreateMachine(const char *name, cleanup: VIR_FREE(creatorname); - VIR_FREE(machinename); VIR_FREE(slicename); return ret; } -int virSystemdTerminateMachine(const char *name, - const char *drivername, - bool privileged) +int virSystemdTerminateMachine(const char *name) { int ret; DBusConnection *conn; - char *machinename = NULL; virError error; + if (!name) + return 0; + memset(&error, 0, sizeof(error)); ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); @@ -409,9 +440,6 @@ int virSystemdTerminateMachine(const char *name, if (!(conn = virDBusGetSystemBus())) goto cleanup; - if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) - goto cleanup; - /* * The systemd DBus API we're invoking has the * following signature @@ -431,7 +459,7 @@ int virSystemdTerminateMachine(const char *name, "org.freedesktop.machine1.Manager", "TerminateMachine", "s", - machinename) < 0) + name) < 0) goto cleanup; if (error.code == VIR_ERR_ERROR && @@ -446,7 +474,6 @@ int virSystemdTerminateMachine(const char *name, cleanup: virResetError(&error); - VIR_FREE(machinename); return ret; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index a13a4c0c48be..93b0aae7e15f 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -25,16 +25,17 @@ # include "internal.h" char *virSystemdMakeScopeName(const char *name, - const char *drivername); + const char *drivername, + bool legacy_behaviour); char *virSystemdMakeSliceName(const char *partition); -char *virSystemdMakeMachineName(const char *name, - const char *drivername, +char *virSystemdMakeMachineName(const char *drivername, + int id, + const char *name, bool privileged); int virSystemdCreateMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -43,9 +44,7 @@ int virSystemdCreateMachine(const char *name, int *nicindexes, const char *partition); -int virSystemdTerminateMachine(const char *name, - const char *drivername, - bool privileged); +int virSystemdTerminateMachine(const char *name); void virSystemdNotifyStartup(void); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 3a3cd9968032..46452dd7436a 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -166,7 +166,6 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) }; if (virSystemdCreateMachine("demo", "lxc", - true, uuid, "/proc/123/root", 123, @@ -182,9 +181,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) { - if (virSystemdTerminateMachine("demo", - "lxc", - true) < 0) { + if (virSystemdTerminateMachine("lxc-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); return -1; } @@ -202,7 +199,6 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) }; if (virSystemdCreateMachine("demo", "qemu", - false, uuid, NULL, 123, @@ -218,9 +214,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) { - if (virSystemdTerminateMachine("demo", - "qemu", - false) < 0) { + if (virSystemdTerminateMachine("test-qemu-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); return -1; } @@ -242,7 +236,6 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -277,7 +270,6 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -312,7 +304,6 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -348,7 +339,6 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) size_t nnicindexes = ARRAY_CARDINALITY(nicindexes); if (virSystemdCreateMachine("demo", "lxc", - true, uuid, "/proc/123/root", 123, @@ -385,6 +375,8 @@ testGetMachineName(const void *opaque ATTRIBUTE_UNUSED) struct testNameData { const char *name; const char *expected; + int id; + bool legacy; }; static int @@ -394,7 +386,7 @@ testScopeName(const void *opaque) int ret = -1; char *actual = NULL; - if (!(actual = virSystemdMakeScopeName(data->name, "lxc"))) + if (!(actual = virSystemdMakeScopeName(data->name, "lxc", data->legacy))) goto cleanup; if (STRNEQ(actual, data->expected)) { @@ -417,7 +409,8 @@ testMachineName(const void *opaque) int ret = -1; char *actual = NULL; - if (!(actual = virSystemdMakeMachineName(data->name, "qemu", true))) + if (!(actual = virSystemdMakeMachineName("qemu", data->id, + data->name, true))) goto cleanup; if (STRNEQ(actual, data->expected)) { @@ -518,6 +511,12 @@ mymain(void) { int ret = 0; + unsigned char uuid[VIR_UUID_BUFLEN]; + + /* The one we use in tests quite often */ + if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", uuid) < 0) + return EXIT_FAILURE; + if (virtTestRun("Test create container ", testCreateContainer, NULL) < 0) ret = -1; if (virtTestRun("Test terminate container ", testTerminateContainer, NULL) < 0) @@ -538,35 +537,47 @@ mymain(void) if (virtTestRun("Test getting machine name ", testGetMachineName, NULL) < 0) ret = -1; -# define TEST_SCOPE(name, unitname) \ +# define TEST_SCOPE(_name, unitname, _legacy) \ do { \ struct testNameData data = { \ - name, unitname \ + .name = _name, .expected = unitname, .legacy = _legacy, \ }; \ if (virtTestRun("Test scopename", testScopeName, &data) < 0) \ ret = -1; \ } while (0) - TEST_SCOPE("demo", "machine-lxc\\x2ddemo.scope"); - TEST_SCOPE("demo-name", "machine-lxc\\x2ddemo\\x2dname.scope"); - TEST_SCOPE("demo!name", "machine-lxc\\x2ddemo\\x21name.scope"); - TEST_SCOPE(".demo", "machine-lxc\\x2d\\x2edemo.scope"); - TEST_SCOPE("bull💩", "machine-lxc\\x2dbull\\xf0\\x9f\\x92\\xa9.scope"); +# define TEST_SCOPE_OLD(name, unitname) \ + TEST_SCOPE(name, unitname, true) +# define TEST_SCOPE_NEW(name, unitname) \ + TEST_SCOPE(name, unitname, false) + + TEST_SCOPE_OLD("demo", "machine-lxc\\x2ddemo.scope"); + TEST_SCOPE_OLD("demo-name", "machine-lxc\\x2ddemo\\x2dname.scope"); + TEST_SCOPE_OLD("demo!name", "machine-lxc\\x2ddemo\\x21name.scope"); + TEST_SCOPE_OLD(".demo", "machine-lxc\\x2d\\x2edemo.scope"); + TEST_SCOPE_OLD("bull💩", "machine-lxc\\x2dbull\\xf0\\x9f\\x92\\xa9.scope"); + + TEST_SCOPE_NEW("qemu-3-demo", "machine-qemu\\x2d3\\x2ddemo.scope"); -# define TEST_MACHINE(name, machinename) \ +# define TEST_MACHINE(_name, _id, machinename) \ do { \ struct testNameData data = { \ - name, machinename \ + .name = _name, .expected = machinename, .id = _id, \ }; \ if (virtTestRun("Test scopename", testMachineName, &data) < 0) \ ret = -1; \ } while (0) - TEST_MACHINE("demo", "qemu-demo"); - TEST_MACHINE("demo-name", "qemu-demo\\x2dname"); - TEST_MACHINE("demo!name", "qemu-demo\\x21name"); - TEST_MACHINE(".demo", "qemu-\\x2edemo"); - TEST_MACHINE("bull\U0001f4a9", "qemu-bull\\xf0\\x9f\\x92\\xa9"); + TEST_MACHINE("demo", 1, "qemu-1-demo"); + TEST_MACHINE("demo-name", 2, "qemu-2-demo-name"); + TEST_MACHINE("demo!name", 3, "qemu-3-demoname"); + TEST_MACHINE(".demo", 4, "qemu-4-.demo"); + TEST_MACHINE("bull\U0001f4a9", 5, "qemu-5-bull"); + TEST_MACHINE("demo..name", 6, "qemu-6-demo.name"); + TEST_MACHINE("12345678901234567890123456789012345678901234567890123456789", 7, + "qemu-7-123456789012345678901234567890123456789012345678901234567"); + TEST_MACHINE("123456789012345678901234567890123456789012345678901234567890", 8, + "qemu-8-123456789012345678901234567890123456789012345678901234567"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.7.0

2 2

[libvirt] [PATCH 0/3] Fix domains with non-ASCII (or long) names on systemd
by Martin Kletzander 04 Feb '16

04 Feb '16

Well, try starting such domain. More info in patches. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Martin Kletzander (3): Revert "systemd: Escape only needed characters for machined" systemd: Add virSystemdGetMachineNameByPID systemd: Modernize machine naming src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 13 +++- src/lxc/lxc_domain.c | 1 + src/lxc/lxc_domain.h | 1 + src/lxc/lxc_process.c | 19 ++++-- src/qemu/qemu_cgroup.c | 27 +++++--- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 4 +- src/util/vircgroup.c | 25 ++++---- src/util/vircgroup.h | 12 ++-- src/util/virsystemd.c | 156 ++++++++++++++++++++++++++++++++++++----------- src/util/virsystemd.h | 13 ++-- tests/virsystemdtest.c | 81 ++++++++++++++++++------ 15 files changed, 262 insertions(+), 95 deletions(-) -- 2.7.0

4 12

[libvirt] [PATCH] logical: Clarify pieces of lvs regex
by John Ferlan 04 Feb '16

04 Feb '16

Rather than have a unwieldy regex string - split it up into its components each having it's own #define and then combine in a different #define Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index eb22fd0..ba26223 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -312,6 +312,34 @@ virStorageBackendLogicalMakeVol(char **const groups, return ret; } +#define VIR_STORAGE_VOL_LOGICAL_PREFIX_REGEX "^\\s*" +#define VIR_STORAGE_VOL_LOGICAL_LV_NAME_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_ORIGIN_REGEX "(\\S*)#" +#define VIR_STORAGE_VOL_LOGICAL_UUID_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_DEVICES_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_SEGTYPE_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_STRIPES_REGEX "([0-9]+)#" +#define VIR_STORAGE_VOL_LOGICAL_SEG_SIZE_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_VG_EXTENT_SIZE_REGEX "([0-9]+)#" +#define VIR_STORAGE_VOL_LOGICAL_SIZE_REGEX "([0-9]+)#" +#define VIR_STORAGE_VOL_LOGICAL_LV_ATTR_REGEX "(\\S+)#" +#define VIR_STORAGE_VOL_LOGICAL_SUFFIX_REGEX "?\\s*$" + +#define VIR_STORAGE_VOL_LOGICAL_REGEX_COUNT 10 +#define VIR_STORAGE_VOL_LOGICAL_REGEX \ + VIR_STORAGE_VOL_LOGICAL_PREFIX_REGEX \ + VIR_STORAGE_VOL_LOGICAL_LV_NAME_REGEX \ + VIR_STORAGE_VOL_LOGICAL_ORIGIN_REGEX \ + VIR_STORAGE_VOL_LOGICAL_UUID_REGEX \ + VIR_STORAGE_VOL_LOGICAL_DEVICES_REGEX \ + VIR_STORAGE_VOL_LOGICAL_SEGTYPE_REGEX \ + VIR_STORAGE_VOL_LOGICAL_STRIPES_REGEX \ + VIR_STORAGE_VOL_LOGICAL_SEG_SIZE_REGEX \ + VIR_STORAGE_VOL_LOGICAL_VG_EXTENT_SIZE_REGEX \ + VIR_STORAGE_VOL_LOGICAL_SIZE_REGEX \ + VIR_STORAGE_VOL_LOGICAL_LV_ATTR_REGEX \ + VIR_STORAGE_VOL_LOGICAL_SUFFIX_REGEX + static int virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) @@ -342,10 +370,10 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, * striped, so "," is not a suitable separator either (rhbz 727474). */ const char *regexes[] = { - "^\\s*(\\S+)#(\\S*)#(\\S+)#(\\S+)#(\\S+)#([0-9]+)#(\\S+)#([0-9]+)#([0-9]+)#(\\S+)#?\\s*$" + VIR_STORAGE_VOL_LOGICAL_REGEX }; int vars[] = { - 10 + VIR_STORAGE_VOL_LOGICAL_REGEX_COUNT }; int ret = -1; virCommandPtr cmd; -- 2.5.0

2 1

[libvirt] [PATCH 1/2] storage: zfs: enable on Linux
by Roman Bogorodskiy 04 Feb '16

04 Feb '16

ZFS-on-Linux implementation of ZFS starting with version 0.6.4 contains all the features we use, so there's no reason to limit libvirt ZFS storage backend to FreeBSD only. There's still one difference between these implementations: ZFS on FreeBSD requires to set 'volmode' option to 'dev' when creating volumes, while ZFS-on-Linux does not need that. Handle it by checking if 'volmode' option is needed by parsing usage information of the 'zfs get' command. --- configure.ac | 8 ------ src/storage/storage_backend_zfs.c | 51 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a566f5b..d768341 100644 --- a/configure.ac +++ b/configure.ac @@ -2005,14 +2005,6 @@ if test "$with_storage_gluster" = "yes"; then fi AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"]) -if test "$with_storage_zfs" = "check"; then - with_storage_zfs=$with_freebsd -fi - -if test "$with_storage_zfs" = "yes" && test "$with_freebsd" = "no"; then - AC_MSG_ERROR([The ZFS storage driver can be enabled on FreeBSD only.]) -fi - if test "$with_storage_zfs" = "yes" || test "$with_storage_zfs" = "check"; then AC_PATH_PROG([ZFS], [zfs], [], [$PATH:/sbin:/usr/sbin]) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index cb2662a..6bf7963 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -39,6 +39,47 @@ VIR_LOG_INIT("storage.storage_backend_zfs"); * for size, show just a number instead of 2G etc */ +/** + * virStorageBackendZFSVolModeNeeded: + * + * Checks if it's necessary to specify 'volmode' (i.e. that + * we're working with BSD ZFS implementation). + * + * Returns 1 if 'volmode' is need, 0 if not needed, -1 on error + */ +static int +virStorageBackendZFSVolModeNeeded(void) +{ + virCommandPtr cmd = NULL; + int ret = -1, exit = -1; + char *error = NULL; + + /* 'zfs get' without arguments prints out + * usage information to stderr, including + * list of supported options, and exits with + * exit code 2 + */ + cmd = virCommandNewArgList(ZFS, "get", NULL); + virCommandAddEnvString(cmd, "LC_ALL=C"); + virCommandSetErrorBuffer(cmd, &error); + + ret = virCommandRun(cmd, &exit); + if ((ret < 0) || (exit != 2)) { + VIR_WARN("Command 'zfs get' either failed " + "to run or exited with unexpected status"); + goto cleanup; + } + + if (strstr(error, " volmode ")) + ret = 1; + else + ret = 0; + + cleanup: + virCommandFree(cmd); + VIR_FREE(error); + return ret; +} static int virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, @@ -258,6 +299,7 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, { virCommandPtr cmd = NULL; int ret = -1; + int volmode_needed = -1; vol->type = VIR_STORAGE_VOL_BLOCK; @@ -273,6 +315,9 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, if (VIR_STRDUP(vol->key, vol->target.path) < 0) goto cleanup; + volmode_needed = virStorageBackendZFSVolModeNeeded(); + if (volmode_needed < 0) + goto cleanup; /** * $ zfs create -o volmode=dev -V 10240K test/volname * @@ -281,8 +326,10 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, * will lookup vfs.zfs.vol.mode sysctl value * -V -- tells to create a volume with the specified size */ - cmd = virCommandNewArgList(ZFS, "create", "-o", "volmode=dev", - "-V", NULL); + cmd = virCommandNewArgList(ZFS, "create", NULL); + if (volmode_needed) + virCommandAddArgList(cmd, "-o", "volmode=dev", NULL); + virCommandAddArg(cmd, "-V"); virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->target.capacity, 1024)); virCommandAddArgFormat(cmd, "%s/%s", -- 1.9.1

2 7

[libvirt] virStream: this function is not supported by the connection driver
by Wido den Hollander 03 Feb '16

03 Feb '16

Hi, I'm trying to implement the volUpload and volDownload functions for the RBD storage driver but I keep getting this: 2016-01-30 18:56:11.675+0000: 6447: debug : virStorageBackendRBDVolDownload:1395 : Read 4096 bytes at offset 0 from RBD image libvirt/wido1 2016-01-30 18:56:11.675+0000: 6447: debug : virStreamSend:168 : stream=0x7fe780000930, data=0x7fe780062df0, nbytes=4096 2016-01-30 18:56:11.675+0000: 6447: error : virStreamSend:186 : this function is not supported by the connection driver: virStreamSend I reference to the stream with virStreamRef(stream); and then I use virStreamSend() to write data to the stream, but that fails. I've looked through the source and couldn't find anything what might be the issue. Libvirt is running locally on my system and I'm using qemu:///system to connect locally with virsh. Do I need to initialize the stream in any way before I can write data to it? Wido

3 5

[libvirt] [PATCH RFC 0/2] conf: add net device prefix capability
by Joao Martins 03 Feb '16

03 Feb '16

Hey, Back in the pre 1.3.0 release [0] we had a regression when migrating domains in libxl (introduced by the reverted commit d2e5538b1). The chosen solution to address this problem was to introduce a capability to be used by the virDomainNetDefFormat() and virDomainNetDefParseXML() routines. This series implements this, and I would ask if it's in line with what you had in mind by exposing as a hypervisor capability? For the purposes of RFC and compability with other drivers I left the hardcoded checking of VIR_NET_GENERATED_PREFIX plus checking a prefix registered by the driver. Having this series and the reverted commit applied, I can successfully migrate a domain without seeing the same interface name on both source and destination node. Thoughts? Thanks! Joao [0] https://www.redhat.com/archives/libvir-list/2015-December/msg00279.html Joao Martins (2): conf: add net device prefix to capabilities libxl: set net device prefix src/conf/capabilities.c | 21 +++++++++++++++++++++ src/conf/capabilities.h | 4 ++++ src/conf/domain_conf.c | 20 +++++++++++++++----- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 3 +++ src/libxl/libxl_conf.h | 4 ++++ src/network/bridge_driver.c | 2 +- 8 files changed, 51 insertions(+), 6 deletions(-) -- 2.1.4

2 6

[libvirt] [PATCH v2 0/4] Export remote typed params methods internally via util
by Erik Skultety 03 Feb '16

03 Feb '16

Erik Skultety (4): util: Introduce virTypedParameterRemote datatype util: Export remoteDeserializeTypedParameters internally via util util: Export remoteFreeTypedParameters internally via util util: Export remoteSerializeTypedParameters internally via util daemon/remote.c | 316 ++++++++++------------------------------- src/libvirt_private.syms | 3 + src/remote/remote_driver.c | 342 +++++++++++---------------------------------- src/rpc/gendispatch.pl | 26 ++-- src/util/virtypedparam.c | 246 ++++++++++++++++++++++++++++++++ src/util/virtypedparam.h | 39 ++++++ 6 files changed, 459 insertions(+), 513 deletions(-) -- 2.4.3

2 6

[libvirt] [PATCH v2] systemd: Modernize machine naming
by Martin Kletzander 03 Feb '16

03 Feb '16

So, systemd-machined has this philosophy that machine names are like hostnames and hence should follow the same rules. But we always allowed international characters in domain names. Thus we need to modify the machine name we are passing to systemd. In order to change some machinenames that we will be passing to systemd, we also need to call TerminateMachine at the end of a lifetime of a domain. Even for domains that were started with older libvirt. That can be achieved thanks to virSystemdGetMachineNameByPID(). And because we can change machine names, we can get rid of the inconsistent and pointless escaping of domain names when creating machine names. So this patch modifies the naming in the following way. It creates the name as <drivername>-<id>-<name> where invalid hostname characters are stripped out of the name and if the resulting name is longer, it truncates it to 64 characters. That way we can start domains we couldn't start before. Well, at least on systemd. To make it work all together, the machineName (which is needed only for systemd) is saved in domain's private data. That way the generation is moved to the driver and we don't need to pass various unnecessary arguments to cgroup functions. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1282846 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_cgroup.c | 13 ++++++++-- src/lxc/lxc_domain.c | 1 + src/lxc/lxc_domain.h | 1 + src/lxc/lxc_process.c | 19 +++++++++----- src/qemu/qemu_cgroup.c | 27 ++++++++++++++------ src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 4 +-- src/util/vircgroup.c | 25 +++++++++--------- src/util/vircgroup.h | 12 ++++----- src/util/virsystemd.c | 67 ++++++++++++++++++++++++++++++++++--------------- src/util/virsystemd.h | 11 ++++---- tests/virsystemdtest.c | 45 +++++++++++++++++---------------- 14 files changed, 145 insertions(+), 84 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index ad254e4934fc..31489466cfbf 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -29,6 +29,7 @@ #include "viralloc.h" #include "vircgroup.h" #include "virstring.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -483,6 +484,13 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, int *nicindexes) { virCgroupPtr cgroup = NULL; + char *machineName = virSystemdMakeMachineName("lxc", + def->id, + def->name, + true); + + if (!machineName) + goto cleanup; if (def->resource->partition[0] != '/') { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -491,9 +499,8 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, goto cleanup; } - if (virCgroupNewMachine(def->name, + if (virCgroupNewMachine(machineName, "lxc", - true, def->uuid, NULL, initpid, @@ -517,6 +524,8 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, } cleanup: + VIR_FREE(machineName); + return cgroup; } diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index c3f7a564b36b..6732e934453f 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -28,6 +28,7 @@ #include "virerror.h" #include <libxml/xpathInternals.h> #include "virstring.h" +#include "vircgroup.h" #include "virutil.h" #include "virfile.h" diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 2119c7899007..39c6e7def9ce 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -64,6 +64,7 @@ struct _virLXCDomainObjPrivate { pid_t initpid; virCgroupPtr cgroup; + char *machineName; }; extern virDomainXMLNamespace virLXCDriverDomainXMLNamespace; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f7e2b810b74b..b14b69da4a16 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -233,8 +233,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for * the bug we are working around here. */ - virSystemdTerminateMachine(vm->def->name, "lxc", true); - + virCgroupTerminateMachine(priv->machineName); /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -1494,8 +1493,8 @@ int virLXCProcessStart(virConnectPtr conn, * point so lets detect that first, since it gives us a * more reliable way to kill everything off if something * goes wrong from here onwards ... */ - if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - -1, &priv->cgroup) < 0) + if (virCgroupNewDetectMachine(vm->def->name, vm->def->uuid, "lxc", + vm->pid, -1, &priv->cgroup) < 0) goto cleanup; if (!priv->cgroup) { @@ -1505,6 +1504,11 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } + /* Get the machine name so we can properly delete it through + * systemd later */ + if (!(priv->machineName = virSystemdGetMachineNameByPID(vm->pid))) + virResetLastError(); + /* And we can get the first monitor connection now too */ if (!(priv->monitor = virLXCProcessConnectMonitor(driver, vm))) { /* Intentionally overwrite the real monitor error message, @@ -1677,8 +1681,8 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, if (!(priv->monitor = virLXCProcessConnectMonitor(driver, vm))) goto error; - if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - -1, &priv->cgroup) < 0) + if (virCgroupNewDetectMachine(vm->def->name, vm->def->uuid, "lxc", + vm->pid, -1, &priv->cgroup) < 0) goto error; if (!priv->cgroup) { @@ -1688,6 +1692,9 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, goto error; } + if (!(priv->machineName = virSystemdGetMachineNameByPID(vm->pid))) + virResetLastError(); + if (virLXCUpdateActiveUSBHostdevs(driver, vm->def) < 0) goto error; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e41f4617c455..705594d93dc5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -36,6 +36,7 @@ #include "virfile.h" #include "virtypedparam.h" #include "virnuma.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -772,9 +773,19 @@ qemuInitCgroup(virQEMUDriverPtr driver, goto cleanup; } - if (virCgroupNewMachine(vm->def->name, + /* + * We need to do this because of systemd-machined, because + * CreateMachine requires the name to be a valid hostname. + */ + priv->machineName = virSystemdMakeMachineName("qemu", + vm->def->id, + vm->def->name, + virQEMUDriverIsPrivileged(driver)); + if (!priv->machineName) + goto cleanup; + + if (virCgroupNewMachine(priv->machineName, "qemu", - true, vm->def->uuid, NULL, vm->pid, @@ -887,12 +898,17 @@ qemuConnectCgroup(virQEMUDriverPtr driver, virCgroupFree(&priv->cgroup); if (virCgroupNewDetectMachine(vm->def->name, + vm->def->uuid, "qemu", vm->pid, cfg->cgroupControllers, &priv->cgroup) < 0) goto cleanup; + priv->machineName = virSystemdGetMachineNameByPID(vm->pid); + if (!priv->machineName) + virResetLastError(); + qemuRestoreCgroupState(vm); done: @@ -1264,17 +1280,14 @@ qemuSetupCgroupForIOThreads(virDomainObjPtr vm) } int -qemuRemoveCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuRemoveCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; if (priv->cgroup == NULL) return 0; /* Not supported, so claim success */ - if (virCgroupTerminateMachine(vm->def->name, - "qemu", - virQEMUDriverIsPrivileged(driver)) < 0) { + if (virCgroupTerminateMachine(priv->machineName) < 0) { if (!virCgroupNewIgnoreError()) VIR_DEBUG("Failed to terminate cgroup for %s", vm->def->name); } diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 2bcf071d3792..347d126f7394 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -56,7 +56,7 @@ int qemuSetupCgroupCpusetCpus(virCgroupPtr cgroup, virBitmapPtr cpumask); int qemuSetupCgroupForVcpu(virDomainObjPtr vm); int qemuSetupCgroupForIOThreads(virDomainObjPtr vm); int qemuSetupCgroupForEmulator(virDomainObjPtr vm); -int qemuRemoveCgroup(virQEMUDriverPtr driver, virDomainObjPtr vm); +int qemuRemoveCgroup(virDomainObjPtr vm); int qemuAddToCgroup(virDomainObjPtr vm); #endif /* __QEMU_CGROUP_H__ */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 189552045177..09ad2f75916f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -39,6 +39,7 @@ #include "virtime.h" #include "virstoragefile.h" #include "virstring.h" +#include "virsystemd.h" #include "virthreadjob.h" #include "viratomic.h" #include "virprocess.h" diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6a8cf705d8af..ab798faf0fb0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -203,6 +203,7 @@ struct _qemuDomainObjPrivate { bool signalIOError; /* true if the domain condition should be signalled on I/O error */ + char *machineName; }; # define QEMU_DOMAIN_DISK_PRIVATE(disk) \ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b09ba73896b..b3f8c93d1a93 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4610,7 +4610,7 @@ qemuProcessLaunch(virConnectPtr conn, /* Ensure no historical cgroup for this VM is lying around bogus * settings */ VIR_DEBUG("Ensuring no historical cgroup is lying around"); - qemuRemoveCgroup(driver, vm); + qemuRemoveCgroup(vm); VIR_DEBUG("Setting up ports for graphics"); if (qemuProcessSetupGraphics(driver, vm) < 0) @@ -5405,7 +5405,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, } retry: - if ((ret = qemuRemoveCgroup(driver, vm)) < 0) { + if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); goto retry; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index da0df7ae7a5e..4aed5d20b818 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -43,6 +43,7 @@ #include "vircgrouppriv.h" #include "virutil.h" +#include "viruuid.h" #include "viralloc.h" #include "virerror.h" #include "virlog.h" @@ -243,12 +244,14 @@ static bool virCgroupValidateMachineGroup(virCgroupPtr group, const char *name, const char *drivername, + const unsigned char *uuid, bool stripEmulatorSuffix) { size_t i; bool valid = false; char *partname; char *scopename; + char uuidstr[VIR_UUID_STRING_BUFLEN]; if (virAsprintf(&partname, "%s.libvirt-%s", name, drivername) < 0) @@ -263,6 +266,8 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (virCgroupPartitionEscape(&scopename) < 0) goto cleanup; + virUUIDFormat(uuid, uuidstr); + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { char *tmp; @@ -290,6 +295,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, tmp++; if (STRNEQ(tmp, name) && + STRNEQ(tmp, uuidstr) && STRNEQ(tmp, partname) && STRNEQ(tmp, scopename)) { VIR_DEBUG("Name '%s' for controller '%s' does not match " @@ -1554,6 +1560,7 @@ virCgroupNewDetect(pid_t pid, */ int virCgroupNewDetectMachine(const char *name, + const unsigned char *uuid, const char *drivername, pid_t pid, int controllers, @@ -1565,7 +1572,7 @@ virCgroupNewDetectMachine(const char *name, return -1; } - if (!virCgroupValidateMachineGroup(*group, name, drivername, true)) { + if (!virCgroupValidateMachineGroup(*group, name, drivername, uuid, true)) { VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'", name, drivername); virCgroupFree(group); @@ -1582,7 +1589,6 @@ virCgroupNewDetectMachine(const char *name, static int virCgroupNewMachineSystemd(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -1602,7 +1608,6 @@ virCgroupNewMachineSystemd(const char *name, VIR_DEBUG("Trying to setup machine '%s' via systemd", name); if ((rv = virSystemdCreateMachine(name, drivername, - privileged, uuid, rootdir, pidleader, @@ -1690,11 +1695,9 @@ virCgroupNewMachineSystemd(const char *name, /* * Returns 0 on success, -1 on fatal error */ -int virCgroupTerminateMachine(const char *name, - const char *drivername, - bool privileged) +int virCgroupTerminateMachine(const char *name) { - return virSystemdTerminateMachine(name, drivername, privileged); + return virSystemdTerminateMachine(name); } @@ -1749,7 +1752,6 @@ virCgroupNewMachineManual(const char *name, int virCgroupNewMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -1766,7 +1768,6 @@ virCgroupNewMachine(const char *name, if ((rv = virCgroupNewMachineSystemd(name, drivername, - privileged, uuid, rootdir, pidleader, @@ -4240,6 +4241,7 @@ virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED, int virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, + const unsigned char *uuid ATTRIBUTE_UNUSED, const char *drivername ATTRIBUTE_UNUSED, pid_t pid ATTRIBUTE_UNUSED, int controllers ATTRIBUTE_UNUSED, @@ -4251,9 +4253,7 @@ virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, } -int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED, - const char *drivername ATTRIBUTE_UNUSED, - bool privileged ATTRIBUTE_UNUSED) +int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform")); @@ -4264,7 +4264,6 @@ int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED, int virCgroupNewMachine(const char *name ATTRIBUTE_UNUSED, const char *drivername ATTRIBUTE_UNUSED, - bool privileged ATTRIBUTE_UNUSED, const unsigned char *uuid ATTRIBUTE_UNUSED, const char *rootdir ATTRIBUTE_UNUSED, pid_t pidleader ATTRIBUTE_UNUSED, diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index d754b1f3bd7a..dd4cb719f1f1 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -90,14 +90,16 @@ int virCgroupNewDetect(pid_t pid, virCgroupPtr *group); int virCgroupNewDetectMachine(const char *name, + const unsigned char *uuid, const char *drivername, pid_t pid, int controllers, - virCgroupPtr *group); + virCgroupPtr *group) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) + ATTRIBUTE_NONNULL(3); int virCgroupNewMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -110,10 +112,8 @@ int virCgroupNewMachine(const char *name, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); -int virCgroupTerminateMachine(const char *name, - const char *drivername, - bool privileged) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int virCgroupTerminateMachine(const char *name) + ATTRIBUTE_NONNULL(1); bool virCgroupNewIgnoreError(void); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 9e85e24b2c4b..5c6cd872bee0 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -25,6 +25,8 @@ # include <systemd/sd-daemon.h> #endif +#include "internal.h" + #include "virsystemd.h" #include "viratomic.h" #include "virdbus.h" @@ -33,6 +35,7 @@ #include "virutil.h" #include "virlog.h" #include "virerror.h" +#include "viruuid.h" #define VIR_FROM_THIS VIR_FROM_SYSTEMD @@ -113,10 +116,42 @@ char *virSystemdMakeSliceName(const char *partition) return virBufferContentAndReset(&buf); } +#define HOSTNAME_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-" -char *virSystemdMakeMachineName(const char *name, - const char *drivername, - bool privileged) +static void +virSystemdAppendValidMachineName(virBufferPtr buf, + const char *name) +{ + bool skip_dot = false; + + for (; *name; name++) { + if (strlen(virBufferCurrentContent(buf)) >= 64) + break; + + if (*name == '.') { + if (!skip_dot) + virBufferAddChar(buf, *name); + skip_dot = true; + continue; + } + + skip_dot = false; + + if (!strchr(HOSTNAME_CHARS, *name)) + continue; + + virBufferAddChar(buf, *name); + } +} + +#undef HOSTNAME_CHARS + +char * +virSystemdMakeMachineName(const char *drivername, + int id, + const char *name, + bool privileged) { char *machinename = NULL; char *username = NULL; @@ -131,7 +166,8 @@ char *virSystemdMakeMachineName(const char *name, virBufferAsprintf(&buf, "%s-%s-", username, drivername); } - virSystemdEscapeName(&buf, name); + virBufferAsprintf(&buf, "%d-", id); + virSystemdAppendValidMachineName(&buf, name); machinename = virBufferContentAndReset(&buf); cleanup: @@ -212,7 +248,6 @@ virSystemdGetMachineNameByPID(pid_t pid) */ int virSystemdCreateMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -223,7 +258,6 @@ int virSystemdCreateMachine(const char *name, { int ret; DBusConnection *conn; - char *machinename = NULL; char *creatorname = NULL; char *slicename = NULL; static int hasCreateWithNetwork = 1; @@ -239,8 +273,6 @@ int virSystemdCreateMachine(const char *name, return -1; ret = -1; - if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) - goto cleanup; if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) goto cleanup; @@ -318,7 +350,7 @@ int virSystemdCreateMachine(const char *name, "org.freedesktop.machine1.Manager", "CreateMachineWithNetwork", "sayssusa&ia(sv)", - machinename, + name, 16, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], @@ -360,7 +392,7 @@ int virSystemdCreateMachine(const char *name, "org.freedesktop.machine1.Manager", "CreateMachine", "sayssusa(sv)", - machinename, + name, 16, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], @@ -381,20 +413,19 @@ int virSystemdCreateMachine(const char *name, cleanup: VIR_FREE(creatorname); - VIR_FREE(machinename); VIR_FREE(slicename); return ret; } -int virSystemdTerminateMachine(const char *name, - const char *drivername, - bool privileged) +int virSystemdTerminateMachine(const char *name) { int ret; DBusConnection *conn; - char *machinename = NULL; virError error; + if (!name) + return 0; + memset(&error, 0, sizeof(error)); ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); @@ -409,9 +440,6 @@ int virSystemdTerminateMachine(const char *name, if (!(conn = virDBusGetSystemBus())) goto cleanup; - if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) - goto cleanup; - /* * The systemd DBus API we're invoking has the * following signature @@ -431,7 +459,7 @@ int virSystemdTerminateMachine(const char *name, "org.freedesktop.machine1.Manager", "TerminateMachine", "s", - machinename) < 0) + name) < 0) goto cleanup; if (error.code == VIR_ERR_ERROR && @@ -446,7 +474,6 @@ int virSystemdTerminateMachine(const char *name, cleanup: virResetError(&error); - VIR_FREE(machinename); return ret; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index a13a4c0c48be..9042b5f31263 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -23,18 +23,19 @@ # define __VIR_SYSTEMD_H__ # include "internal.h" +# include "virbuffer.h" char *virSystemdMakeScopeName(const char *name, const char *drivername); char *virSystemdMakeSliceName(const char *partition); -char *virSystemdMakeMachineName(const char *name, - const char *drivername, +char *virSystemdMakeMachineName(const char *drivername, + int id, + const char *name, bool privileged); int virSystemdCreateMachine(const char *name, const char *drivername, - bool privileged, const unsigned char *uuid, const char *rootdir, pid_t pidleader, @@ -43,9 +44,7 @@ int virSystemdCreateMachine(const char *name, int *nicindexes, const char *partition); -int virSystemdTerminateMachine(const char *name, - const char *drivername, - bool privileged); +int virSystemdTerminateMachine(const char *name); void virSystemdNotifyStartup(void); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 3a3cd9968032..d7fccf92bc24 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -166,7 +166,6 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) }; if (virSystemdCreateMachine("demo", "lxc", - true, uuid, "/proc/123/root", 123, @@ -182,9 +181,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) { - if (virSystemdTerminateMachine("demo", - "lxc", - true) < 0) { + if (virSystemdTerminateMachine("lxc-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); return -1; } @@ -202,7 +199,6 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) }; if (virSystemdCreateMachine("demo", "qemu", - false, uuid, NULL, 123, @@ -218,9 +214,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) { - if (virSystemdTerminateMachine("demo", - "qemu", - false) < 0) { + if (virSystemdTerminateMachine("test-qemu-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); return -1; } @@ -242,7 +236,6 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -277,7 +270,6 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -312,7 +304,6 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) if ((rv = virSystemdCreateMachine("demo", "qemu", - true, uuid, NULL, 123, @@ -348,7 +339,6 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) size_t nnicindexes = ARRAY_CARDINALITY(nicindexes); if (virSystemdCreateMachine("demo", "lxc", - true, uuid, "/proc/123/root", 123, @@ -385,6 +375,7 @@ testGetMachineName(const void *opaque ATTRIBUTE_UNUSED) struct testNameData { const char *name; const char *expected; + int id; }; static int @@ -417,7 +408,8 @@ testMachineName(const void *opaque) int ret = -1; char *actual = NULL; - if (!(actual = virSystemdMakeMachineName(data->name, "qemu", true))) + if (!(actual = virSystemdMakeMachineName("qemu", data->id, + data->name, true))) goto cleanup; if (STRNEQ(actual, data->expected)) { @@ -518,6 +510,12 @@ mymain(void) { int ret = 0; + unsigned char uuid[VIR_UUID_BUFLEN]; + + /* The one we use in tests quite often */ + if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", uuid) < 0) + return EXIT_FAILURE; + if (virtTestRun("Test create container ", testCreateContainer, NULL) < 0) ret = -1; if (virtTestRun("Test terminate container ", testTerminateContainer, NULL) < 0) @@ -541,7 +539,7 @@ mymain(void) # define TEST_SCOPE(name, unitname) \ do { \ struct testNameData data = { \ - name, unitname \ + name, unitname, 0, \ }; \ if (virtTestRun("Test scopename", testScopeName, &data) < 0) \ ret = -1; \ @@ -553,20 +551,25 @@ mymain(void) TEST_SCOPE(".demo", "machine-lxc\\x2d\\x2edemo.scope"); TEST_SCOPE("bull💩", "machine-lxc\\x2dbull\\xf0\\x9f\\x92\\xa9.scope"); -# define TEST_MACHINE(name, machinename) \ +# define TEST_MACHINE(name, id, machinename) \ do { \ struct testNameData data = { \ - name, machinename \ + name, machinename, id, \ }; \ if (virtTestRun("Test scopename", testMachineName, &data) < 0) \ ret = -1; \ } while (0) - TEST_MACHINE("demo", "qemu-demo"); - TEST_MACHINE("demo-name", "qemu-demo\\x2dname"); - TEST_MACHINE("demo!name", "qemu-demo\\x21name"); - TEST_MACHINE(".demo", "qemu-\\x2edemo"); - TEST_MACHINE("bull\U0001f4a9", "qemu-bull\\xf0\\x9f\\x92\\xa9"); + TEST_MACHINE("demo", 1, "qemu-1-demo"); + TEST_MACHINE("demo-name", 2, "qemu-2-demo-name"); + TEST_MACHINE("demo!name", 3, "qemu-3-demoname"); + TEST_MACHINE(".demo", 4, "qemu-4-.demo"); + TEST_MACHINE("bull\U0001f4a9", 5, "qemu-5-bull"); + TEST_MACHINE("demo..name", 6, "qemu-6-demo.name"); + TEST_MACHINE("12345678901234567890123456789012345678901234567890123456789", 7, + "qemu-7-123456789012345678901234567890123456789012345678901234567"); + TEST_MACHINE("123456789012345678901234567890123456789012345678901234567890", 8, + "qemu-8-123456789012345678901234567890123456789012345678901234567"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.7.0

2 2