External/libvirt
1
0
Fork 0
Code

virsh: Convert EDIT_NOT_CHANGED macro to do-while block.

Browse Source 
This macro is being used as an inline body after an if and might get
pretty confusing.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-11-14 15:57:17 +01:00
parent 9fdb2b55d5
commit e09f9e4c32
6 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/virsh-domain.c
View File

@ -4377,9 +4377,12 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML \ #define EDIT_GET_XML \
virDomainSaveImageGetXMLDesc(ctl->conn, file, getxml_flags) virDomainSaveImageGetXMLDesc(ctl->conn, file, getxml_flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Saved image %s XML configuration " \ vshPrint(ctl, _("Saved image %s XML configuration " \
"not changed.\n"), file); \ "not changed.\n"), file); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) == 0) (virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) == 0)
#include "virsh-edit.c" #include "virsh-edit.c"
@ -7561,9 +7564,12 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML \ #define EDIT_GET_XML \
vshDomainGetEditMetadata(ctl, dom, uri, flags) vshDomainGetEditMetadata(ctl, dom, uri, flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, "%s", _("Metadata not changed")); \ vshPrint(ctl, "%s", _("Metadata not changed")); \
ret = true; \ ret = true; \
goto edit_cleanup; goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(virDomainSetMetadata(dom, VIR_DOMAIN_METADATA_ELEMENT, doc_edited, \ (virDomainSetMetadata(dom, VIR_DOMAIN_METADATA_ELEMENT, doc_edited, \
key, uri, flags) == 0) key, uri, flags) == 0)
@ -11059,9 +11065,12 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML virDomainGetXMLDesc(dom, flags) #define EDIT_GET_XML virDomainGetXMLDesc(dom, flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Domain %s XML configuration not changed.\n"), \ vshPrint(ctl, _("Domain %s XML configuration not changed.\n"), \
virDomainGetName(dom)); \ virDomainGetName(dom)); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(dom_edited = virDomainDefineXML(ctl->conn, doc_edited)) (dom_edited = virDomainDefineXML(ctl->conn, doc_edited))
#include "virsh-edit.c" #include "virsh-edit.c"

7
tools/virsh-interface.c
View File

@ -1,7 +1,7 @@
/* /*
* virsh-interface.c: Commands to manage host interface * virsh-interface.c: Commands to manage host interface
* *
* Copyright (C) 2005, 2007-2013 Red Hat, Inc. * Copyright (C) 2005, 2007-2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -123,9 +123,12 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML virInterfaceGetXMLDesc(iface, flags) #define EDIT_GET_XML virInterfaceGetXMLDesc(iface, flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Interface %s XML configuration not changed.\n"), \ vshPrint(ctl, _("Interface %s XML configuration not changed.\n"), \
virInterfaceGetName(iface)); \ virInterfaceGetName(iface)); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(iface_edited = virInterfaceDefineXML(ctl->conn, doc_edited, 0)) (iface_edited = virInterfaceDefineXML(ctl->conn, doc_edited, 0))
#include "virsh-edit.c" #include "virsh-edit.c"

5
tools/virsh-network.c
View File

@ -1106,9 +1106,12 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML vshNetworkGetXMLDesc(network) #define EDIT_GET_XML vshNetworkGetXMLDesc(network)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Network %s XML configuration not changed.\n"), \ vshPrint(ctl, _("Network %s XML configuration not changed.\n"), \
virNetworkGetName(network)); \ virNetworkGetName(network)); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(network_edited = virNetworkDefineXML(ctl->conn, doc_edited)) (network_edited = virNetworkDefineXML(ctl->conn, doc_edited))
#include "virsh-edit.c" #include "virsh-edit.c"

7
tools/virsh-nwfilter.c
View File

@ -1,7 +1,7 @@
/* /*
* virsh-nwfilter.c: Commands to manage network filters * virsh-nwfilter.c: Commands to manage network filters
* *
* Copyright (C) 2005, 2007-2013 Red Hat, Inc. * Copyright (C) 2005, 2007-2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -422,10 +422,13 @@ cmdNWFilterEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML virNWFilterGetXMLDesc(nwfilter, 0) #define EDIT_GET_XML virNWFilterGetXMLDesc(nwfilter, 0)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Network filter %s XML " \ vshPrint(ctl, _("Network filter %s XML " \
"configuration not changed.\n"), \ "configuration not changed.\n"), \
virNWFilterGetName(nwfilter)); \ virNWFilterGetName(nwfilter)); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(nwfilter_edited = virNWFilterDefineXML(ctl->conn, doc_edited)) (nwfilter_edited = virNWFilterDefineXML(ctl->conn, doc_edited))
#include "virsh-edit.c" #include "virsh-edit.c"

5
tools/virsh-pool.c
View File

@ -1762,9 +1762,12 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML virStoragePoolGetXMLDesc(pool, flags) #define EDIT_GET_XML virStoragePoolGetXMLDesc(pool, flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
vshPrint(ctl, _("Pool %s XML configuration not changed.\n"), \ vshPrint(ctl, _("Pool %s XML configuration not changed.\n"), \
virStoragePoolGetName(pool)); \ virStoragePoolGetName(pool)); \
ret = true; goto edit_cleanup; ret = true; \
goto edit_cleanup; \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(pool_edited = virStoragePoolDefineXML(ctl->conn, doc_edited, 0)) (pool_edited = virStoragePoolDefineXML(ctl->conn, doc_edited, 0))
#include "virsh-edit.c" #include "virsh-edit.c"

6
tools/virsh-snapshot.c
View File

@ -1,7 +1,7 @@
/* /*
* virsh-snapshot.c: Commands to manage domain snapshot * virsh-snapshot.c: Commands to manage domain snapshot
* *
* Copyright (C) 2005, 2007-2013 Red Hat, Inc. * Copyright (C) 2005, 2007-2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -577,6 +577,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd)
#define EDIT_GET_XML \ #define EDIT_GET_XML \
virDomainSnapshotGetXMLDesc(snapshot, getxml_flags) virDomainSnapshotGetXMLDesc(snapshot, getxml_flags)
#define EDIT_NOT_CHANGED \ #define EDIT_NOT_CHANGED \
do { \
/* Depending on flags, we re-edit even if XML is unchanged. */ \ /* Depending on flags, we re-edit even if XML is unchanged. */ \
if (!(define_flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) { \ if (!(define_flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) { \
vshPrint(ctl, \ vshPrint(ctl, \
@ -584,7 +585,8 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd)
name); \ name); \
ret = true; \ ret = true; \
goto edit_cleanup; \ goto edit_cleanup; \
} } \
} while (0)
#define EDIT_DEFINE \ #define EDIT_DEFINE \
(strstr(doc, "<state>disk-snapshot</state>") ? \ (strstr(doc, "<state>disk-snapshot</state>") ? \
define_flags |= VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY : 0), \ define_flags |= VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY : 0), \