summaryrefslogtreecommitdiff
path: root/tools/virt-admin.h
diff options
context:
space:
mode:
authorErik Skultety <eskultet@redhat.com>2015-12-10 13:46:45 +0100
committerErik Skultety <eskultet@redhat.com>2015-12-21 10:07:59 +0100
commit3245e1783c3fa0a3756a2de7009c135a424ed030 (patch)
tree8bb2ed9cbe7297183744f78bf89a3235ef754d07 /tools/virt-admin.h
parent5b74103b0bcb8b9c184c1583694d76976753265a (diff)
downloadlibvirt-3245e1783c3fa0a3756a2de7009c135a424ed030.tar.gz
Revert "admin: Rename virAdmConnect to virAdmDaemon"
Commmit df8192aa introduced admin related rename and some minor (caused by automated approach, aka sed) and some more severe isues along with it. First reason to revert is the inconsistency with libvirt library. Although we deal with the daemon directly rather than with a specific hypervisor, we still do have a connection. That being said, contributors might get under the impression that AdmDaemonNew would spawn/start a new daemon (since it's admin API, why not...), or AdmDaemonClose would do the exact opposite or they might expect DaemonIsAlive report overall status of the daemon which definitely isn't the case. The second reason to revert this patch is renaming virt-admin client. The client tool does not necessarily have to reflect the names of the API's it's using in his internals. An example would be 's/vshAdmConnect/vshAdmDaemon' where noone can be certain of what the latter function really does. The former is quite expressive about some connection magic it performs, but the latter does not say anything, especially when vshAdmReconnect and vshAdmDisconnect were left untouched.
Diffstat (limited to 'tools/virt-admin.h')
-rw-r--r--tools/virt-admin.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/virt-admin.h b/tools/virt-admin.h
index d1b1bb4f1a..62228ccab1 100644
--- a/tools/virt-admin.h
+++ b/tools/virt-admin.h
@@ -39,8 +39,7 @@ typedef vshAdmControl *vshAdmControlPtr;
* adminControl
*/
struct _vshAdmControl {
- virAdmDaemonPtr dmn; /* remote daemon */
- char *name;
+ virAdmConnectPtr conn; /* connection to a daemon's admin server */
bool wantReconnect;
};