1:21 p.m.
Since I'm a procrastinator and I wanted to do this after full node-name support
is added I'm kind of late for this release here. Since oVirt is asking for this
feature for a very long time I would like to deliver it ASAP though.
This series adds a event which is fired once a guest writes beyond a configured
offset in the backing file. The threshold offset is configurable via a new API.
This series is in RFC state since I did not manage to polish few details mostly
connected to node names:
- currently only the top level image can be selected
- some blockjobs may clear the remembered node names and thus break this
( re-detection of the backing chain needs to be connected with node name
detection )
- the node name detection code is VERY crude
- I'm not sure how well it plays with qcow images, since I select only the top
level node (qcow protocol) rather than the file backing it
- the documentation probably sucks since I did not proof-read
Any feedback is welcome.
Peter Krempa (12):
util: storage: Split out useful bits of virStorageFileParseChainIndex
util: storage: Add preliminary storage for node names into
virStorageSource
lib: Introduce event for tracking disk backing file write threshold
qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event
qemu: domain: Add helper to lookup disk by node name
qemu: domain: Add helper to generate indexed backing store names
qemu: process: Wire up firing of the
VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD event
lib: Add API for setting the threshold size for
VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD
virsh: Implement 'blockthreshold' command to call
virDomainSetBlockThreshold
qemu: domain: Add helper to look up disk soruce by the backing store
string
qemu: implement qemuDomainSetBlockThreshold
qemu: WIP: lookup nodenames
daemon/remote.c | 43 +++++++++
examples/object-events/event-test.c | 19 ++++
include/libvirt/libvirt-domain.h | 36 +++++++
src/conf/domain_event.c | 97 +++++++++++++++++++
src/conf/domain_event.h | 15 +++
src/driver-hypervisor.h | 8 ++
src/libvirt-domain.c | 51 ++++++++++
src/libvirt_private.syms | 4 +
src/libvirt_public.syms | 1 +
src/qemu/qemu_capabilities.c | 2 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_domain.c | 103 ++++++++++++++++++++
src/qemu/qemu_domain.h | 14 +++
src/qemu/qemu_driver.c | 64 +++++++++++++
src/qemu/qemu_monitor.c | 42 ++++++++-
src/qemu/qemu_monitor.h | 19 ++++
src/qemu/qemu_monitor_json.c | 65 ++++++++++++-
src/qemu/qemu_monitor_json.h | 6 ++
src/qemu/qemu_process.c | 41 ++++++++
src/remote/remote_driver.c | 34 +++++++
src/remote/remote_protocol.x | 33 ++++++-
src/remote_protocol-structs | 16 ++++
src/util/virstoragefile.c | 105 ++++++++++++++++++---
src/util/virstoragefile.h | 14 +++
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 +
.../caps_2.6.0-gicv2.aarch64.xml | 1 +
.../caps_2.6.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
tools/virsh-domain.c | 84 +++++++++++++++++
tools/virsh.pod | 8 ++
37 files changed, 922 insertions(+), 14 deletions(-)
--
2.11.1
1:21 p.m.
New subject: [libvirt] [RFC PATCH 01/12] util: storage: Split out useful bits of virStorageFileParseChainIndex
The function has very specific semantics. Split out the part that parses
the backing store specification string into a separate helper so that it
can be reused later while keeping the wrapper with existing semantics.
Note that virStorageFileParseChainIndex is pretty well covered by the
test suite.
---
src/libvirt_private.syms | 1 +
src/util/virstoragefile.c | 68 +++++++++++++++++++++++++++++++++++++++--------
src/util/virstoragefile.h | 5 ++++
3 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 07a35333b..69d1bc860 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2462,6 +2462,7 @@ virStorageFileGetMetadataInternal;
virStorageFileGetRelativeBackingPath;
virStorageFileGetSCSIKey;
virStorageFileIsClusterFS;
+virStorageFileParseBackingStoreStr;
virStorageFileParseChainIndex;
virStorageFileProbeFormat;
virStorageFileResize;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index c9420fdb7..3e711228b 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1442,32 +1442,78 @@ int virStorageFileGetSCSIKey(const char *path,
}
#endif
+
+/**
+ * virStorageFileParseBackingStoreStr:
+ * @str: backing store specifier string to parse
+ * @target: returns target device portion of the string
+ * @chainIndex: returns the backing store portion of the string
+ *
+ * Parses the backing store specifier string such as vda[1], or sda into
+ * components and returns them via arguments. If the string did not specify an
+ * index 0 is assumed.
+ *
+ * Returns 0 on success -1 on error
+ */
+int
+virStorageFileParseBackingStoreStr(const char *str,
+ char **target,
+ unsigned int *chainIndex)
+{
+ char **strings = NULL;
+ size_t nstrings;
+ unsigned int idx = 0;
+ char *suffix;
+ int ret = -1;
+
+ *chainIndex = 0;
+
+ if (!(strings = virStringSplitCount(str, "[", 2, &nstrings)))
+ return -1;
+
+ if (nstrings == 2) {
+ if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||
+ STRNEQ(suffix, "]"))
+ goto cleanup;
+ }
+
+ if (target &&
+ VIR_STRDUP(*target, strings[0]) < 0)
+ goto cleanup;
+
+ *chainIndex = idx;
+ ret = 0;
+
+ cleanup:
+ virStringListFreeCount(strings, nstrings);
+ return ret;
+}
+
+
int
virStorageFileParseChainIndex(const char *diskTarget,
const char *name,
unsigned int *chainIndex)
{
- char **strings = NULL;
unsigned int idx = 0;
- char *suffix;
+ char *target = NULL;
int ret = 0;
*chainIndex = 0;
- if (name && diskTarget)
- strings = virStringSplit(name, "[", 2);
+ if (!name || !diskTarget)
+ return 0;
- if (virStringListLength((const char * const *)strings) != 2)
- goto cleanup;
+ if (virStorageFileParseBackingStoreStr(name, &target, &idx) < 0)
+ return 0;
- if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||
- STRNEQ(suffix, "]"))
+ if (idx == 0)
goto cleanup;
- if (STRNEQ(diskTarget, strings[0])) {
+ if (STRNEQ(diskTarget, target)) {
virReportError(VIR_ERR_INVALID_ARG,
_("requested target '%s' does not match target
'%s'"),
- strings[0], diskTarget);
+ target, diskTarget);
ret = -1;
goto cleanup;
}
@@ -1475,7 +1521,7 @@ virStorageFileParseChainIndex(const char *diskTarget,
*chainIndex = idx;
cleanup:
- virStringListFree(strings);
+ VIR_FREE(target);
return ret;
}
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index bea1c35a2..5f6e41911 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -309,6 +309,11 @@ int virStorageFileParseChainIndex(const char *diskTarget,
unsigned int *chainIndex)
ATTRIBUTE_NONNULL(3);
+int virStorageFileParseBackingStoreStr(const char *str,
+ char **target,
+ unsigned int *chainIndex)
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
+
virStorageSourcePtr virStorageFileChainLookup(virStorageSourcePtr chain,
virStorageSourcePtr startFrom,
const char *name,
--
2.11.1
2:36 p.m.
New subject: [libvirt] [RFC PATCH 01/12] util: storage: Split out useful bits of virStorageFileParseChainIndex
On 02/23/2017 01:21 PM, Peter Krempa wrote:
The function has very specific semantics. Split out the part that
parses
the backing store specification string into a separate helper so that it
can be reused later while keeping the wrapper with existing semantics.
Note that virStorageFileParseChainIndex is pretty well covered by the
test suite.
---
src/libvirt_private.syms | 1 +
src/util/virstoragefile.c | 68 +++++++++++++++++++++++++++++++++++++++--------
src/util/virstoragefile.h | 5 ++++
3 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 07a35333b..69d1bc860 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2462,6 +2462,7 @@ virStorageFileGetMetadataInternal;
virStorageFileGetRelativeBackingPath;
virStorageFileGetSCSIKey;
virStorageFileIsClusterFS;
+virStorageFileParseBackingStoreStr;
virStorageFileParseChainIndex;
virStorageFileProbeFormat;
virStorageFileResize;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index c9420fdb7..3e711228b 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1442,32 +1442,78 @@ int virStorageFileGetSCSIKey(const char *path,
}
#endif
+
+/**
+ * virStorageFileParseBackingStoreStr:
+ * @str: backing store specifier string to parse
+ * @target: returns target device portion of the string
+ * @chainIndex: returns the backing store portion of the string
+ *
+ * Parses the backing store specifier string such as vda[1], or sda into
+ * components and returns them via arguments. If the string did not specify an
+ * index 0 is assumed.
grammar nit: s/index/index,/
+ *
+ * Returns 0 on success -1 on error
+ */
+int
+virStorageFileParseBackingStoreStr(const char *str,
+ char **target,
+ unsigned int *chainIndex)
+{
+ char **strings = NULL;
+ size_t nstrings;
+ unsigned int idx = 0;
+ char *suffix;
+ int ret = -1;
+
+ *chainIndex = 0;
+
+ if (!(strings = virStringSplitCount(str, "[", 2, &nstrings)))
+ return -1;
+
+ if (nstrings == 2) {
+ if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||
+ STRNEQ(suffix, "]"))
+ goto cleanup;
+ }
+
+ if (target &&
+ VIR_STRDUP(*target, strings[0]) < 0)
+ goto cleanup;
+
+ *chainIndex = idx;
+ ret = 0;
+
+ cleanup:
+ virStringListFreeCount(strings, nstrings);
+ return ret;
+}
I might have gone for a simpler implementation (no need to malloc and
throw away a full-blown string split, when it is easy to do by hand):
char *p = strchr(str, '[');
char *suffix;
int ret = 0;
*chainIndex = 0;
if (!p) {
if (target)
ret = VIR_STRDUP(*target, str);
} else if (virStrToLong_uip(p + 1, &suffix, 10, chainIndex) < 0 ||
STRNEQ(suffix, "]")) {
return -1;
} else if (target) {
ret = VIR_STRNDUP(*target, str, p - str);
}
return ret;
(well, modulo a tweak to the return value if returning 0 is more
important than returning 1 on success)
I see that you were just moving the pre-existing complexity, though. At
any rate, it's a nice refactoring, whether or not you also improve the
new helper function to not be so roundabout at computing its results.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
1:21 p.m.
New subject: [libvirt] [RFC PATCH 02/12] util: storage: Add preliminary storage for node names into virStorageSource
---
src/libvirt_private.syms | 1 +
src/util/virstoragefile.c | 37 +++++++++++++++++++++++++++++++++++++
src/util/virstoragefile.h | 9 +++++++++
3 files changed, 47 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 69d1bc860..078cca001 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2476,6 +2476,7 @@ virStorageNetProtocolTypeToString;
virStorageSourceBackingStoreClear;
virStorageSourceClear;
virStorageSourceCopy;
+virStorageSourceFindByNodeName;
virStorageSourceFree;
virStorageSourceGetActualType;
virStorageSourceGetSecurityLabelDef;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 3e711228b..d8f66a8a1 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2012,6 +2012,7 @@ virStorageSourceCopy(const virStorageSource *src,
VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 ||
VIR_STRDUP(ret->snapshot, src->snapshot) < 0 ||
VIR_STRDUP(ret->configFile, src->configFile) < 0 ||
+ VIR_STRDUP(ret->nodeName, src->nodeName) < 0 ||
VIR_STRDUP(ret->compat, src->compat) < 0)
goto error;
@@ -2232,6 +2233,8 @@ virStorageSourceClear(virStorageSourcePtr def)
virStorageNetHostDefFree(def->nhosts, def->hosts);
virStorageAuthDefFree(def->auth);
+ VIR_FREE(def->nodeName);
+
virStorageSourceBackingStoreClear(def);
}
@@ -3781,3 +3784,37 @@ virStorageSourceIsRelative(virStorageSourcePtr src)
return false;
}
+
+
+/**
+ * virStorageSourceFindByNodeName:
+ * @top: backing chain top
+ * @nodeName: node name to find in backing chain
+ * @index: if provided the index in the backing chain
+ *
+ * Looks up the given storage source in the backing chain and returns the
+ * pointer to it. If @index is passed then it's filled by the index in the
+ * backing chain. On failure NULL is returned and no error is reported.
+ */
+virStorageSourcePtr
+virStorageSourceFindByNodeName(virStorageSourcePtr top,
+ const char *nodeName,
+ unsigned int *index)
+{
+ virStorageSourcePtr tmp;
+
+ if (index)
+ *index = 0;
+
+ for (tmp = top; tmp; tmp = tmp->backingStore) {
+ if (STREQ_NULLABLE(tmp->nodeName, nodeName))
+ return tmp;
+
+ if (index)
+ (*index)++;
+ }
+
+ if (index)
+ *index = 0;
+ return NULL;
+}
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 5f6e41911..ffea60075 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -276,6 +276,9 @@ struct _virStorageSource {
/* Name of the child backing store recorded in metadata of the
* current file. */
char *backingStoreRaw;
+
+ /* metadata that allows identifying given storage source */
+ char *nodeName;
};
@@ -395,4 +398,10 @@ virStorageSourcePtr virStorageSourceNewFromBackingAbsolute(const char
*path);
bool virStorageSourceIsRelative(virStorageSourcePtr src);
+virStorageSourcePtr
+virStorageSourceFindByNodeName(virStorageSourcePtr top,
+ const char *nodeName,
+ unsigned int *index)
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+
#endif /* __VIR_STORAGE_FILE_H__ */
--
2.11.1
3:46 p.m.
New subject: [libvirt] [RFC PATCH 02/12] util: storage: Add preliminary storage for node names into virStorageSource
On 02/23/2017 01:21 PM, Peter Krempa wrote:
---
src/libvirt_private.syms | 1 +
src/util/virstoragefile.c | 37 +++++++++++++++++++++++++++++++++++++
src/util/virstoragefile.h | 9 +++++++++
3 files changed, 47 insertions(+)
ACK
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
1:21 p.m.
New subject: [libvirt] [RFC PATCH 03/12] lib: Introduce event for tracking disk backing file write threshold
When using thin provisioning, management tools need to resize the disk
in certain cases. To avoid having them to poll disk fillng introduce an
event whic will be fired when a given offset of the storage is written
by the hypervisor. Together with the API which will be added later, it
will allow to register thresholds for given storage backing volumes and
this event will then notify management if the threshold is exceeded.
---
daemon/remote.c | 43 ++++++++++++++++
examples/object-events/event-test.c | 19 ++++++++
include/libvirt/libvirt-domain.h | 31 ++++++++++++
src/conf/domain_event.c | 97 +++++++++++++++++++++++++++++++++++++
src/conf/domain_event.h | 15 ++++++
src/libvirt_private.syms | 2 +
src/remote/remote_driver.c | 33 +++++++++++++
src/remote/remote_protocol.x | 18 ++++++-
src/remote_protocol-structs | 9 ++++
tools/virsh-domain.c | 21 ++++++++
10 files changed, 287 insertions(+), 1 deletion(-)
diff --git a/daemon/remote.c b/daemon/remote.c
index f2b9b9aec..511f499de 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1295,6 +1295,48 @@ remoteRelayDomainEventMetadataChange(virConnectPtr conn,
}
+static int
+remoteRelayDomainEventBlockThreshold(virConnectPtr conn,
+ virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess,
+ void *opaque)
+{
+ daemonClientEventCallbackPtr callback = opaque;
+ remote_domain_event_block_threshold_msg data;
+
+ if (callback->callbackID < 0 ||
+ !remoteRelayDomainEventCheckACL(callback->client, conn, dom))
+ return -1;
+
+ VIR_DEBUG("Relaying domain block threshold event %s %d %s %s %llu %llu, callback
%d",
+ dom->name, dom->id, dev, NULLSTR(path), threshold, excess,
callback->callbackID);
+
+ /* build return data */
+ memset(&data, 0, sizeof(data));
+ data.callbackID = callback->callbackID;
+ if (VIR_STRDUP(data.dev, dev) < 0)
+ goto error;
+ if (VIR_ALLOC(data.path) < 0)
+ goto error;
+ if (VIR_STRDUP(*(data.path), path) < 0)
+ goto error;
+ data.threshold = threshold;
+ data.excess = excess;
+ make_nonnull_domain(&data.dom, dom);
+
+ remoteDispatchObjectEventSend(callback->client, remoteProgram,
+ REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD,
+ (xdrproc_t)xdr_remote_domain_event_block_threshold_msg,
&data);
+
+ return 0;
+ error:
+ VIR_FREE(data.dev);
+ return -1;
+}
+
static virConnectDomainEventGenericCallback domainEventCallbacks[] = {
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle),
@@ -1321,6 +1363,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] =
{
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventJobCompleted),
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed),
VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMetadataChange),
+ VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockThreshold),
};
verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST);
diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c
index 55c004f93..12690cac0 100644
--- a/examples/object-events/event-test.c
+++ b/examples/object-events/event-test.c
@@ -15,6 +15,7 @@
#define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array)))
#define STREQ(a, b) (strcmp(a, b) == 0)
+#define NULLSTR(s) ((s) ? (s) : "<null>")
#ifndef ATTRIBUTE_UNUSED
# define ATTRIBUTE_UNUSED __attribute__((__unused__))
@@ -925,6 +926,23 @@ myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
static int
+myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+ virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess,
+ void *opaque ATTRIBUTE_UNUSED)
+{
+ printf("%s EVENT: Domain %s(%d) block threshold callback dev '%s'(%s),
"
+ "threshold: '%llu', excess: '%llu'",
+ __func__, virDomainGetName(dom), virDomainGetID(dom),
+ dev, NULLSTR(path), threshold, excess);
+ return 0;
+}
+
+
+static int
myDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
virDomainPtr dom,
int iteration,
@@ -1053,6 +1071,7 @@ struct domainEventData domainEvents[] = {
DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback),
DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED,
myDomainEventDeviceRemovalFailedCallback),
DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_METADATA_CHANGE,
myDomainEventMetadataChangeCallback),
+ DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD,
myDomainEventBlockThresholdCallback),
};
struct storagePoolEventData {
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index c0f715d66..892cf2cc5 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -4175,6 +4175,36 @@ typedef void
(*virConnectDomainEventAgentLifecycleCallback)(virConnectPtr conn,
/**
+ * virConnectDomainEventBlockThresholdCallback:
+ * @conn: connection object
+ * @dom: domain on which the event occurred
+ * @dev: name associated with the affected disk or storage backing chain
+ * element
+ * @path: for local storage, the path of the backing chain element
+ * @threshold: threshold
+ * @excess: WTF
+ * @opaque: application specified data
+ *
+ * The callback occurs when the hypervisor detects that the given storage
+ * element was written beyond the point specified by @threshold. The excess
+ * data size written beyond @threshold is reported by @excess (if supported
+ * by the hypervisor, 0 otherwise). The event is useful for thin-provisioned
+ * storage.
+ *
+ * The threshold size can be set via the virDomainSetBlockThreshold API.
+ *
+ * The callback signature to use when registering for an event of type
+ * VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD with virConnectDomainEventRegisterAny()
+ */
+typedef void (*virConnectDomainEventBlockThresholdCallback)(virConnectPtr conn,
+ virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long
threshold,
+ unsigned long long excess,
+ void *opaque);
+
+/**
* VIR_DOMAIN_EVENT_CALLBACK:
*
* Used to cast the event specific callback into the generic one
@@ -4215,6 +4245,7 @@ typedef enum {
VIR_DOMAIN_EVENT_ID_JOB_COMPLETED = 21, /* virConnectDomainEventJobCompletedCallback
*/
VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /*
virConnectDomainEventDeviceRemovalFailedCallback */
VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /*
virConnectDomainEventMetadataChangeCallback */
+ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD = 24, /*
virConnectDomainEventBlockThresholdCallback */
# ifdef VIR_ENUM_SENTINELS
VIR_DOMAIN_EVENT_ID_LAST
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index da503f3ee..6243b4262 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -60,6 +60,7 @@ static virClassPtr virDomainEventMigrationIterationClass;
static virClassPtr virDomainEventJobCompletedClass;
static virClassPtr virDomainEventDeviceRemovalFailedClass;
static virClassPtr virDomainEventMetadataChangeClass;
+static virClassPtr virDomainEventBlockThresholdClass;
static void virDomainEventDispose(void *obj);
static void virDomainEventLifecycleDispose(void *obj);
@@ -81,6 +82,7 @@ static void virDomainEventMigrationIterationDispose(void *obj);
static void virDomainEventJobCompletedDispose(void *obj);
static void virDomainEventDeviceRemovalFailedDispose(void *obj);
static void virDomainEventMetadataChangeDispose(void *obj);
+static void virDomainEventBlockThresholdDispose(void *obj);
static void
virDomainEventDispatchDefaultFunc(virConnectPtr conn,
@@ -277,6 +279,17 @@ struct _virDomainEventMetadataCange {
typedef struct _virDomainEventMetadataCange virDomainEventMetadataChange;
typedef virDomainEventMetadataChange *virDomainEventMetadataChangePtr;
+struct _virDomainEventBlockThreshold {
+ virDomainEvent parent;
+
+ char *dev;
+ char *path;
+
+ unsigned long long threshold;
+ unsigned long long excess;
+};
+typedef struct _virDomainEventBlockThreshold virDomainEventBlockThreshold;
+typedef virDomainEventBlockThreshold *virDomainEventBlockThresholdPtr;
static int
@@ -402,6 +415,12 @@ virDomainEventsOnceInit(void)
sizeof(virDomainEventMetadataChange),
virDomainEventMetadataChangeDispose)))
return -1;
+ if (!(virDomainEventBlockThresholdClass =
+ virClassNew(virDomainEventClass,
+ "virDomainEventBlockThreshold",
+ sizeof(virDomainEventBlockThreshold),
+ virDomainEventBlockThresholdDispose)))
+ return -1;
return 0;
}
@@ -600,6 +619,17 @@ virDomainEventMetadataChangeDispose(void *obj)
}
+static void
+virDomainEventBlockThresholdDispose(void *obj)
+{
+ virDomainEventBlockThresholdPtr event = obj;
+ VIR_DEBUG("obj=%p", event);
+
+ VIR_FREE(event->dev);
+ VIR_FREE(event->path);
+}
+
+
static void *
virDomainEventNew(virClassPtr klass,
int eventID,
@@ -1674,6 +1704,60 @@ virDomainEventMetadataChangeNewFromDom(virDomainPtr dom,
}
+static virObjectEventPtr
+virDomainEventBlockThresholdNew(int id,
+ const char *name,
+ unsigned char *uuid,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess)
+{
+ virDomainEventBlockThresholdPtr ev;
+
+ if (virDomainEventsInitialize() < 0)
+ return NULL;
+
+ if (!(ev = virDomainEventNew(virDomainEventBlockThresholdClass,
+ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD,
+ id, name, uuid)))
+ return NULL;
+
+ if (VIR_STRDUP(ev->dev, dev) < 0 ||
+ VIR_STRDUP(ev->path, path) < 0) {
+ virObjectUnref(ev);
+ return NULL;
+ }
+ ev->threshold = threshold;
+ ev->excess = excess;
+
+ return (virObjectEventPtr)ev;
+}
+
+virObjectEventPtr
+virDomainEventBlockThresholdNewFromObj(virDomainObjPtr obj,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess)
+{
+ return virDomainEventBlockThresholdNew(obj->def->id, obj->def->name,
+ obj->def->uuid, dev, path,
+ threshold, excess);
+}
+
+virObjectEventPtr
+virDomainEventBlockThresholdNewFromDom(virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess)
+{
+ return virDomainEventBlockThresholdNew(dom->id, dom->name, dom->uuid,
+ dev, path, threshold, excess);
+}
+
+
static void
virDomainEventDispatchDefaultFunc(virConnectPtr conn,
virObjectEventPtr event,
@@ -1943,6 +2027,19 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn,
goto cleanup;
}
+ case VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD:
+ {
+ virDomainEventBlockThresholdPtr blockThresholdEvent;
+
+ blockThresholdEvent = (virDomainEventBlockThresholdPtr)event;
+ ((virConnectDomainEventBlockThresholdCallback)cb)(conn, dom,
+
blockThresholdEvent->dev,
+
blockThresholdEvent->path,
+
blockThresholdEvent->threshold,
+
blockThresholdEvent->excess,
+ cbopaque);
+ goto cleanup;
+ }
case VIR_DOMAIN_EVENT_ID_LAST:
break;
}
diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index 1933f4724..3992a29c5 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -244,6 +244,21 @@ virDomainEventMetadataChangeNewFromDom(virDomainPtr dom,
int type,
const char *nsuri);
+
+virObjectEventPtr
+virDomainEventBlockThresholdNewFromObj(virDomainObjPtr obj,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess);
+
+virObjectEventPtr
+virDomainEventBlockThresholdNewFromDom(virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess);
+
int
virDomainEventStateRegister(virConnectPtr conn,
virObjectEventStatePtr state,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 078cca001..c0a037011 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -536,6 +536,8 @@ virDomainEventBlockJob2NewFromDom;
virDomainEventBlockJob2NewFromObj;
virDomainEventBlockJobNewFromDom;
virDomainEventBlockJobNewFromObj;
+virDomainEventBlockThresholdNewFromDom;
+virDomainEventBlockThresholdNewFromObj;
virDomainEventControlErrorNewFromDom;
virDomainEventControlErrorNewFromObj;
virDomainEventDeviceAddedNewFromDom;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 0c8bfeed1..efa47beaf 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -396,6 +396,11 @@ remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog
ATTRIBUTE_UNUSED,
void *evdata, void *opaque);
static void
+remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog,
+ virNetClientPtr client,
+ void *evdata, void *opaque);
+
+static void
remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
virNetClientPtr client ATTRIBUTE_UNUSED,
void *evdata, void *opaque);
@@ -602,6 +607,10 @@ static virNetClientProgramEvent remoteEvents[] = {
remoteSecretBuildEventValueChanged,
sizeof(remote_secret_event_value_changed_msg),
(xdrproc_t)xdr_remote_secret_event_value_changed_msg },
+ { REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD,
+ remoteDomainBuildEventBlockThreshold,
+ sizeof(remote_domain_event_block_threshold_msg),
+ (xdrproc_t)xdr_remote_domain_event_block_threshold_msg },
};
static void
@@ -5577,6 +5586,30 @@ remoteSecretGetValue(virSecretPtr secret, size_t *value_size,
}
+static void
+remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
+ virNetClientPtr client ATTRIBUTE_UNUSED,
+ void *evdata, void *opaque)
+{
+ virConnectPtr conn = opaque;
+ remote_domain_event_block_threshold_msg *msg = evdata;
+ struct private_data *priv = conn->privateData;
+ virDomainPtr dom;
+ virObjectEventPtr event = NULL;
+
+ if (!(dom = get_nonnull_domain(conn, msg->dom)))
+ return;
+
+ event = virDomainEventBlockThresholdNewFromDom(dom, msg->dev,
+ msg->path ? *msg->path : NULL,
+ msg->threshold, msg->excess);
+
+ virObjectUnref(dom);
+
+ remoteEventQueue(priv, event, msg->callbackID);
+}
+
+
static int
remoteStreamSend(virStreamPtr st,
const char *data,
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index abe63af07..39dd2b728 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -3071,6 +3071,15 @@ struct remote_domain_event_block_job_2_msg {
int status;
};
+struct remote_domain_event_block_threshold_msg {
+ int callbackID;
+ remote_nonnull_domain dom;
+ remote_nonnull_string dev;
+ remote_string path;
+ unsigned hyper threshold;
+ unsigned hyper excess;
+};
+
struct remote_domain_event_callback_tunable_msg {
int callbackID;
remote_nonnull_domain dom;
@@ -6033,5 +6042,12 @@ enum remote_procedure {
* @acl: domain:save:!VIR_DOMAIN_AFFECT_CONFIG|VIR_DOMAIN_AFFECT_LIVE
* @acl: domain:save:VIR_DOMAIN_AFFECT_CONFIG
*/
- REMOTE_PROC_DOMAIN_SET_VCPU = 384
+ REMOTE_PROC_DOMAIN_SET_VCPU = 384,
+
+ /**
+ * @generate: both
+ * @acl: none
+ */
+ REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD = 385
+
};
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index e1e53d21b..67e43a4ac 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2516,6 +2516,14 @@ struct remote_domain_event_block_job_2_msg {
int type;
int status;
};
+struct remote_domain_event_block_threshold_msg {
+ int callbackID;
+ remote_nonnull_domain dom;
+ remote_nonnull_string dev;
+ remote_string path;
+ uint64_t threshold;
+ uint64_t excess;
+};
struct remote_domain_event_callback_tunable_msg {
int callbackID;
remote_nonnull_domain dom;
@@ -3217,4 +3225,5 @@ enum remote_procedure {
REMOTE_PROC_SECRET_EVENT_LIFECYCLE = 382,
REMOTE_PROC_SECRET_EVENT_VALUE_CHANGED = 383,
REMOTE_PROC_DOMAIN_SET_VCPU = 384,
+ REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD = 385,
};
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 09a9f8203..ee702f3c4 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -12870,6 +12870,25 @@ virshEventMetadataChangePrint(virConnectPtr conn
ATTRIBUTE_UNUSED,
}
+static void
+virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED,
+ virDomainPtr dom,
+ const char *dev,
+ const char *path,
+ unsigned long long threshold,
+ unsigned long long excess,
+ void *opaque)
+{
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+ virBufferAsprintf(&buf, _("event 'block-threshold' for domain %s:
"
+ "dev: %s(%s) %llu %llu\n"),
+ virDomainGetName(dom),
+ dev, NULLSTR(path), threshold, excess);
+ virshEventPrint(opaque, &buf);
+}
+
+
static vshEventCallback vshEventCallbacks[] = {
{ "lifecycle",
VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), },
@@ -12917,6 +12936,8 @@ static vshEventCallback vshEventCallbacks[] = {
VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovalFailedPrint), },
{ "metadata-change",
VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), },
+ { "block-threshold",
+ VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), },
};
verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks));
--
2.11.1
4:32 p.m.
New subject: [libvirt] [RFC PATCH 03/12] lib: Introduce event for tracking disk backing file write threshold
On 02/23/2017 01:21 PM, Peter Krempa wrote:
When using thin provisioning, management tools need to resize the
disk
in certain cases. To avoid having them to poll disk fillng introduce an
Typo, but a different word sounds better:
s/fillng/usage/
event whic will be fired when a given offset of the storage is
written
s/whic/which/
by the hypervisor. Together with the API which will be added later,
it
will allow to register thresholds for given storage backing volumes and
s/to register/registering/
this event will then notify management if the threshold is exceeded.
---
daemon/remote.c | 43 ++++++++++++++++
examples/object-events/event-test.c | 19 ++++++++
include/libvirt/libvirt-domain.h | 31 ++++++++++++
src/conf/domain_event.c | 97 +++++++++++++++++++++++++++++++++++++
src/conf/domain_event.h | 15 ++++++
src/libvirt_private.syms | 2 +
src/remote/remote_driver.c | 33 +++++++++++++
src/remote/remote_protocol.x | 18 ++++++-
src/remote_protocol-structs | 9 ++++
tools/virsh-domain.c | 21 ++++++++
10 files changed, 287 insertions(+), 1 deletion(-)
+++ b/include/libvirt/libvirt-domain.h
@@ -4175,6 +4175,36 @@ typedef void
(*virConnectDomainEventAgentLifecycleCallback)(virConnectPtr conn,
/**
+ * virConnectDomainEventBlockThresholdCallback:
+ * @conn: connection object
+ * @dom: domain on which the event occurred
+ * @dev: name associated with the affected disk or storage backing chain
+ * element
+ * @path: for local storage, the path of the backing chain element
+ * @threshold: threshold
+ * @excess: WTF
Supposedly, how much beyond the threshold a write was detected at the
time the event was fired. (For example, if I have an 8M file with a
threshold at 6M, then the guest does a 2M write at offset 5M, threshold
would be 1M, because the write from 5-7M is 1M beyond my threshold of 6M).
+ * @opaque: application specified data
+ *
+ * The callback occurs when the hypervisor detects that the given storage
+ * element was written beyond the point specified by @threshold. The excess
+ * data size written beyond @threshold is reported by @excess (if supported
+ * by the hypervisor, 0 otherwise). The event is useful for thin-provisioned
+ * storage.
This description is better than the WTF above :)
+ *
+ * The threshold size can be set via the virDomainSetBlockThreshold API.
(added later in the series, but documenting now is fine)
Looks okay
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
3:24 a.m.
New subject: [libvirt] [RFC PATCH 03/12] lib: Introduce event for tracking disk backing file write threshold
On Thu, Feb 23, 2017 at 16:32:45 -0600, Eric Blake wrote:
On 02/23/2017 01:21 PM, Peter Krempa wrote:
> When using thin provisioning, management tools need to resize the disk
> in certain cases. To avoid having them to poll disk fillng introduce an
Typo, but a different word sounds better:
s/fillng/usage/
> event whic will be fired when a given offset of the storage is written
s/whic/which/
> by the hypervisor. Together with the API which will be added later, it
> will allow to register thresholds for given storage backing volumes and
s/to register/registering/
> this event will then notify management if the threshold is exceeded.
> ---
> daemon/remote.c | 43 ++++++++++++++++
> examples/object-events/event-test.c | 19 ++++++++
> include/libvirt/libvirt-domain.h | 31 ++++++++++++
> src/conf/domain_event.c | 97 +++++++++++++++++++++++++++++++++++++
> src/conf/domain_event.h | 15 ++++++
> src/libvirt_private.syms | 2 +
> src/remote/remote_driver.c | 33 +++++++++++++
> src/remote/remote_protocol.x | 18 ++++++-
> src/remote_protocol-structs | 9 ++++
> tools/virsh-domain.c | 21 ++++++++
> 10 files changed, 287 insertions(+), 1 deletion(-)
>
> +++ b/include/libvirt/libvirt-domain.h
> @@ -4175,6 +4175,36 @@ typedef void
(*virConnectDomainEventAgentLifecycleCallback)(virConnectPtr conn,
>
>
> /**
> + * virConnectDomainEventBlockThresholdCallback:
> + * @conn: connection object
> + * @dom: domain on which the event occurred
> + * @dev: name associated with the affected disk or storage backing chain
> + * element
> + * @path: for local storage, the path of the backing chain element
> + * @threshold: threshold
> + * @excess: WTF
Supposedly, how much beyond the threshold a write was detected at the
time the event was fired. (For example, if I have an 8M file with a
threshold at 6M, then the guest does a 2M write at offset 5M, threshold
would be 1M, because the write from 5-7M is 1M beyond my threshold of 6M).
Ummm, yes, I just forgot to update it once I actually written the docs.
> + * @opaque: application specified data
> + *
> + * The callback occurs when the hypervisor detects that the given storage
> + * element was written beyond the point specified by @threshold. The excess
> + * data size written beyond @threshold is reported by @excess (if supported
> + * by the hypervisor, 0 otherwise). The event is useful for thin-provisioned
> + * storage.
This description is better than the WTF above :)
Maybe I should pick better strings to make the docs generator shut up
for work in progress code :D
> + *
> + * The threshold size can be set via the virDomainSetBlockThreshold API.
(added later in the series, but documenting now is fine)
Looks okay
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
1:21 p.m.
New subject: [libvirt] [RFC PATCH 04/12] qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event
The event is fired when a given block backend node (identified by the
node name) experiences a write beyond the bound set via
block-set-write-threshold QMP command. This wires up the monitor code to
extract the data and allow us receiving the events and the capability.
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_monitor.c | 18 +++++++++++++++
src/qemu/qemu_monitor.h | 14 ++++++++++++
src/qemu/qemu_monitor_json.c | 26 ++++++++++++++++++++++
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 +
.../caps_2.6.0-gicv2.aarch64.xml | 1 +
.../caps_2.6.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
16 files changed, 72 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5b5e3ac18..927ac49cf 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -358,6 +358,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"query-cpu-model-expansion", /* 245 */
"virtio-net.host_mtu",
"spice-rendernode",
+ "BLOCK_WRITE_THRESHOLD",
);
@@ -1535,6 +1536,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
{ "MIGRATION", QEMU_CAPS_MIGRATION_EVENT },
{ "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
{ "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED },
+ { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
};
struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0f998c473..83fb3acaf 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -394,6 +394,7 @@ typedef enum {
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */
QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */
QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */
+ QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index b15207a69..a8e113f94 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1580,6 +1580,24 @@ qemuMonitorEmitAcpiOstInfo(qemuMonitorPtr mon,
int
+qemuMonitorEmitBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold,
+ unsigned long long excess)
+{
+ int ret = -1;
+
+ VIR_DEBUG("mon=%p, node-name='%s', threshold='%llu',
excess='%llu'",
+ mon, nodename, threshold, excess);
+
+ QEMU_MONITOR_CALLBACK(mon, ret, domainBlockThreshold, mon->vm,
+ nodename, threshold, excess);
+
+ return ret;
+}
+
+
+int
qemuMonitorSetCapabilities(qemuMonitorPtr mon)
{
QEMU_CHECK_MONITOR(mon);
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8811d8501..a866685e9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -207,6 +207,14 @@ typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitorPtr
mon,
void *opaque);
+typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitorPtr mon,
+ virDomainObjPtr vm,
+ const char *nodename,
+ unsigned long long threshold,
+ unsigned long long excess,
+ void *opaque);
+
+
typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr;
struct _qemuMonitorCallbacks {
@@ -238,6 +246,7 @@ struct _qemuMonitorCallbacks {
qemuMonitorDomainMigrationStatusCallback domainMigrationStatus;
qemuMonitorDomainMigrationPassCallback domainMigrationPass;
qemuMonitorDomainAcpiOstInfoCallback domainAcpiOstInfo;
+ qemuMonitorDomainBlockThresholdCallback domainBlockThreshold;
};
char *qemuMonitorEscapeArg(const char *in);
@@ -357,6 +366,11 @@ int qemuMonitorEmitAcpiOstInfo(qemuMonitorPtr mon,
unsigned int source,
unsigned int status);
+int qemuMonitorEmitBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold,
+ unsigned long long excess);
+
int qemuMonitorStartCPUs(qemuMonitorPtr mon,
virConnectPtr conn);
int qemuMonitorStopCPUs(qemuMonitorPtr mon);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7aa9e314c..b69d870d3 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -89,6 +89,7 @@ static void qemuMonitorJSONHandleSpiceMigrated(qemuMonitorPtr mon,
virJSONValueP
static void qemuMonitorJSONHandleMigrationStatus(qemuMonitorPtr mon, virJSONValuePtr
data);
static void qemuMonitorJSONHandleMigrationPass(qemuMonitorPtr mon, virJSONValuePtr
data);
static void qemuMonitorJSONHandleAcpiOstInfo(qemuMonitorPtr mon, virJSONValuePtr data);
+static void qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValuePtr
data);
typedef struct {
const char *type;
@@ -102,6 +103,7 @@ static qemuEventHandler eventHandlers[] = {
{ "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, },
{ "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, },
{ "BLOCK_JOB_READY", qemuMonitorJSONHandleBlockJobReady, },
+ { "BLOCK_WRITE_THRESHOLD", qemuMonitorJSONHandleBlockThreshold, },
{ "DEVICE_DELETED", qemuMonitorJSONHandleDeviceDeleted, },
{ "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, },
{ "GUEST_PANICKED", qemuMonitorJSONHandleGuestPanic, },
@@ -1065,6 +1067,30 @@ qemuMonitorJSONHandleAcpiOstInfo(qemuMonitorPtr mon,
virJSONValuePtr data)
}
+static void
+qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValuePtr data)
+{
+ const char *nodename;
+ unsigned long long threshold;
+ unsigned long long excess;
+
+ if (!(nodename = virJSONValueObjectGetString(data, "node-name")))
+ goto error;
+
+ if (virJSONValueObjectGetNumberUlong(data, "write-threshold",
&threshold) < 0)
+ goto error;
+
+ if (virJSONValueObjectGetNumberUlong(data, "amount-exceeded", &excess)
< 0)
+ goto error;
+
+ qemuMonitorEmitBlockThreshold(mon, nodename, threshold, excess);
+ return;
+
+ error:
+ VIR_WARN("malformed 'BLOCK_WRITE_THRESHOLD' event");
+}
+
+
int
qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
const char *cmd_str,
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 9248a0634..e22099fb3 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -183,6 +183,7 @@
<flag name='virtio-vga'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2004000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 96e62d3e5..95006d0b4 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -189,6 +189,7 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index 0aed651e7..707ddd02f 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -164,6 +164,7 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index 1041a12c1..953e3f073 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -164,6 +164,7 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index 92e27810f..f271915bd 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -159,6 +159,7 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index faddd5065..efc1324ee 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -198,6 +198,7 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index af21017bc..787c6811c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -127,6 +127,7 @@
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index c789f0eaa..7393d9da4 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -200,6 +200,7 @@
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.7.0)</package>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index c4c9bf9d5..547a74820 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -129,6 +129,7 @@
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<package></package>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index caa14c41e..a81c66694 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -201,6 +201,7 @@
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.8.0)</package>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index dcdc0e621..272adfb3c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -202,6 +202,7 @@
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
+ <flag name='BLOCK_WRITE_THRESHOLD'/>
<version>2008050</version>
<kvmVersion>0</kvmVersion>
<package> (v2.8.0-1321-gad584d3)</package>
--
2.11.1
4:36 p.m.
New subject: [libvirt] [RFC PATCH 04/12] qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event
On 02/23/2017 01:21 PM, Peter Krempa wrote:
The event is fired when a given block backend node (identified by
the
node name) experiences a write beyond the bound set via
block-set-write-threshold QMP command. This wires up the monitor code to
extract the data and allow us receiving the events and the capability.
s/receiving/to receive/
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_monitor.c | 18 +++++++++++++++
src/qemu/qemu_monitor.h | 14 ++++++++++++
src/qemu/qemu_monitor_json.c | 26 ++++++++++++++++++++++
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 +
.../caps_2.6.0-gicv2.aarch64.xml | 1 +
.../caps_2.6.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
16 files changed, 72 insertions(+)
An all-caps capability name is unusual, but not wrong.
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
1:21 p.m.
New subject: [libvirt] [RFC PATCH 05/12] qemu: domain: Add helper to lookup disk by node name
Looks up a disk and it's corresponding backing chain element by node
name.
---
src/qemu/qemu_domain.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_domain.h | 6 ++++++
2 files changed, 50 insertions(+)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c187214dc..4b446f1e8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8275,3 +8275,47 @@ qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver,
cleanup:
return ret;
}
+
+
+/**
+ * qemuDomainDiskLookupByNodename:
+ * @def: domain definition to look for the disk
+ * @nodename: block backend node name to find
+ * @src: filled with the specific backing store element if provided
+ * @idx: index of @src in the backing chain, if provided
+ *
+ * Looks up the disk in the domain via @nodename and returns it's definition.
+ * Optionally fills @src and @idx if provided with the specific backing chain
+ * element which corresponds to the node name.
+ */
+virDomainDiskDefPtr
+qemuDomainDiskLookupByNodename(virDomainDefPtr def,
+ const char *nodename,
+ virStorageSourcePtr *src,
+ unsigned int *idx)
+{
+ size_t i;
+ unsigned int srcindex;
+ virStorageSourcePtr tmp = NULL;
+
+ if (src)
+ *src = NULL;
+
+ if (idx)
+ *idx = 0;
+
+ for (i = 0; i < def->ndisks; i++) {
+ if ((tmp = virStorageSourceFindByNodeName(def->disks[i]->src,
+ nodename, &srcindex))) {
+ if (src)
+ *src = tmp;
+
+ if (idx)
+ *idx = srcindex;
+
+ return def->disks[i];
+ }
+ }
+
+ return NULL;
+}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 72efa3336..03377645f 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -849,4 +849,10 @@ int qemuDomainNamespaceSetupRNG(virQEMUDriverPtr driver,
int qemuDomainNamespaceTeardownRNG(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainRNGDefPtr rng);
+
+virDomainDiskDefPtr qemuDomainDiskLookupByNodename(virDomainDefPtr def,
+ const char *nodename,
+ virStorageSourcePtr *src,
+ unsigned int *idx);
+
#endif /* __QEMU_DOMAIN_H__ */
--
2.11.1
4:56 p.m.
New subject: [libvirt] [RFC PATCH 05/12] qemu: domain: Add helper to lookup disk by node name
On 02/23/2017 01:21 PM, Peter Krempa wrote:
Looks up a disk and it's corresponding backing chain element by
node
name.
---
src/qemu/qemu_domain.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_domain.h | 6 ++++++
2 files changed, 50 insertions(+)
+virDomainDiskDefPtr
+qemuDomainDiskLookupByNodename(virDomainDefPtr def,
+ const char *nodename,
+ virStorageSourcePtr *src,
+ unsigned int *idx)
+{
+ size_t i;
+ unsigned int srcindex;
+ virStorageSourcePtr tmp = NULL;
Sometimes, I find it easier to do:
if (!idx)
idx = &srcindex;
so that later on...
+
+ if (src)
+ *src = NULL;
+
+ if (idx)
+ *idx = 0;
+
+ for (i = 0; i < def->ndisks; i++) {
+ if ((tmp = virStorageSourceFindByNodeName(def->disks[i]->src,
+ nodename, &srcindex))) {
...I can just pass 'idx' instead of '&srcindex' here...
+ if (src)
+ *src = tmp;
+
+ if (idx)
+ *idx = srcindex;
...and completely skip this conditional. But not a show-stopper.
ACK
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
1:21 p.m.
New subject: [libvirt] [RFC PATCH 06/12] qemu: domain: Add helper to generate indexed backing store names
The code is currently simple, but if we later add node names, it will be
necessary to generate the names based on the node name. Add a helper so
that there's a central point to fix once we add self-generated node
names.
---
src/qemu/qemu_domain.c | 22 ++++++++++++++++++++++
src/qemu/qemu_domain.h | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4b446f1e8..b8a65cfd5 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8319,3 +8319,25 @@ qemuDomainDiskLookupByNodename(virDomainDefPtr def,
return NULL;
}
+
+
+/**
+ * qemuDomainDiskBackingStoreGetName:
+ *
+ * Creates a name using the indexed syntax (vda[1])for the given backing store
+ * entry for a disk.
+ */
+char *
+qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk,
+ virStorageSourcePtr src ATTRIBUTE_UNUSED,
+ unsigned int idx)
+{
+ char *ret = NULL;
+
+ if (idx)
+ ignore_value(virAsprintf(&ret, "%s[%d]", disk->dst, idx));
+ else
+ ignore_value(VIR_STRDUP(ret, disk->dst));
+
+ return ret;
+}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 03377645f..6e847c7ae 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -855,4 +855,8 @@ virDomainDiskDefPtr qemuDomainDiskLookupByNodename(virDomainDefPtr
def,
virStorageSourcePtr *src,
unsigned int *idx);
+char *qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk,
+ virStorageSourcePtr src,
+ unsigned int idx);
+
#endif /* __QEMU_DOMAIN_H__ */
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 07/12] qemu: process: Wire up firing of the VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD event
Bind it to qemus BLOCK_WRITE_THRESHOLD event. Look up the disk by
nodename and construct the string to return.
---
src/qemu/qemu_process.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ea10fff45..cfe4073de 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1439,6 +1439,45 @@ qemuProcessHandleAcpiOstInfo(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
static int
+qemuProcessHandleBlockThreshold(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+ virDomainObjPtr vm,
+ const char *nodename,
+ unsigned long long threshold,
+ unsigned long long excess,
+ void *opaque)
+{
+ virQEMUDriverPtr driver = opaque;
+ virObjectEventPtr event = NULL;
+ virDomainDiskDefPtr disk;
+ virStorageSourcePtr src;
+ unsigned int idx;
+ char *dev = NULL;
+ const char *path = NULL;
+
+ virObjectLock(vm);
+
+ VIR_DEBUG("BLOCK_WRITE_THRESHOLD event for block node '%s' in domain %p
%s:"
+ "threshold '%llu' exceeded by '%llu'",
+ nodename, vm, vm->def->name, threshold, excess);
+
+ if ((disk = qemuDomainDiskLookupByNodename(vm->def, nodename, &src,
&idx))) {
+ if (virStorageSourceIsLocalStorage(src))
+ path = src->path;
+
+ if ((dev = qemuDomainDiskBackingStoreGetName(disk, src, idx))) {
+ event = virDomainEventBlockThresholdNewFromObj(vm, dev, path,
+ threshold, excess);
+ }
+ }
+
+ virObjectUnlock(vm);
+ qemuDomainEventQueue(driver, event);
+
+ return 0;
+}
+
+
+static int
qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm,
const char *devAlias,
@@ -1634,6 +1673,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
.domainMigrationStatus = qemuProcessHandleMigrationStatus,
.domainMigrationPass = qemuProcessHandleMigrationPass,
.domainAcpiOstInfo = qemuProcessHandleAcpiOstInfo,
+ .domainBlockThreshold = qemuProcessHandleBlockThreshold,
};
static void
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 08/12] lib: Add API for setting the threshold size for VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD
The new API can be used to configure the threshold when
VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD should be fired.
---
include/libvirt/libvirt-domain.h | 5 ++++
src/driver-hypervisor.h | 8 +++++++
src/libvirt-domain.c | 51 ++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 1 +
src/remote/remote_driver.c | 1 +
src/remote/remote_protocol.x | 17 +++++++++++++-
src/remote_protocol-structs | 7 ++++++
7 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 892cf2cc5..7752cd38c 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -4564,4 +4564,9 @@ int virDomainSetVcpu(virDomainPtr domain,
int state,
unsigned int flags);
+int virDomainSetBlockThreshold(virDomainPtr domain,
+ const char *dev,
+ unsigned long long threshold,
+ unsigned int flags);
+
#endif /* __VIR_LIBVIRT_DOMAIN_H__ */
diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index b81420aef..3053d7ae8 100644
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -1257,6 +1257,13 @@ typedef int
int state,
unsigned int flags);
+typedef int
+(*virDrvDomainSetBlockThreshold)(virDomainPtr domain,
+ const char *dev,
+ unsigned long long threshold,
+ unsigned int flags);
+
+
typedef struct _virHypervisorDriver virHypervisorDriver;
typedef virHypervisorDriver *virHypervisorDriverPtr;
@@ -1496,6 +1503,7 @@ struct _virHypervisorDriver {
virDrvDomainGetGuestVcpus domainGetGuestVcpus;
virDrvDomainSetGuestVcpus domainSetGuestVcpus;
virDrvDomainSetVcpu domainSetVcpu;
+ virDrvDomainSetBlockThreshold domainSetBlockThreshold;
};
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 619a9fccb..93ebe1e86 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11797,3 +11797,54 @@ virDomainSetVcpu(virDomainPtr domain,
virDispatchError(domain->conn);
return -1;
}
+
+
+/**
+ * virDomainSetBlockThreshold:
+ * @domain: pointer to domain object
+ * @dev: string specifying the block device or backing chain element
+ * @threshold: threshold in bytes when to fire the event
+ * @flags: currently unused, callers should pass 0
+ *
+ * Set the threshold level for delivering the
+ * VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD if the device or backing chain element
+ * described by @dev is written beyond the set threshold level. The threshold
+ * level is unset once the event fired. The event may not be delivered at all if
+ * libvirtd was not running at the moment when the threshold was reached.
+ *
+ * This event allows to use thin-provisioned storage which needs management
+ * tools to grow it without the need for polling of the data.
+ *
+ * Returns 0 if the operation has started, -1 on failure.
+ */
+int
+virDomainSetBlockThreshold(virDomainPtr domain,
+ const char *dev,
+ unsigned long long threshold,
+ unsigned int flags)
+{
+ VIR_DOMAIN_DEBUG(domain, "dev='%s' threshold=%llu flags=%x",
+ NULLSTR(dev), threshold, flags);
+
+ virResetLastError();
+
+ virCheckDomainReturn(domain, -1);
+ virCheckReadOnlyGoto(domain->conn->flags, error);
+
+ virCheckNonNullArgGoto(dev, error);
+
+ if (domain->conn->driver->domainSetBlockThreshold) {
+ int ret;
+ ret = domain->conn->driver->domainSetBlockThreshold(domain, dev,
+ threshold, flags);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virReportUnsupportedError();
+
+ error:
+ virDispatchError(domain->conn);
+ return -1;
+}
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 04ef58021..428cf2e19 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -755,6 +755,7 @@ LIBVIRT_3.0.0 {
LIBVIRT_3.1.0 {
global:
+ virDomainSetBlockThreshold;
virDomainSetVcpu;
} LIBVIRT_3.0.0;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index efa47beaf..baa5cbab3 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -8436,6 +8436,7 @@ static virHypervisorDriver hypervisor_driver = {
.domainGetGuestVcpus = remoteDomainGetGuestVcpus, /* 2.0.0 */
.domainSetGuestVcpus = remoteDomainSetGuestVcpus, /* 2.0.0 */
.domainSetVcpu = remoteDomainSetVcpu, /* 3.1.0 */
+ .domainSetBlockThreshold = remoteDomainSetBlockThreshold, /* 3.1.0 */
};
static virNetworkDriver network_driver = {
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 39dd2b728..87b2bd365 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -3402,6 +3402,14 @@ struct remote_secret_event_value_changed_msg {
remote_nonnull_secret secret;
};
+struct remote_domain_set_block_threshold_args {
+ remote_nonnull_domain dom;
+ remote_nonnull_string dev;
+ unsigned hyper threshold;
+ unsigned int flags;
+};
+
+
/*----- Protocol. -----*/
/* Define the program number, protocol version and procedure numbers here. */
@@ -6048,6 +6056,13 @@ enum remote_procedure {
* @generate: both
* @acl: none
*/
- REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD = 385
+ REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD = 385,
+
+ /**
+ * @generate: both
+ * @acl: domain:write
+ */
+ REMOTE_PROC_DOMAIN_SET_BLOCK_THRESHOLD = 386
+
};
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 67e43a4ac..a46fe37bf 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2840,6 +2840,12 @@ struct remote_secret_event_value_changed_msg {
int callbackID;
remote_nonnull_secret secret;
};
+struct remote_domain_set_block_threshold_args {
+ remote_nonnull_domain dom;
+ remote_nonnull_string dev;
+ uint64_t threshold;
+ u_int flags;
+};
enum remote_procedure {
REMOTE_PROC_CONNECT_OPEN = 1,
REMOTE_PROC_CONNECT_CLOSE = 2,
@@ -3226,4 +3232,5 @@ enum remote_procedure {
REMOTE_PROC_SECRET_EVENT_VALUE_CHANGED = 383,
REMOTE_PROC_DOMAIN_SET_VCPU = 384,
REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD = 385,
+ REMOTE_PROC_DOMAIN_SET_BLOCK_THRESHOLD = 386,
};
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 09/12] virsh: Implement 'blockthreshold' command to call virDomainSetBlockThreshold
Add a simple wrapper which will allow to set the threshold for
delivering the event.
---
tools/virsh-domain.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/virsh.pod | 8 +++++++
2 files changed, 71 insertions(+)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index ee702f3c4..f70f61b72 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7097,6 +7097,63 @@ cmdSetvcpu(vshControl *ctl, const vshCmd *cmd)
/*
+ * "blockthreshold" command
+ */
+static const vshCmdInfo info_blockthreshold[] = {
+ {.name = "help",
+ .data = N_("attach/detach vcpu or groups of threads")
+ },
+ {.name = "desc",
+ .data = N_("Add or remove vcpus")
+ },
+ {.name = NULL}
+};
+
+static const vshCmdOptDef opts_blockthreshold[] = {
+ VIRSH_COMMON_OPT_DOMAIN_FULL,
+ {.name = "dev",
+ .type = VSH_OT_DATA,
+ .flags = VSH_OFLAG_REQ,
+ .help = N_("device to set threshold for")
+ },
+ {.name = "threshold",
+ .type = VSH_OT_INT,
+ .flags = VSH_OFLAG_REQ,
+ .help = N_("threshold as a scaled number (by default bytes)")
+ },
+ {.name = NULL}
+};
+
+static bool
+cmdBlockThreshold(vshControl *ctl, const vshCmd *cmd)
+{
+ unsigned long long threshold;
+ const char *dev = NULL;
+ virDomainPtr dom;
+ bool ret = false;
+
+ if (vshCommandOptStringReq(ctl, cmd, "dev", &dev))
+ return false;
+
+ if (vshCommandOptScaledInt(ctl, cmd, "threshold",
+ &threshold, 1, ULLONG_MAX) < 0)
+ return false;
+
+ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
+ return false;
+
+ if (virDomainSetBlockThreshold(dom, dev, threshold, 0) < 0)
+ goto cleanup;
+
+ ret = true;
+
+ cleanup:
+ virDomainFree(dom);
+ return ret;
+}
+
+
+/*
* "iothreadinfo" command
*/
static const vshCmdInfo info_iothreadinfo[] = {
@@ -14060,5 +14117,11 @@ const vshCmdDef domManagementCmds[] = {
.info = info_setvcpu,
.flags = 0
},
+ {.name = "blockthreshold",
+ .handler = cmdBlockThreshold,
+ .opts = opts_blockthreshold,
+ .info = info_blockthreshold,
+ .flags = 0
+ },
{.name = NULL}
};
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 6c06ee029..102aefc0c 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1265,6 +1265,14 @@ I<--bytes> with a scaled value allows to use finer
granularity. A scaled value
used without I<--bytes> will be rounded down to MiB/s. Note that the
I<--bytes> may be unsupported by the hypervisor.
+
+=item B<blockthreshold> I<domain> I<dev> I<threshold>
+
+Set the threshold value for delivering the block-threshold event. I<dev>
+specifies the disk device target or backing chain element of given device using
+the 'target[1]' syntax. I<threshold> is a scaled value of the offset. If
the
+block device should write beyond that offset the event will be delivered.
+
=item B<blockresize> I<domain> I<path> I<size>
Resize a block device of domain while the domain is running, I<path>
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 10/12] qemu: domain: Add helper to look up disk soruce by the backing store string
---
src/qemu/qemu_domain.c | 37 +++++++++++++++++++++++++++++++++++++
src/qemu/qemu_domain.h | 3 +++
2 files changed, 40 insertions(+)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b8a65cfd5..1740a9d80 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8341,3 +8341,40 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk,
return ret;
}
+
+
+virStorageSourcePtr
+qemuDomainGetStorageSourceByDevstr(const char *devstr,
+ virDomainDefPtr def)
+{
+ virDomainDiskDefPtr disk = NULL;
+ virStorageSourcePtr src = NULL;
+ char *target = NULL;
+ unsigned int idx;
+ size_t i;
+
+ if (virStorageFileParseBackingStoreStr(devstr, &target, &idx) < 0) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("failed to parse block device '%s'"),
devstr);
+ return NULL;
+ }
+
+ for (i = 0; i < def->ndisks; i++) {
+ if (STREQ(target, def->disks[i]->dst)) {
+ disk = def->disks[i];
+ break;
+ }
+ }
+
+ if (!disk) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("failed to find disk '%s"), target);
+ goto cleanup;
+ }
+
+ src = virStorageFileChainLookup(disk->src, NULL, NULL, idx, NULL);
+
+ cleanup:
+ VIR_FREE(target);
+ return src;
+}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 6e847c7ae..705a3ad59 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -859,4 +859,7 @@ char *qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk,
virStorageSourcePtr src,
unsigned int idx);
+virStorageSourcePtr qemuDomainGetStorageSourceByDevstr(const char *devstr,
+ virDomainDefPtr def);
+
#endif /* __QEMU_DOMAIN_H__ */
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 11/12] qemu: implement qemuDomainSetBlockThreshold
Add code to call the appropriate monitor command and code to lookup the
given disk backing chain member.
---
src/qemu/qemu_driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_monitor.c | 13 +++++++++
src/qemu/qemu_monitor.h | 5 ++++
src/qemu/qemu_monitor_json.c | 31 +++++++++++++++++++++
src/qemu/qemu_monitor_json.h | 6 +++++
5 files changed, 119 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6e1e3d408..279a0033d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -20283,6 +20283,69 @@ qemuDomainSetVcpu(virDomainPtr dom,
}
+static int
+qemuDomainSetBlockThreshold(virDomainPtr dom,
+ const char *dev,
+ unsigned long long threshold,
+ unsigned int flags)
+{
+ virQEMUDriverPtr driver = dom->conn->privateData;
+ qemuDomainObjPrivatePtr priv;
+ virDomainObjPtr vm = NULL;
+ virStorageSourcePtr src;
+ char *nodename = NULL;
+ int rc;
+ int ret = -1;
+
+ virCheckFlags(0, -1);
+
+ if (!(vm = qemuDomObjFromDomain(dom)))
+ goto cleanup;
+
+ priv = vm->privateData;
+
+ if (virDomainSetBlockThresholdEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup;
+
+ if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+ goto cleanup;
+
+ if (!virDomainObjIsActive(vm)) {
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("domain is not running"));
+ goto endjob;
+ }
+
+ if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def)))
+ goto endjob;
+
+ if (!src->nodeName) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+ _("threshold currently can't be set for block device
'%s'"),
+ dev);
+ goto endjob;
+ }
+
+ if (VIR_STRDUP(nodename, src->nodeName) < 0)
+ goto endjob;
+
+ qemuDomainObjEnterMonitor(driver, vm);
+ rc = qemuMonitorSetBlockThreshold(priv->mon, nodename, threshold);
+ if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
+ goto endjob;
+
+ ret = 0;
+
+ endjob:
+ qemuDomainObjEndJob(driver, vm);
+
+ cleanup:
+ VIR_FREE(nodename);
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static virHypervisorDriver qemuHypervisorDriver = {
.name = QEMU_DRIVER_NAME,
.connectOpen = qemuConnectOpen, /* 0.2.0 */
@@ -20497,6 +20560,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.domainGetGuestVcpus = qemuDomainGetGuestVcpus, /* 2.0.0 */
.domainSetGuestVcpus = qemuDomainSetGuestVcpus, /* 2.0.0 */
.domainSetVcpu = qemuDomainSetVcpu, /* 3.1.0 */
+ .domainSetBlockThreshold = qemuDomainSetBlockThreshold /* 3.1.0 */
};
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a8e113f94..7caced7fe 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4150,3 +4150,16 @@ qemuMonitorQueryQMPSchema(qemuMonitorPtr mon)
return qemuMonitorJSONQueryQMPSchema(mon);
}
+
+
+int
+qemuMonitorSetBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold)
+{
+ VIR_DEBUG("mon=%p, node='%s', threshold=%llu", mon, nodename,
threshold);
+
+ QEMU_CHECK_MONITOR_JSON(mon);
+
+ return qemuMonitorJSONSetBlockThreshold(mon, nodename, threshold);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index a866685e9..ef5c2fdc8 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1047,4 +1047,9 @@ int qemuMonitorGetRTCTime(qemuMonitorPtr mon,
virHashTablePtr qemuMonitorQueryQMPSchema(qemuMonitorPtr mon);
+int qemuMonitorSetBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold);
+
+
#endif /* QEMU_MONITOR_H */
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b69d870d3..4b8103195 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -7434,3 +7434,34 @@ qemuMonitorJSONQueryQMPSchema(qemuMonitorPtr mon)
return ret;
}
+
+
+int
+qemuMonitorJSONSetBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold)
+{
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+ int ret = -1;
+
+ if (!(cmd = qemuMonitorJSONMakeCommand("block-set-write-threshold",
+ "s:node-name", nodename,
+ "U:write-threshold", threshold,
+ NULL)))
+ return -1;
+
+ if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+ goto cleanup;
+
+ if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+ goto cleanup;
+
+ ret = 0;
+
+ cleanup:
+ virJSONValueFree(cmd);
+ virJSONValueFree(reply);
+
+ return ret;
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 79688c82f..0459356b4 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -511,4 +511,10 @@ int qemuMonitorJSONGetHotpluggableCPUs(qemuMonitorPtr mon,
virHashTablePtr qemuMonitorJSONQueryQMPSchema(qemuMonitorPtr mon)
ATTRIBUTE_NONNULL(1);
+
+int qemuMonitorJSONSetBlockThreshold(qemuMonitorPtr mon,
+ const char *nodename,
+ unsigned long long threshold)
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+
#endif /* QEMU_MONITOR_JSON_H */
--
2.11.1
1:22 p.m.
New subject: [libvirt] [RFC PATCH 12/12] qemu: WIP: lookup nodenames
---
src/qemu/qemu_domain.h | 1 +
src/qemu/qemu_monitor.c | 11 ++++++++++-
src/qemu/qemu_monitor_json.c | 8 +++++++-
src/qemu/qemu_process.c | 1 +
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 705a3ad59..db6e9a75f 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -356,6 +356,7 @@ struct qemuDomainDiskInfo {
bool tray_open;
bool empty;
int io_status;
+ char *nodename;
};
typedef struct _qemuDomainHostdevPrivate qemuDomainHostdevPrivate;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 7caced7fe..42c32bc64 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2147,6 +2147,15 @@ qemuMonitorBlockIOStatusToError(const char *status)
return -1;
}
+static void
+qemuDomainDiskInfoFree(void *value, const void *name ATTRIBUTE_UNUSED)
+{
+ struct qemuDomainDiskInfo *info = value;
+
+ VIR_FREE(info->nodename);
+ VIR_FREE(info);
+}
+
virHashTablePtr
qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
@@ -2156,7 +2165,7 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
QEMU_CHECK_MONITOR_NULL(mon);
- if (!(table = virHashCreate(32, virHashValueFree)))
+ if (!(table = virHashCreate(32, qemuDomainDiskInfoFree)))
return NULL;
if (mon->json)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 4b8103195..6e65b26d3 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1868,9 +1868,11 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev;
+ virJSONValuePtr image;
struct qemuDomainDiskInfo *info;
const char *thisdev;
const char *status;
+ const char *nodename;
if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
goto cleanup;
@@ -1907,8 +1909,12 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
info->tray = true;
/* presence of 'inserted' notifies that a medium is in the device */
- if (!virJSONValueObjectGetObject(dev, "inserted"))
+ if ((image = virJSONValueObjectGetObject(dev, "inserted"))) {
+ if ((nodename = virJSONValueObjectGetString(image, "node-name")))
+ ignore_value(VIR_STRDUP(info->nodename, nodename));
+ } else {
info->empty = true;
+ }
/* Missing io-status indicates no error */
if ((status = virJSONValueObjectGetString(dev, "io-status"))) {
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cfe4073de..74409f88a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6735,6 +6735,7 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver,
/* fill in additional data */
diskpriv->removable = info->removable;
diskpriv->tray = info->tray;
+ VIR_STEAL_PTR(disk->src->nodeName, info->nodename);
}
ret = 0;
--
2.11.1
1:50 p.m.
On 02/23/2017 01:21 PM, Peter Krempa wrote:
Since I'm a procrastinator and I wanted to do this after full
node-name support
is added I'm kind of late for this release here. Since oVirt is asking for this
feature for a very long time I would like to deliver it ASAP though.
Thanks for picking up on this. I tried once a long time ago:
https://www.redhat.com/archives/libvir-list/2015-June/msg01111.html
and got stalled on node name weirdness, so it never went in.
This series adds a event which is fired once a guest writes beyond a configured
offset in the backing file. The threshold offset is configurable via a new API.
This series is in RFC state since I did not manage to polish few details mostly
connected to node names:
- currently only the top level image can be selected
- some blockjobs may clear the remembered node names and thus break this
( re-detection of the backing chain needs to be connected with node name
detection )
- the node name detection code is VERY crude
Indeed, that's where I got stalled, but I think you may already be
further along than my attempt. (It may also be that the QMP side from
qemu is easier to use now than when I first tried)
- I'm not sure how well it plays with qcow images, since I select
only the top
level node (qcow protocol) rather than the file backing it
That may be a deal-breaker - my recollection is that you HAVE to use the
node-name of the file backing the qcow2 to get the useful threshold, and
not the node-name of the qcow2 protocol.
- the documentation probably sucks since I did not proof-read
Any feedback is welcome.
Peter Krempa (12):
util: storage: Split out useful bits of virStorageFileParseChainIndex
util: storage: Add preliminary storage for node names into
virStorageSource
lib: Introduce event for tracking disk backing file write threshold
qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event
qemu: domain: Add helper to lookup disk by node name
qemu: domain: Add helper to generate indexed backing store names
qemu: process: Wire up firing of the
VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD event
lib: Add API for setting the threshold size for
VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD
virsh: Implement 'blockthreshold' command to call
virDomainSetBlockThreshold
qemu: domain: Add helper to look up disk soruce by the backing store
string
qemu: implement qemuDomainSetBlockThreshold
qemu: WIP: lookup nodenames
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
3:27 a.m.
On Thu, Feb 23, 2017 at 13:50:03 -0600, Eric Blake wrote:
On 02/23/2017 01:21 PM, Peter Krempa wrote:
> Since I'm a procrastinator and I wanted to do this after full node-name support
> is added I'm kind of late for this release here. Since oVirt is asking for this
> feature for a very long time I would like to deliver it ASAP though.
Thanks for picking up on this. I tried once a long time ago:
https://www.redhat.com/archives/libvir-list/2015-June/msg01111.html
and got stalled on node name weirdness, so it never went in.
>
> This series adds a event which is fired once a guest writes beyond a configured
> offset in the backing file. The threshold offset is configurable via a new API.
>
> This series is in RFC state since I did not manage to polish few details mostly
> connected to node names:
>
> - currently only the top level image can be selected
> - some blockjobs may clear the remembered node names and thus break this
> ( re-detection of the backing chain needs to be connected with node name
> detection )
> - the node name detection code is VERY crude
Indeed, that's where I got stalled, but I think you may already be
further along than my attempt. (It may also be that the QMP side from
qemu is easier to use now than when I first tried)
> - I'm not sure how well it plays with qcow images, since I select only the top
> level node (qcow protocol) rather than the file backing it
That may be a deal-breaker - my recollection is that you HAVE to use the
node-name of the file backing the qcow2 to get the useful threshold, and
Yes, that's what I expect as well.
not the node-name of the qcow2 protocol.
For -blockdev support we will need full node-name detection anyways.
I plan to keep two node-names per virStorageSource, one that describes
the format layer and one that describes the protocol/backing layer. The
last patch is just a very dirty hack to see that the rest was wired up
properly.
> - the documentation probably sucks since I did not proof-read
>
> Any feedback is welcome.
>
> Peter Krempa (12):
> util: storage: Split out useful bits of virStorageFileParseChainIndex
> util: storage: Add preliminary storage for node names into
> virStorageSource
> lib: Introduce event for tracking disk backing file write threshold
> qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event
> qemu: domain: Add helper to lookup disk by node name
> qemu: domain: Add helper to generate indexed backing store names
> qemu: process: Wire up firing of the
> VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD event
> lib: Add API for setting the threshold size for
> VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD
> virsh: Implement 'blockthreshold' command to call
> virDomainSetBlockThreshold
> qemu: domain: Add helper to look up disk soruce by the backing store
> string
> qemu: implement qemuDomainSetBlockThreshold
> qemu: WIP: lookup nodenames
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
2831
days inactive
2832
days old
20 comments
2 participants
participants (2)
-
Eric Blake -
Peter Krempa