Re: [libvirt] [PATCH 1/4] General structures and interfaces were added

From: sonya <rodinasophie(a)gmail.com&gt;

--- tools/Makefile.am | 1 + tools/virsh-domain.c | 195 ++++++++++++++++++++++++++++++++++++------------ tools/virsh-edit.c | 97 +++++------------------- tools/virsh-interface.c | 66 ++++++++++++---- tools/virsh-network.c | 66 ++++++++++++---- tools/virsh-nwfilter.c | 67 +++++++++++++---- tools/virsh-pool.c | 66 ++++++++++++---- tools/virsh-snapshot.c | 78 ++++++++++++++----- 8 files changed, 437 insertions(+), 199 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d5638d9..88bb1b2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -205,6 +205,7 @@ virsh_SOURCES = \ virsh-domain.c virsh-domain.h \ virsh-domain-monitor.c virsh-domain-monitor.h \ virsh-host.c virsh-host.h \ + virsh-edit.c virsh-edit.h \ virsh-interface.c virsh-interface.h \ virsh-network.c virsh-network.h \ virsh-nodedev.c virsh-nodedev.h \ diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12e85e3..648b086 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -56,6 +56,7 @@ #include "virtime.h" #include "virtypedparam.h" #include "virxml.h" +#include "virsh-edit.h"

/* Gnulib doesn't guarantee SA_SIGINFO support. */ #ifndef SA_SIGINFO @@ -4622,6 +4623,45 @@ static const vshCmdOptDef opts_save_image_edit[] = { {.name = NULL} }; +typedef struct editDomainUniversalStruct

+{ + vshControl *ctl; + virshControlPtr priv; + const char *file; + virDomainPtr dom; + unsigned int getxml_flags; + bool *ret; + unsigned int *define_flags; + const char *key; + virDomainPtr *dom_edited; +} editDomainUniversalStruct;

+ +static char*

+editDomainSaveImageGetXML(void *args)

+{ + editDomainUniversalStruct *str = (editDomainUniversalStruct*)args;

+ return virDomainSaveImageGetXMLDesc(str->priv->conn, str->file, str->getxml_flags); +} +