On 4/5/23 19:28, K Shiva wrote:
From: skran <shiva_kr@riseup.net>
In an effort to separate the validation steps from the Parse stage, a part of the validation of virDomainGraphicsListenDef has been moved to domain_validate.h.
Signed-off-by: K Shiva <shiva_kr@riseup.net>
Now, this is perfect! This message tells you what the commit does (except, the patch does a bit more than what the commit message describes, but more on that below).
---
This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-April/239205.html
diff to v1: - Made virDomainGraphicsListenDefValidate() static, called by virDomainGraphicsDefListensValidate() - Removed unused Parameter (*graphics) out of Parse Function definition i.e virDomainGraphicsListenParseXML() - Corrected code format
Splendid! Except, this is still a diff to your previous patch. And your previous patch wasn't merged and thus this patch doesn't apply cleanly. There's no virDomainStorageNetHostSocketValidate() or virDomainGraphicsListenDefValidate() in current master branch.
src/conf/domain_conf.c | 9 ++--- src/conf/domain_validate.c | 68 ++++++++++++++++++++------------------ src/conf/domain_validate.h | 4 --- 3 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e0ac737bb..746bb4efdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5836,7 +5836,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode,
host->socket = virXMLPropString(hostnode, "socket");
- // Socket Validation + /* Socket Validation */ if (virDomainStorageNetHostSocketValidate(host, transport) < 0) goto cleanup;
This hunk (and some others) causes this patch doesn't apply cleanly. Please make sure to send a patch that applies on top of master branch cleanly: https://libvirt.org/submitting-patches.html Also, this might be worth reading: https://libvirt.org/best-practices.html Looking forward to v3. Michal