Re: [libvirt] [PATCH 13/16] snapshot: Rename file for virDomainMomentObj
On 3/20/19 1:41 AM, Eric Blake wrote:
Now that we have made virDomainMomentObj sufficiently generic to
support both snapshots and checkpoints, it is time to rename the file
that it lives in. The split between a generic object and a list of the
generic objects doesn't buy us as much, so it will be easier to stick
all the moment list code in one file, with more code moving in the
next patch.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
...snapshotobj.h => virdomainmomentobjlist.h} | 26 ++++++++++---------
src/conf/virdomainsnapshotobjlist.h | 7 ++++-
src/conf/Makefile.inc.am | 4 +--
...snapshotobj.c => virdomainmomentobjlist.c} | 12 ++++-----
src/libvirt_private.syms | 18 ++++++-------
5 files changed, 37 insertions(+), 30 deletions(-)
rename src/conf/{virdomainsnapshotobj.h => virdomainmomentobjlist.h} (72%)
rename src/conf/{virdomainsnapshotobj.c => virdomainmomentobjlist.c} (95%)
I have to say it's "weird" the order that occurs in gitk and the patches
is different... IIRC you have some hook that places the .h files up
front in the sent patch, but for some reason gitk has it's own freaking
mind /-|
Reviewed-by: John Ferlan <jferlan(a)redhat.com>
John
diff --git a/src/conf/virdomainsnapshotobj.c
b/src/conf/virdomainmomentobjlist.c
similarity index 95%
rename from src/conf/virdomainsnapshotobj.c
rename to src/conf/virdomainmomentobjlist.c
index 877a0a9079..766d7fe2e4 100644
--- a/src/conf/virdomainsnapshotobj.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -1,5 +1,5 @@
/*
- * virdomainsnapshotobj.c: handle snapshot objects
+ * virdomainmomentobjlist.c: handle snapshot/checkpoint objects
* (derived from snapshot_conf.c)
*
* Copyright (C) 2006-2019 Red Hat, Inc.
@@ -23,15 +23,15 @@
#include <config.h>
#include "internal.h"
-#include "virdomainsnapshotobj.h"
-#include "snapshot_conf.h"
-#include "virdomainsnapshotobjlist.h"
+#include "virdomainmomentobjlist.h"
#include "virlog.h"
#include "virerror.h"
+#include "virstring.h"
+#include "moment_conf.h"
-#define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
+#define VIR_FROM_THIS VIR_FROM_DOMAIN
Hmm... Almost feels like we should have a VIR_FROM_DOMAIN_MOMENT, but
there's only one virReportError and it's a hash lookup. Maybe something
for the future.
-VIR_LOG_INIT("conf.virdomainsnapshotobj");
+VIR_LOG_INIT("conf.virdomainmomentobjlist");
/* Run iter(data) on all direct children of moment, while ignoring all
* other entries in moments. Return the number of children
[...]