- Devel - libvirt List Archives

[libvirt] [PATCH 0/7] parallels: bridge network support enhancement and other network fixes
by Maxim Nestratov 10 Mar '15

10 Mar '15

Maxim Nestratov (7): parallels: introduce and use string constants for network types and names parallels: fix parallelsLoadNetworks parallels: better bridge network interface support parallels: set network adapter device status to connected parallels: make E1000 network adapter type default parallels: switch off offline management feature parallels: don't prevent domain start if VIR_DOMAIN_NET_TYPE_BRIDGE

1 7

[libvirt] [PATCH 0/4] parallels: fixes and cleanups
by Maxim Nestratov 10 Mar '15

10 Mar '15

Maxim Nestratov (3): parallels: don't forget to unlock domain if unregister fails parallels: fix home directory for VMs parallels: minor cleanup Mikhail Feoktistov (1): parallels: set cpu mode when applying xml configuration

1 4

[libvirt] OVMF whitepaper released
by Laszlo Ersek 10 Mar '15

10 Mar '15

http://people.redhat.com/~lersek/ovmf-whitepaper-c770f8c.txt (An official Red Hat whitepaper PDF edition, for graphical displays, is in the works. As time and technical hurdles allow, both the plain text and the PDF editions shall appear under <http://www.linux-kvm.org/page/OVMF> too, replacing the stale article currently visible there.) Feedback is welcome. For public feedback, please trim the address list to <edk2-devel(a)lists.sourceforge.net> and yours truly; my intent is to spam qemu-devel, linux-efi and libvir-list just this once. (Appropriate levels of embarrassment are already being felt for spamming those.) Thanks Laszlo

1 0

[libvirt] [PATCH v2] docs: add a note that spice channel is usable only with spice graphics
by Pavel Hrdina 10 Mar '15

10 Mar '15

To prevent a confusion about missing chardev argument in qemu command line add a note about that behavior into documentation. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/formatdomain.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..2f2976c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5372,6 +5372,10 @@ qemu-kvm -net nic,model=? /dev/null under a channel name specified in the <code>channel</code> attribute. Since 1.2.2 + + Note: in order for the spiceport to be usable, the domain must have + spice graphics as well. + <pre> ... -- 2.0.5

2 2

[libvirt] [PATCH v9 0/4] Introduce API to query IP addresses for given domain
by Daniel P. Berrange 10 Mar '15

10 Mar '15

This polishes off Nehal's long standing work to add IP address reporting to libvirt. In v9 I address John's coverity comments and switched to use an dedicated parameter for selecting the data source, instead of flags. Nehal J Wani (4): domifaddr: Implement the public APIs domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support daemon/remote.c | 135 ++++++++++++++++++++++++++ include/libvirt/libvirt-domain.h | 28 ++++++ src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 123 +++++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_agent.c | 204 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 + src/qemu/qemu_driver.c | 175 +++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 104 ++++++++++++++++++++ src/remote/remote_protocol.x | 37 ++++++- src/remote_protocol-structs | 25 +++++ tests/qemuagenttest.c | 188 ++++++++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 146 ++++++++++++++++++++++++++++ tools/virsh.pod | 16 +++ 14 files changed, 1192 insertions(+), 1 deletion(-) -- 2.1.0

2 5

[libvirt] [PATCH] network_conf: check sysfs if the bridge exists on host for user created bridges
by Shivaprasad G Bhat 09 Mar '15

09 Mar '15

The patch fixes the below problem. ============================== If the bridge name is not mentioned in the <network> xml, the bridge name is auto generated from virNetworkAllocateBridge(). If the default template named bridge is created manually by a user, the bridge start will fail with "File exists". bash-4.3$ sudo brctl addbr virbr1 bash-4.3$ brctl show bridge name bridge id STP enabled interfaces br0 8000.000000000000 no virbr0 8000.525400a91d03 yes virbr0-nic virbr1 8000.000000000000 no bash-4.3$ sudo virsh net-list --all Name State Autostart Persistent ---------------------------------------------------------- default active no yes bash-4.3$ cat /tmp/isolated # Notice that the <bridge> intentionally not given. <network> <name>isolated</name> <forward/> <ip address="192.168.123.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.123.2" end="192.168.123.254"/> </dhcp> </ip> </network> bash-4.3$ sudo virsh net-create /tmp/isolated error: Failed to create network from isolated error: Unable to create bridge virbr1: File exists =============================== --- The following series implements... Shivaprasad G Bhat (1): network_conf: check sysfs if the bridge exists on host for user created bridges src/conf/network_conf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -- Signature

3 3

[libvirt] [PATCH 0/3] update and unify some documentation texts
by Pavel Hrdina 09 Mar '15

09 Mar '15

Pavel Hrdina (3): iface-define: update and unify documentation pool-define: update and unify documentation net-define: update or unify documentation src/libvirt-interface.c | 3 ++- src/libvirt-network.c | 3 ++- src/libvirt-storage.c | 4 ++-- tools/virsh-interface.c | 5 +++-- tools/virsh-network.c | 5 +++-- tools/virsh-pool.c | 5 +++-- tools/virsh.pod | 11 ++++++----- 7 files changed, 21 insertions(+), 15 deletions(-) -- 2.0.5

2 5

[libvirt] [PATCH v2] qemu: bulk stats: implement (cpu) tune group.
by Francesco Romani 09 Mar '15

09 Mar '15

Management applications, like oVirt, may need to setup cpu quota limits to enforce QoS for domains. For this purpose, management applications also need to check how domains are behaving with respect to CPU quota. This data is available using the virDomainGetSchedulerParameters API. This patch adds a new group to bulk stats API to obtain the same information. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1191428 --- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 16 ++++++++ src/qemu/qemu_driver.c | 84 ++++++++++++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 7 ++++ tools/virsh.pod | 10 ++++- 5 files changed, 117 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index a9d3efd..a283f93 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1723,6 +1723,7 @@ typedef enum { VIR_DOMAIN_STATS_VCPU = (1 << 3), /* return domain virtual CPU info */ VIR_DOMAIN_STATS_INTERFACE = (1 << 4), /* return domain interfaces info */ VIR_DOMAIN_STATS_BLOCK = (1 << 5), /* return domain block info */ + VIR_DOMAIN_STATS_TUNE_CPU = (1 << 6), /* return domain CPU tuning info */ } virDomainStatsTypes; typedef enum { diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 89d1eab..b451299 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11004,6 +11004,22 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "block.<num>.physical" - physical size in bytes of the container of the * backing image as unsigned long long. * + * VIR_DOMAIN_STATS_TUNE_CPU: Return CPU tuning statistics + * and usage information. + * The typed parameter keys are in this format: + * "tune.vcpu.quota" - max allowed bandwidth, in microseconds, as + * long long integer. -1 means 'infinite'. + * "tune.vcpu.period" - timeframe on which the virtual cpu quota is + * enforced, in microseconds, as unsigned long long. + * "tune.emu.quota" - max allowed bandwidth for emulator threads, + * in microseconds, as long long integer. + * -1 means 'infinite'. + * "tune.emu.period" - timeframe on which the emulator quota is + * enforced, in microseconds, as unsigned long long. + * "tune.cpu.shares" - weight of this domain. This value is meaningful + * only if compared with the other values of + * the running domains. Expressed as unsigned long long. + * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not * applicable for the current state of the guest domain, or their retrieval diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ffa4e19..a810fa5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18768,6 +18768,89 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM + +#define QEMU_ADD_PARAM_LL(record, maxparams, name, value) \ +do { \ + if (virTypedParamsAddLLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + +#define QEMU_ADD_PARAM_ULL(record, maxparams, name, value) \ +do { \ + if (virTypedParamsAddULLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + +static int +qemuDomainGetStatsCpuTune(virQEMUDriverPtr driver, + virDomainObjPtr dom, + virDomainStatsRecordPtr record, + int *maxparams, + unsigned int privflags ATTRIBUTE_UNUSED) +{ + int ret = -1; + unsigned long long shares = 0; + qemuDomainObjPrivatePtr priv = dom->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + + if (!cfg->privileged || + !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU)) { + ret = 0; + goto cleanup; + } + + if (virCgroupGetCpuShares(priv->cgroup, &shares) < 0) { + ret = 0; + goto cleanup; + } + + QEMU_ADD_PARAM_ULL(record, maxparams, "tune.cpu.shares", shares); + + if (virCgroupSupportsCpuBW(priv->cgroup)) { + unsigned long long period = 0; + long long quota = 0; + unsigned long long emulator_period = 0; + long long emulator_quota = 0; + int err; + + err = qemuGetVcpusBWLive(dom, &period, &quota); + if (!err) { + QEMU_ADD_PARAM_ULL(record, maxparams, + "tune.vcpu.period", period); + QEMU_ADD_PARAM_LL(record, maxparams, + "tune.vcpu.quota", quota); + } + + err = qemuGetEmulatorBandwidthLive(dom, priv->cgroup, + &emulator_period, &emulator_quota); + if (!err) { + QEMU_ADD_PARAM_ULL(record, maxparams, + "tune.emu.period", emulator_period); + QEMU_ADD_PARAM_LL(record, maxparams, + "tune.emu.quota", emulator_quota); + } + } + + ret = 0; + + cleanup: + virObjectUnref(cfg); + return ret; +} + +#undef QEMU_ADD_PARAM_LL + +#undef QEMU_ADD_PARAM_ULL + + typedef int (*qemuDomainGetStatsFunc)(virQEMUDriverPtr driver, virDomainObjPtr dom, @@ -18788,6 +18871,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, + { qemuDomainGetStatsCpuTune, VIR_DOMAIN_STATS_TUNE_CPU, false }, { NULL, 0, false } }; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 464ac11..ede433d 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2017,6 +2017,10 @@ static const vshCmdOptDef opts_domstats[] = { .type = VSH_OT_BOOL, .help = N_("report domain block device statistics"), }, + {.name = "tune-cpu", + .type = VSH_OT_BOOL, + .help = N_("report domain cpu scheduler parameters"), + }, {.name = "list-active", .type = VSH_OT_BOOL, .help = N_("list only active domains"), @@ -2127,6 +2131,9 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "block")) stats |= VIR_DOMAIN_STATS_BLOCK; + if (vshCommandOptBool(cmd, "tune-cpu")) + stats |= VIR_DOMAIN_STATS_TUNE_CPU; + if (vshCommandOptBool(cmd, "list-active")) flags |= VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE; diff --git a/tools/virsh.pod b/tools/virsh.pod index 1f71c91..bcc966e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -828,6 +828,7 @@ or unique source names printed by this command. =item B<domstats> [I<--raw>] [I<--enforce>] [I<--backing>] [I<--state>] [I<--cpu-total>] [I<--balloon>] [I<--vcpu>] [I<--interface>] [I<--block>] +[I<--tune-cpu>] [[I<--list-active>] [I<--list-inactive>] [I<--list-persistent>] [I<--list-transient>] [I<--list-running>] [I<--list-paused>] [I<--list-shutoff>] [I<--list-other>]] | [I<domain> ...] @@ -846,7 +847,7 @@ behavior use the I<--raw> flag. The individual statistics groups are selectable via specific flags. By default all supported statistics groups are returned. Supported statistics groups flags are: I<--state>, I<--cpu-total>, I<--balloon>, -I<--vcpu>, I<--interface>, I<--block>. +I<--vcpu>, I<--interface>, I<--block>, I<--tune-cpu>. When selecting the I<--state> group the following fields are returned: "state.state" - state of the VM, returned as number from virDomainState enum, @@ -906,6 +907,13 @@ local file or block device, "block.<num>.capacity" - logical size of source file in bytes, "block.<num>.physical" - physical size of source file in bytes +I<--tune-cpu> returns: +"tune.vcpu.quota" - max allowed bandwidth, in microseconds, +"tune.vcpu.period" - timeframe for enforcing the vcpu quota, in microseconds, +"tune.emu.quota" - maximum bandwidth for emulator threads, in microseconds, +"tune.emu.period" - timeframe for enforcing the emu quota, in microseconds, +"tune.cpu.shares" - weight of this domain, compared to other running domains. + Selecting a specific statistics groups doesn't guarantee that the daemon supports the selected group of stats. Flag I<--enforce> forces the command to fail if the daemon doesn't support the -- 2.1.0

2 3

[libvirt] [PATCH] Error out on an address for isa-serial in QEMU driver.
by Ján Tomko 09 Mar '15

09 Mar '15

We've never formatted them on the qemu command line. https://bugzilla.redhat.com/show_bug.cgi?id=1164053 --- src/qemu/qemu_command.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c112619..e7b8c66 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10409,7 +10409,8 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrSerialTargetTypeToString(serial->targetType), serial->info.alias, serial->info.alias); - if (serial->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) { + switch (serial->targetType) { + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_SERIAL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("usb-serial is not supported in this QEMU binary")); @@ -10425,6 +10426,15 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0) goto error; + break; + + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: + if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("no addresses are suported for isa-serial")); + goto error; + } + break; } } -- 2.0.5

2 1

[libvirt] [PATCH] sanlock: Don't spam logs with "target pid not found"
by Jiri Denemark 09 Mar '15

09 Mar '15

Commit v1.2.4-52-gda879e5 fixed issues with domains started before sanlock driver was enabled by checking whether a running domain is registered with sanlock and if it's not, sanlock driver is basically ignored for the domain. However, it was checking this even for domain which has just been started and no sanlock_* API was called for them yet. This results in cmd 9 target pid 2135544 not found error messages to appear in sanlock.log whenever we start a new domain. This patch avoids this useless check for freshly started domains. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/locking/domain_lock.c | 22 ++++++++++++---------- src/locking/lock_driver.h | 12 +++++++++++- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_sanlock.c | 9 ++++++--- src/locking/lock_manager.c | 2 +- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index d7b681e..705b132 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -104,7 +104,8 @@ static int virDomainLockManagerAddImage(virLockManagerPtr lock, static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin, const char *uri, virDomainObjPtr dom, - bool withResources) + bool withResources, + unsigned int flags) { virLockManagerPtr lock; size_t i; @@ -138,7 +139,7 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin, VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN, ARRAY_CARDINALITY(params), params, - 0))) + flags))) goto error; if (withResources) { @@ -177,7 +178,8 @@ int virDomainLockProcessStart(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p paused=%d fd=%p", plugin, dom, paused, fd); - if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true))) + if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true, + VIR_LOCK_MANAGER_NEW_STARTED))) return -1; if (paused) @@ -201,7 +203,7 @@ int virDomainLockProcessPause(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p state=%p", plugin, dom, state); - if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true))) + if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true, 0))) return -1; ret = virLockManagerRelease(lock, state, 0); @@ -221,7 +223,7 @@ int virDomainLockProcessResume(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p state=%s", plugin, dom, NULLSTR(state)); - if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true))) + if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true, 0))) return -1; ret = virLockManagerAcquire(lock, state, 0, dom->def->onLockFailure, NULL); @@ -240,7 +242,7 @@ int virDomainLockProcessInquire(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p state=%p", plugin, dom, state); - if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true))) + if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true, 0))) return -1; ret = virLockManagerInquire(lock, state, 0); @@ -260,7 +262,7 @@ int virDomainLockImageAttach(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p src=%p", plugin, dom, src); - if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false))) + if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false, 0))) return -1; if (virDomainLockManagerAddImage(lock, src) < 0) @@ -297,7 +299,7 @@ int virDomainLockImageDetach(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p src=%p", plugin, dom, src); - if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false))) + if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false, 0))) return -1; if (virDomainLockManagerAddImage(lock, src) < 0) @@ -334,7 +336,7 @@ int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p lease=%p", plugin, dom, lease); - if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false))) + if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false, 0))) return -1; if (virDomainLockManagerAddLease(lock, lease) < 0) @@ -362,7 +364,7 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin, VIR_DEBUG("plugin=%p dom=%p lease=%p", plugin, dom, lease); - if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false))) + if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false, 0))) return -1; if (virDomainLockManagerAddLease(lock, lease) < 0) diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index a7d9782..f8fd38e 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -65,6 +65,11 @@ typedef enum { VIR_LOCK_MANAGER_ACQUIRE_RESTRICT = (1 << 1), } virLockManagerAcquireFlags; +typedef enum { + /* virLockManagerNew called for a freshly started domain */ + VIR_LOCK_MANAGER_NEW_STARTED = (1 << 0), +} virLockManagerNewFlags; + enum { VIR_LOCK_MANAGER_PARAM_TYPE_STRING, VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, @@ -142,13 +147,18 @@ typedef int (*virLockDriverDeinit)(void); * @type: the type of process to be supervised * @nparams: number of metadata parameters * @params: extra metadata parameters - * @flags: optional flags, currently unused + * @flags: bitwise-OR of virLockManagerNewFlags * * Initialize a new context to supervise a process, usually * a virtual machine. The lock driver implementation can use * the <code>privateData</code> field of <code>man</code> * to store a pointer to any driver specific state. * + * If @flags contains VIR_LOCK_MANAGER_NEW_STARTED, this API is called for + * a domain that has just been started and may therefore skip some actions. + * Specifically, checking whether the domain is registered with a lock + * daemon is useless in this case. + * * A process of VIR_LOCK_MANAGER_START_DOMAIN will be * given the following parameters * diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 8d184fe..72a4a0c 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -439,7 +439,7 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock, virLockManagerLockDaemonPrivatePtr priv; size_t i; - virCheckFlags(VIR_LOCK_MANAGER_USES_STATE, -1); + virCheckFlags(VIR_LOCK_MANAGER_NEW_STARTED, -1); if (VIR_ALLOC(priv) < 0) return -1; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 60f305c..dbe79bc 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -455,7 +455,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, size_t i; int resCount = 0; - virCheckFlags(0, -1); + virCheckFlags(VIR_LOCK_MANAGER_NEW_STARTED, -1); if (!driver) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -497,8 +497,11 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, * if it returns any other error (rv < 0), then we cannot fail due * to back-compat. So this whole call is non-fatal, because it's * called from all over the place (it will usually fail). It merely - * updates privateData. */ - if (sanlock_inquire(-1, priv->vm_pid, 0, &resCount, NULL) >= 0) + * updates privateData. + * If the process has just been started, we are pretty sure it is not + * registered. */ + if (!(flags & VIR_LOCK_MANAGER_NEW_STARTED) && + sanlock_inquire(-1, priv->vm_pid, 0, &resCount, NULL) >= 0) priv->registered = true; lock->privateData = priv; diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index f277f22..a002ea8 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -287,7 +287,7 @@ virLockDriverPtr virLockManagerPluginGetDriver(virLockManagerPluginPtr plugin) * virLockManagerNew: * @driver: the lock manager implementation to use * @type: the type of process to be supervised - * @flags: optional flags, currently unused + * @flags: bitwise-OR of virLockManagerNewFlags * * Create a new context to supervise a process, usually * a virtual machine. -- 2.3.1

2 4