On 04/23/2013 04:26 AM, Daniel P. Berrange wrote: s/obsecure/obscure/ s/prioroty/priority/ while reindenting. Beyond that, I found it much easier to read with 'git diff -b': > diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl > index 65a0ac2..fdc345f 100755 > --- a/src/rpc/gendispatch.pl > @@ -17,13 +17,15 @@ > > use strict; > > -use Getopt::Std; > +use Getopt::Long; > > -# Command line options. > -# -k - client bodies > -# -b - server bodies > -our ($opt_p, $opt_t, $opt_a, $opt_r, $opt_d, $opt_b, $opt_k); > -getopts ('ptardbk'); > +my $mode = "debug"; > +my $res = GetOptions("mode=s" => \$mode); > + > +die "cannot parse command line options" unless $res; > + > +die "unknown mode '$mode', expecting 'client', 'server' or 'debug'" > + unless $mode =~ /^(client|server|debug)$/; > > my $structprefix = shift or die "missing struct prefix argument"; > my $procprefix = shift or die "missing procedure prefix argument"; > @@ -105,7 +107,7 @@ while (<PROTOCOL>) { > push(@{$calls{$name}->{ret_members}}, $1); > } > } elsif ($collect_opts) { > - if (m,^\s*\*\s*\@(\w+)\s*:\s*(\w+)\s*$,) { > + if (m,^\s*\*\s*\@(\w+)\s*:\s*((?:\w|:)+)\s*$,) { Does this change really belong here, or is it a separate cleanup better put in its own patch? ACK with typos fixed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; A number of the remote procedure names did not match the corresponding API names. For example, many lacked the word 'CONNECT', others re-arranged the names. Update the procedures so their names exactly match the API names. Then remove the special case handling of these APIs in the generator Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- daemon/remote.c | 83 ++++++++--------- src/qemu_protocol-structs | 6 +- src/remote/qemu_protocol.x | 6 +- src/remote/remote_driver.c | 216 +++++++++++++++++++++---------------------- src/remote/remote_protocol.x | 198 +++++++++++++++++++-------------------- src/remote_protocol-structs | 198 +++++++++++++++++++-------------------- src/rpc/gendispatch.pl | 31 ++----- 7 files changed, 363 insertions(+), 375 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index c559d6f..cc2ecec 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -719,11 +719,11 @@ void *remoteClientInitHook(virNetServerClientPtr client, /*----- Functions. -----*/ static int -remoteDispatchOpen(virNetServerPtr server, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - struct remote_open_args *args) +remoteDispatchConnectOpen(virNetServerPtr server, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + struct remote_connect_open_args *args) { const char *name; unsigned int flags; @@ -772,10 +772,10 @@ cleanup: static int -remoteDispatchClose(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) +remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) { virNetServerClientDelayedClose(client); return 0; @@ -3124,11 +3124,11 @@ cleanup: * Register / deregister events ***************************/ static int -remoteDispatchDomainEventsRegister(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_domain_events_register_ret *ret ATTRIBUTE_UNUSED) +remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_domain_event_register_ret *ret ATTRIBUTE_UNUSED) { int callbackID; int rv = -1; @@ -3166,11 +3166,11 @@ cleanup: } static int -remoteDispatchDomainEventsDeregister(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_domain_events_deregister_ret *ret ATTRIBUTE_UNUSED) +remoteDispatchConnectDomainEventDeregister(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_domain_event_deregister_ret *ret ATTRIBUTE_UNUSED) { int rv = -1; struct daemonClientPrivate *priv = @@ -3313,11 +3313,11 @@ cleanup: } static int -remoteDispatchDomainEventsRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_domain_events_register_any_args *args) +remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_domain_event_register_any_args *args) { int callbackID; int rv = -1; @@ -3362,11 +3362,11 @@ cleanup: static int -remoteDispatchDomainEventsDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_domain_events_deregister_any_args *args) +remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + remote_connect_domain_event_deregister_any_args *args) { int callbackID = -1; int rv = -1; @@ -3407,12 +3407,12 @@ cleanup: } static int -qemuDispatchMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - qemu_monitor_command_args *args, - qemu_monitor_command_ret *ret) +qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + qemu_domain_monitor_command_args *args, + qemu_domain_monitor_command_ret *ret) { virDomainPtr dom = NULL; int rv = -1; @@ -3699,13 +3699,12 @@ cleanup: } -static int remoteDispatchSupportsFeature( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_supports_feature_args *args, - remote_supports_feature_ret *ret) +static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_connect_supports_feature_args *args, + remote_connect_supports_feature_ret *ret) { int rv = -1; int supported; diff --git a/src/qemu_protocol-structs b/src/qemu_protocol-structs index e6cde60..0dcd2c6 100644 --- a/src/qemu_protocol-structs +++ b/src/qemu_protocol-structs @@ -4,12 +4,12 @@ struct remote_nonnull_domain { remote_uuid uuid; int id; }; -struct qemu_monitor_command_args { +struct qemu_domain_monitor_command_args { remote_nonnull_domain dom; remote_nonnull_string cmd; u_int flags; }; -struct qemu_monitor_command_ret { +struct qemu_domain_monitor_command_ret { remote_nonnull_string result; }; struct qemu_domain_attach_args { @@ -29,7 +29,7 @@ struct qemu_domain_agent_command_ret { remote_string result; }; enum qemu_procedure { - QEMU_PROC_MONITOR_COMMAND = 1, + QEMU_PROC_DOMAIN_MONITOR_COMMAND = 1, QEMU_PROC_DOMAIN_ATTACH = 2, QEMU_PROC_DOMAIN_AGENT_COMMAND = 3, }; diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x index 2ac8c1b..63fd92f 100644 --- a/src/remote/qemu_protocol.x +++ b/src/remote/qemu_protocol.x @@ -27,13 +27,13 @@ %#include <arpa/inet.h> /*----- Protocol. -----*/ -struct qemu_monitor_command_args { +struct qemu_domain_monitor_command_args { remote_nonnull_domain dom; remote_nonnull_string cmd; unsigned int flags; }; -struct qemu_monitor_command_ret { +struct qemu_domain_monitor_command_ret { remote_nonnull_string result; }; @@ -92,7 +92,7 @@ enum qemu_procedure { * @generate: none * @priority: low */ - QEMU_PROC_MONITOR_COMMAND = 1, + QEMU_PROC_DOMAIN_MONITOR_COMMAND = 1, /** * @generate: both diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 18c086b..6790f78 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -800,14 +800,14 @@ doRemoteOpen(virConnectPtr conn, goto failed; if (virNetClientKeepAliveIsSupported(priv->client)) { - remote_supports_feature_args args = + remote_connect_supports_feature_args args = { VIR_DRV_FEATURE_PROGRAM_KEEPALIVE }; - remote_supports_feature_ret ret = { 0 }; + remote_connect_supports_feature_ret ret = { 0 }; int rc; - rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE, - (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args, - (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret); + rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE, + (xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args, + (xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret); if (rc != -1 && ret.supported) { priv->serverKeepAlive = true; @@ -819,25 +819,25 @@ doRemoteOpen(virConnectPtr conn, /* Finally we can call the remote side's open function. */ { - remote_open_args args = { &name, flags }; + remote_connect_open_args args = { &name, flags }; VIR_DEBUG("Trying to open URI %s", name); - if (call(conn, priv, 0, REMOTE_PROC_OPEN, - (xdrproc_t) xdr_remote_open_args, (char *) &args, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_OPEN, + (xdrproc_t) xdr_remote_connect_open_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto failed; } /* Now try and find out what URI the daemon used */ if (conn->uri == NULL) { - remote_get_uri_ret uriret; + remote_connect_get_uri_ret uriret; VIR_DEBUG("Trying to query remote URI"); memset(&uriret, 0, sizeof(uriret)); if (call(conn, priv, 0, - REMOTE_PROC_GET_URI, + REMOTE_PROC_CONNECT_GET_URI, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_get_uri_ret, (char *) &uriret) < 0) + (xdrproc_t) xdr_remote_connect_get_uri_ret, (char *) &uriret) < 0) goto failed; VIR_DEBUG("Auto-probed URI is %s", uriret.uri); @@ -1023,7 +1023,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv) { int ret = 0; - if (call(conn, priv, 0, REMOTE_PROC_CLOSE, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_CLOSE, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL) == -1) ret = -1; @@ -1088,10 +1088,10 @@ remoteClose(virConnectPtr conn) * http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html */ static const char * -remoteType(virConnectPtr conn) +remoteConnectGetType(virConnectPtr conn) { char *rv = NULL; - remote_get_type_ret ret; + remote_connect_get_type_ret ret; struct private_data *priv = conn->privateData; remoteDriverLock(priv); @@ -1103,9 +1103,9 @@ remoteType(virConnectPtr conn) } memset(&ret, 0, sizeof(ret)); - if (call(conn, priv, 0, REMOTE_PROC_GET_TYPE, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_TYPE, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_get_type_ret, (char *) &ret) == -1) + (xdrproc_t) xdr_remote_connect_get_type_ret, (char *) &ret) == -1) goto done; /* Stash. */ @@ -1116,17 +1116,17 @@ done: return rv; } -static int remoteIsSecure(virConnectPtr conn) +static int remoteConnectIsSecure(virConnectPtr conn) { int rv = -1; struct private_data *priv = conn->privateData; - remote_is_secure_ret ret; + remote_connect_is_secure_ret ret; remoteDriverLock(priv); memset(&ret, 0, sizeof(ret)); - if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) + (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1) goto done; /* We claim to be secure, if the remote driver @@ -1144,18 +1144,18 @@ done: return rv; } -static int remoteIsEncrypted(virConnectPtr conn) +static int remoteConnectIsEncrypted(virConnectPtr conn) { int rv = -1; int encrypted = 0; struct private_data *priv = conn->privateData; - remote_is_secure_ret ret; + remote_connect_is_secure_ret ret; remoteDriverLock(priv); memset(&ret, 0, sizeof(ret)); - if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_IS_SECURE, (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) + (xdrproc_t) xdr_remote_connect_is_secure_ret, (char *) &ret) == -1) goto done; if (virNetClientIsEncrypted(priv->client)) @@ -1348,12 +1348,12 @@ done: } static int -remoteListDomains(virConnectPtr conn, int *ids, int maxids) +remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) { int rv = -1; int i; - remote_list_domains_args args; - remote_list_domains_ret ret; + remote_connect_list_domains_args args; + remote_connect_list_domains_ret ret; struct private_data *priv = conn->privateData; remoteDriverLock(priv); @@ -1367,9 +1367,9 @@ remoteListDomains(virConnectPtr conn, int *ids, int maxids) args.maxids = maxids; memset(&ret, 0, sizeof(ret)); - if (call(conn, priv, 0, REMOTE_PROC_LIST_DOMAINS, - (xdrproc_t) xdr_remote_list_domains_args, (char *) &args, - (xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret) == -1) + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_LIST_DOMAINS, + (xdrproc_t) xdr_remote_connect_list_domains_args, (char *) &args, + (xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret) == -1) goto done; if (ret.ids.ids_len > maxids) { @@ -1385,7 +1385,7 @@ remoteListDomains(virConnectPtr conn, int *ids, int maxids) rv = ret.ids.ids_len; cleanup: - xdr_free((xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret); + xdr_free((xdrproc_t) xdr_remote_connect_list_domains_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -3204,14 +3204,14 @@ remoteStorageClose(virConnectPtr conn) } static char * -remoteFindStoragePoolSources(virConnectPtr conn, - const char *type, - const char *srcSpec, - unsigned int flags) +remoteConnectFindStoragePoolSources(virConnectPtr conn, + const char *type, + const char *srcSpec, + unsigned int flags) { char *rv = NULL; - remote_find_storage_pool_sources_args args; - remote_find_storage_pool_sources_ret ret; + remote_connect_find_storage_pool_sources_args args; + remote_connect_find_storage_pool_sources_ret ret; struct private_data *priv = conn->storagePrivateData; remoteDriverLock(priv); @@ -3221,15 +3221,15 @@ remoteFindStoragePoolSources(virConnectPtr conn, args.flags = flags; memset(&ret, 0, sizeof(ret)); - if (call(conn, priv, 0, REMOTE_PROC_FIND_STORAGE_POOL_SOURCES, - (xdrproc_t) xdr_remote_find_storage_pool_sources_args, (char *) &args, - (xdrproc_t) xdr_remote_find_storage_pool_sources_ret, (char *) &ret) == -1) + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES, + (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_args, (char *) &args, + (xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret) == -1) goto done; rv = ret.xml; ret.xml = NULL; /* To stop xdr_free free'ing it */ - xdr_free((xdrproc_t) xdr_remote_find_storage_pool_sources_ret, (char *) &ret); + xdr_free((xdrproc_t) xdr_remote_connect_find_storage_pool_sources_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -4195,10 +4195,10 @@ out: #endif /* WITH_POLKIT */ /*----------------------------------------------------------------------*/ -static int remoteDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +static int remoteConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; @@ -4214,7 +4214,7 @@ static int remoteDomainEventRegister(virConnectPtr conn, if (count == 1) { /* Tell the server when we are the first callback deregistering */ - if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_REGISTER, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4227,8 +4227,8 @@ done: return rv; } -static int remoteDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +static int remoteConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { struct private_data *priv = conn->privateData; int rv = -1; @@ -4243,7 +4243,7 @@ static int remoteDomainEventDeregister(virConnectPtr conn, if (count == 0) { /* Tell the server when we are the last callback deregistering */ - if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4955,16 +4955,16 @@ static virStreamDriver remoteStreamDrv = { }; -static int remoteDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +static int remoteConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { int rv = -1; struct private_data *priv = conn->privateData; - remote_domain_events_register_any_args args; + remote_connect_domain_event_register_any_args args; int callbackID; int count; @@ -4984,8 +4984,8 @@ static int remoteDomainEventRegisterAny(virConnectPtr conn, if (count == 1) { args.eventID = eventID; - if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY, - (xdrproc_t) xdr_remote_domain_events_register_any_args, (char *) &args, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY, + (xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args, (xdrproc_t) xdr_void, (char *)NULL) == -1) { virDomainEventStateDeregisterID(conn, priv->domainEventState, @@ -5002,12 +5002,12 @@ done: } -static int remoteDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { struct private_data *priv = conn->privateData; int rv = -1; - remote_domain_events_deregister_any_args args; + remote_connect_domain_event_deregister_any_args args; int eventID; int count; @@ -5032,8 +5032,8 @@ static int remoteDomainEventDeregisterAny(virConnectPtr conn, if (count == 0) { args.eventID = callbackID; - if (call(conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY, - (xdrproc_t) xdr_remote_domain_events_deregister_any_args, (char *) &args, + if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY, + (xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; } @@ -5053,8 +5053,8 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, char **result, unsigned int flags) { int rv = -1; - qemu_monitor_command_args args; - qemu_monitor_command_ret ret; + qemu_domain_monitor_command_args args; + qemu_domain_monitor_command_ret ret; struct private_data *priv = domain->conn->privateData; remoteDriverLock(priv); @@ -5064,9 +5064,9 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, args.flags = flags; memset(&ret, 0, sizeof(ret)); - if (call(domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_MONITOR_COMMAND, - (xdrproc_t) xdr_qemu_monitor_command_args, (char *) &args, - (xdrproc_t) xdr_qemu_monitor_command_ret, (char *) &ret) == -1) + if (call(domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_DOMAIN_MONITOR_COMMAND, + (xdrproc_t) xdr_qemu_domain_monitor_command_args, (char *) &args, + (xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret) == -1) goto done; *result = strdup(ret.result); @@ -5078,7 +5078,7 @@ remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_qemu_monitor_command_ret, (char *) &ret); + xdr_free((xdrproc_t) xdr_qemu_domain_monitor_command_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -6122,17 +6122,17 @@ static virDriver remote_driver = { .name = "remote", .open = remoteOpen, /* 0.3.0 */ .close = remoteClose, /* 0.3.0 */ - .supports_feature = remoteSupportsFeature, /* 0.3.0 */ - .type = remoteType, /* 0.3.0 */ - .version = remoteGetVersion, /* 0.3.0 */ - .libvirtVersion = remoteGetLibVersion, /* 0.7.3 */ - .getHostname = remoteGetHostname, /* 0.3.0 */ - .getSysinfo = remoteGetSysinfo, /* 0.8.8 */ - .getMaxVcpus = remoteGetMaxVcpus, /* 0.3.0 */ + .supports_feature = remoteConnectSupportsFeature, /* 0.3.0 */ + .type = remoteConnectGetType, /* 0.3.0 */ + .version = remoteConnectGetVersion, /* 0.3.0 */ + .libvirtVersion = remoteConnectGetLibVersion, /* 0.7.3 */ + .getHostname = remoteConnectGetHostname, /* 0.3.0 */ + .getSysinfo = remoteConnectGetSysinfo, /* 0.8.8 */ + .getMaxVcpus = remoteConnectGetMaxVcpus, /* 0.3.0 */ .nodeGetInfo = remoteNodeGetInfo, /* 0.3.0 */ - .getCapabilities = remoteGetCapabilities, /* 0.3.0 */ - .listDomains = remoteListDomains, /* 0.3.0 */ - .numOfDomains = remoteNumOfDomains, /* 0.3.0 */ + .getCapabilities = remoteConnectGetCapabilities, /* 0.3.0 */ + .listDomains = remoteConnectListDomains, /* 0.3.0 */ + .numOfDomains = remoteConnectNumOfDomains, /* 0.3.0 */ .listAllDomains = remoteConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = remoteDomainCreateXML, /* 0.3.0 */ .domainLookupByID = remoteDomainLookupByID, /* 0.3.0 */ @@ -6182,10 +6182,10 @@ static virDriver remote_driver = { .domainGetSecurityLabelList = remoteDomainGetSecurityLabelList, /* 0.10.0 */ .nodeGetSecurityModel = remoteNodeGetSecurityModel, /* 0.6.1 */ .domainGetXMLDesc = remoteDomainGetXMLDesc, /* 0.3.0 */ - .domainXMLFromNative = remoteDomainXMLFromNative, /* 0.6.4 */ - .domainXMLToNative = remoteDomainXMLToNative, /* 0.6.4 */ - .listDefinedDomains = remoteListDefinedDomains, /* 0.3.0 */ - .numOfDefinedDomains = remoteNumOfDefinedDomains, /* 0.3.0 */ + .domainXMLFromNative = remoteConnectDomainXMLFromNative, /* 0.6.4 */ + .domainXMLToNative = remoteConnectDomainXMLToNative, /* 0.6.4 */ + .listDefinedDomains = remoteConnectListDefinedDomains, /* 0.3.0 */ + .numOfDefinedDomains = remoteConnectNumOfDefinedDomains, /* 0.3.0 */ .domainCreate = remoteDomainCreate, /* 0.3.0 */ .domainCreateWithFlags = remoteDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = remoteDomainDefineXML, /* 0.3.0 */ @@ -6220,21 +6220,21 @@ static virDriver remote_driver = { .nodeGetMemoryStats = remoteNodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, /* 0.3.3 */ .nodeGetFreeMemory = remoteNodeGetFreeMemory, /* 0.3.3 */ - .domainEventRegister = remoteDomainEventRegister, /* 0.5.0 */ - .domainEventDeregister = remoteDomainEventDeregister, /* 0.5.0 */ + .domainEventRegister = remoteConnectDomainEventRegister, /* 0.5.0 */ + .domainEventDeregister = remoteConnectDomainEventDeregister, /* 0.5.0 */ .domainMigratePrepare2 = remoteDomainMigratePrepare2, /* 0.5.0 */ .domainMigrateFinish2 = remoteDomainMigrateFinish2, /* 0.5.0 */ .nodeDeviceDettach = remoteNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = remoteNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = remoteNodeDeviceReset, /* 0.6.1 */ .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, /* 0.7.2 */ - .isEncrypted = remoteIsEncrypted, /* 0.7.3 */ - .isSecure = remoteIsSecure, /* 0.7.3 */ + .isEncrypted = remoteConnectIsEncrypted, /* 0.7.3 */ + .isSecure = remoteConnectIsSecure, /* 0.7.3 */ .domainIsActive = remoteDomainIsActive, /* 0.7.3 */ .domainIsPersistent = remoteDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = remoteDomainIsUpdated, /* 0.8.6 */ - .cpuCompare = remoteCPUCompare, /* 0.7.5 */ - .cpuBaseline = remoteCPUBaseline, /* 0.7.7 */ + .cpuCompare = remoteConnectCompareCPU, /* 0.7.5 */ + .cpuBaseline = remoteConnectBaselineCPU, /* 0.7.7 */ .domainGetJobInfo = remoteDomainGetJobInfo, /* 0.7.7 */ .domainGetJobStats = remoteDomainGetJobStats, /* 1.0.3 */ .domainAbortJob = remoteDomainAbortJob, /* 0.7.7 */ @@ -6243,8 +6243,8 @@ static virDriver remote_driver = { .domainMigrateSetCompressionCache = remoteDomainMigrateSetCompressionCache, /* 1.0.3 */ .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed, /* 0.9.0 */ .domainMigrateGetMaxSpeed = remoteDomainMigrateGetMaxSpeed, /* 0.9.5 */ - .domainEventRegisterAny = remoteDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = remoteDomainEventDeregisterAny, /* 0.8.0 */ + .domainEventRegisterAny = remoteConnectDomainEventRegisterAny, /* 0.8.0 */ + .domainEventDeregisterAny = remoteConnectDomainEventDeregisterAny, /* 0.8.0 */ .domainManagedSave = remoteDomainManagedSave, /* 0.8.0 */ .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage, /* 0.8.0 */ .domainManagedSaveRemove = remoteDomainManagedSaveRemove, /* 0.8.0 */ @@ -6308,10 +6308,10 @@ static virNetworkDriver network_driver = { .name = "remote", .open = remoteNetworkOpen, /* 0.3.0 */ .close = remoteNetworkClose, /* 0.3.0 */ - .numOfNetworks = remoteNumOfNetworks, /* 0.3.0 */ - .listNetworks = remoteListNetworks, /* 0.3.0 */ - .numOfDefinedNetworks = remoteNumOfDefinedNetworks, /* 0.3.0 */ - .listDefinedNetworks = remoteListDefinedNetworks, /* 0.3.0 */ + .numOfNetworks = remoteConnectNumOfNetworks, /* 0.3.0 */ + .listNetworks = remoteConnectListNetworks, /* 0.3.0 */ + .numOfDefinedNetworks = remoteConnectNumOfDefinedNetworks, /* 0.3.0 */ + .listDefinedNetworks = remoteConnectListDefinedNetworks, /* 0.3.0 */ .listAllNetworks = remoteConnectListAllNetworks, /* 0.10.2 */ .networkLookupByUUID = remoteNetworkLookupByUUID, /* 0.3.0 */ .networkLookupByName = remoteNetworkLookupByName, /* 0.3.0 */ @@ -6333,10 +6333,10 @@ static virInterfaceDriver interface_driver = { .name = "remote", .open = remoteInterfaceOpen, /* 0.7.2 */ .close = remoteInterfaceClose, /* 0.7.2 */ - .numOfInterfaces = remoteNumOfInterfaces, /* 0.7.2 */ - .listInterfaces = remoteListInterfaces, /* 0.7.2 */ - .numOfDefinedInterfaces = remoteNumOfDefinedInterfaces, /* 0.7.2 */ - .listDefinedInterfaces = remoteListDefinedInterfaces, /* 0.7.2 */ + .numOfInterfaces = remoteConnectNumOfInterfaces, /* 0.7.2 */ + .listInterfaces = remoteConnectListInterfaces, /* 0.7.2 */ + .numOfDefinedInterfaces = remoteConnectNumOfDefinedInterfaces, /* 0.7.2 */ + .listDefinedInterfaces = remoteConnectListDefinedInterfaces, /* 0.7.2 */ .listAllInterfaces = remoteConnectListAllInterfaces, /* 0.10.2 */ .interfaceLookupByName = remoteInterfaceLookupByName, /* 0.7.2 */ .interfaceLookupByMACString = remoteInterfaceLookupByMACString, /* 0.7.2 */ @@ -6355,12 +6355,12 @@ static virStorageDriver storage_driver = { .name = "remote", .open = remoteStorageOpen, /* 0.4.1 */ .close = remoteStorageClose, /* 0.4.1 */ - .numOfPools = remoteNumOfStoragePools, /* 0.4.1 */ - .listPools = remoteListStoragePools, /* 0.4.1 */ - .numOfDefinedPools = remoteNumOfDefinedStoragePools, /* 0.4.1 */ - .listDefinedPools = remoteListDefinedStoragePools, /* 0.4.1 */ + .numOfPools = remoteConnectNumOfStoragePools, /* 0.4.1 */ + .listPools = remoteConnectListStoragePools, /* 0.4.1 */ + .numOfDefinedPools = remoteConnectNumOfDefinedStoragePools, /* 0.4.1 */ + .listDefinedPools = remoteConnectListDefinedStoragePools, /* 0.4.1 */ .listAllPools = remoteConnectListAllStoragePools, /* 0.10.2 */ - .findPoolSources = remoteFindStoragePoolSources, /* 0.4.5 */ + .findPoolSources = remoteConnectFindStoragePoolSources, /* 0.4.5 */ .poolLookupByName = remoteStoragePoolLookupByName, /* 0.4.1 */ .poolLookupByUUID = remoteStoragePoolLookupByUUID, /* 0.4.1 */ .poolLookupByVolume = remoteStoragePoolLookupByVolume, /* 0.4.1 */ @@ -6402,8 +6402,8 @@ static virSecretDriver secret_driver = { .name = "remote", .open = remoteSecretOpen, /* 0.7.1 */ .close = remoteSecretClose, /* 0.7.1 */ - .numOfSecrets = remoteNumOfSecrets, /* 0.7.1 */ - .listSecrets = remoteListSecrets, /* 0.7.1 */ + .numOfSecrets = remoteConnectNumOfSecrets, /* 0.7.1 */ + .listSecrets = remoteConnectListSecrets, /* 0.7.1 */ .listAllSecrets = remoteConnectListAllSecrets, /* 0.10.2 */ .lookupByUUID = remoteSecretLookupByUUID, /* 0.7.1 */ .lookupByUsage = remoteSecretLookupByUsage, /* 0.7.1 */ @@ -6440,8 +6440,8 @@ static virNWFilterDriver nwfilter_driver = { .getXMLDesc = remoteNWFilterGetXMLDesc, /* 0.8.0 */ .defineXML = remoteNWFilterDefineXML, /* 0.8.0 */ .undefine = remoteNWFilterUndefine, /* 0.8.0 */ - .numOfNWFilters = remoteNumOfNWFilters, /* 0.8.0 */ - .listNWFilters = remoteListNWFilters, /* 0.8.0 */ + .numOfNWFilters = remoteConnectNumOfNWFilters, /* 0.8.0 */ + .listNWFilters = remoteConnectListNWFilters, /* 0.8.0 */ .listAllNWFilters = remoteConnectListAllNWFilters, /* 0.10.2 */ }; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e531b97..486d640 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -401,7 +401,7 @@ struct remote_domain_disk_error { * Dynamic opaque and remote_nonnull_string arrays can be annotated with an * optional typecast */ -struct remote_open_args { +struct remote_connect_open_args { /* NB. "name" might be NULL although in practice you can't * yet do that using the remote_internal driver. */ @@ -409,50 +409,50 @@ struct remote_open_args { unsigned int flags; }; -struct remote_supports_feature_args { +struct remote_connect_supports_feature_args { int feature; }; -struct remote_supports_feature_ret { +struct remote_connect_supports_feature_ret { int supported; }; -struct remote_get_type_ret { +struct remote_connect_get_type_ret { remote_nonnull_string type; }; -struct remote_get_version_ret { +struct remote_connect_get_version_ret { unsigned hyper hv_ver; }; -struct remote_get_lib_version_ret { +struct remote_connect_get_lib_version_ret { unsigned hyper lib_ver; }; -struct remote_get_hostname_ret { +struct remote_connect_get_hostname_ret { remote_nonnull_string hostname; }; -struct remote_get_sysinfo_args { +struct remote_connect_get_sysinfo_args { unsigned int flags; }; -struct remote_get_sysinfo_ret { +struct remote_connect_get_sysinfo_ret { remote_nonnull_string sysinfo; }; -struct remote_get_uri_ret { +struct remote_connect_get_uri_ret { remote_nonnull_string uri; }; -struct remote_get_max_vcpus_args { +struct remote_connect_get_max_vcpus_args { /* The only backend which supports this call is Xen HV, and * there the type is ignored so it could be NULL. */ remote_string type; }; -struct remote_get_max_vcpus_ret { +struct remote_connect_get_max_vcpus_ret { int max_vcpus; }; @@ -467,7 +467,7 @@ struct remote_node_get_info_ret { /* insert@1 */ int threads; }; -struct remote_get_capabilities_ret { +struct remote_connect_get_capabilities_ret { remote_nonnull_string capabilities; }; @@ -713,15 +713,15 @@ struct remote_domain_get_block_info_ret { /* insert@2 */ unsigned hyper physical; }; -struct remote_list_domains_args { +struct remote_connect_list_domains_args { int maxids; }; -struct remote_list_domains_ret { +struct remote_connect_list_domains_ret { int ids<REMOTE_DOMAIN_ID_LIST_MAX>; /* insert@1 */ }; -struct remote_num_of_domains_ret { +struct remote_connect_num_of_domains_ret { int num; }; @@ -964,15 +964,15 @@ struct remote_domain_migrate_finish2_ret { remote_nonnull_domain ddom; }; -struct remote_list_defined_domains_args { +struct remote_connect_list_defined_domains_args { int maxnames; }; -struct remote_list_defined_domains_ret { +struct remote_connect_list_defined_domains_ret { remote_nonnull_string names<REMOTE_DOMAIN_NAME_LIST_MAX>; /* insert@1 */ }; -struct remote_num_of_defined_domains_ret { +struct remote_connect_num_of_defined_domains_ret { int num; }; @@ -1283,27 +1283,27 @@ struct remote_domain_get_hostname_ret { /* Network calls: */ -struct remote_num_of_networks_ret { +struct remote_connect_num_of_networks_ret { int num; }; -struct remote_list_networks_args { +struct remote_connect_list_networks_args { int maxnames; }; -struct remote_list_networks_ret { +struct remote_connect_list_networks_ret { remote_nonnull_string names<REMOTE_NETWORK_NAME_LIST_MAX>; /* insert@1 */ }; -struct remote_num_of_defined_networks_ret { +struct remote_connect_num_of_defined_networks_ret { int num; }; -struct remote_list_defined_networks_args { +struct remote_connect_list_defined_networks_args { int maxnames; }; -struct remote_list_defined_networks_ret { +struct remote_connect_list_defined_networks_ret { remote_nonnull_string names<REMOTE_NETWORK_NAME_LIST_MAX>; /* insert@1 */ }; @@ -1392,15 +1392,15 @@ struct remote_network_set_autostart_args { /* network filter calls */ -struct remote_num_of_nwfilters_ret { +struct remote_connect_num_of_nwfilters_ret { int num; }; -struct remote_list_nwfilters_args { +struct remote_connect_list_nwfilters_args { int maxnames; }; -struct remote_list_nwfilters_ret { +struct remote_connect_list_nwfilters_ret { remote_nonnull_string names<REMOTE_NWFILTER_NAME_LIST_MAX>; /* insert@1 */ }; @@ -1444,27 +1444,27 @@ struct remote_nwfilter_get_xml_desc_ret { /* Interface calls: */ -struct remote_num_of_interfaces_ret { +struct remote_connect_num_of_interfaces_ret { int num; }; -struct remote_list_interfaces_args { +struct remote_connect_list_interfaces_args { int maxnames; }; -struct remote_list_interfaces_ret { +struct remote_connect_list_interfaces_ret { remote_nonnull_string names<REMOTE_INTERFACE_NAME_LIST_MAX>; /* insert@1 */ }; -struct remote_num_of_defined_interfaces_ret { +struct remote_connect_num_of_defined_interfaces_ret { int num; }; -struct remote_list_defined_interfaces_args { +struct remote_connect_list_defined_interfaces_args { int maxnames; }; -struct remote_list_defined_interfaces_ret { +struct remote_connect_list_defined_interfaces_ret { remote_nonnull_string names<REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX>; /* insert@1 */ }; @@ -1570,37 +1570,37 @@ struct remote_auth_polkit_ret { /* Storage pool calls: */ -struct remote_num_of_storage_pools_ret { +struct remote_connect_num_of_storage_pools_ret { int num; }; -struct remote_list_storage_pools_args { +struct remote_connect_list_storage_pools_args { int maxnames; }; -struct remote_list_storage_pools_ret { +struct remote_connect_list_storage_pools_ret { remote_nonnull_string names<REMOTE_STORAGE_POOL_NAME_LIST_MAX>; /* insert@1 */ }; -struct remote_num_of_defined_storage_pools_ret { +struct remote_connect_num_of_defined_storage_pools_ret { int num; }; -struct remote_list_defined_storage_pools_args { +struct remote_connect_list_defined_storage_pools_args { int maxnames; }; -struct remote_list_defined_storage_pools_ret { +struct remote_connect_list_defined_storage_pools_ret { remote_nonnull_string names<REMOTE_STORAGE_POOL_NAME_LIST_MAX>; /* insert@1 */ }; -struct remote_find_storage_pool_sources_args { +struct remote_connect_find_storage_pool_sources_args { remote_nonnull_string type; remote_string srcSpec; unsigned int flags; }; -struct remote_find_storage_pool_sources_ret { +struct remote_connect_find_storage_pool_sources_ret { remote_nonnull_string xml; }; @@ -1928,11 +1928,11 @@ struct remote_node_device_destroy_args { * to be null. It will not generate the prototype otherwise. * Pass back a redundant boolean to force prototype generation. */ -struct remote_domain_events_register_ret { +struct remote_connect_domain_event_register_ret { int cb_registered; }; -struct remote_domain_events_deregister_ret { +struct remote_connect_domain_event_deregister_ret { int cb_registered; }; @@ -1943,37 +1943,37 @@ struct remote_domain_event_lifecycle_msg { }; -struct remote_domain_xml_from_native_args { +struct remote_connect_domain_xml_from_native_args { remote_nonnull_string nativeFormat; remote_nonnull_string nativeConfig; unsigned int flags; }; -struct remote_domain_xml_from_native_ret { +struct remote_connect_domain_xml_from_native_ret { remote_nonnull_string domainXml; }; -struct remote_domain_xml_to_native_args { +struct remote_connect_domain_xml_to_native_args { remote_nonnull_string nativeFormat; remote_nonnull_string domainXml; unsigned int flags; }; -struct remote_domain_xml_to_native_ret { +struct remote_connect_domain_xml_to_native_ret { remote_nonnull_string nativeConfig; }; -struct remote_num_of_secrets_ret { +struct remote_connect_num_of_secrets_ret { int num; }; -struct remote_list_secrets_args { +struct remote_connect_list_secrets_args { int maxuuids; }; -struct remote_list_secrets_ret { +struct remote_connect_list_secrets_ret { remote_nonnull_string uuids<REMOTE_SECRET_UUID_LIST_MAX>; /* insert@1 */ }; @@ -2039,7 +2039,7 @@ struct remote_domain_migrate_prepare_tunnel_args { }; -struct remote_is_secure_ret { +struct remote_connect_is_secure_ret { int secure; }; @@ -2112,22 +2112,22 @@ struct remote_interface_is_active_ret { }; -struct remote_cpu_compare_args { +struct remote_connect_compare_cpu_args { remote_nonnull_string xml; unsigned int flags; }; -struct remote_cpu_compare_ret { +struct remote_connect_compare_cpu_ret { int result; }; -struct remote_cpu_baseline_args { +struct remote_connect_baseline_cpu_args { remote_nonnull_string xmlCPUs<REMOTE_CPU_BASELINE_MAX>; /* (const char **) */ unsigned int flags; }; -struct remote_cpu_baseline_ret { +struct remote_connect_baseline_cpu_ret { remote_nonnull_string cpu; }; @@ -2209,11 +2209,11 @@ struct remote_domain_migrate_get_max_speed_ret { }; -struct remote_domain_events_register_any_args { +struct remote_connect_domain_event_register_any_args { int eventID; }; -struct remote_domain_events_deregister_any_args { +struct remote_connect_domain_event_deregister_any_args { int eventID; }; @@ -2775,31 +2775,31 @@ enum remote_procedure { * @generate: none * @priority: high */ - REMOTE_PROC_OPEN = 1, + REMOTE_PROC_CONNECT_OPEN = 1, /** * @generate: none * @priority: high */ - REMOTE_PROC_CLOSE = 2, + REMOTE_PROC_CONNECT_CLOSE = 2, /** * @generate: server * @priority: high */ - REMOTE_PROC_GET_TYPE = 3, + REMOTE_PROC_CONNECT_GET_TYPE = 3, /** * @generate: both * @priority: high */ - REMOTE_PROC_GET_VERSION = 4, + REMOTE_PROC_CONNECT_GET_VERSION = 4, /** * @generate: both * @priority: high */ - REMOTE_PROC_GET_MAX_VCPUS = 5, + REMOTE_PROC_CONNECT_GET_MAX_VCPUS = 5, /** * @generate: both @@ -2810,7 +2810,7 @@ enum remote_procedure { /** * @generate: both */ - REMOTE_PROC_GET_CAPABILITIES = 7, + REMOTE_PROC_CONNECT_GET_CAPABILITIES = 7, /** * @generate: both @@ -2888,7 +2888,7 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_LIST_DEFINED_DOMAINS = 21, + REMOTE_PROC_CONNECT_LIST_DEFINED_DOMAINS = 21, /** * @generate: both @@ -2912,7 +2912,7 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_DEFINED_DOMAINS = 25, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_DOMAINS = 25, /** * @generate: both @@ -2971,19 +2971,19 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_LIST_DEFINED_NETWORKS = 36, + REMOTE_PROC_CONNECT_LIST_DEFINED_NETWORKS = 36, /** * @generate: server * @priority: high */ - REMOTE_PROC_LIST_DOMAINS = 37, + REMOTE_PROC_CONNECT_LIST_DOMAINS = 37, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_NETWORKS = 38, + REMOTE_PROC_CONNECT_LIST_NETWORKS = 38, /** * @generate: both @@ -3053,19 +3053,19 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_DEFINED_NETWORKS = 50, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_NETWORKS = 50, /** * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_DOMAINS = 51, + REMOTE_PROC_CONNECT_NUM_OF_DOMAINS = 51, /** * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_NETWORKS = 52, + REMOTE_PROC_CONNECT_NUM_OF_NETWORKS = 52, /** * @generate: both @@ -3101,13 +3101,13 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_GET_HOSTNAME = 59, + REMOTE_PROC_CONNECT_GET_HOSTNAME = 59, /** * @generate: client * @priority: high */ - REMOTE_PROC_SUPPORTS_FEATURE = 60, + REMOTE_PROC_CONNECT_SUPPORTS_FEATURE = 60, /** * @generate: none @@ -3169,30 +3169,30 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_STORAGE_POOLS = 71, + REMOTE_PROC_CONNECT_NUM_OF_STORAGE_POOLS = 71, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_STORAGE_POOLS = 72, + REMOTE_PROC_CONNECT_LIST_STORAGE_POOLS = 72, /** * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_DEFINED_STORAGE_POOLS = 73, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_STORAGE_POOLS = 73, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_DEFINED_STORAGE_POOLS = 74, + REMOTE_PROC_CONNECT_LIST_DEFINED_STORAGE_POOLS = 74, /** * @generate: server */ - REMOTE_PROC_FIND_STORAGE_POOL_SOURCES = 75, + REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES = 75, /** * @generate: both @@ -3363,13 +3363,13 @@ enum remote_procedure { * @generate: none * @priority: high */ - REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER = 105, /** * @generate: none * @priority: high */ - REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER = 106, /** * @generate: both @@ -3390,7 +3390,7 @@ enum remote_procedure { * @generate: server * @priority: high */ - REMOTE_PROC_GET_URI = 110, + REMOTE_PROC_CONNECT_GET_URI = 110, /** * @generate: both @@ -3480,13 +3480,13 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_INTERFACES = 126, + REMOTE_PROC_CONNECT_NUM_OF_INTERFACES = 126, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_INTERFACES = 127, + REMOTE_PROC_CONNECT_LIST_INTERFACES = 127, /** * @generate: both @@ -3531,36 +3531,36 @@ enum remote_procedure { /** * @generate: both */ - REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 135, + REMOTE_PROC_CONNECT_DOMAIN_XML_FROM_NATIVE = 135, /** * @generate: both */ - REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 136, + REMOTE_PROC_CONNECT_DOMAIN_XML_TO_NATIVE = 136, /** * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_DEFINED_INTERFACES = 137, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_INTERFACES = 137, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_DEFINED_INTERFACES = 138, + REMOTE_PROC_CONNECT_LIST_DEFINED_INTERFACES = 138, /** * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_SECRETS = 139, + REMOTE_PROC_CONNECT_NUM_OF_SECRETS = 139, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_SECRETS = 140, + REMOTE_PROC_CONNECT_LIST_SECRETS = 140, /** * @generate: both @@ -3614,7 +3614,7 @@ enum remote_procedure { * @generate: server * @priority: high */ - REMOTE_PROC_IS_SECURE = 149, + REMOTE_PROC_CONNECT_IS_SECURE = 149, /** * @generate: both @@ -3662,13 +3662,13 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_GET_LIB_VERSION = 157, + REMOTE_PROC_CONNECT_GET_LIB_VERSION = 157, /** * @generate: both * @priority: high */ - REMOTE_PROC_CPU_COMPARE = 158, + REMOTE_PROC_CONNECT_COMPARE_CPU = 158, /** * @generate: none @@ -3688,7 +3688,7 @@ enum remote_procedure { /** * @generate: both */ - REMOTE_PROC_CPU_BASELINE = 162, + REMOTE_PROC_CONNECT_BASELINE_CPU = 162, /** * @generate: both @@ -3714,13 +3714,13 @@ enum remote_procedure { * @generate: none * @priority: high */ - REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY = 167, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY = 167, /** * @generate: none * @priority: high */ - REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY = 168, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY = 168, /** * @generate: both @@ -3774,13 +3774,13 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_NUM_OF_NWFILTERS = 178, + REMOTE_PROC_CONNECT_NUM_OF_NWFILTERS = 178, /** * @generate: both * @priority: high */ - REMOTE_PROC_LIST_NWFILTERS = 179, + REMOTE_PROC_CONNECT_LIST_NWFILTERS = 179, /** * @generate: both @@ -3909,7 +3909,7 @@ enum remote_procedure { * @generate: both * @priority: high */ - REMOTE_PROC_GET_SYSINFO = 203, + REMOTE_PROC_CONNECT_GET_SYSINFO = 203, /** * @generate: both diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index c85defd..11a53a2 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -98,41 +98,41 @@ struct remote_domain_disk_error { remote_nonnull_string disk; int error; }; -struct remote_open_args { +struct remote_connect_open_args { remote_string name; u_int flags; }; -struct remote_supports_feature_args { +struct remote_connect_supports_feature_args { int feature; }; -struct remote_supports_feature_ret { +struct remote_connect_supports_feature_ret { int supported; }; -struct remote_get_type_ret { +struct remote_connect_get_type_ret { remote_nonnull_string type; }; -struct remote_get_version_ret { +struct remote_connect_get_version_ret { uint64_t hv_ver; }; -struct remote_get_lib_version_ret { +struct remote_connect_get_lib_version_ret { uint64_t lib_ver; }; -struct remote_get_hostname_ret { +struct remote_connect_get_hostname_ret { remote_nonnull_string hostname; }; -struct remote_get_sysinfo_args { +struct remote_connect_get_sysinfo_args { u_int flags; }; -struct remote_get_sysinfo_ret { +struct remote_connect_get_sysinfo_ret { remote_nonnull_string sysinfo; }; -struct remote_get_uri_ret { +struct remote_connect_get_uri_ret { remote_nonnull_string uri; }; -struct remote_get_max_vcpus_args { +struct remote_connect_get_max_vcpus_args { remote_string type; }; -struct remote_get_max_vcpus_ret { +struct remote_connect_get_max_vcpus_ret { int max_vcpus; }; struct remote_node_get_info_ret { @@ -145,7 +145,7 @@ struct remote_node_get_info_ret { int cores; int threads; }; -struct remote_get_capabilities_ret { +struct remote_connect_get_capabilities_ret { remote_nonnull_string capabilities; }; struct remote_node_get_cpu_stats_args { @@ -404,16 +404,16 @@ struct remote_domain_get_block_info_ret { uint64_t capacity; uint64_t physical; }; -struct remote_list_domains_args { +struct remote_connect_list_domains_args { int maxids; }; -struct remote_list_domains_ret { +struct remote_connect_list_domains_ret { struct { u_int ids_len; int * ids_val; } ids; }; -struct remote_num_of_domains_ret { +struct remote_connect_num_of_domains_ret { int num; }; struct remote_domain_create_xml_args { @@ -623,16 +623,16 @@ struct remote_domain_migrate_finish2_args { struct remote_domain_migrate_finish2_ret { remote_nonnull_domain ddom; }; -struct remote_list_defined_domains_args { +struct remote_connect_list_defined_domains_args { int maxnames; }; -struct remote_list_defined_domains_ret { +struct remote_connect_list_defined_domains_ret { struct { u_int names_len; remote_nonnull_string * names_val; } names; }; -struct remote_num_of_defined_domains_ret { +struct remote_connect_num_of_defined_domains_ret { int num; }; struct remote_domain_create_args { @@ -932,25 +932,25 @@ struct remote_domain_get_hostname_args { struct remote_domain_get_hostname_ret { remote_nonnull_string hostname; }; -struct remote_num_of_networks_ret { +struct remote_connect_num_of_networks_ret { int num; }; -struct remote_list_networks_args { +struct remote_connect_list_networks_args { int maxnames; }; -struct remote_list_networks_ret { +struct remote_connect_list_networks_ret { struct { u_int names_len; remote_nonnull_string * names_val; } names; }; -struct remote_num_of_defined_networks_ret { +struct remote_connect_num_of_defined_networks_ret { int num; }; -struct remote_list_defined_networks_args { +struct remote_connect_list_defined_networks_args { int maxnames; }; -struct remote_list_defined_networks_ret { +struct remote_connect_list_defined_networks_ret { struct { u_int names_len; remote_nonnull_string * names_val; @@ -1020,13 +1020,13 @@ struct remote_network_set_autostart_args { remote_nonnull_network net; int autostart; }; -struct remote_num_of_nwfilters_ret { +struct remote_connect_num_of_nwfilters_ret { int num; }; -struct remote_list_nwfilters_args { +struct remote_connect_list_nwfilters_args { int maxnames; }; -struct remote_list_nwfilters_ret { +struct remote_connect_list_nwfilters_ret { struct { u_int names_len; remote_nonnull_string * names_val; @@ -1060,25 +1060,25 @@ struct remote_nwfilter_get_xml_desc_args { struct remote_nwfilter_get_xml_desc_ret { remote_nonnull_string xml; }; -struct remote_num_of_interfaces_ret { +struct remote_connect_num_of_interfaces_ret { int num; }; -struct remote_list_interfaces_args { +struct remote_connect_list_interfaces_args { int maxnames; }; -struct remote_list_interfaces_ret { +struct remote_connect_list_interfaces_ret { struct { u_int names_len; remote_nonnull_string * names_val; } names; }; -struct remote_num_of_defined_interfaces_ret { +struct remote_connect_num_of_defined_interfaces_ret { int num; }; -struct remote_list_defined_interfaces_args { +struct remote_connect_list_defined_interfaces_args { int maxnames; }; -struct remote_list_defined_interfaces_ret { +struct remote_connect_list_defined_interfaces_ret { struct { u_int names_len; remote_nonnull_string * names_val; @@ -1173,36 +1173,36 @@ struct remote_auth_sasl_step_ret { struct remote_auth_polkit_ret { int complete; }; -struct remote_num_of_storage_pools_ret { +struct remote_connect_num_of_storage_pools_ret { int num; }; -struct remote_list_storage_pools_args { +struct remote_connect_list_storage_pools_args { int maxnames; }; -struct remote_list_storage_pools_ret { +struct remote_connect_list_storage_pools_ret { struct { u_int names_len; remote_nonnull_string * names_val; } names; }; -struct remote_num_of_defined_storage_pools_ret { +struct remote_connect_num_of_defined_storage_pools_ret { int num; }; -struct remote_list_defined_storage_pools_args { +struct remote_connect_list_defined_storage_pools_args { int maxnames; }; -struct remote_list_defined_storage_pools_ret { +struct remote_connect_list_defined_storage_pools_ret { struct { u_int names_len; remote_nonnull_string * names_val; } names; }; -struct remote_find_storage_pool_sources_args { +struct remote_connect_find_storage_pool_sources_args { remote_nonnull_string type; remote_string srcSpec; u_int flags; }; -struct remote_find_storage_pool_sources_ret { +struct remote_connect_find_storage_pool_sources_ret { remote_nonnull_string xml; }; struct remote_storage_pool_lookup_by_uuid_args { @@ -1456,10 +1456,10 @@ struct remote_node_device_create_xml_ret { struct remote_node_device_destroy_args { remote_nonnull_string name; }; -struct remote_domain_events_register_ret { +struct remote_connect_domain_event_register_ret { int cb_registered; }; -struct remote_domain_events_deregister_ret { +struct remote_connect_domain_event_deregister_ret { int cb_registered; }; struct remote_domain_event_lifecycle_msg { @@ -1467,29 +1467,29 @@ struct remote_domain_event_lifecycle_msg { int event; int detail; }; -struct remote_domain_xml_from_native_args { +struct remote_connect_domain_xml_from_native_args { remote_nonnull_string nativeFormat; remote_nonnull_string nativeConfig; u_int flags; }; -struct remote_domain_xml_from_native_ret { +struct remote_connect_domain_xml_from_native_ret { remote_nonnull_string domainXml; }; -struct remote_domain_xml_to_native_args { +struct remote_connect_domain_xml_to_native_args { remote_nonnull_string nativeFormat; remote_nonnull_string domainXml; u_int flags; }; -struct remote_domain_xml_to_native_ret { +struct remote_connect_domain_xml_to_native_ret { remote_nonnull_string nativeConfig; }; -struct remote_num_of_secrets_ret { +struct remote_connect_num_of_secrets_ret { int num; }; -struct remote_list_secrets_args { +struct remote_connect_list_secrets_args { int maxuuids; }; -struct remote_list_secrets_ret { +struct remote_connect_list_secrets_ret { struct { u_int uuids_len; remote_nonnull_string * uuids_val; @@ -1549,7 +1549,7 @@ struct remote_domain_migrate_prepare_tunnel_args { uint64_t resource; remote_nonnull_string dom_xml; }; -struct remote_is_secure_ret { +struct remote_connect_is_secure_ret { int secure; }; struct remote_domain_is_active_args { @@ -1600,21 +1600,21 @@ struct remote_interface_is_active_args { struct remote_interface_is_active_ret { int active; }; -struct remote_cpu_compare_args { +struct remote_connect_compare_cpu_args { remote_nonnull_string xml; u_int flags; }; -struct remote_cpu_compare_ret { +struct remote_connect_compare_cpu_ret { int result; }; -struct remote_cpu_baseline_args { +struct remote_connect_baseline_cpu_args { struct { u_int xmlCPUs_len; remote_nonnull_string * xmlCPUs_val; } xmlCPUs; u_int flags; }; -struct remote_cpu_baseline_ret { +struct remote_connect_baseline_cpu_ret { remote_nonnull_string cpu; }; struct remote_domain_get_job_info_args { @@ -1677,10 +1677,10 @@ struct remote_domain_migrate_get_max_speed_args { struct remote_domain_migrate_get_max_speed_ret { uint64_t bandwidth; }; -struct remote_domain_events_register_any_args { +struct remote_connect_domain_event_register_any_args { int eventID; }; -struct remote_domain_events_deregister_any_args { +struct remote_connect_domain_event_deregister_any_args { int eventID; }; struct remote_domain_event_reboot_msg { @@ -2188,13 +2188,13 @@ struct remote_domain_fstrim_args { u_int flags; }; enum remote_procedure { - REMOTE_PROC_OPEN = 1, - REMOTE_PROC_CLOSE = 2, - REMOTE_PROC_GET_TYPE = 3, - REMOTE_PROC_GET_VERSION = 4, - REMOTE_PROC_GET_MAX_VCPUS = 5, + REMOTE_PROC_CONNECT_OPEN = 1, + REMOTE_PROC_CONNECT_CLOSE = 2, + REMOTE_PROC_CONNECT_GET_TYPE = 3, + REMOTE_PROC_CONNECT_GET_VERSION = 4, + REMOTE_PROC_CONNECT_GET_MAX_VCPUS = 5, REMOTE_PROC_NODE_GET_INFO = 6, - REMOTE_PROC_GET_CAPABILITIES = 7, + REMOTE_PROC_CONNECT_GET_CAPABILITIES = 7, REMOTE_PROC_DOMAIN_ATTACH_DEVICE = 8, REMOTE_PROC_DOMAIN_CREATE = 9, REMOTE_PROC_DOMAIN_CREATE_XML = 10, @@ -2208,11 +2208,11 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_MAX_VCPUS = 18, REMOTE_PROC_DOMAIN_GET_OS_TYPE = 19, REMOTE_PROC_DOMAIN_GET_VCPUS = 20, - REMOTE_PROC_LIST_DEFINED_DOMAINS = 21, + REMOTE_PROC_CONNECT_LIST_DEFINED_DOMAINS = 21, REMOTE_PROC_DOMAIN_LOOKUP_BY_ID = 22, REMOTE_PROC_DOMAIN_LOOKUP_BY_NAME = 23, REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID = 24, - REMOTE_PROC_NUM_OF_DEFINED_DOMAINS = 25, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_DOMAINS = 25, REMOTE_PROC_DOMAIN_PIN_VCPU = 26, REMOTE_PROC_DOMAIN_REBOOT = 27, REMOTE_PROC_DOMAIN_RESUME = 28, @@ -2223,9 +2223,9 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SHUTDOWN = 33, REMOTE_PROC_DOMAIN_SUSPEND = 34, REMOTE_PROC_DOMAIN_UNDEFINE = 35, - REMOTE_PROC_LIST_DEFINED_NETWORKS = 36, - REMOTE_PROC_LIST_DOMAINS = 37, - REMOTE_PROC_LIST_NETWORKS = 38, + REMOTE_PROC_CONNECT_LIST_DEFINED_NETWORKS = 36, + REMOTE_PROC_CONNECT_LIST_DOMAINS = 37, + REMOTE_PROC_CONNECT_LIST_NETWORKS = 38, REMOTE_PROC_NETWORK_CREATE = 39, REMOTE_PROC_NETWORK_CREATE_XML = 40, REMOTE_PROC_NETWORK_DEFINE_XML = 41, @@ -2237,17 +2237,17 @@ enum remote_procedure { REMOTE_PROC_NETWORK_LOOKUP_BY_UUID = 47, REMOTE_PROC_NETWORK_SET_AUTOSTART = 48, REMOTE_PROC_NETWORK_UNDEFINE = 49, - REMOTE_PROC_NUM_OF_DEFINED_NETWORKS = 50, - REMOTE_PROC_NUM_OF_DOMAINS = 51, - REMOTE_PROC_NUM_OF_NETWORKS = 52, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_NETWORKS = 50, + REMOTE_PROC_CONNECT_NUM_OF_DOMAINS = 51, + REMOTE_PROC_CONNECT_NUM_OF_NETWORKS = 52, REMOTE_PROC_DOMAIN_CORE_DUMP = 53, REMOTE_PROC_DOMAIN_RESTORE = 54, REMOTE_PROC_DOMAIN_SAVE = 55, REMOTE_PROC_DOMAIN_GET_SCHEDULER_TYPE = 56, REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS = 57, REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS = 58, - REMOTE_PROC_GET_HOSTNAME = 59, - REMOTE_PROC_SUPPORTS_FEATURE = 60, + REMOTE_PROC_CONNECT_GET_HOSTNAME = 59, + REMOTE_PROC_CONNECT_SUPPORTS_FEATURE = 60, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE = 61, REMOTE_PROC_DOMAIN_MIGRATE_PERFORM = 62, REMOTE_PROC_DOMAIN_MIGRATE_FINISH = 63, @@ -2258,11 +2258,11 @@ enum remote_procedure { REMOTE_PROC_AUTH_SASL_START = 68, REMOTE_PROC_AUTH_SASL_STEP = 69, REMOTE_PROC_AUTH_POLKIT = 70, - REMOTE_PROC_NUM_OF_STORAGE_POOLS = 71, - REMOTE_PROC_LIST_STORAGE_POOLS = 72, - REMOTE_PROC_NUM_OF_DEFINED_STORAGE_POOLS = 73, - REMOTE_PROC_LIST_DEFINED_STORAGE_POOLS = 74, - REMOTE_PROC_FIND_STORAGE_POOL_SOURCES = 75, + REMOTE_PROC_CONNECT_NUM_OF_STORAGE_POOLS = 71, + REMOTE_PROC_CONNECT_LIST_STORAGE_POOLS = 72, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_STORAGE_POOLS = 73, + REMOTE_PROC_CONNECT_LIST_DEFINED_STORAGE_POOLS = 74, + REMOTE_PROC_CONNECT_FIND_STORAGE_POOL_SOURCES = 75, REMOTE_PROC_STORAGE_POOL_CREATE_XML = 76, REMOTE_PROC_STORAGE_POOL_DEFINE_XML = 77, REMOTE_PROC_STORAGE_POOL_CREATE = 78, @@ -2292,12 +2292,12 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_FREE_MEMORY = 102, REMOTE_PROC_DOMAIN_BLOCK_PEEK = 103, REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104, - REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105, - REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER = 105, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER = 106, REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE = 107, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108, REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109, - REMOTE_PROC_GET_URI = 110, + REMOTE_PROC_CONNECT_GET_URI = 110, REMOTE_PROC_NODE_NUM_OF_DEVICES = 111, REMOTE_PROC_NODE_LIST_DEVICES = 112, REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113, @@ -2313,8 +2313,8 @@ enum remote_procedure { REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123, REMOTE_PROC_NODE_DEVICE_DESTROY = 124, REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125, - REMOTE_PROC_NUM_OF_INTERFACES = 126, - REMOTE_PROC_LIST_INTERFACES = 127, + REMOTE_PROC_CONNECT_NUM_OF_INTERFACES = 126, + REMOTE_PROC_CONNECT_LIST_INTERFACES = 127, REMOTE_PROC_INTERFACE_LOOKUP_BY_NAME = 128, REMOTE_PROC_INTERFACE_LOOKUP_BY_MAC_STRING = 129, REMOTE_PROC_INTERFACE_GET_XML_DESC = 130, @@ -2322,12 +2322,12 @@ enum remote_procedure { REMOTE_PROC_INTERFACE_UNDEFINE = 132, REMOTE_PROC_INTERFACE_CREATE = 133, REMOTE_PROC_INTERFACE_DESTROY = 134, - REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 135, - REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 136, - REMOTE_PROC_NUM_OF_DEFINED_INTERFACES = 137, - REMOTE_PROC_LIST_DEFINED_INTERFACES = 138, - REMOTE_PROC_NUM_OF_SECRETS = 139, - REMOTE_PROC_LIST_SECRETS = 140, + REMOTE_PROC_CONNECT_DOMAIN_XML_FROM_NATIVE = 135, + REMOTE_PROC_CONNECT_DOMAIN_XML_TO_NATIVE = 136, + REMOTE_PROC_CONNECT_NUM_OF_DEFINED_INTERFACES = 137, + REMOTE_PROC_CONNECT_LIST_DEFINED_INTERFACES = 138, + REMOTE_PROC_CONNECT_NUM_OF_SECRETS = 139, + REMOTE_PROC_CONNECT_LIST_SECRETS = 140, REMOTE_PROC_SECRET_LOOKUP_BY_UUID = 141, REMOTE_PROC_SECRET_DEFINE_XML = 142, REMOTE_PROC_SECRET_GET_XML_DESC = 143, @@ -2336,7 +2336,7 @@ enum remote_procedure { REMOTE_PROC_SECRET_UNDEFINE = 146, REMOTE_PROC_SECRET_LOOKUP_BY_USAGE = 147, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL = 148, - REMOTE_PROC_IS_SECURE = 149, + REMOTE_PROC_CONNECT_IS_SECURE = 149, REMOTE_PROC_DOMAIN_IS_ACTIVE = 150, REMOTE_PROC_DOMAIN_IS_PERSISTENT = 151, REMOTE_PROC_NETWORK_IS_ACTIVE = 152, @@ -2344,18 +2344,18 @@ enum remote_procedure { REMOTE_PROC_STORAGE_POOL_IS_ACTIVE = 154, REMOTE_PROC_STORAGE_POOL_IS_PERSISTENT = 155, REMOTE_PROC_INTERFACE_IS_ACTIVE = 156, - REMOTE_PROC_GET_LIB_VERSION = 157, - REMOTE_PROC_CPU_COMPARE = 158, + REMOTE_PROC_CONNECT_GET_LIB_VERSION = 157, + REMOTE_PROC_CONNECT_COMPARE_CPU = 158, REMOTE_PROC_DOMAIN_MEMORY_STATS = 159, REMOTE_PROC_DOMAIN_ATTACH_DEVICE_FLAGS = 160, REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161, - REMOTE_PROC_CPU_BASELINE = 162, + REMOTE_PROC_CONNECT_BASELINE_CPU = 162, REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163, REMOTE_PROC_DOMAIN_ABORT_JOB = 164, REMOTE_PROC_STORAGE_VOL_WIPE = 165, REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_DOWNTIME = 166, - REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY = 167, - REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY = 168, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY = 167, + REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY = 168, REMOTE_PROC_DOMAIN_EVENT_REBOOT = 169, REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE = 170, REMOTE_PROC_DOMAIN_EVENT_WATCHDOG = 171, @@ -2365,8 +2365,8 @@ enum remote_procedure { REMOTE_PROC_NWFILTER_LOOKUP_BY_NAME = 175, REMOTE_PROC_NWFILTER_LOOKUP_BY_UUID = 176, REMOTE_PROC_NWFILTER_GET_XML_DESC = 177, - REMOTE_PROC_NUM_OF_NWFILTERS = 178, - REMOTE_PROC_LIST_NWFILTERS = 179, + REMOTE_PROC_CONNECT_NUM_OF_NWFILTERS = 178, + REMOTE_PROC_CONNECT_LIST_NWFILTERS = 179, REMOTE_PROC_NWFILTER_DEFINE_XML = 180, REMOTE_PROC_NWFILTER_UNDEFINE = 181, REMOTE_PROC_DOMAIN_MANAGED_SAVE = 182, @@ -2390,7 +2390,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200, REMOTE_PROC_DOMAIN_OPEN_CONSOLE = 201, REMOTE_PROC_DOMAIN_IS_UPDATED = 202, - REMOTE_PROC_GET_SYSINFO = 203, + REMOTE_PROC_CONNECT_GET_SYSINFO = 203, REMOTE_PROC_DOMAIN_SET_MEMORY_FLAGS = 204, REMOTE_PROC_DOMAIN_SET_BLKIO_PARAMETERS = 205, REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS = 206, diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index fdc345f..7bbc76a 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -293,8 +293,8 @@ my $long_legacy = { DomainSetMaxMemory => { arg => { memory => 1 } }, DomainSetMemory => { arg => { memory => 1 } }, DomainSetMemoryFlags => { arg => { memory => 1 } }, - GetLibVersion => { ret => { lib_ver => 1 } }, - GetVersion => { ret => { hv_ver => 1 } }, + ConnectGetLibVersion => { ret => { lib_ver => 1 } }, + ConnectGetVersion => { ret => { hv_ver => 1 } }, NodeGetInfo => { ret => { memory => 1 } }, DomainBlockCommit => { arg => { bandwidth => 1 } }, DomainBlockPull => { arg => { bandwidth => 1 } }, @@ -606,7 +606,7 @@ elsif ($mode eq "server") { # error out on unannotated arrays die "remote_nonnull_string array without insert@<offset> annotation: $ret_member"; } elsif ($ret_member =~ m/^remote_nonnull_string (\S+);/) { - if ($call->{ProcName} eq "GetType") { + if ($call->{ProcName} eq "ConnectGetType") { # SPECIAL: virConnectGetType returns a constant string that must # not be freed. Therefore, duplicate the string here. push(@vars_list, "const char *$1"); @@ -893,28 +893,14 @@ elsif ($mode eq "server") { if (! @args_list) { push(@args_list, "priv->conn"); - - if ($call->{ProcName} ne "NodeGetFreeMemory") { - $prefix = "Connect" - } } - if ($call->{ProcName} eq "GetSysinfo" or - $call->{ProcName} eq "GetMaxVcpus" or - $call->{ProcName} eq "DomainXMLFromNative" or - $call->{ProcName} eq "DomainXMLToNative" or - $call->{ProcName} eq "FindStoragePoolSources" or - $call->{ProcName} =~ m/^List/) { - $prefix = "Connect" - } elsif ($call->{ProcName} eq "SupportsFeature") { - $prefix = "Drv" - } elsif ($call->{ProcName} eq "CPUBaseline") { - $proc_name = "ConnectBaselineCPU" - } elsif ($call->{ProcName} eq "CPUCompare") { - $proc_name = "ConnectCompareCPU" - } elsif ($structprefix eq "qemu" && $call->{ProcName} =~ /^Domain/) { + if ($structprefix eq "qemu" && $call->{ProcName} =~ /^Domain/) { $proc_name =~ s/^(Domain)/${1}Qemu/; } + if ($structprefix eq "lxc" && $call->{ProcName} =~ /^Domain/) { + $proc_name =~ s/^(Domain)/${1}Lxc/; + } if ($single_ret_as_list) { print " /* Allocate return buffer. */\n"; @@ -1538,6 +1524,9 @@ elsif ($mode eq "client") { if ($structprefix eq "qemu") { $callflags = "REMOTE_CALL_QEMU"; } + if ($structprefix eq "lxc") { + $callflags = "REMOTE_CALL_LXC"; + } print "\n"; print " if (call($priv_src, priv, $callflags, $call->{constname},\n"; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Ensure that the virDrvXXX method names exactly match the public APIs virYYY method names. ie XXX == YYY. Add a test case to prevent any regressions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- docs/hvsupport.pl | 2 +- src/Makefile.am | 11 +- src/check-drivername.pl | 53 +++++++++ src/driver.h | 304 ++++++++++++++++++++++++------------------------ src/xen/xen_driver.h | 10 +- 5 files changed, 221 insertions(+), 159 deletions(-) create mode 100644 src/check-drivername.pl diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 6230e3c..d752d87 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -154,7 +154,7 @@ close FILE; # Some special things which aren't public APIs, # but we want to report -$apis{virConnectDrvSupportsFeature} = "0.3.2"; +$apis{virConnectSupportsFeature} = "0.3.2"; $apis{virDomainMigratePrepare} = "0.3.2"; $apis{virDomainMigratePerform} = "0.3.2"; $apis{virDomainMigrateFinish} = "0.3.2"; diff --git a/src/Makefile.am b/src/Makefile.am index 6edbb11..02fb2ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -427,7 +427,16 @@ else !WITH_REMOTE check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) -check-local: check-protocol check-symfile check-symsorting + +check-drivername: + $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ + $(srcdir)/driver.h \ + $(srcdir)/libvirt_public.syms \ + $(srcdir)/libvirt_qemu.syms \ + $(srcdir)/libvirt_lxc.syms + +check-local: check-protocol check-symfile check-symsorting \ + check-drivername .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc diff --git a/src/check-drivername.pl b/src/check-drivername.pl new file mode 100644 index 0000000..f92316d --- /dev/null +++ b/src/check-drivername.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +my $drvfile = shift; +my @symfiles = @ARGV; + +my %symbols; + +foreach my $symfile (@symfiles) { + open SYMFILE, "<", $symfile + or die "cannot read $symfile: $!"; + while (<SYMFILE>) { + if (/^\s*(vir\w+)\s*;\s*$/) { + $symbols{$1} = 1; + } + } + + close SYMFILE; +} + +open DRVFILE, "<", $drvfile + or die "cannot read $drvfile: $!"; + +my $status = 0; + +while (<DRVFILE>) { + next if /virDrvConnectSupportsFeature/; + if (/\*(virDrv\w+)\s*\)/) { + + my $drv = $1; + + next if $drv =~ /virDrvState/; + next if $drv =~ /virDrvDomainMigrate(Prepare|Perform|Confirm|Begin|Finish)/; + + my $sym = $drv; + $sym =~ s/virDrv/vir/; + + unless (exists $symbols{$sym}) { + print "Driver method name $drv doesn't match public API name\n"; + $status = 1; + } + } elsif (/^\*(vir\w+)\s*\)/) { + my $name = $1; + print "Bogus name $1\n"; + $status = 1; + } +} + +close DRVFILE; + +exit $status; diff --git a/src/driver.h b/src/driver.h index 28b4a97..2ca244c 100644 --- a/src/driver.h +++ b/src/driver.h @@ -67,42 +67,42 @@ typedef enum { (drv)->supports_feature((conn), (feature)) > 0 : 0) typedef virDrvOpenStatus - (*virDrvOpen) (virConnectPtr conn, + (*virDrvConnectOpen) (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags); typedef int - (*virDrvClose) (virConnectPtr conn); + (*virDrvConnectClose) (virConnectPtr conn); typedef int - (*virDrvDrvSupportsFeature) (virConnectPtr conn, int feature); + (*virDrvConnectSupportsFeature) (virConnectPtr conn, int feature); typedef const char * - (*virDrvGetType) (virConnectPtr conn); + (*virDrvConnectGetType) (virConnectPtr conn); typedef int - (*virDrvGetVersion) (virConnectPtr conn, - unsigned long *hvVer); + (*virDrvConnectGetVersion) (virConnectPtr conn, + unsigned long *hvVer); typedef int - (*virDrvGetLibVersion) (virConnectPtr conn, - unsigned long *libVer); + (*virDrvConnectGetLibVersion) (virConnectPtr conn, + unsigned long *libVer); typedef char * - (*virDrvGetHostname) (virConnectPtr conn); + (*virDrvConnectGetHostname) (virConnectPtr conn); typedef char * - (*virDrvGetURI) (virConnectPtr conn); + (*virDrvConnectGetURI) (virConnectPtr conn); typedef char * - (*virDrvGetSysinfo) (virConnectPtr conn, - unsigned int flags); + (*virDrvConnectGetSysinfo) (virConnectPtr conn, + unsigned int flags); typedef int - (*virDrvGetMaxVcpus) (virConnectPtr conn, - const char *type); + (*virDrvConnectGetMaxVcpus) (virConnectPtr conn, + const char *type); typedef int (*virDrvNodeGetInfo) (virConnectPtr conn, virNodeInfoPtr info); typedef char * - (*virDrvGetCapabilities) (virConnectPtr conn); + (*virDrvConnectGetCapabilities) (virConnectPtr conn); typedef int - (*virDrvListDomains) (virConnectPtr conn, - int *ids, - int maxids); + (*virDrvConnectListDomains) (virConnectPtr conn, + int *ids, + int maxids); typedef int - (*virDrvNumOfDomains) (virConnectPtr conn); + (*virDrvConnectNumOfDomains) (virConnectPtr conn); typedef virDomainPtr (*virDrvDomainCreateXML) (virConnectPtr conn, const char *xmlDesc, @@ -257,15 +257,15 @@ typedef char * const char *domainXml, unsigned int flags); typedef int - (*virDrvListDefinedDomains) (virConnectPtr conn, - char **const names, - int maxnames); + (*virDrvConnectListDefinedDomains) (virConnectPtr conn, + char **const names, + int maxnames); typedef int - (*virDrvListAllDomains) (virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags); + (*virDrvConnectListAllDomains) (virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags); typedef int - (*virDrvNumOfDefinedDomains) (virConnectPtr conn); + (*virDrvConnectNumOfDefinedDomains) (virConnectPtr conn); typedef int (*virDrvDomainCreate) (virDomainPtr dom); typedef int @@ -512,14 +512,14 @@ typedef unsigned long long (virConnectPtr conn); typedef int - (*virDrvDomainEventRegister) + (*virDrvConnectDomainEventRegister) (virConnectPtr conn, virConnectDomainEventCallback cb, void *opaque, virFreeCallback freecb); typedef int - (*virDrvDomainEventDeregister) + (*virDrvConnectDomainEventDeregister) (virConnectPtr conn, virConnectDomainEventCallback cb); @@ -578,14 +578,14 @@ typedef int (*virDrvDomainIsUpdated)(virDomainPtr dom); typedef int - (*virDrvCompareCPU)(virConnectPtr conn, - const char *cpu, - unsigned int flags); + (*virDrvConnectCompareCPU)(virConnectPtr conn, + const char *cpu, + unsigned int flags); typedef char * - (*virDrvBaselineCPU)(virConnectPtr conn, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags); + (*virDrvConnectBaselineCPU)(virConnectPtr conn, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags); typedef int (*virDrvDomainGetJobInfo)(virDomainPtr domain, @@ -624,16 +624,16 @@ typedef int unsigned int flags); typedef int - (*virDrvDomainEventRegisterAny)(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback cb, - void *opaque, - virFreeCallback freecb); + (*virDrvConnectDomainEventRegisterAny)(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback cb, + void *opaque, + virFreeCallback freecb); typedef int - (*virDrvDomainEventDeregisterAny)(virConnectPtr conn, - int callbackID); + (*virDrvConnectDomainEventDeregisterAny)(virConnectPtr conn, + int callbackID); typedef int (*virDrvDomainManagedSave)(virDomainPtr domain, unsigned int flags); @@ -865,9 +865,9 @@ typedef int unsigned long bandwidth, unsigned int flags); typedef int - (*virDrvSetKeepAlive)(virConnectPtr conn, - int interval, - unsigned int count); + (*virDrvConnectSetKeepAlive)(virConnectPtr conn, + int interval, + unsigned int count); typedef int (*virDrvDomainSetBlockIoTune)(virDomainPtr dom, @@ -956,20 +956,20 @@ typedef int struct _virDriver { int no; /* the number virDrvNo */ const char *name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; - virDrvDrvSupportsFeature supports_feature; - virDrvGetType type; - virDrvGetVersion version; - virDrvGetLibVersion libvirtVersion; - virDrvGetHostname getHostname; - virDrvGetSysinfo getSysinfo; - virDrvGetMaxVcpus getMaxVcpus; + virDrvConnectOpen open; + virDrvConnectClose close; + virDrvConnectSupportsFeature supports_feature; + virDrvConnectGetType type; + virDrvConnectGetVersion version; + virDrvConnectGetLibVersion libvirtVersion; + virDrvConnectGetHostname getHostname; + virDrvConnectGetSysinfo getSysinfo; + virDrvConnectGetMaxVcpus getMaxVcpus; virDrvNodeGetInfo nodeGetInfo; - virDrvGetCapabilities getCapabilities; - virDrvListDomains listDomains; - virDrvNumOfDomains numOfDomains; - virDrvListAllDomains listAllDomains; + virDrvConnectGetCapabilities getCapabilities; + virDrvConnectListDomains listDomains; + virDrvConnectNumOfDomains numOfDomains; + virDrvConnectListAllDomains listAllDomains; virDrvDomainCreateXML domainCreateXML; virDrvDomainLookupByID domainLookupByID; virDrvDomainLookupByUUID domainLookupByUUID; @@ -1023,8 +1023,8 @@ struct _virDriver { virDrvDomainGetXMLDesc domainGetXMLDesc; virDrvConnectDomainXMLFromNative domainXMLFromNative; virDrvConnectDomainXMLToNative domainXMLToNative; - virDrvListDefinedDomains listDefinedDomains; - virDrvNumOfDefinedDomains numOfDefinedDomains; + virDrvConnectListDefinedDomains listDefinedDomains; + virDrvConnectNumOfDefinedDomains numOfDefinedDomains; virDrvDomainCreate domainCreate; virDrvDomainCreateWithFlags domainCreateWithFlags; virDrvDomainDefineXML domainDefineXML; @@ -1059,8 +1059,8 @@ struct _virDriver { virDrvNodeGetMemoryStats nodeGetMemoryStats; virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; virDrvNodeGetFreeMemory nodeGetFreeMemory; - virDrvDomainEventRegister domainEventRegister; - virDrvDomainEventDeregister domainEventDeregister; + virDrvConnectDomainEventRegister domainEventRegister; + virDrvConnectDomainEventDeregister domainEventDeregister; virDrvDomainMigratePrepare2 domainMigratePrepare2; virDrvDomainMigrateFinish2 domainMigrateFinish2; virDrvNodeDeviceDettach nodeDeviceDettach; @@ -1072,8 +1072,8 @@ struct _virDriver { virDrvDomainIsActive domainIsActive; virDrvDomainIsPersistent domainIsPersistent; virDrvDomainIsUpdated domainIsUpdated; - virDrvCompareCPU cpuCompare; - virDrvBaselineCPU cpuBaseline; + virDrvConnectCompareCPU cpuCompare; + virDrvConnectBaselineCPU cpuBaseline; virDrvDomainGetJobInfo domainGetJobInfo; virDrvDomainGetJobStats domainGetJobStats; virDrvDomainAbortJob domainAbortJob; @@ -1082,8 +1082,8 @@ struct _virDriver { virDrvDomainMigrateSetCompressionCache domainMigrateSetCompressionCache; virDrvDomainMigrateGetMaxSpeed domainMigrateGetMaxSpeed; virDrvDomainMigrateSetMaxSpeed domainMigrateSetMaxSpeed; - virDrvDomainEventRegisterAny domainEventRegisterAny; - virDrvDomainEventDeregisterAny domainEventDeregisterAny; + virDrvConnectDomainEventRegisterAny domainEventRegisterAny; + virDrvConnectDomainEventDeregisterAny domainEventDeregisterAny; virDrvDomainManagedSave domainManagedSave; virDrvDomainHasManagedSaveImage domainHasManagedSaveImage; virDrvDomainManagedSaveRemove domainManagedSaveRemove; @@ -1123,7 +1123,7 @@ struct _virDriver { virDrvDomainBlockPull domainBlockPull; virDrvDomainBlockRebase domainBlockRebase; virDrvDomainBlockCommit domainBlockCommit; - virDrvSetKeepAlive setKeepAlive; + virDrvConnectSetKeepAlive setKeepAlive; virDrvConnectIsAlive isAlive; virDrvNodeSuspendForDuration nodeSuspendForDuration; virDrvDomainSetBlockIoTune domainSetBlockIoTune; @@ -1141,21 +1141,21 @@ struct _virDriver { }; typedef int - (*virDrvNumOfNetworks) (virConnectPtr conn); + (*virDrvConnectNumOfNetworks) (virConnectPtr conn); typedef int - (*virDrvListNetworks) (virConnectPtr conn, - char **const names, - int maxnames); + (*virDrvConnectListNetworks) (virConnectPtr conn, + char **const names, + int maxnames); typedef int - (*virDrvNumOfDefinedNetworks) (virConnectPtr conn); + (*virDrvConnectNumOfDefinedNetworks) (virConnectPtr conn); typedef int - (*virDrvListDefinedNetworks) (virConnectPtr conn, - char **const names, - int maxnames); + (*virDrvConnectListDefinedNetworks) (virConnectPtr conn, + char **const names, + int maxnames); typedef int - (*virDrvListAllNetworks) (virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags); + (*virDrvConnectListAllNetworks) (virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags); typedef virNetworkPtr (*virDrvNetworkLookupByUUID) (virConnectPtr conn, const unsigned char *uuid); @@ -1215,13 +1215,13 @@ typedef virNetworkDriver *virNetworkDriverPtr; */ struct _virNetworkDriver { const char * name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; - virDrvNumOfNetworks numOfNetworks; - virDrvListNetworks listNetworks; - virDrvNumOfDefinedNetworks numOfDefinedNetworks; - virDrvListDefinedNetworks listDefinedNetworks; - virDrvListAllNetworks listAllNetworks; + virDrvConnectOpen open; + virDrvConnectClose close; + virDrvConnectNumOfNetworks numOfNetworks; + virDrvConnectListNetworks listNetworks; + virDrvConnectNumOfDefinedNetworks numOfDefinedNetworks; + virDrvConnectListDefinedNetworks listDefinedNetworks; + virDrvConnectListAllNetworks listAllNetworks; virDrvNetworkLookupByUUID networkLookupByUUID; virDrvNetworkLookupByName networkLookupByName; virDrvNetworkCreateXML networkCreateXML; @@ -1240,21 +1240,21 @@ struct _virNetworkDriver { /*-------*/ typedef int - (*virDrvNumOfInterfaces) (virConnectPtr conn); + (*virDrvConnectNumOfInterfaces) (virConnectPtr conn); typedef int - (*virDrvListInterfaces) (virConnectPtr conn, - char **const names, - int maxnames); + (*virDrvConnectListInterfaces) (virConnectPtr conn, + char **const names, + int maxnames); typedef int - (*virDrvNumOfDefinedInterfaces) (virConnectPtr conn); + (*virDrvConnectNumOfDefinedInterfaces) (virConnectPtr conn); typedef int - (*virDrvListDefinedInterfaces) (virConnectPtr conn, - char **const names, - int maxnames); + (*virDrvConnectListDefinedInterfaces) (virConnectPtr conn, + char **const names, + int maxnames); typedef int - (*virDrvListAllInterfaces) (virConnectPtr conn, - virInterfacePtr **ifaces, - unsigned int flags); + (*virDrvConnectListAllInterfaces) (virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags); typedef virInterfacePtr (*virDrvInterfaceLookupByName) (virConnectPtr conn, const char *name); @@ -1307,13 +1307,13 @@ typedef virInterfaceDriver *virInterfaceDriverPtr; */ struct _virInterfaceDriver { const char *name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; - virDrvNumOfInterfaces numOfInterfaces; - virDrvListInterfaces listInterfaces; - virDrvNumOfDefinedInterfaces numOfDefinedInterfaces; - virDrvListDefinedInterfaces listDefinedInterfaces; - virDrvListAllInterfaces listAllInterfaces; + virDrvConnectOpen open; + virDrvConnectClose close; + virDrvConnectNumOfInterfaces numOfInterfaces; + virDrvConnectListInterfaces listInterfaces; + virDrvConnectNumOfDefinedInterfaces numOfDefinedInterfaces; + virDrvConnectListDefinedInterfaces listDefinedInterfaces; + virDrvConnectListAllInterfaces listAllInterfaces; virDrvInterfaceLookupByName interfaceLookupByName; virDrvInterfaceLookupByMACString interfaceLookupByMACString; virDrvInterfaceGetXMLDesc interfaceGetXMLDesc; @@ -1484,8 +1484,8 @@ typedef virStorageDriver *virStorageDriverPtr; */ struct _virStorageDriver { const char * name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; + virDrvConnectOpen open; + virDrvConnectClose close; virDrvConnectNumOfStoragePools numOfPools; virDrvConnectListStoragePools listPools; @@ -1555,35 +1555,35 @@ struct _virStateDriver { typedef struct _virDeviceMonitor virDeviceMonitor; typedef virDeviceMonitor *virDeviceMonitorPtr; -typedef int (*virDevMonNumOfDevices)(virConnectPtr conn, +typedef int (*virDrvNodeNumOfDevices)(virConnectPtr conn, + const char *cap, + unsigned int flags); + +typedef int (*virDrvNodeListDevices)(virConnectPtr conn, const char *cap, + char **const names, + int maxnames, unsigned int flags); +typedef int (*virDrvConnectListAllNodeDevices)(virConnectPtr conn, + virNodeDevicePtr **devices, + unsigned int flags); -typedef int (*virDevMonListDevices)(virConnectPtr conn, - const char *cap, - char **const names, - int maxnames, - unsigned int flags); -typedef int (*virDevMonListAllNodeDevices)(virConnectPtr conn, - virNodeDevicePtr **devices, - unsigned int flags); - -typedef virNodeDevicePtr (*virDevMonDeviceLookupByName)(virConnectPtr conn, - const char *name); +typedef virNodeDevicePtr (*virDrvNodeDeviceLookupByName)(virConnectPtr conn, + const char *name); -typedef virNodeDevicePtr (*virDevMonDeviceLookupSCSIHostByWWN)(virConnectPtr conn, - const char *wwnn, - const char *wwpn, - unsigned int flags); +typedef virNodeDevicePtr (*virDrvNodeDeviceLookupSCSIHostByWWN)(virConnectPtr conn, + const char *wwnn, + const char *wwpn, + unsigned int flags); -typedef char * (*virDevMonDeviceGetXMLDesc)(virNodeDevicePtr dev, - unsigned int flags); +typedef char * (*virDrvNodeDeviceGetXMLDesc)(virNodeDevicePtr dev, + unsigned int flags); -typedef char * (*virDevMonDeviceGetParent)(virNodeDevicePtr dev); +typedef char * (*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); -typedef int (*virDevMonDeviceNumOfCaps)(virNodeDevicePtr dev); +typedef int (*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); -typedef int (*virDevMonDeviceListCaps)(virNodeDevicePtr dev, +typedef int (*virDrvNodeDeviceListCaps)(virNodeDevicePtr dev, char **const names, int maxnames); @@ -1601,17 +1601,17 @@ typedef int (*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev); */ struct _virDeviceMonitor { const char * name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; - virDevMonNumOfDevices numOfDevices; - virDevMonListDevices listDevices; - virDevMonListAllNodeDevices listAllNodeDevices; - virDevMonDeviceLookupByName deviceLookupByName; - virDevMonDeviceLookupSCSIHostByWWN deviceLookupSCSIHostByWWN; - virDevMonDeviceGetXMLDesc deviceGetXMLDesc; - virDevMonDeviceGetParent deviceGetParent; - virDevMonDeviceNumOfCaps deviceNumOfCaps; - virDevMonDeviceListCaps deviceListCaps; + virDrvConnectOpen open; + virDrvConnectClose close; + virDrvNodeNumOfDevices numOfDevices; + virDrvNodeListDevices listDevices; + virDrvConnectListAllNodeDevices listAllNodeDevices; + virDrvNodeDeviceLookupByName deviceLookupByName; + virDrvNodeDeviceLookupSCSIHostByWWN deviceLookupSCSIHostByWWN; + virDrvNodeDeviceGetXMLDesc deviceGetXMLDesc; + virDrvNodeDeviceGetParent deviceGetParent; + virDrvNodeDeviceNumOfCaps deviceNumOfCaps; + virDrvNodeDeviceListCaps deviceListCaps; virDrvNodeDeviceCreateXML deviceCreateXML; virDrvNodeDeviceDestroy deviceDestroy; }; @@ -1649,15 +1649,15 @@ typedef unsigned char * typedef int (*virDrvSecretUndefine) (virSecretPtr secret); typedef int - (*virDrvNumOfSecrets) (virConnectPtr conn); + (*virDrvConnectNumOfSecrets) (virConnectPtr conn); typedef int - (*virDrvListSecrets) (virConnectPtr conn, - char **uuids, - int maxuuids); + (*virDrvConnectListSecrets) (virConnectPtr conn, + char **uuids, + int maxuuids); typedef int - (*virDrvListAllSecrets) (virConnectPtr conn, - virSecretPtr **secrets, - unsigned int flags); + (*virDrvConnectListAllSecrets) (virConnectPtr conn, + virSecretPtr **secrets, + unsigned int flags); typedef struct _virSecretDriver virSecretDriver; typedef virSecretDriver *virSecretDriverPtr; @@ -1674,12 +1674,12 @@ typedef virSecretDriver *virSecretDriverPtr; */ struct _virSecretDriver { const char *name; - virDrvOpen open; - virDrvClose close; + virDrvConnectOpen open; + virDrvConnectClose close; - virDrvNumOfSecrets numOfSecrets; - virDrvListSecrets listSecrets; - virDrvListAllSecrets listAllSecrets; + virDrvConnectNumOfSecrets numOfSecrets; + virDrvConnectListSecrets listSecrets; + virDrvConnectListAllSecrets listAllSecrets; virDrvSecretLookupByUUID lookupByUUID; virDrvSecretLookupByUsage lookupByUsage; virDrvSecretDefineXML defineXML; @@ -1766,8 +1766,8 @@ typedef virNWFilterDriver *virNWFilterDriverPtr; */ struct _virNWFilterDriver { const char * name; /* the name of the driver */ - virDrvOpen open; - virDrvClose close; + virDrvConnectOpen open; + virDrvConnectClose close; virDrvConnectNumOfNWFilters numOfNWFilters; virDrvConnectListNWFilters listNWFilters; diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 702b1e8..6fe9539 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -93,9 +93,9 @@ extern int xenRegister (void); * structure with direct calls in xen_unified.c. */ struct xenUnifiedDriver { - virDrvClose xenClose; /* Only mandatory callback; all others may be NULL */ - virDrvGetVersion xenVersion; - virDrvGetHostname xenGetHostname; + virDrvConnectClose xenClose; /* Only mandatory callback; all others may be NULL */ + virDrvConnectGetVersion xenVersion; + virDrvConnectGetHostname xenGetHostname; virDrvDomainSuspend xenDomainSuspend; virDrvDomainResume xenDomainResume; virDrvDomainShutdown xenDomainShutdown; @@ -108,8 +108,8 @@ struct xenUnifiedDriver { virDrvDomainGetInfo xenDomainGetInfo; virDrvDomainPinVcpu xenDomainPinVcpu; virDrvDomainGetVcpus xenDomainGetVcpus; - virDrvListDefinedDomains xenListDefinedDomains; - virDrvNumOfDefinedDomains xenNumOfDefinedDomains; + virDrvConnectListDefinedDomains xenListDefinedDomains; + virDrvConnectNumOfDefinedDomains xenNumOfDefinedDomains; virDrvDomainCreate xenDomainCreate; virDrvDomainDefineXML xenDomainDefineXML; virDrvDomainUndefine xenDomainUndefine; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Ensure that the driver struct field names match the public API names. For an API virXXXX we must have a driver struct field xXXXX. ie strip the leading 'vir' and lowercase any leading uppercase letters. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- daemon/remote.c | 2 +- docs/apibuild.py | 2 +- docs/hvsupport.pl | 16 +- src/check-drivername.pl | 13 + src/datatypes.c | 14 +- src/driver.h | 262 +++++++++--------- src/esx/esx_device_monitor.c | 4 +- src/esx/esx_driver.c | 34 +-- src/esx/esx_interface_driver.c | 12 +- src/esx/esx_network_driver.c | 12 +- src/esx/esx_nwfilter_driver.c | 4 +- src/esx/esx_secret_driver.c | 4 +- src/esx/esx_storage_backend_iscsi.c | 36 +-- src/esx/esx_storage_backend_vmfs.c | 38 +-- src/esx/esx_storage_driver.c | 96 +++---- src/fdstream.c | 6 +- src/hyperv/hyperv_device_monitor.c | 4 +- src/hyperv/hyperv_driver.c | 24 +- src/hyperv/hyperv_interface_driver.c | 4 +- src/hyperv/hyperv_network_driver.c | 4 +- src/hyperv/hyperv_nwfilter_driver.c | 4 +- src/hyperv/hyperv_secret_driver.c | 4 +- src/hyperv/hyperv_storage_driver.c | 4 +- src/interface/interface_backend_netcf.c | 14 +- src/interface/interface_backend_udev.c | 14 +- src/libvirt-qemu.c | 14 +- src/libvirt.c | 469 ++++++++++++++++---------------- src/libvirt_internal.h | 2 +- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 44 +-- src/lxc/lxc_driver.c | 42 +-- src/network/bridge_driver.c | 20 +- src/node_device/node_device_hal.c | 32 +-- src/node_device/node_device_udev.c | 32 +-- src/nwfilter/nwfilter_driver.c | 22 +- src/openvz/openvz_driver.c | 30 +- src/parallels/parallels_driver.c | 20 +- src/parallels/parallels_network.c | 14 +- src/parallels/parallels_storage.c | 66 ++--- src/phyp/phyp_driver.c | 64 ++--- src/qemu/qemu_command.c | 8 +- src/qemu/qemu_driver.c | 64 ++--- src/qemu/qemu_process.c | 12 +- src/remote/remote_driver.c | 248 ++++++++--------- src/secret/secret_driver.c | 30 +- src/storage/storage_backend.c | 16 +- src/storage/storage_driver.c | 94 +++---- src/test/test_driver.c | 172 ++++++------ src/uml/uml_driver.c | 42 +-- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_tmpl.c | 96 +++---- src/vmware/vmware_driver.c | 22 +- src/xen/xen_driver.c | 44 +-- src/xenapi/xenapi_driver.c | 26 +- tests/qemuxml2argvtest.c | 22 +- 55 files changed, 1205 insertions(+), 1197 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cc2ecec..e5e3f2c 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3732,7 +3732,7 @@ static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE break; default: - if ((supported = virDrvSupportsFeature(priv->conn, args->feature)) < 0) + if ((supported = virConnectSupportsFeature(priv->conn, args->feature)) < 0) goto cleanup; break; } diff --git a/docs/apibuild.py b/docs/apibuild.py index df12ba6..d17b593 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -50,6 +50,7 @@ ignored_words = { } ignored_functions = { + "virConnectSupportsFeature": "private function for remote access", "virDomainMigrateFinish": "private function for migration", "virDomainMigrateFinish2": "private function for migration", "virDomainMigratePerform": "private function for migration", @@ -62,7 +63,6 @@ ignored_functions = { "virDomainMigratePrepare3": "private function for migration", "virDomainMigrateConfirm3": "private function for migration", "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", - "virDrvSupportsFeature": "private function for remote access", "DllMain": "specific function for Win32", "virTypedParameterArrayValidate": "internal function in virtypedparam.c", "virTypedParameterAssign": "internal function in virtypedparam.c", diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index d752d87..baebfc4 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -190,17 +190,13 @@ while (defined($line = <FILE>)) { $groups{$ingrp} = { apis => {}, drivers => {} }; } } elsif ($ingrp) { - if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) { + if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) { my $field = $2; my $name = $1; my $api; if (exists $apis{"vir$name"}) { $api = "vir$name"; - } elsif (exists $apis{"virConnect$name"}) { - $api = "virConnect$name"; - } elsif (exists $apis{"virNode$name"}) { - $api = "virNode$name"; } else { die "driver $name does not have a public API"; } @@ -290,24 +286,24 @@ $groups{virDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0; foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { - my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; + my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; my $openVers; if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } # virConnectOpenReadOnly always matches virConnectOpen version - $groups{"virDriver"}->{drivers}->{$drv}->{"openReadOnly"} = - $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; + $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = + $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; # virConnectOpenAuth is always 0.4.0 if the driver existed # before this time, otherwise it matches the version of # the driver's virConnectOpen entry if ($openVersStr eq "Y" || $openVers >= $openAuthVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = $openVersStr; + $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = "0.4.0"; + $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; } } diff --git a/src/check-drivername.pl b/src/check-drivername.pl index f92316d..459c661 100644 --- a/src/check-drivername.pl +++ b/src/check-drivername.pl @@ -45,6 +45,19 @@ while (<DRVFILE>) { my $name = $1; print "Bogus name $1\n"; $status = 1; + } elsif (/^\s*(virDrv\w+)\s+(\w+);\s*/) { + my $drv = $1; + my $field = $2; + + my $tmp = $drv; + $tmp =~ s/virDrv//; + $tmp =~ s/^NWFilter/nwfilter/; + $tmp =~ s/^(\w)/lc $1/e; + + unless ($tmp eq $field) { + print "Driver struct field $field should be named $tmp\n"; + $status = 1; + } } } diff --git a/src/datatypes.c b/src/datatypes.c index b21daac..f8b6f49 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -144,19 +144,19 @@ virConnectDispose(void *obj) virConnectPtr conn = obj; if (conn->networkDriver) - conn->networkDriver->close(conn); + conn->networkDriver->connectClose(conn); if (conn->interfaceDriver) - conn->interfaceDriver->close(conn); + conn->interfaceDriver->connectClose(conn); if (conn->storageDriver) - conn->storageDriver->close(conn); + conn->storageDriver->connectClose(conn); if (conn->deviceMonitor) - conn->deviceMonitor->close(conn); + conn->deviceMonitor->connectClose(conn); if (conn->secretDriver) - conn->secretDriver->close(conn); + conn->secretDriver->connectClose(conn); if (conn->nwfilterDriver) - conn->nwfilterDriver->close(conn); + conn->nwfilterDriver->connectClose(conn); if (conn->driver) - conn->driver->close(conn); + conn->driver->connectClose(conn); virMutexLock(&conn->lock); diff --git a/src/driver.h b/src/driver.h index 2ca244c..8c1a9d1 100644 --- a/src/driver.h +++ b/src/driver.h @@ -63,8 +63,8 @@ typedef enum { * 0 Feature is not supported. */ # define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ - ((drv)->supports_feature ? \ - (drv)->supports_feature((conn), (feature)) > 0 : 0) + ((drv)->connectSupportsFeature ? \ + (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0) typedef virDrvOpenStatus (*virDrvConnectOpen) (virConnectPtr conn, @@ -956,20 +956,20 @@ typedef int struct _virDriver { int no; /* the number virDrvNo */ const char *name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; - virDrvConnectSupportsFeature supports_feature; - virDrvConnectGetType type; - virDrvConnectGetVersion version; - virDrvConnectGetLibVersion libvirtVersion; - virDrvConnectGetHostname getHostname; - virDrvConnectGetSysinfo getSysinfo; - virDrvConnectGetMaxVcpus getMaxVcpus; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectSupportsFeature connectSupportsFeature; + virDrvConnectGetType connectGetType; + virDrvConnectGetVersion connectGetVersion; + virDrvConnectGetLibVersion connectGetLibVersion; + virDrvConnectGetHostname connectGetHostname; + virDrvConnectGetSysinfo connectGetSysinfo; + virDrvConnectGetMaxVcpus connectGetMaxVcpus; virDrvNodeGetInfo nodeGetInfo; - virDrvConnectGetCapabilities getCapabilities; - virDrvConnectListDomains listDomains; - virDrvConnectNumOfDomains numOfDomains; - virDrvConnectListAllDomains listAllDomains; + virDrvConnectGetCapabilities connectGetCapabilities; + virDrvConnectListDomains connectListDomains; + virDrvConnectNumOfDomains connectNumOfDomains; + virDrvConnectListAllDomains connectListAllDomains; virDrvDomainCreateXML domainCreateXML; virDrvDomainLookupByID domainLookupByID; virDrvDomainLookupByUUID domainLookupByUUID; @@ -1021,10 +1021,10 @@ struct _virDriver { virDrvDomainGetSecurityLabelList domainGetSecurityLabelList; virDrvNodeGetSecurityModel nodeGetSecurityModel; virDrvDomainGetXMLDesc domainGetXMLDesc; - virDrvConnectDomainXMLFromNative domainXMLFromNative; - virDrvConnectDomainXMLToNative domainXMLToNative; - virDrvConnectListDefinedDomains listDefinedDomains; - virDrvConnectNumOfDefinedDomains numOfDefinedDomains; + virDrvConnectDomainXMLFromNative connectDomainXMLFromNative; + virDrvConnectDomainXMLToNative connectDomainXMLToNative; + virDrvConnectListDefinedDomains connectListDefinedDomains; + virDrvConnectNumOfDefinedDomains connectNumOfDefinedDomains; virDrvDomainCreate domainCreate; virDrvDomainCreateWithFlags domainCreateWithFlags; virDrvDomainDefineXML domainDefineXML; @@ -1059,21 +1059,21 @@ struct _virDriver { virDrvNodeGetMemoryStats nodeGetMemoryStats; virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; virDrvNodeGetFreeMemory nodeGetFreeMemory; - virDrvConnectDomainEventRegister domainEventRegister; - virDrvConnectDomainEventDeregister domainEventDeregister; + virDrvConnectDomainEventRegister connectDomainEventRegister; + virDrvConnectDomainEventDeregister connectDomainEventDeregister; virDrvDomainMigratePrepare2 domainMigratePrepare2; virDrvDomainMigrateFinish2 domainMigrateFinish2; virDrvNodeDeviceDettach nodeDeviceDettach; virDrvNodeDeviceReAttach nodeDeviceReAttach; virDrvNodeDeviceReset nodeDeviceReset; virDrvDomainMigratePrepareTunnel domainMigratePrepareTunnel; - virDrvConnectIsEncrypted isEncrypted; - virDrvConnectIsSecure isSecure; + virDrvConnectIsEncrypted connectIsEncrypted; + virDrvConnectIsSecure connectIsSecure; virDrvDomainIsActive domainIsActive; virDrvDomainIsPersistent domainIsPersistent; virDrvDomainIsUpdated domainIsUpdated; - virDrvConnectCompareCPU cpuCompare; - virDrvConnectBaselineCPU cpuBaseline; + virDrvConnectCompareCPU connectCompareCPU; + virDrvConnectBaselineCPU connectBaselineCPU; virDrvDomainGetJobInfo domainGetJobInfo; virDrvDomainGetJobStats domainGetJobStats; virDrvDomainAbortJob domainAbortJob; @@ -1082,8 +1082,8 @@ struct _virDriver { virDrvDomainMigrateSetCompressionCache domainMigrateSetCompressionCache; virDrvDomainMigrateGetMaxSpeed domainMigrateGetMaxSpeed; virDrvDomainMigrateSetMaxSpeed domainMigrateSetMaxSpeed; - virDrvConnectDomainEventRegisterAny domainEventRegisterAny; - virDrvConnectDomainEventDeregisterAny domainEventDeregisterAny; + virDrvConnectDomainEventRegisterAny connectDomainEventRegisterAny; + virDrvConnectDomainEventDeregisterAny connectDomainEventDeregisterAny; virDrvDomainManagedSave domainManagedSave; virDrvDomainHasManagedSaveImage domainHasManagedSaveImage; virDrvDomainManagedSaveRemove domainManagedSaveRemove; @@ -1103,9 +1103,9 @@ struct _virDriver { virDrvDomainSnapshotHasMetadata domainSnapshotHasMetadata; virDrvDomainRevertToSnapshot domainRevertToSnapshot; virDrvDomainSnapshotDelete domainSnapshotDelete; - virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; - virDrvDomainQemuAttach qemuDomainAttach; - virDrvDomainQemuAgentCommand qemuDomainArbitraryAgentCommand; + virDrvDomainQemuMonitorCommand domainQemuMonitorCommand; + virDrvDomainQemuAttach domainQemuAttach; + virDrvDomainQemuAgentCommand domainQemuAgentCommand; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenChannel domainOpenChannel; virDrvDomainOpenGraphics domainOpenGraphics; @@ -1123,8 +1123,8 @@ struct _virDriver { virDrvDomainBlockPull domainBlockPull; virDrvDomainBlockRebase domainBlockRebase; virDrvDomainBlockCommit domainBlockCommit; - virDrvConnectSetKeepAlive setKeepAlive; - virDrvConnectIsAlive isAlive; + virDrvConnectSetKeepAlive connectSetKeepAlive; + virDrvConnectIsAlive connectIsAlive; virDrvNodeSuspendForDuration nodeSuspendForDuration; virDrvDomainSetBlockIoTune domainSetBlockIoTune; virDrvDomainGetBlockIoTune domainGetBlockIoTune; @@ -1215,13 +1215,13 @@ typedef virNetworkDriver *virNetworkDriverPtr; */ struct _virNetworkDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; - virDrvConnectNumOfNetworks numOfNetworks; - virDrvConnectListNetworks listNetworks; - virDrvConnectNumOfDefinedNetworks numOfDefinedNetworks; - virDrvConnectListDefinedNetworks listDefinedNetworks; - virDrvConnectListAllNetworks listAllNetworks; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfNetworks connectNumOfNetworks; + virDrvConnectListNetworks connectListNetworks; + virDrvConnectNumOfDefinedNetworks connectNumOfDefinedNetworks; + virDrvConnectListDefinedNetworks connectListDefinedNetworks; + virDrvConnectListAllNetworks connectListAllNetworks; virDrvNetworkLookupByUUID networkLookupByUUID; virDrvNetworkLookupByName networkLookupByName; virDrvNetworkCreateXML networkCreateXML; @@ -1307,13 +1307,13 @@ typedef virInterfaceDriver *virInterfaceDriverPtr; */ struct _virInterfaceDriver { const char *name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; - virDrvConnectNumOfInterfaces numOfInterfaces; - virDrvConnectListInterfaces listInterfaces; - virDrvConnectNumOfDefinedInterfaces numOfDefinedInterfaces; - virDrvConnectListDefinedInterfaces listDefinedInterfaces; - virDrvConnectListAllInterfaces listAllInterfaces; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfInterfaces connectNumOfInterfaces; + virDrvConnectListInterfaces connectListInterfaces; + virDrvConnectNumOfDefinedInterfaces connectNumOfDefinedInterfaces; + virDrvConnectListDefinedInterfaces connectListDefinedInterfaces; + virDrvConnectListAllInterfaces connectListAllInterfaces; virDrvInterfaceLookupByName interfaceLookupByName; virDrvInterfaceLookupByMACString interfaceLookupByMACString; virDrvInterfaceGetXMLDesc interfaceGetXMLDesc; @@ -1484,50 +1484,50 @@ typedef virStorageDriver *virStorageDriverPtr; */ struct _virStorageDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; - - virDrvConnectNumOfStoragePools numOfPools; - virDrvConnectListStoragePools listPools; - virDrvConnectNumOfDefinedStoragePools numOfDefinedPools; - virDrvConnectListDefinedStoragePools listDefinedPools; - virDrvConnectListAllStoragePools listAllPools; - virDrvConnectFindStoragePoolSources findPoolSources; - virDrvStoragePoolLookupByName poolLookupByName; - virDrvStoragePoolLookupByUUID poolLookupByUUID; - virDrvStoragePoolLookupByVolume poolLookupByVolume; - virDrvStoragePoolCreateXML poolCreateXML; - virDrvStoragePoolDefineXML poolDefineXML; - virDrvStoragePoolBuild poolBuild; - virDrvStoragePoolUndefine poolUndefine; - virDrvStoragePoolCreate poolCreate; - virDrvStoragePoolDestroy poolDestroy; - virDrvStoragePoolDelete poolDelete; - virDrvStoragePoolRefresh poolRefresh; - virDrvStoragePoolGetInfo poolGetInfo; - virDrvStoragePoolGetXMLDesc poolGetXMLDesc; - virDrvStoragePoolGetAutostart poolGetAutostart; - virDrvStoragePoolSetAutostart poolSetAutostart; - virDrvStoragePoolNumOfVolumes poolNumOfVolumes; - virDrvStoragePoolListVolumes poolListVolumes; - virDrvStoragePoolListAllVolumes poolListAllVolumes; - - virDrvStorageVolLookupByName volLookupByName; - virDrvStorageVolLookupByKey volLookupByKey; - virDrvStorageVolLookupByPath volLookupByPath; - virDrvStorageVolCreateXML volCreateXML; - virDrvStorageVolCreateXMLFrom volCreateXMLFrom; - virDrvStorageVolDownload volDownload; - virDrvStorageVolUpload volUpload; - virDrvStorageVolDelete volDelete; - virDrvStorageVolWipe volWipe; - virDrvStorageVolWipePattern volWipePattern; - virDrvStorageVolGetInfo volGetInfo; - virDrvStorageVolGetXMLDesc volGetXMLDesc; - virDrvStorageVolGetPath volGetPath; - virDrvStorageVolResize volResize; - virDrvStoragePoolIsActive poolIsActive; - virDrvStoragePoolIsPersistent poolIsPersistent; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + + virDrvConnectNumOfStoragePools connectNumOfStoragePools; + virDrvConnectListStoragePools connectListStoragePools; + virDrvConnectNumOfDefinedStoragePools connectNumOfDefinedStoragePools; + virDrvConnectListDefinedStoragePools connectListDefinedStoragePools; + virDrvConnectListAllStoragePools connectListAllStoragePools; + virDrvConnectFindStoragePoolSources connectFindStoragePoolSources; + virDrvStoragePoolLookupByName storagePoolLookupByName; + virDrvStoragePoolLookupByUUID storagePoolLookupByUUID; + virDrvStoragePoolLookupByVolume storagePoolLookupByVolume; + virDrvStoragePoolCreateXML storagePoolCreateXML; + virDrvStoragePoolDefineXML storagePoolDefineXML; + virDrvStoragePoolBuild storagePoolBuild; + virDrvStoragePoolUndefine storagePoolUndefine; + virDrvStoragePoolCreate storagePoolCreate; + virDrvStoragePoolDestroy storagePoolDestroy; + virDrvStoragePoolDelete storagePoolDelete; + virDrvStoragePoolRefresh storagePoolRefresh; + virDrvStoragePoolGetInfo storagePoolGetInfo; + virDrvStoragePoolGetXMLDesc storagePoolGetXMLDesc; + virDrvStoragePoolGetAutostart storagePoolGetAutostart; + virDrvStoragePoolSetAutostart storagePoolSetAutostart; + virDrvStoragePoolNumOfVolumes storagePoolNumOfVolumes; + virDrvStoragePoolListVolumes storagePoolListVolumes; + virDrvStoragePoolListAllVolumes storagePoolListAllVolumes; + + virDrvStorageVolLookupByName storageVolLookupByName; + virDrvStorageVolLookupByKey storageVolLookupByKey; + virDrvStorageVolLookupByPath storageVolLookupByPath; + virDrvStorageVolCreateXML storageVolCreateXML; + virDrvStorageVolCreateXMLFrom storageVolCreateXMLFrom; + virDrvStorageVolDownload storageVolDownload; + virDrvStorageVolUpload storageVolUpload; + virDrvStorageVolDelete storageVolDelete; + virDrvStorageVolWipe storageVolWipe; + virDrvStorageVolWipePattern storageVolWipePattern; + virDrvStorageVolGetInfo storageVolGetInfo; + virDrvStorageVolGetXMLDesc storageVolGetXMLDesc; + virDrvStorageVolGetPath storageVolGetPath; + virDrvStorageVolResize storageVolResize; + virDrvStoragePoolIsActive storagePoolIsActive; + virDrvStoragePoolIsPersistent storagePoolIsPersistent; }; # ifdef WITH_LIBVIRTD @@ -1544,10 +1544,10 @@ typedef virStateDriver *virStateDriverPtr; struct _virStateDriver { const char *name; - virDrvStateInitialize initialize; - virDrvStateCleanup cleanup; - virDrvStateReload reload; - virDrvStateStop stop; + virDrvStateInitialize stateInitialize; + virDrvStateCleanup stateCleanup; + virDrvStateReload stateReload; + virDrvStateStop stateStop; }; # endif @@ -1601,19 +1601,19 @@ typedef int (*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev); */ struct _virDeviceMonitor { const char * name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; - virDrvNodeNumOfDevices numOfDevices; - virDrvNodeListDevices listDevices; - virDrvConnectListAllNodeDevices listAllNodeDevices; - virDrvNodeDeviceLookupByName deviceLookupByName; - virDrvNodeDeviceLookupSCSIHostByWWN deviceLookupSCSIHostByWWN; - virDrvNodeDeviceGetXMLDesc deviceGetXMLDesc; - virDrvNodeDeviceGetParent deviceGetParent; - virDrvNodeDeviceNumOfCaps deviceNumOfCaps; - virDrvNodeDeviceListCaps deviceListCaps; - virDrvNodeDeviceCreateXML deviceCreateXML; - virDrvNodeDeviceDestroy deviceDestroy; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvNodeNumOfDevices nodeNumOfDevices; + virDrvNodeListDevices nodeListDevices; + virDrvConnectListAllNodeDevices connectListAllNodeDevices; + virDrvNodeDeviceLookupByName nodeDeviceLookupByName; + virDrvNodeDeviceLookupSCSIHostByWWN nodeDeviceLookupSCSIHostByWWN; + virDrvNodeDeviceGetXMLDesc nodeDeviceGetXMLDesc; + virDrvNodeDeviceGetParent nodeDeviceGetParent; + virDrvNodeDeviceNumOfCaps nodeDeviceNumOfCaps; + virDrvNodeDeviceListCaps nodeDeviceListCaps; + virDrvNodeDeviceCreateXML nodeDeviceCreateXML; + virDrvNodeDeviceDestroy nodeDeviceDestroy; }; enum { @@ -1674,19 +1674,19 @@ typedef virSecretDriver *virSecretDriverPtr; */ struct _virSecretDriver { const char *name; - virDrvConnectOpen open; - virDrvConnectClose close; - - virDrvConnectNumOfSecrets numOfSecrets; - virDrvConnectListSecrets listSecrets; - virDrvConnectListAllSecrets listAllSecrets; - virDrvSecretLookupByUUID lookupByUUID; - virDrvSecretLookupByUsage lookupByUsage; - virDrvSecretDefineXML defineXML; - virDrvSecretGetXMLDesc getXMLDesc; - virDrvSecretSetValue setValue; - virDrvSecretGetValue getValue; - virDrvSecretUndefine undefine; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + + virDrvConnectNumOfSecrets connectNumOfSecrets; + virDrvConnectListSecrets connectListSecrets; + virDrvConnectListAllSecrets connectListAllSecrets; + virDrvSecretLookupByUUID secretLookupByUUID; + virDrvSecretLookupByUsage secretLookupByUsage; + virDrvSecretDefineXML secretDefineXML; + virDrvSecretGetXMLDesc secretGetXMLDesc; + virDrvSecretSetValue secretSetValue; + virDrvSecretGetValue secretGetValue; + virDrvSecretUndefine secretUndefine; }; @@ -1716,9 +1716,9 @@ typedef int (*virDrvStreamAbort)(virStreamPtr st); struct _virStreamDriver { virDrvStreamSend streamSend; virDrvStreamRecv streamRecv; - virDrvStreamEventAddCallback streamAddCallback; - virDrvStreamEventUpdateCallback streamUpdateCallback; - virDrvStreamEventRemoveCallback streamRemoveCallback; + virDrvStreamEventAddCallback streamEventAddCallback; + virDrvStreamEventUpdateCallback streamEventUpdateCallback; + virDrvStreamEventRemoveCallback streamEventRemoveCallback; virDrvStreamFinish streamFinish; virDrvStreamAbort streamAbort; }; @@ -1766,17 +1766,17 @@ typedef virNWFilterDriver *virNWFilterDriverPtr; */ struct _virNWFilterDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen open; - virDrvConnectClose close; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; - virDrvConnectNumOfNWFilters numOfNWFilters; - virDrvConnectListNWFilters listNWFilters; - virDrvConnectListAllNWFilters listAllNWFilters; + virDrvConnectNumOfNWFilters connectNumOfNWFilters; + virDrvConnectListNWFilters connectListNWFilters; + virDrvConnectListAllNWFilters connectListAllNWFilters; virDrvNWFilterLookupByName nwfilterLookupByName; virDrvNWFilterLookupByUUID nwfilterLookupByUUID; - virDrvNWFilterDefineXML defineXML; - virDrvNWFilterUndefine undefine; - virDrvNWFilterGetXMLDesc getXMLDesc; + virDrvNWFilterDefineXML nwfilterDefineXML; + virDrvNWFilterUndefine nwfilterUndefine; + virDrvNWFilterGetXMLDesc nwfilterGetXMLDesc; }; diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index f6c85ba..826b171 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -69,8 +69,8 @@ esxDeviceClose(virConnectPtr conn) static virDeviceMonitor esxDeviceMonitor = { .name = "ESX", - .open = esxDeviceOpen, /* 0.7.6 */ - .close = esxDeviceClose, /* 0.7.6 */ + .connectOpen = esxDeviceOpen, /* 0.7.6 */ + .connectClose = esxDeviceClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4828209..40b9f7f 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5236,17 +5236,17 @@ no_memory: static virDriver esxDriver = { .no = VIR_DRV_ESX, .name = "ESX", - .open = esxOpen, /* 0.7.0 */ - .close = esxClose, /* 0.7.0 */ - .supports_feature = esxSupportsFeature, /* 0.7.0 */ - .type = esxGetType, /* 0.7.0 */ - .version = esxGetVersion, /* 0.7.0 */ - .getHostname = esxGetHostname, /* 0.7.0 */ + .connectOpen = esxOpen, /* 0.7.0 */ + .connectClose = esxClose, /* 0.7.0 */ + .connectSupportsFeature = esxSupportsFeature, /* 0.7.0 */ + .connectGetType = esxGetType, /* 0.7.0 */ + .connectGetVersion = esxGetVersion, /* 0.7.0 */ + .connectGetHostname = esxGetHostname, /* 0.7.0 */ .nodeGetInfo = esxNodeGetInfo, /* 0.7.0 */ - .getCapabilities = esxGetCapabilities, /* 0.7.1 */ - .listDomains = esxListDomains, /* 0.7.0 */ - .numOfDomains = esxNumberOfDomains, /* 0.7.0 */ - .listAllDomains = esxListAllDomains, /* 0.10.2 */ + .connectGetCapabilities = esxGetCapabilities, /* 0.7.1 */ + .connectListDomains = esxListDomains, /* 0.7.0 */ + .connectNumOfDomains = esxNumberOfDomains, /* 0.7.0 */ + .connectListAllDomains = esxListAllDomains, /* 0.10.2 */ .domainLookupByID = esxDomainLookupByID, /* 0.7.0 */ .domainLookupByUUID = esxDomainLookupByUUID, /* 0.7.0 */ .domainLookupByName = esxDomainLookupByName, /* 0.7.0 */ @@ -5270,10 +5270,10 @@ static virDriver esxDriver = { .domainGetVcpusFlags = esxDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = esxDomainGetMaxVcpus, /* 0.7.0 */ .domainGetXMLDesc = esxDomainGetXMLDesc, /* 0.7.0 */ - .domainXMLFromNative = esxDomainXMLFromNative, /* 0.7.0 */ - .domainXMLToNative = esxDomainXMLToNative, /* 0.7.2 */ - .listDefinedDomains = esxListDefinedDomains, /* 0.7.0 */ - .numOfDefinedDomains = esxNumberOfDefinedDomains, /* 0.7.0 */ + .connectDomainXMLFromNative = esxDomainXMLFromNative, /* 0.7.0 */ + .connectDomainXMLToNative = esxDomainXMLToNative, /* 0.7.2 */ + .connectListDefinedDomains = esxListDefinedDomains, /* 0.7.0 */ + .connectNumOfDefinedDomains = esxNumberOfDefinedDomains, /* 0.7.0 */ .domainCreate = esxDomainCreate, /* 0.7.0 */ .domainCreateWithFlags = esxDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = esxDomainDefineXML, /* 0.7.2 */ @@ -5290,8 +5290,8 @@ static virDriver esxDriver = { .domainMigratePerform = esxDomainMigratePerform, /* 0.7.0 */ .domainMigrateFinish = esxDomainMigrateFinish, /* 0.7.0 */ .nodeGetFreeMemory = esxNodeGetFreeMemory, /* 0.7.2 */ - .isEncrypted = esxIsEncrypted, /* 0.7.3 */ - .isSecure = esxIsSecure, /* 0.7.3 */ + .connectIsEncrypted = esxIsEncrypted, /* 0.7.3 */ + .connectIsSecure = esxIsSecure, /* 0.7.3 */ .domainIsActive = esxDomainIsActive, /* 0.7.3 */ .domainIsPersistent = esxDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = esxDomainIsUpdated, /* 0.8.6 */ @@ -5309,7 +5309,7 @@ static virDriver esxDriver = { .domainSnapshotIsCurrent = esxDomainSnapshotIsCurrent, /* 0.9.13 */ .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ - .isAlive = esxIsAlive, /* 0.9.8 */ + .connectIsAlive = esxIsAlive, /* 0.9.8 */ }; diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 53c179b..ec19051 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -298,12 +298,12 @@ esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ - .numOfInterfaces = esxNumberOfInterfaces, /* 0.10.0 */ - .listInterfaces = esxListInterfaces, /* 0.10.0 */ - .numOfDefinedInterfaces = esxNumberOfDefinedInterfaces, /* 0.10.0 */ - .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.10.0 */ + .connectOpen = esxInterfaceOpen, /* 0.7.6 */ + .connectClose = esxInterfaceClose, /* 0.7.6 */ + .connectNumOfInterfaces = esxNumberOfInterfaces, /* 0.10.0 */ + .connectListInterfaces = esxListInterfaces, /* 0.10.0 */ + .connectNumOfDefinedInterfaces = esxNumberOfDefinedInterfaces, /* 0.10.0 */ + .connectListDefinedInterfaces = esxListDefinedInterfaces, /* 0.10.0 */ .interfaceLookupByName = esxInterfaceLookupByName, /* 0.10.0 */ .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.10.0 */ .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.10.0 */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 48763d4..c657c82 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -933,12 +933,12 @@ esxNetworkIsPersistent(virNetworkPtr network ATTRIBUTE_UNUSED) static virNetworkDriver esxNetworkDriver = { .name = "ESX", - .open = esxNetworkOpen, /* 0.7.6 */ - .close = esxNetworkClose, /* 0.7.6 */ - .numOfNetworks = esxNumberOfNetworks, /* 0.10.0 */ - .listNetworks = esxListNetworks, /* 0.10.0 */ - .numOfDefinedNetworks = esxNumberOfDefinedNetworks, /* 0.10.0 */ - .listDefinedNetworks = esxListDefinedNetworks, /* 0.10.0 */ + .connectOpen = esxNetworkOpen, /* 0.7.6 */ + .connectClose = esxNetworkClose, /* 0.7.6 */ + .connectNumOfNetworks = esxNumberOfNetworks, /* 0.10.0 */ + .connectListNetworks = esxListNetworks, /* 0.10.0 */ + .connectNumOfDefinedNetworks = esxNumberOfDefinedNetworks, /* 0.10.0 */ + .connectListDefinedNetworks = esxListDefinedNetworks, /* 0.10.0 */ .networkLookupByUUID = esxNetworkLookupByUUID, /* 0.10.0 */ .networkLookupByName = esxNetworkLookupByName, /* 0.10.0 */ .networkDefineXML = esxNetworkDefineXML, /* 0.10.0 */ diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index c59929c..1181c33 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -69,8 +69,8 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { .name = "ESX", - .open = esxNWFilterOpen, /* 0.8.1 */ - .close = esxNWFilterClose, /* 0.8.1 */ + .connectOpen = esxNWFilterOpen, /* 0.8.1 */ + .connectClose = esxNWFilterClose, /* 0.8.1 */ }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index 92cbb14..a840895 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -67,8 +67,8 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { .name = "ESX", - .open = esxSecretOpen, /* 0.7.6 */ - .close = esxSecretClose, /* 0.7.6 */ + .connectOpen = esxSecretOpen, /* 0.7.6 */ + .connectClose = esxSecretClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index e09fa55..a3336a2 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -753,22 +753,22 @@ esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) virStorageDriver esxStorageBackendISCSI = { - .numOfPools = esxStorageBackendISCSINumberOfPools, /* 1.0.1 */ - .listPools = esxStorageBackendISCSIListPools, /* 1.0.1 */ - .poolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 1.0.1 */ - .poolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 1.0.1 */ - .poolRefresh = esxStorageBackendISCSIPoolRefresh, /* 1.0.1 */ - .poolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 1.0.1 */ - .poolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 1.0.1 */ - .poolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfVolumes, /* 1.0.1 */ - .poolListVolumes = esxStorageBackendISCSIPoolListVolumes, /* 1.0.1 */ - .volLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 1.0.1 */ - .volLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 1.0.1 */ - .volLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 1.0.1 */ - .volCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 1.0.1 */ - .volCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 1.0.1 */ - .volGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 1.0.1 */ - .volDelete = esxStorageBackendISCSIVolumeDelete, /* 1.0.1 */ - .volWipe = esxStorageBackendISCSIVolumeWipe, /* 1.0.1 */ - .volGetPath = esxStorageBackendISCSIVolumeGetPath, /* 1.0.1 */ + .connectNumOfStoragePools = esxStorageBackendISCSINumberOfPools, /* 1.0.1 */ + .connectListStoragePools = esxStorageBackendISCSIListPools, /* 1.0.1 */ + .storagePoolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 1.0.1 */ + .storagePoolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 1.0.1 */ + .storagePoolRefresh = esxStorageBackendISCSIPoolRefresh, /* 1.0.1 */ + .storagePoolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 1.0.1 */ + .storagePoolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 1.0.1 */ + .storagePoolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfVolumes, /* 1.0.1 */ + .storagePoolListVolumes = esxStorageBackendISCSIPoolListVolumes, /* 1.0.1 */ + .storageVolLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 1.0.1 */ + .storageVolLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 1.0.1 */ + .storageVolLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 1.0.1 */ + .storageVolCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 1.0.1 */ + .storageVolCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 1.0.1 */ + .storageVolGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 1.0.1 */ + .storageVolDelete = esxStorageBackendISCSIVolumeDelete, /* 1.0.1 */ + .storageVolWipe = esxStorageBackendISCSIVolumeWipe, /* 1.0.1 */ + .storageVolGetPath = esxStorageBackendISCSIVolumeGetPath, /* 1.0.1 */ }; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index f965b4f..329022e 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -1515,23 +1515,23 @@ esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) virStorageDriver esxStorageBackendVMFS = { - .numOfPools = esxStorageBackendVMFSNumberOfPools, /* 0.8.2 */ - .listPools = esxStorageBackendVMFSListPools, /* 0.8.2 */ - .poolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */ - .poolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */ - .poolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */ - .poolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */ - .poolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */ - .poolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfVolumes, /* 0.8.4 */ - .poolListVolumes = esxStorageBackendVMFSPoolListVolumes, /* 0.8.4 */ - .volLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 0.8.4 */ - .volLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */ - .volLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */ - .volCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */ - .volCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */ - .volDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */ - .volWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */ - .volGetInfo = esxStorageBackendVMFSVolumeGetInfo, /* 0.8.4 */ - .volGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */ - .volGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.8.4 */ + .connectNumOfStoragePools = esxStorageBackendVMFSNumberOfPools, /* 0.8.2 */ + .connectListStoragePools = esxStorageBackendVMFSListPools, /* 0.8.2 */ + .storagePoolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */ + .storagePoolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */ + .storagePoolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */ + .storagePoolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */ + .storagePoolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */ + .storagePoolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfVolumes, /* 0.8.4 */ + .storagePoolListVolumes = esxStorageBackendVMFSPoolListVolumes, /* 0.8.4 */ + .storageVolLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 0.8.4 */ + .storageVolLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */ + .storageVolLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */ + .storageVolCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */ + .storageVolCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */ + .storageVolDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */ + .storageVolWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */ + .storageVolGetInfo = esxStorageBackendVMFSVolumeGetInfo, /* 0.8.4 */ + .storageVolGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */ + .storageVolGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.8.4 */ }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 5fb4e1f..9ab7a9c 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -95,7 +95,7 @@ esxNumberOfStoragePools(virConnectPtr conn) } for (i = 0; i < LAST_BACKEND; ++i) { - tmp = backends[i]->numOfPools(conn); + tmp = backends[i]->connectNumOfStoragePools(conn); if (tmp < 0) { return -1; @@ -127,7 +127,7 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) } for (i = 0; i < LAST_BACKEND; ++i) { - tmp = backends[i]->listPools(conn, &names[count], maxnames - count); + tmp = backends[i]->connectListStoragePools(conn, &names[count], maxnames - count); if (tmp < 0) { goto cleanup; @@ -186,7 +186,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) } for (i = 0; i < LAST_BACKEND; ++i) { - pool = backends[i]->poolLookupByName(conn, name); + pool = backends[i]->storagePoolLookupByName(conn, name); if (pool != NULL) { return pool; @@ -215,7 +215,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) /* invoke backend drive method to search all known pools */ for (i = 0; i < LAST_BACKEND; ++i) { - pool = backends[i]->poolLookupByUUID(conn, uuid); + pool = backends[i]->storagePoolLookupByUUID(conn, uuid); if (pool != NULL) { return pool; @@ -252,7 +252,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) return -1; } - return backend->poolRefresh(pool, flags); + return backend->storagePoolRefresh(pool, flags); } @@ -271,7 +271,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) return -1; } - return backend->poolGetInfo(pool, info); + return backend->storagePoolGetInfo(pool, info); } @@ -288,7 +288,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) return NULL; } - return backend->poolGetXMLDesc(pool, flags); + return backend->storagePoolGetXMLDesc(pool, flags); } @@ -335,7 +335,7 @@ esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) return -1; } - return backend->poolNumOfVolumes(pool); + return backend->storagePoolNumOfVolumes(pool); } @@ -353,7 +353,7 @@ esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, return -1; } - return backend->poolListVolumes(pool, names, maxnames); + return backend->storagePoolListVolumes(pool, names, maxnames); } @@ -370,7 +370,7 @@ esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) return NULL; } - return backend->volLookupByName(pool, name); + return backend->storageVolLookupByName(pool, name); } @@ -393,9 +393,9 @@ esxStorageVolumeLookupByPath(virConnectPtr conn, const char *path) * iSCSI LUNs device path follows normal linux path convention */ if (STRPREFIX(path, "[")) { - return backends[VMFS]->volLookupByPath(conn, path); + return backends[VMFS]->storageVolLookupByPath(conn, path); } else if (STRPREFIX(path, "/")) { - return backends[ISCSI]->volLookupByPath(conn, path); + return backends[ISCSI]->storageVolLookupByPath(conn, path); } else { virReportError(VIR_ERR_INVALID_ARG, _("Unexpected volume path format: %s"), path); @@ -418,7 +418,7 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key) } for (i = 0; i < LAST_BACKEND; ++i) { - volume = backends[i]->volLookupByKey(conn, key); + volume = backends[i]->storageVolLookupByKey(conn, key); if (volume != NULL) { return volume; @@ -447,7 +447,7 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, return NULL; } - return backend->volCreateXML(pool, xmldesc, flags); + return backend->storageVolCreateXML(pool, xmldesc, flags); } @@ -465,7 +465,7 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, return NULL; } - return backend->volCreateXMLFrom(pool, xmldesc, sourceVolume, flags); + return backend->storageVolCreateXMLFrom(pool, xmldesc, sourceVolume, flags); } @@ -482,7 +482,7 @@ esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) return -1; } - return backend->volDelete(volume, flags); + return backend->storageVolDelete(volume, flags); } @@ -499,7 +499,7 @@ esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) return -1; } - return backend->volWipe(volume, flags); + return backend->storageVolWipe(volume, flags); } @@ -516,7 +516,7 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) return -1; } - return backend->volGetInfo(volume, info); + return backend->storageVolGetInfo(volume, info); } @@ -533,7 +533,7 @@ esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) return NULL; } - return backend->volGetXMLDesc(volume, flags); + return backend->storageVolGetXMLDesc(volume, flags); } @@ -550,7 +550,7 @@ esxStorageVolumeGetPath(virStorageVolPtr volume) return NULL; } - return backend->volGetPath(volume); + return backend->storageVolGetPath(volume); } @@ -575,34 +575,34 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { .name = "ESX", - .open = esxStorageOpen, /* 0.7.6 */ - .close = esxStorageClose, /* 0.7.6 */ - .numOfPools = esxNumberOfStoragePools, /* 0.8.2 */ - .listPools = esxListStoragePools, /* 0.8.2 */ - .numOfDefinedPools = esxNumberOfDefinedStoragePools, /* 0.8.2 */ - .listDefinedPools = esxListDefinedStoragePools, /* 0.8.2 */ - .poolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */ - .poolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */ - .poolLookupByVolume = esxStoragePoolLookupByVolume, /* 0.8.4 */ - .poolRefresh = esxStoragePoolRefresh, /* 0.8.2 */ - .poolGetInfo = esxStoragePoolGetInfo, /* 0.8.2 */ - .poolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */ - .poolGetAutostart = esxStoragePoolGetAutostart, /* 0.8.2 */ - .poolSetAutostart = esxStoragePoolSetAutostart, /* 0.8.2 */ - .poolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes, /* 0.8.4 */ - .poolListVolumes = esxStoragePoolListStorageVolumes, /* 0.8.4 */ - .volLookupByName = esxStorageVolumeLookupByName, /* 0.8.4 */ - .volLookupByPath = esxStorageVolumeLookupByPath, /* 0.8.4 */ - .volLookupByKey = esxStorageVolumeLookupByKey, /* 0.8.4 */ - .volCreateXML = esxStorageVolumeCreateXML, /* 0.8.4 */ - .volCreateXMLFrom = esxStorageVolumeCreateXMLFrom, /* 0.8.7 */ - .volDelete = esxStorageVolumeDelete, /* 0.8.7 */ - .volWipe = esxStorageVolumeWipe, /* 0.8.7 */ - .volGetInfo = esxStorageVolumeGetInfo, /* 0.8.4 */ - .volGetXMLDesc = esxStorageVolumeGetXMLDesc, /* 0.8.4 */ - .volGetPath = esxStorageVolumeGetPath, /* 0.8.4 */ - .poolIsActive = esxStoragePoolIsActive, /* 0.8.2 */ - .poolIsPersistent = esxStoragePoolIsPersistent, /* 0.8.2 */ + .connectOpen = esxStorageOpen, /* 0.7.6 */ + .connectClose = esxStorageClose, /* 0.7.6 */ + .connectNumOfStoragePools = esxNumberOfStoragePools, /* 0.8.2 */ + .connectListStoragePools = esxListStoragePools, /* 0.8.2 */ + .connectNumOfDefinedStoragePools = esxNumberOfDefinedStoragePools, /* 0.8.2 */ + .connectListDefinedStoragePools = esxListDefinedStoragePools, /* 0.8.2 */ + .storagePoolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */ + .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */ + .storagePoolLookupByVolume = esxStoragePoolLookupByVolume, /* 0.8.4 */ + .storagePoolRefresh = esxStoragePoolRefresh, /* 0.8.2 */ + .storagePoolGetInfo = esxStoragePoolGetInfo, /* 0.8.2 */ + .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */ + .storagePoolGetAutostart = esxStoragePoolGetAutostart, /* 0.8.2 */ + .storagePoolSetAutostart = esxStoragePoolSetAutostart, /* 0.8.2 */ + .storagePoolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes, /* 0.8.4 */ + .storagePoolListVolumes = esxStoragePoolListStorageVolumes, /* 0.8.4 */ + .storageVolLookupByName = esxStorageVolumeLookupByName, /* 0.8.4 */ + .storageVolLookupByPath = esxStorageVolumeLookupByPath, /* 0.8.4 */ + .storageVolLookupByKey = esxStorageVolumeLookupByKey, /* 0.8.4 */ + .storageVolCreateXML = esxStorageVolumeCreateXML, /* 0.8.4 */ + .storageVolCreateXMLFrom = esxStorageVolumeCreateXMLFrom, /* 0.8.7 */ + .storageVolDelete = esxStorageVolumeDelete, /* 0.8.7 */ + .storageVolWipe = esxStorageVolumeWipe, /* 0.8.7 */ + .storageVolGetInfo = esxStorageVolumeGetInfo, /* 0.8.4 */ + .storageVolGetXMLDesc = esxStorageVolumeGetXMLDesc, /* 0.8.4 */ + .storageVolGetPath = esxStorageVolumeGetPath, /* 0.8.4 */ + .storagePoolIsActive = esxStoragePoolIsActive, /* 0.8.2 */ + .storagePoolIsPersistent = esxStoragePoolIsPersistent, /* 0.8.2 */ }; diff --git a/src/fdstream.c b/src/fdstream.c index 9a6f042..53dde97 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -455,9 +455,9 @@ static virStreamDriver virFDStreamDrv = { .streamRecv = virFDStreamRead, .streamFinish = virFDStreamClose, .streamAbort = virFDStreamAbort, - .streamAddCallback = virFDStreamAddCallback, - .streamUpdateCallback = virFDStreamUpdateCallback, - .streamRemoveCallback = virFDStreamRemoveCallback + .streamEventAddCallback = virFDStreamAddCallback, + .streamEventUpdateCallback = virFDStreamUpdateCallback, + .streamEventRemoveCallback = virFDStreamRemoveCallback }; static int virFDStreamOpenInternal(virStreamPtr st, diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c index 9432081..cf3ba25 100644 --- a/src/hyperv/hyperv_device_monitor.c +++ b/src/hyperv/hyperv_device_monitor.c @@ -66,8 +66,8 @@ hypervDeviceClose(virConnectPtr conn) static virDeviceMonitor hypervDeviceMonitor = { "Hyper-V", - .open = hypervDeviceOpen, /* 0.9.5 */ - .close = hypervDeviceClose, /* 0.9.5 */ + .connectOpen = hypervDeviceOpen, /* 0.9.5 */ + .connectClose = hypervDeviceClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 4644bff..828e3fe 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1398,14 +1398,14 @@ no_memory: static virDriver hypervDriver = { .no = VIR_DRV_HYPERV, .name = "Hyper-V", - .open = hypervOpen, /* 0.9.5 */ - .close = hypervClose, /* 0.9.5 */ - .type = hypervGetType, /* 0.9.5 */ - .getHostname = hypervGetHostname, /* 0.9.5 */ + .connectOpen = hypervOpen, /* 0.9.5 */ + .connectClose = hypervClose, /* 0.9.5 */ + .connectGetType = hypervGetType, /* 0.9.5 */ + .connectGetHostname = hypervGetHostname, /* 0.9.5 */ .nodeGetInfo = hypervNodeGetInfo, /* 0.9.5 */ - .listDomains = hypervListDomains, /* 0.9.5 */ - .numOfDomains = hypervNumberOfDomains, /* 0.9.5 */ - .listAllDomains = hypervListAllDomains, /* 0.10.2 */ + .connectListDomains = hypervListDomains, /* 0.9.5 */ + .connectNumOfDomains = hypervNumberOfDomains, /* 0.9.5 */ + .connectListAllDomains = hypervListAllDomains, /* 0.10.2 */ .domainLookupByID = hypervDomainLookupByID, /* 0.9.5 */ .domainLookupByUUID = hypervDomainLookupByUUID, /* 0.9.5 */ .domainLookupByName = hypervDomainLookupByName, /* 0.9.5 */ @@ -1417,19 +1417,19 @@ static virDriver hypervDriver = { .domainGetInfo = hypervDomainGetInfo, /* 0.9.5 */ .domainGetState = hypervDomainGetState, /* 0.9.5 */ .domainGetXMLDesc = hypervDomainGetXMLDesc, /* 0.9.5 */ - .listDefinedDomains = hypervListDefinedDomains, /* 0.9.5 */ - .numOfDefinedDomains = hypervNumberOfDefinedDomains, /* 0.9.5 */ + .connectListDefinedDomains = hypervListDefinedDomains, /* 0.9.5 */ + .connectNumOfDefinedDomains = hypervNumberOfDefinedDomains, /* 0.9.5 */ .domainCreate = hypervDomainCreate, /* 0.9.5 */ .domainCreateWithFlags = hypervDomainCreateWithFlags, /* 0.9.5 */ - .isEncrypted = hypervIsEncrypted, /* 0.9.5 */ - .isSecure = hypervIsSecure, /* 0.9.5 */ + .connectIsEncrypted = hypervIsEncrypted, /* 0.9.5 */ + .connectIsSecure = hypervIsSecure, /* 0.9.5 */ .domainIsActive = hypervDomainIsActive, /* 0.9.5 */ .domainIsPersistent = hypervDomainIsPersistent, /* 0.9.5 */ .domainIsUpdated = hypervDomainIsUpdated, /* 0.9.5 */ .domainManagedSave = hypervDomainManagedSave, /* 0.9.5 */ .domainHasManagedSaveImage = hypervDomainHasManagedSaveImage, /* 0.9.5 */ .domainManagedSaveRemove = hypervDomainManagedSaveRemove, /* 0.9.5 */ - .isAlive = hypervIsAlive, /* 0.9.8 */ + .connectIsAlive = hypervIsAlive, /* 0.9.8 */ }; diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c index b42dbce..db909f3 100644 --- a/src/hyperv/hyperv_interface_driver.c +++ b/src/hyperv/hyperv_interface_driver.c @@ -66,8 +66,8 @@ hypervInterfaceClose(virConnectPtr conn) static virInterfaceDriver hypervInterfaceDriver = { .name = "Hyper-V", - .open = hypervInterfaceOpen, /* 0.9.5 */ - .close = hypervInterfaceClose, /* 0.9.5 */ + .connectOpen = hypervInterfaceOpen, /* 0.9.5 */ + .connectClose = hypervInterfaceClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index c75c943..5ede105 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -66,8 +66,8 @@ hypervNetworkClose(virConnectPtr conn) static virNetworkDriver hypervNetworkDriver = { .name = "Hyper-V", - .open = hypervNetworkOpen, /* 0.9.5 */ - .close = hypervNetworkClose, /* 0.9.5 */ + .connectOpen = hypervNetworkOpen, /* 0.9.5 */ + .connectClose = hypervNetworkClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c index faa9074..07d8275 100644 --- a/src/hyperv/hyperv_nwfilter_driver.c +++ b/src/hyperv/hyperv_nwfilter_driver.c @@ -66,8 +66,8 @@ hypervNWFilterClose(virConnectPtr conn) static virNWFilterDriver hypervNWFilterDriver = { .name = "Hyper-V", - .open = hypervNWFilterOpen, /* 0.9.5 */ - .close = hypervNWFilterClose, /* 0.9.5 */ + .connectOpen = hypervNWFilterOpen, /* 0.9.5 */ + .connectClose = hypervNWFilterClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c index 602ae99..6554667 100644 --- a/src/hyperv/hyperv_secret_driver.c +++ b/src/hyperv/hyperv_secret_driver.c @@ -66,8 +66,8 @@ hypervSecretClose(virConnectPtr conn) static virSecretDriver hypervSecretDriver = { .name = "Hyper-V", - .open = hypervSecretOpen, /* 0.9.5 */ - .close = hypervSecretClose, /* 0.9.5 */ + .connectOpen = hypervSecretOpen, /* 0.9.5 */ + .connectClose = hypervSecretClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c index a169b14..a908a0c 100644 --- a/src/hyperv/hyperv_storage_driver.c +++ b/src/hyperv/hyperv_storage_driver.c @@ -66,8 +66,8 @@ hypervStorageClose(virConnectPtr conn) static virStorageDriver hypervStorageDriver = { .name = "Hyper-V", - .open = hypervStorageOpen, /* 0.9.5*/ - .close = hypervStorageClose, /* 0.9.5 */ + .connectOpen = hypervStorageOpen, /* 0.9.5*/ + .connectClose = hypervStorageClose, /* 0.9.5 */ }; diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 8671717..8394b06 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -784,13 +784,13 @@ static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) static virInterfaceDriver interfaceDriver = { "netcf", - .open = interfaceOpenInterface, /* 0.7.0 */ - .close = interfaceCloseInterface, /* 0.7.0 */ - .numOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ - .listInterfaces = interfaceListInterfaces, /* 0.7.0 */ - .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ - .listDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ - .listAllInterfaces = interfaceListAllInterfaces, /* 0.10.2 */ + .connectOpen = interfaceOpenInterface, /* 0.7.0 */ + .connectClose = interfaceCloseInterface, /* 0.7.0 */ + .connectNumOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ + .connectListInterfaces = interfaceListInterfaces, /* 0.7.0 */ + .connectNumOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ + .connectListDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ + .connectListAllInterfaces = interfaceListAllInterfaces, /* 0.10.2 */ .interfaceLookupByName = interfaceLookupByName, /* 0.7.0 */ .interfaceLookupByMACString = interfaceLookupByMACString, /* 0.7.0 */ .interfaceGetXMLDesc = interfaceGetXMLDesc, /* 0.7.0 */ diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1132d9a..1c317f0 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1149,13 +1149,13 @@ cleanup: static virInterfaceDriver udevIfaceDriver = { "udev", - .open = udevIfaceOpenInterface, /* 1.0.0 */ - .close = udevIfaceCloseInterface, /* 1.0.0 */ - .numOfInterfaces = udevIfaceNumOfInterfaces, /* 1.0.0 */ - .listInterfaces = udevIfaceListInterfaces, /* 1.0.0 */ - .numOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 1.0.0 */ - .listDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 1.0.0 */ - .listAllInterfaces = udevIfaceListAllInterfaces, /* 1.0.0 */ + .connectOpen = udevIfaceOpenInterface, /* 1.0.0 */ + .connectClose = udevIfaceCloseInterface, /* 1.0.0 */ + .connectNumOfInterfaces = udevIfaceNumOfInterfaces, /* 1.0.0 */ + .connectListInterfaces = udevIfaceListInterfaces, /* 1.0.0 */ + .connectNumOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 1.0.0 */ + .connectListDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 1.0.0 */ + .connectListAllInterfaces = udevIfaceListAllInterfaces, /* 1.0.0 */ .interfaceLookupByName = udevIfaceLookupByName, /* 1.0.0 */ .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 1.0.0 */ .interfaceIsActive = udevIfaceIsActive, /* 1.0.0 */ diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index fb19584..747488d 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -95,9 +95,9 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, goto error; } - if (conn->driver->qemuDomainMonitorCommand) { + if (conn->driver->domainQemuMonitorCommand) { int ret; - ret = conn->driver->qemuDomainMonitorCommand(domain, cmd, result, + ret = conn->driver->domainQemuMonitorCommand(domain, cmd, result, flags); if (ret < 0) goto error; @@ -170,9 +170,9 @@ virDomainQemuAttach(virConnectPtr conn, goto error; } - if (conn->driver->qemuDomainAttach) { + if (conn->driver->domainQemuAttach) { virDomainPtr ret; - ret = conn->driver->qemuDomainAttach(conn, pid_value, flags); + ret = conn->driver->domainQemuAttach(conn, pid_value, flags); if (!ret) goto error; return ret; @@ -227,9 +227,9 @@ virDomainQemuAgentCommand(virDomainPtr domain, conn = domain->conn; - if (conn->driver->qemuDomainArbitraryAgentCommand) { - return conn->driver->qemuDomainArbitraryAgentCommand(domain, cmd, - timeout, flags); + if (conn->driver->domainQemuAgentCommand) { + return conn->driver->domainQemuAgentCommand(domain, cmd, + timeout, flags); } virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); diff --git a/src/libvirt.c b/src/libvirt.c index 870519e..7818e7f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -827,12 +827,12 @@ int virStateInitialize(bool privileged, return -1; for (i = 0 ; i < virStateDriverTabCount ; i++) { - if (virStateDriverTab[i]->initialize) { + if (virStateDriverTab[i]->stateInitialize) { VIR_DEBUG("Running global init for %s state driver", virStateDriverTab[i]->name); - if (virStateDriverTab[i]->initialize(privileged, - callback, - opaque) < 0) { + if (virStateDriverTab[i]->stateInitialize(privileged, + callback, + opaque) < 0) { VIR_ERROR(_("Initialization of %s state driver failed"), virStateDriverTab[i]->name); return -1; @@ -853,8 +853,8 @@ int virStateCleanup(void) { int i, ret = 0; for (i = 0 ; i < virStateDriverTabCount ; i++) { - if (virStateDriverTab[i]->cleanup && - virStateDriverTab[i]->cleanup() < 0) + if (virStateDriverTab[i]->stateCleanup && + virStateDriverTab[i]->stateCleanup() < 0) ret = -1; } return ret; @@ -871,8 +871,8 @@ int virStateReload(void) { int i, ret = 0; for (i = 0 ; i < virStateDriverTabCount ; i++) { - if (virStateDriverTab[i]->reload && - virStateDriverTab[i]->reload() < 0) + if (virStateDriverTab[i]->stateReload && + virStateDriverTab[i]->stateReload() < 0) ret = -1; } return ret; @@ -889,8 +889,8 @@ int virStateStop(void) { int i, ret = 0; for (i = 0 ; i < virStateDriverTabCount ; i++) { - if (virStateDriverTab[i]->stop && - virStateDriverTab[i]->stop()) + if (virStateDriverTab[i]->stateStop && + virStateDriverTab[i]->stateStop()) ret = 1; } return ret; @@ -1209,7 +1209,7 @@ do_open(const char *name, } VIR_DEBUG("trying driver %d (%s) ...", i, virDriverTab[i]->name); - res = virDriverTab[i]->open(ret, auth, flags); + res = virDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("driver %d %s returned %s", i, virDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1233,7 +1233,7 @@ do_open(const char *name, } for (i = 0; i < virNetworkDriverTabCount; i++) { - res = virNetworkDriverTab[i]->open(ret, auth, flags); + res = virNetworkDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("network driver %d %s returned %s", i, virNetworkDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1249,7 +1249,7 @@ do_open(const char *name, } for (i = 0; i < virInterfaceDriverTabCount; i++) { - res = virInterfaceDriverTab[i]->open(ret, auth, flags); + res = virInterfaceDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("interface driver %d %s returned %s", i, virInterfaceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1266,7 +1266,7 @@ do_open(const char *name, /* Secondary driver for storage. Optional */ for (i = 0; i < virStorageDriverTabCount; i++) { - res = virStorageDriverTab[i]->open(ret, auth, flags); + res = virStorageDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("storage driver %d %s returned %s", i, virStorageDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1283,7 +1283,7 @@ do_open(const char *name, /* Node driver (optional) */ for (i = 0; i < virDeviceMonitorTabCount; i++) { - res = virDeviceMonitorTab[i]->open(ret, auth, flags); + res = virDeviceMonitorTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("node driver %d %s returned %s", i, virDeviceMonitorTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1300,7 +1300,7 @@ do_open(const char *name, /* Secret manipulation driver. Optional */ for (i = 0; i < virSecretDriverTabCount; i++) { - res = virSecretDriverTab[i]->open(ret, auth, flags); + res = virSecretDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("secret driver %d %s returned %s", i, virSecretDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1317,7 +1317,7 @@ do_open(const char *name, /* Network filter driver. Optional */ for (i = 0; i < virNWFilterDriverTabCount; i++) { - res = virNWFilterDriverTab[i]->open(ret, auth, flags); + res = virNWFilterDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("nwfilter driver %d %s returned %s", i, virNWFilterDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1544,7 +1544,7 @@ virConnectRef(virConnectPtr conn) * implementation of driver features in the remote case. */ int -virDrvSupportsFeature(virConnectPtr conn, int feature) +virConnectSupportsFeature(virConnectPtr conn, int feature) { int ret; VIR_DEBUG("conn=%p, feature=%d", conn, feature); @@ -1557,10 +1557,10 @@ virDrvSupportsFeature(virConnectPtr conn, int feature) return -1; } - if (!conn->driver->supports_feature) + if (!conn->driver->connectSupportsFeature) ret = 0; else - ret = conn->driver->supports_feature(conn, feature); + ret = conn->driver->connectSupportsFeature(conn, feature); if (ret < 0) virDispatchError(conn); @@ -1593,8 +1593,8 @@ virConnectGetType(virConnectPtr conn) return NULL; } - if (conn->driver->type) { - ret = conn->driver->type(conn); + if (conn->driver->connectGetType) { + ret = conn->driver->connectGetType(conn); if (ret) return ret; } return conn->driver->name; @@ -1628,8 +1628,8 @@ virConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) virCheckNonNullArgGoto(hvVer, error); - if (conn->driver->version) { - int ret = conn->driver->version(conn, hvVer); + if (conn->driver->connectGetVersion) { + int ret = conn->driver->connectGetVersion(conn, hvVer); if (ret < 0) goto error; return ret; @@ -1669,8 +1669,8 @@ virConnectGetLibVersion(virConnectPtr conn, unsigned long *libVer) virCheckNonNullArgGoto(libVer, error); - if (conn->driver->libvirtVersion) { - ret = conn->driver->libvirtVersion(conn, libVer); + if (conn->driver->connectGetLibVersion) { + ret = conn->driver->connectGetLibVersion(conn, libVer); if (ret < 0) goto error; return ret; @@ -1709,8 +1709,8 @@ virConnectGetHostname(virConnectPtr conn) return NULL; } - if (conn->driver->getHostname) { - char *ret = conn->driver->getHostname(conn); + if (conn->driver->connectGetHostname) { + char *ret = conn->driver->connectGetHostname(conn); if (!ret) goto error; return ret; @@ -1788,8 +1788,8 @@ virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) return NULL; } - if (conn->driver->getSysinfo) { - char *ret = conn->driver->getSysinfo(conn, flags); + if (conn->driver->connectGetSysinfo) { + char *ret = conn->driver->connectGetSysinfo(conn, flags); if (!ret) goto error; return ret; @@ -1827,8 +1827,8 @@ virConnectGetMaxVcpus(virConnectPtr conn, return -1; } - if (conn->driver->getMaxVcpus) { - int ret = conn->driver->getMaxVcpus(conn, type); + if (conn->driver->connectGetMaxVcpus) { + int ret = conn->driver->connectGetMaxVcpus(conn, type); if (ret < 0) goto error; return ret; @@ -1873,8 +1873,8 @@ virConnectListDomains(virConnectPtr conn, int *ids, int maxids) virCheckNonNullArgGoto(ids, error); virCheckNonNegativeArgGoto(maxids, error); - if (conn->driver->listDomains) { - int ret = conn->driver->listDomains(conn, ids, maxids); + if (conn->driver->connectListDomains) { + int ret = conn->driver->connectListDomains(conn, ids, maxids); if (ret < 0) goto error; return ret; @@ -1907,8 +1907,8 @@ virConnectNumOfDomains(virConnectPtr conn) return -1; } - if (conn->driver->numOfDomains) { - int ret = conn->driver->numOfDomains(conn); + if (conn->driver->connectNumOfDomains) { + int ret = conn->driver->connectNumOfDomains(conn); if (ret < 0) goto error; return ret; @@ -4447,12 +4447,12 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, virCheckNonNullArgGoto(nativeFormat, error); virCheckNonNullArgGoto(nativeConfig, error); - if (conn->driver->domainXMLFromNative) { + if (conn->driver->connectDomainXMLFromNative) { char *ret; - ret = conn->driver->domainXMLFromNative(conn, - nativeFormat, - nativeConfig, - flags); + ret = conn->driver->connectDomainXMLFromNative(conn, + nativeFormat, + nativeConfig, + flags); if (!ret) goto error; return ret; @@ -4502,12 +4502,12 @@ char *virConnectDomainXMLToNative(virConnectPtr conn, virCheckNonNullArgGoto(nativeFormat, error); virCheckNonNullArgGoto(domainXml, error); - if (conn->driver->domainXMLToNative) { + if (conn->driver->connectDomainXMLToNative) { char *ret; - ret = conn->driver->domainXMLToNative(conn, - nativeFormat, - domainXml, - flags); + ret = conn->driver->connectDomainXMLToNative(conn, + nativeFormat, + domainXml, + flags); if (!ret) goto error; return ret; @@ -6590,9 +6590,9 @@ virConnectGetCapabilities(virConnectPtr conn) return NULL; } - if (conn->driver->getCapabilities) { + if (conn->driver->connectGetCapabilities) { char *ret; - ret = conn->driver->getCapabilities(conn); + ret = conn->driver->connectGetCapabilities(conn); if (!ret) goto error; VIR_DEBUG("conn=%p ret=%s", conn, ret); @@ -8257,9 +8257,9 @@ virConnectNumOfDefinedDomains(virConnectPtr conn) return -1; } - if (conn->driver->numOfDefinedDomains) { + if (conn->driver->connectNumOfDefinedDomains) { int ret; - ret = conn->driver->numOfDefinedDomains(conn); + ret = conn->driver->connectNumOfDefinedDomains(conn); if (ret < 0) goto error; return ret; @@ -8306,9 +8306,9 @@ virConnectListDefinedDomains(virConnectPtr conn, char **const names, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->driver->listDefinedDomains) { + if (conn->driver->connectListDefinedDomains) { int ret; - ret = conn->driver->listDefinedDomains(conn, names, maxnames); + ret = conn->driver->connectListDefinedDomains(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -8411,9 +8411,9 @@ virConnectListAllDomains(virConnectPtr conn, return -1; } - if (conn->driver->listAllDomains) { + if (conn->driver->connectListAllDomains) { int ret; - ret = conn->driver->listAllDomains(conn, domains, flags); + ret = conn->driver->connectListAllDomains(conn, domains, flags); if (ret < 0) goto error; return ret; @@ -10222,9 +10222,9 @@ virConnectListAllNetworks(virConnectPtr conn, } if (conn->networkDriver && - conn->networkDriver->listAllNetworks) { + conn->networkDriver->connectListAllNetworks) { int ret; - ret = conn->networkDriver->listAllNetworks(conn, nets, flags); + ret = conn->networkDriver->connectListAllNetworks(conn, nets, flags); if (ret < 0) goto error; return ret; @@ -10259,9 +10259,9 @@ virConnectNumOfNetworks(virConnectPtr conn) return -1; } - if (conn->networkDriver && conn->networkDriver->numOfNetworks) { + if (conn->networkDriver && conn->networkDriver->connectNumOfNetworks) { int ret; - ret = conn->networkDriver->numOfNetworks(conn); + ret = conn->networkDriver->connectNumOfNetworks(conn); if (ret < 0) goto error; return ret; @@ -10306,9 +10306,9 @@ virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->networkDriver && conn->networkDriver->listNetworks) { + if (conn->networkDriver && conn->networkDriver->connectListNetworks) { int ret; - ret = conn->networkDriver->listNetworks(conn, names, maxnames); + ret = conn->networkDriver->connectListNetworks(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -10342,9 +10342,9 @@ virConnectNumOfDefinedNetworks(virConnectPtr conn) return -1; } - if (conn->networkDriver && conn->networkDriver->numOfDefinedNetworks) { + if (conn->networkDriver && conn->networkDriver->connectNumOfDefinedNetworks) { int ret; - ret = conn->networkDriver->numOfDefinedNetworks(conn); + ret = conn->networkDriver->connectNumOfDefinedNetworks(conn); if (ret < 0) goto error; return ret; @@ -10390,10 +10390,9 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->networkDriver && conn->networkDriver->listDefinedNetworks) { + if (conn->networkDriver && conn->networkDriver->connectListDefinedNetworks) { int ret; - ret = conn->networkDriver->listDefinedNetworks(conn, - names, maxnames); + ret = conn->networkDriver->connectListDefinedNetworks(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -11204,9 +11203,9 @@ virConnectListAllInterfaces(virConnectPtr conn, } if (conn->interfaceDriver && - conn->interfaceDriver->listAllInterfaces) { + conn->interfaceDriver->connectListAllInterfaces) { int ret; - ret = conn->interfaceDriver->listAllInterfaces(conn, ifaces, flags); + ret = conn->interfaceDriver->connectListAllInterfaces(conn, ifaces, flags); if (ret < 0) goto error; return ret; @@ -11240,9 +11239,9 @@ virConnectNumOfInterfaces(virConnectPtr conn) return -1; } - if (conn->interfaceDriver && conn->interfaceDriver->numOfInterfaces) { + if (conn->interfaceDriver && conn->interfaceDriver->connectNumOfInterfaces) { int ret; - ret = conn->interfaceDriver->numOfInterfaces(conn); + ret = conn->interfaceDriver->connectNumOfInterfaces(conn); if (ret < 0) goto error; return ret; @@ -11288,9 +11287,9 @@ virConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->interfaceDriver && conn->interfaceDriver->listInterfaces) { + if (conn->interfaceDriver && conn->interfaceDriver->connectListInterfaces) { int ret; - ret = conn->interfaceDriver->listInterfaces(conn, names, maxnames); + ret = conn->interfaceDriver->connectListInterfaces(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -11324,9 +11323,9 @@ virConnectNumOfDefinedInterfaces(virConnectPtr conn) return -1; } - if (conn->interfaceDriver && conn->interfaceDriver->numOfDefinedInterfaces) { + if (conn->interfaceDriver && conn->interfaceDriver->connectNumOfDefinedInterfaces) { int ret; - ret = conn->interfaceDriver->numOfDefinedInterfaces(conn); + ret = conn->interfaceDriver->connectNumOfDefinedInterfaces(conn); if (ret < 0) goto error; return ret; @@ -11374,9 +11373,9 @@ virConnectListDefinedInterfaces(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->interfaceDriver && conn->interfaceDriver->listDefinedInterfaces) { + if (conn->interfaceDriver && conn->interfaceDriver->connectListDefinedInterfaces) { int ret; - ret = conn->interfaceDriver->listDefinedInterfaces(conn, names, maxnames); + ret = conn->interfaceDriver->connectListDefinedInterfaces(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -12071,9 +12070,9 @@ virConnectListAllStoragePools(virConnectPtr conn, } if (conn->storageDriver && - conn->storageDriver->listAllPools) { + conn->storageDriver->connectListAllStoragePools) { int ret; - ret = conn->storageDriver->listAllPools(conn, pools, flags); + ret = conn->storageDriver->connectListAllStoragePools(conn, pools, flags); if (ret < 0) goto error; return ret; @@ -12107,9 +12106,9 @@ virConnectNumOfStoragePools(virConnectPtr conn) return -1; } - if (conn->storageDriver && conn->storageDriver->numOfPools) { + if (conn->storageDriver && conn->storageDriver->connectNumOfStoragePools) { int ret; - ret = conn->storageDriver->numOfPools(conn); + ret = conn->storageDriver->connectNumOfStoragePools(conn); if (ret < 0) goto error; return ret; @@ -12158,9 +12157,9 @@ virConnectListStoragePools(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->storageDriver && conn->storageDriver->listPools) { + if (conn->storageDriver && conn->storageDriver->connectListStoragePools) { int ret; - ret = conn->storageDriver->listPools(conn, names, maxnames); + ret = conn->storageDriver->connectListStoragePools(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -12195,9 +12194,9 @@ virConnectNumOfDefinedStoragePools(virConnectPtr conn) return -1; } - if (conn->storageDriver && conn->storageDriver->numOfDefinedPools) { + if (conn->storageDriver && conn->storageDriver->connectNumOfDefinedStoragePools) { int ret; - ret = conn->storageDriver->numOfDefinedPools(conn); + ret = conn->storageDriver->connectNumOfDefinedStoragePools(conn); if (ret < 0) goto error; return ret; @@ -12247,9 +12246,9 @@ virConnectListDefinedStoragePools(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->storageDriver && conn->storageDriver->listDefinedPools) { + if (conn->storageDriver && conn->storageDriver->connectListDefinedStoragePools) { int ret; - ret = conn->storageDriver->listDefinedPools(conn, names, maxnames); + ret = conn->storageDriver->connectListDefinedStoragePools(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -12307,9 +12306,9 @@ virConnectFindStoragePoolSources(virConnectPtr conn, goto error; } - if (conn->storageDriver && conn->storageDriver->findPoolSources) { + if (conn->storageDriver && conn->storageDriver->connectFindStoragePoolSources) { char *ret; - ret = conn->storageDriver->findPoolSources(conn, type, srcSpec, flags); + ret = conn->storageDriver->connectFindStoragePoolSources(conn, type, srcSpec, flags); if (!ret) goto error; return ret; @@ -12347,9 +12346,9 @@ virStoragePoolLookupByName(virConnectPtr conn, } virCheckNonNullArgGoto(name, error); - if (conn->storageDriver && conn->storageDriver->poolLookupByName) { + if (conn->storageDriver && conn->storageDriver->storagePoolLookupByName) { virStoragePoolPtr ret; - ret = conn->storageDriver->poolLookupByName(conn, name); + ret = conn->storageDriver->storagePoolLookupByName(conn, name); if (!ret) goto error; return ret; @@ -12387,9 +12386,9 @@ virStoragePoolLookupByUUID(virConnectPtr conn, } virCheckNonNullArgGoto(uuid, error); - if (conn->storageDriver && conn->storageDriver->poolLookupByUUID) { + if (conn->storageDriver && conn->storageDriver->storagePoolLookupByUUID) { virStoragePoolPtr ret; - ret = conn->storageDriver->poolLookupByUUID(conn, uuid); + ret = conn->storageDriver->storagePoolLookupByUUID(conn, uuid); if (!ret) goto error; return ret; @@ -12464,9 +12463,9 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) return NULL; } - if (vol->conn->storageDriver && vol->conn->storageDriver->poolLookupByVolume) { + if (vol->conn->storageDriver && vol->conn->storageDriver->storagePoolLookupByVolume) { virStoragePoolPtr ret; - ret = vol->conn->storageDriver->poolLookupByVolume(vol); + ret = vol->conn->storageDriver->storagePoolLookupByVolume(vol); if (!ret) goto error; return ret; @@ -12512,9 +12511,9 @@ virStoragePoolCreateXML(virConnectPtr conn, goto error; } - if (conn->storageDriver && conn->storageDriver->poolCreateXML) { + if (conn->storageDriver && conn->storageDriver->storagePoolCreateXML) { virStoragePoolPtr ret; - ret = conn->storageDriver->poolCreateXML(conn, xmlDesc, flags); + ret = conn->storageDriver->storagePoolCreateXML(conn, xmlDesc, flags); if (!ret) goto error; return ret; @@ -12558,9 +12557,9 @@ virStoragePoolDefineXML(virConnectPtr conn, } virCheckNonNullArgGoto(xml, error); - if (conn->storageDriver && conn->storageDriver->poolDefineXML) { + if (conn->storageDriver && conn->storageDriver->storagePoolDefineXML) { virStoragePoolPtr ret; - ret = conn->storageDriver->poolDefineXML(conn, xml, flags); + ret = conn->storageDriver->storagePoolDefineXML(conn, xml, flags); if (!ret) goto error; return ret; @@ -12605,9 +12604,9 @@ virStoragePoolBuild(virStoragePoolPtr pool, goto error; } - if (conn->storageDriver && conn->storageDriver->poolBuild) { + if (conn->storageDriver && conn->storageDriver->storagePoolBuild) { int ret; - ret = conn->storageDriver->poolBuild(pool, flags); + ret = conn->storageDriver->storagePoolBuild(pool, flags); if (ret < 0) goto error; return ret; @@ -12648,9 +12647,9 @@ virStoragePoolUndefine(virStoragePoolPtr pool) goto error; } - if (conn->storageDriver && conn->storageDriver->poolUndefine) { + if (conn->storageDriver && conn->storageDriver->storagePoolUndefine) { int ret; - ret = conn->storageDriver->poolUndefine(pool); + ret = conn->storageDriver->storagePoolUndefine(pool); if (ret < 0) goto error; return ret; @@ -12693,9 +12692,9 @@ virStoragePoolCreate(virStoragePoolPtr pool, goto error; } - if (conn->storageDriver && conn->storageDriver->poolCreate) { + if (conn->storageDriver && conn->storageDriver->storagePoolCreate) { int ret; - ret = conn->storageDriver->poolCreate(pool, flags); + ret = conn->storageDriver->storagePoolCreate(pool, flags); if (ret < 0) goto error; return ret; @@ -12741,9 +12740,9 @@ virStoragePoolDestroy(virStoragePoolPtr pool) goto error; } - if (conn->storageDriver && conn->storageDriver->poolDestroy) { + if (conn->storageDriver && conn->storageDriver->storagePoolDestroy) { int ret; - ret = conn->storageDriver->poolDestroy(pool); + ret = conn->storageDriver->storagePoolDestroy(pool); if (ret < 0) goto error; return ret; @@ -12788,9 +12787,9 @@ virStoragePoolDelete(virStoragePoolPtr pool, goto error; } - if (conn->storageDriver && conn->storageDriver->poolDelete) { + if (conn->storageDriver && conn->storageDriver->storagePoolDelete) { int ret; - ret = conn->storageDriver->poolDelete(pool, flags); + ret = conn->storageDriver->storagePoolDelete(pool, flags); if (ret < 0) goto error; return ret; @@ -12893,9 +12892,9 @@ virStoragePoolRefresh(virStoragePoolPtr pool, goto error; } - if (conn->storageDriver && conn->storageDriver->poolRefresh) { + if (conn->storageDriver && conn->storageDriver->storagePoolRefresh) { int ret; - ret = conn->storageDriver->poolRefresh(pool, flags); + ret = conn->storageDriver->storagePoolRefresh(pool, flags); if (ret < 0) goto error; return ret; @@ -13033,9 +13032,9 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, conn = pool->conn; - if (conn->storageDriver->poolGetInfo) { + if (conn->storageDriver->storagePoolGetInfo) { int ret; - ret = conn->storageDriver->poolGetInfo(pool, info); + ret = conn->storageDriver->storagePoolGetInfo(pool, info); if (ret < 0) goto error; return ret; @@ -13077,9 +13076,9 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, conn = pool->conn; - if (conn->storageDriver && conn->storageDriver->poolGetXMLDesc) { + if (conn->storageDriver && conn->storageDriver->storagePoolGetXMLDesc) { char *ret; - ret = conn->storageDriver->poolGetXMLDesc(pool, flags); + ret = conn->storageDriver->storagePoolGetXMLDesc(pool, flags); if (!ret) goto error; return ret; @@ -13121,9 +13120,9 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, conn = pool->conn; - if (conn->storageDriver && conn->storageDriver->poolGetAutostart) { + if (conn->storageDriver && conn->storageDriver->storagePoolGetAutostart) { int ret; - ret = conn->storageDriver->poolGetAutostart(pool, autostart); + ret = conn->storageDriver->storagePoolGetAutostart(pool, autostart); if (ret < 0) goto error; return ret; @@ -13168,9 +13167,9 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool, conn = pool->conn; - if (conn->storageDriver && conn->storageDriver->poolSetAutostart) { + if (conn->storageDriver && conn->storageDriver->storagePoolSetAutostart) { int ret; - ret = conn->storageDriver->poolSetAutostart(pool, autostart); + ret = conn->storageDriver->storagePoolSetAutostart(pool, autostart); if (ret < 0) goto error; return ret; @@ -13217,9 +13216,9 @@ virStoragePoolListAllVolumes(virStoragePoolPtr pool, } if (pool->conn->storageDriver && - pool->conn->storageDriver->poolListAllVolumes) { + pool->conn->storageDriver->storagePoolListAllVolumes) { int ret; - ret = pool->conn->storageDriver->poolListAllVolumes(pool, vols, flags); + ret = pool->conn->storageDriver->storagePoolListAllVolumes(pool, vols, flags); if (ret < 0) goto error; return ret; @@ -13253,9 +13252,9 @@ virStoragePoolNumOfVolumes(virStoragePoolPtr pool) return -1; } - if (pool->conn->storageDriver && pool->conn->storageDriver->poolNumOfVolumes) { + if (pool->conn->storageDriver && pool->conn->storageDriver->storagePoolNumOfVolumes) { int ret; - ret = pool->conn->storageDriver->poolNumOfVolumes(pool); + ret = pool->conn->storageDriver->storagePoolNumOfVolumes(pool); if (ret < 0) goto error; return ret; @@ -13300,9 +13299,9 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (pool->conn->storageDriver && pool->conn->storageDriver->poolListVolumes) { + if (pool->conn->storageDriver && pool->conn->storageDriver->storagePoolListVolumes) { int ret; - ret = pool->conn->storageDriver->poolListVolumes(pool, names, maxnames); + ret = pool->conn->storageDriver->storagePoolListVolumes(pool, names, maxnames); if (ret < 0) goto error; return ret; @@ -13372,9 +13371,9 @@ virStorageVolLookupByName(virStoragePoolPtr pool, virCheckNonNullArgGoto(name, error); - if (pool->conn->storageDriver && pool->conn->storageDriver->volLookupByName) { + if (pool->conn->storageDriver && pool->conn->storageDriver->storageVolLookupByName) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->volLookupByName(pool, name); + ret = pool->conn->storageDriver->storageVolLookupByName(pool, name); if (!ret) goto error; return ret; @@ -13415,9 +13414,9 @@ virStorageVolLookupByKey(virConnectPtr conn, virCheckNonNullArgGoto(key, error); - if (conn->storageDriver && conn->storageDriver->volLookupByKey) { + if (conn->storageDriver && conn->storageDriver->storageVolLookupByKey) { virStorageVolPtr ret; - ret = conn->storageDriver->volLookupByKey(conn, key); + ret = conn->storageDriver->storageVolLookupByKey(conn, key); if (!ret) goto error; return ret; @@ -13455,9 +13454,9 @@ virStorageVolLookupByPath(virConnectPtr conn, } virCheckNonNullArgGoto(path, error); - if (conn->storageDriver && conn->storageDriver->volLookupByPath) { + if (conn->storageDriver && conn->storageDriver->storageVolLookupByPath) { virStorageVolPtr ret; - ret = conn->storageDriver->volLookupByPath(conn, path); + ret = conn->storageDriver->storageVolLookupByPath(conn, path); if (!ret) goto error; return ret; @@ -13561,9 +13560,9 @@ virStorageVolCreateXML(virStoragePoolPtr pool, goto error; } - if (pool->conn->storageDriver && pool->conn->storageDriver->volCreateXML) { + if (pool->conn->storageDriver && pool->conn->storageDriver->storageVolCreateXML) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->volCreateXML(pool, xmlDesc, flags); + ret = pool->conn->storageDriver->storageVolCreateXML(pool, xmlDesc, flags); if (!ret) goto error; return ret; @@ -13627,9 +13626,9 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, } if (pool->conn->storageDriver && - pool->conn->storageDriver->volCreateXMLFrom) { + pool->conn->storageDriver->storageVolCreateXMLFrom) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->volCreateXMLFrom(pool, xmlDesc, + ret = pool->conn->storageDriver->storageVolCreateXMLFrom(pool, xmlDesc, clonevol, flags); if (!ret) goto error; @@ -13693,9 +13692,9 @@ virStorageVolDownload(virStorageVolPtr vol, } if (vol->conn->storageDriver && - vol->conn->storageDriver->volDownload) { + vol->conn->storageDriver->storageVolDownload) { int ret; - ret = vol->conn->storageDriver->volDownload(vol, + ret = vol->conn->storageDriver->storageVolDownload(vol, stream, offset, length, @@ -13764,9 +13763,9 @@ virStorageVolUpload(virStorageVolPtr vol, } if (vol->conn->storageDriver && - vol->conn->storageDriver->volUpload) { + vol->conn->storageDriver->storageVolUpload) { int ret; - ret = vol->conn->storageDriver->volUpload(vol, + ret = vol->conn->storageDriver->storageVolUpload(vol, stream, offset, length, @@ -13814,9 +13813,9 @@ virStorageVolDelete(virStorageVolPtr vol, goto error; } - if (conn->storageDriver && conn->storageDriver->volDelete) { + if (conn->storageDriver && conn->storageDriver->storageVolDelete) { int ret; - ret = conn->storageDriver->volDelete(vol, flags); + ret = conn->storageDriver->storageVolDelete(vol, flags); if (ret < 0) goto error; return ret; @@ -13860,9 +13859,9 @@ virStorageVolWipe(virStorageVolPtr vol, goto error; } - if (conn->storageDriver && conn->storageDriver->volWipe) { + if (conn->storageDriver && conn->storageDriver->storageVolWipe) { int ret; - ret = conn->storageDriver->volWipe(vol, flags); + ret = conn->storageDriver->storageVolWipe(vol, flags); if (ret < 0) { goto error; } @@ -13910,9 +13909,9 @@ virStorageVolWipePattern(virStorageVolPtr vol, goto error; } - if (conn->storageDriver && conn->storageDriver->volWipePattern) { + if (conn->storageDriver && conn->storageDriver->storageVolWipePattern) { int ret; - ret = conn->storageDriver->volWipePattern(vol, algorithm, flags); + ret = conn->storageDriver->storageVolWipePattern(vol, algorithm, flags); if (ret < 0) { goto error; } @@ -14012,9 +14011,9 @@ virStorageVolGetInfo(virStorageVolPtr vol, conn = vol->conn; - if (conn->storageDriver->volGetInfo){ + if (conn->storageDriver->storageVolGetInfo){ int ret; - ret = conn->storageDriver->volGetInfo(vol, info); + ret = conn->storageDriver->storageVolGetInfo(vol, info); if (ret < 0) goto error; return ret; @@ -14055,9 +14054,9 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, conn = vol->conn; - if (conn->storageDriver && conn->storageDriver->volGetXMLDesc) { + if (conn->storageDriver && conn->storageDriver->storageVolGetXMLDesc) { char *ret; - ret = conn->storageDriver->volGetXMLDesc(vol, flags); + ret = conn->storageDriver->storageVolGetXMLDesc(vol, flags); if (!ret) goto error; return ret; @@ -14100,9 +14099,9 @@ virStorageVolGetPath(virStorageVolPtr vol) conn = vol->conn; - if (conn->storageDriver && conn->storageDriver->volGetPath) { + if (conn->storageDriver && conn->storageDriver->storageVolGetPath) { char *ret; - ret = conn->storageDriver->volGetPath(vol); + ret = conn->storageDriver->storageVolGetPath(vol); if (!ret) goto error; return ret; @@ -14180,9 +14179,9 @@ virStorageVolResize(virStorageVolPtr vol, goto error; } - if (conn->storageDriver && conn->storageDriver->volResize) { + if (conn->storageDriver && conn->storageDriver->storageVolResize) { int ret; - ret = conn->storageDriver->volResize(vol, capacity, flags); + ret = conn->storageDriver->storageVolResize(vol, capacity, flags); if (ret < 0) goto error; return ret; @@ -14221,9 +14220,9 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) return -1; } - if (conn->deviceMonitor && conn->deviceMonitor->numOfDevices) { + if (conn->deviceMonitor && conn->deviceMonitor->nodeNumOfDevices) { int ret; - ret = conn->deviceMonitor->numOfDevices(conn, cap, flags); + ret = conn->deviceMonitor->nodeNumOfDevices(conn, cap, flags); if (ret < 0) goto error; return ret; @@ -14293,9 +14292,9 @@ virConnectListAllNodeDevices(virConnectPtr conn, } if (conn->deviceMonitor && - conn->deviceMonitor->listAllNodeDevices) { + conn->deviceMonitor->connectListAllNodeDevices) { int ret; - ret = conn->deviceMonitor->listAllNodeDevices(conn, devices, flags); + ret = conn->deviceMonitor->connectListAllNodeDevices(conn, devices, flags); if (ret < 0) goto error; return ret; @@ -14344,9 +14343,9 @@ virNodeListDevices(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->deviceMonitor && conn->deviceMonitor->listDevices) { + if (conn->deviceMonitor && conn->deviceMonitor->nodeListDevices) { int ret; - ret = conn->deviceMonitor->listDevices(conn, cap, names, maxnames, flags); + ret = conn->deviceMonitor->nodeListDevices(conn, cap, names, maxnames, flags); if (ret < 0) goto error; return ret; @@ -14383,9 +14382,9 @@ virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) virCheckNonNullArgGoto(name, error); - if (conn->deviceMonitor && conn->deviceMonitor->deviceLookupByName) { + if (conn->deviceMonitor && conn->deviceMonitor->nodeDeviceLookupByName) { virNodeDevicePtr ret; - ret = conn->deviceMonitor->deviceLookupByName(conn, name); + ret = conn->deviceMonitor->nodeDeviceLookupByName(conn, name); if (!ret) goto error; return ret; @@ -14429,9 +14428,9 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virCheckNonNullArgGoto(wwpn, error); if (conn->deviceMonitor && - conn->deviceMonitor->deviceLookupSCSIHostByWWN) { + conn->deviceMonitor->nodeDeviceLookupSCSIHostByWWN) { virNodeDevicePtr ret; - ret = conn->deviceMonitor->deviceLookupSCSIHostByWWN(conn, wwnn, + ret = conn->deviceMonitor->nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, flags); if (!ret) goto error; @@ -14467,9 +14466,9 @@ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) return NULL; } - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceGetXMLDesc) { + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceGetXMLDesc) { char *ret; - ret = dev->conn->deviceMonitor->deviceGetXMLDesc(dev, flags); + ret = dev->conn->deviceMonitor->nodeDeviceGetXMLDesc(dev, flags); if (!ret) goto error; return ret; @@ -14526,8 +14525,8 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) } if (!dev->parent) { - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceGetParent) { - dev->parent = dev->conn->deviceMonitor->deviceGetParent(dev); + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceGetParent) { + dev->parent = dev->conn->deviceMonitor->nodeDeviceGetParent(dev); } else { virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); virDispatchError(dev->conn); @@ -14557,9 +14556,9 @@ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) return -1; } - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceNumOfCaps) { + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceNumOfCaps) { int ret; - ret = dev->conn->deviceMonitor->deviceNumOfCaps(dev); + ret = dev->conn->deviceMonitor->nodeDeviceNumOfCaps(dev); if (ret < 0) goto error; return ret; @@ -14600,9 +14599,9 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceListCaps) { + if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceListCaps) { int ret; - ret = dev->conn->deviceMonitor->deviceListCaps(dev, names, maxnames); + ret = dev->conn->deviceMonitor->nodeDeviceListCaps(dev, names, maxnames); if (ret < 0) goto error; return ret; @@ -14856,8 +14855,8 @@ virNodeDeviceCreateXML(virConnectPtr conn, virCheckNonNullArgGoto(xmlDesc, error); if (conn->deviceMonitor && - conn->deviceMonitor->deviceCreateXML) { - virNodeDevicePtr dev = conn->deviceMonitor->deviceCreateXML(conn, xmlDesc, flags); + conn->deviceMonitor->nodeDeviceCreateXML) { + virNodeDevicePtr dev = conn->deviceMonitor->nodeDeviceCreateXML(conn, xmlDesc, flags); if (dev == NULL) goto error; return dev; @@ -14899,8 +14898,8 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) } if (dev->conn->deviceMonitor && - dev->conn->deviceMonitor->deviceDestroy) { - int retval = dev->conn->deviceMonitor->deviceDestroy(dev); + dev->conn->deviceMonitor->nodeDeviceDestroy) { + int retval = dev->conn->deviceMonitor->nodeDeviceDestroy(dev); if (retval < 0) { goto error; } @@ -14959,9 +14958,9 @@ virConnectDomainEventRegister(virConnectPtr conn, } virCheckNonNullArgGoto(cb, error); - if ((conn->driver) && (conn->driver->domainEventRegister)) { + if ((conn->driver) && (conn->driver->connectDomainEventRegister)) { int ret; - ret = conn->driver->domainEventRegister(conn, cb, opaque, freecb); + ret = conn->driver->connectDomainEventRegister(conn, cb, opaque, freecb); if (ret < 0) goto error; return ret; @@ -15002,9 +15001,9 @@ virConnectDomainEventDeregister(virConnectPtr conn, } virCheckNonNullArgGoto(cb, error); - if ((conn->driver) && (conn->driver->domainEventDeregister)) { + if ((conn->driver) && (conn->driver->connectDomainEventDeregister)) { int ret; - ret = conn->driver->domainEventDeregister(conn, cb); + ret = conn->driver->connectDomainEventDeregister(conn, cb); if (ret < 0) goto error; return ret; @@ -15065,10 +15064,10 @@ virConnectNumOfSecrets(virConnectPtr conn) } if (conn->secretDriver != NULL && - conn->secretDriver->numOfSecrets != NULL) { + conn->secretDriver->connectNumOfSecrets != NULL) { int ret; - ret = conn->secretDriver->numOfSecrets(conn); + ret = conn->secretDriver->connectNumOfSecrets(conn); if (ret < 0) goto error; return ret; @@ -15133,9 +15132,9 @@ virConnectListAllSecrets(virConnectPtr conn, } if (conn->secretDriver && - conn->secretDriver->listAllSecrets) { + conn->secretDriver->connectListAllSecrets) { int ret; - ret = conn->secretDriver->listAllSecrets(conn, secrets, flags); + ret = conn->secretDriver->connectListAllSecrets(conn, secrets, flags); if (ret < 0) goto error; return ret; @@ -15173,10 +15172,10 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) virCheckNonNullArgGoto(uuids, error); virCheckNonNegativeArgGoto(maxuuids, error); - if (conn->secretDriver != NULL && conn->secretDriver->listSecrets != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->connectListSecrets != NULL) { int ret; - ret = conn->secretDriver->listSecrets(conn, uuids, maxuuids); + ret = conn->secretDriver->connectListSecrets(conn, uuids, maxuuids); if (ret < 0) goto error; return ret; @@ -15215,9 +15214,9 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virCheckNonNullArgGoto(uuid, error); if (conn->secretDriver && - conn->secretDriver->lookupByUUID) { + conn->secretDriver->secretLookupByUUID) { virSecretPtr ret; - ret = conn->secretDriver->lookupByUUID(conn, uuid); + ret = conn->secretDriver->secretLookupByUUID(conn, uuid); if (!ret) goto error; return ret; @@ -15301,9 +15300,9 @@ virSecretLookupByUsage(virConnectPtr conn, virCheckNonNullArgGoto(usageID, error); if (conn->secretDriver && - conn->secretDriver->lookupByUsage) { + conn->secretDriver->secretLookupByUsage) { virSecretPtr ret; - ret = conn->secretDriver->lookupByUsage(conn, usageType, usageID); + ret = conn->secretDriver->secretLookupByUsage(conn, usageType, usageID); if (!ret) goto error; return ret; @@ -15350,10 +15349,10 @@ virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) } virCheckNonNullArgGoto(xml, error); - if (conn->secretDriver != NULL && conn->secretDriver->defineXML != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->secretDefineXML != NULL) { virSecretPtr ret; - ret = conn->secretDriver->defineXML(conn, xml, flags); + ret = conn->secretDriver->secretDefineXML(conn, xml, flags); if (ret == NULL) goto error; return ret; @@ -15521,10 +15520,10 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) } conn = secret->conn; - if (conn->secretDriver != NULL && conn->secretDriver->getXMLDesc != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->secretGetXMLDesc != NULL) { char *ret; - ret = conn->secretDriver->getXMLDesc(secret, flags); + ret = conn->secretDriver->secretGetXMLDesc(secret, flags); if (ret == NULL) goto error; return ret; @@ -15571,10 +15570,10 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, } virCheckNonNullArgGoto(value, error); - if (conn->secretDriver != NULL && conn->secretDriver->setValue != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->secretSetValue != NULL) { int ret; - ret = conn->secretDriver->setValue(secret, value, value_size, flags); + ret = conn->secretDriver->secretSetValue(secret, value, value_size, flags); if (ret < 0) goto error; return ret; @@ -15619,10 +15618,10 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) } virCheckNonNullArgGoto(value_size, error); - if (conn->secretDriver != NULL && conn->secretDriver->getValue != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->secretGetValue != NULL) { unsigned char *ret; - ret = conn->secretDriver->getValue(secret, value_size, flags, 0); + ret = conn->secretDriver->secretGetValue(secret, value_size, flags, 0); if (ret == NULL) goto error; return ret; @@ -15664,10 +15663,10 @@ virSecretUndefine(virSecretPtr secret) goto error; } - if (conn->secretDriver != NULL && conn->secretDriver->undefine != NULL) { + if (conn->secretDriver != NULL && conn->secretDriver->secretUndefine != NULL) { int ret; - ret = conn->secretDriver->undefine(secret); + ret = conn->secretDriver->secretUndefine(secret); if (ret < 0) goto error; return ret; @@ -16231,9 +16230,9 @@ int virStreamEventAddCallback(virStreamPtr stream, } if (stream->driver && - stream->driver->streamAddCallback) { + stream->driver->streamEventAddCallback) { int ret; - ret = (stream->driver->streamAddCallback)(stream, events, cb, opaque, ff); + ret = (stream->driver->streamEventAddCallback)(stream, events, cb, opaque, ff); if (ret < 0) goto error; return ret; @@ -16273,9 +16272,9 @@ int virStreamEventUpdateCallback(virStreamPtr stream, } if (stream->driver && - stream->driver->streamUpdateCallback) { + stream->driver->streamEventUpdateCallback) { int ret; - ret = (stream->driver->streamUpdateCallback)(stream, events); + ret = (stream->driver->streamEventUpdateCallback)(stream, events); if (ret < 0) goto error; return ret; @@ -16309,9 +16308,9 @@ int virStreamEventRemoveCallback(virStreamPtr stream) } if (stream->driver && - stream->driver->streamRemoveCallback) { + stream->driver->streamEventRemoveCallback) { int ret; - ret = (stream->driver->streamRemoveCallback)(stream); + ret = (stream->driver->streamEventRemoveCallback)(stream); if (ret < 0) goto error; return ret; @@ -16633,9 +16632,9 @@ int virStoragePoolIsActive(virStoragePoolPtr pool) virDispatchError(NULL); return -1; } - if (pool->conn->storageDriver->poolIsActive) { + if (pool->conn->storageDriver->storagePoolIsActive) { int ret; - ret = pool->conn->storageDriver->poolIsActive(pool); + ret = pool->conn->storageDriver->storagePoolIsActive(pool); if (ret < 0) goto error; return ret; @@ -16668,9 +16667,9 @@ int virStoragePoolIsPersistent(virStoragePoolPtr pool) virDispatchError(NULL); return -1; } - if (pool->conn->storageDriver->poolIsPersistent) { + if (pool->conn->storageDriver->storagePoolIsPersistent) { int ret; - ret = pool->conn->storageDriver->poolIsPersistent(pool); + ret = pool->conn->storageDriver->storagePoolIsPersistent(pool); if (ret < 0) goto error; return ret; @@ -16705,9 +16704,9 @@ virConnectNumOfNWFilters(virConnectPtr conn) return -1; } - if (conn->nwfilterDriver && conn->nwfilterDriver->numOfNWFilters) { + if (conn->nwfilterDriver && conn->nwfilterDriver->connectNumOfNWFilters) { int ret; - ret = conn->nwfilterDriver->numOfNWFilters(conn); + ret = conn->nwfilterDriver->connectNumOfNWFilters(conn); if (ret < 0) goto error; return ret; @@ -16756,9 +16755,9 @@ virConnectListAllNWFilters(virConnectPtr conn, } if (conn->nwfilterDriver && - conn->nwfilterDriver->listAllNWFilters) { + conn->nwfilterDriver->connectListAllNWFilters) { int ret; - ret = conn->nwfilterDriver->listAllNWFilters(conn, filters, flags); + ret = conn->nwfilterDriver->connectListAllNWFilters(conn, filters, flags); if (ret < 0) goto error; return ret; @@ -16797,9 +16796,9 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->nwfilterDriver && conn->nwfilterDriver->listNWFilters) { + if (conn->nwfilterDriver && conn->nwfilterDriver->connectListNWFilters) { int ret; - ret = conn->nwfilterDriver->listNWFilters(conn, names, maxnames); + ret = conn->nwfilterDriver->connectListNWFilters(conn, names, maxnames); if (ret < 0) goto error; return ret; @@ -17078,9 +17077,9 @@ virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) goto error; } - if (conn->nwfilterDriver && conn->nwfilterDriver->defineXML) { + if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterDefineXML) { virNWFilterPtr ret; - ret = conn->nwfilterDriver->defineXML(conn, xmlDesc); + ret = conn->nwfilterDriver->nwfilterDefineXML(conn, xmlDesc); if (!ret) goto error; return ret; @@ -17124,9 +17123,9 @@ virNWFilterUndefine(virNWFilterPtr nwfilter) goto error; } - if (conn->nwfilterDriver && conn->nwfilterDriver->undefine) { + if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterUndefine) { int ret; - ret = conn->nwfilterDriver->undefine(nwfilter); + ret = conn->nwfilterDriver->nwfilterUndefine(nwfilter); if (ret < 0) goto error; return ret; @@ -17167,9 +17166,9 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) conn = nwfilter->conn; - if (conn->nwfilterDriver && conn->nwfilterDriver->getXMLDesc) { + if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterGetXMLDesc) { char *ret; - ret = conn->nwfilterDriver->getXMLDesc(nwfilter, flags); + ret = conn->nwfilterDriver->nwfilterGetXMLDesc(nwfilter, flags); if (!ret) goto error; return ret; @@ -17267,9 +17266,9 @@ int virConnectIsEncrypted(virConnectPtr conn) virDispatchError(NULL); return -1; } - if (conn->driver->isEncrypted) { + if (conn->driver->connectIsEncrypted) { int ret; - ret = conn->driver->isEncrypted(conn); + ret = conn->driver->connectIsEncrypted(conn); if (ret < 0) goto error; return ret; @@ -17304,9 +17303,9 @@ int virConnectIsSecure(virConnectPtr conn) virDispatchError(NULL); return -1; } - if (conn->driver->isSecure) { + if (conn->driver->connectIsSecure) { int ret; - ret = conn->driver->isSecure(conn); + ret = conn->driver->connectIsSecure(conn); if (ret < 0) goto error; return ret; @@ -17345,10 +17344,10 @@ virConnectCompareCPU(virConnectPtr conn, } virCheckNonNullArgGoto(xmlDesc, error); - if (conn->driver->cpuCompare) { + if (conn->driver->connectCompareCPU) { int ret; - ret = conn->driver->cpuCompare(conn, xmlDesc, flags); + ret = conn->driver->connectCompareCPU(conn, xmlDesc, flags); if (ret == VIR_CPU_COMPARE_ERROR) goto error; return ret; @@ -17399,10 +17398,10 @@ virConnectBaselineCPU(virConnectPtr conn, } virCheckNonNullArgGoto(xmlCPUs, error); - if (conn->driver->cpuBaseline) { + if (conn->driver->connectBaselineCPU) { char *cpu; - cpu = conn->driver->cpuBaseline(conn, xmlCPUs, ncpus, flags); + cpu = conn->driver->connectBaselineCPU(conn, xmlCPUs, ncpus, flags); if (!cpu) goto error; return cpu; @@ -17872,9 +17871,9 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, goto error; } - if ((conn->driver) && (conn->driver->domainEventRegisterAny)) { + if ((conn->driver) && (conn->driver->connectDomainEventRegisterAny)) { int ret; - ret = conn->driver->domainEventRegisterAny(conn, dom, eventID, cb, opaque, freecb); + ret = conn->driver->connectDomainEventRegisterAny(conn, dom, eventID, cb, opaque, freecb); if (ret < 0) goto error; return ret; @@ -17911,9 +17910,9 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn, } virCheckNonNegativeArgGoto(callbackID, error); - if ((conn->driver) && (conn->driver->domainEventDeregisterAny)) { + if ((conn->driver) && (conn->driver->connectDomainEventDeregisterAny)) { int ret; - ret = conn->driver->domainEventDeregisterAny(conn, callbackID); + ret = conn->driver->connectDomainEventDeregisterAny(conn, callbackID); if (ret < 0) goto error; return ret; @@ -20108,8 +20107,8 @@ int virConnectSetKeepAlive(virConnectPtr conn, return -1; } - if (conn->driver->setKeepAlive) { - ret = conn->driver->setKeepAlive(conn, interval, count); + if (conn->driver->connectSetKeepAlive) { + ret = conn->driver->connectSetKeepAlive(conn, interval, count); if (ret < 0) goto error; return ret; @@ -20144,9 +20143,9 @@ int virConnectIsAlive(virConnectPtr conn) virDispatchError(NULL); return -1; } - if (conn->driver->isAlive) { + if (conn->driver->connectIsAlive) { int ret; - ret = conn->driver->isAlive(conn); + ret = conn->driver->connectIsAlive(conn); if (ret < 0) goto error; return ret; diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 595d2db..7b49be2 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -113,7 +113,7 @@ enum { }; -int virDrvSupportsFeature (virConnectPtr conn, int feature); +int virConnectSupportsFeature (virConnectPtr conn, int feature); int virDomainMigratePrepare (virConnectPtr dconn, char **cookie, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 82fb7ac..c4ae681 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -700,6 +700,7 @@ virFDStreamOpenFile; # libvirt_internal.h +virConnectSupportsFeature; virDomainMigrateBegin3; virDomainMigrateConfirm3; virDomainMigrateFinish; @@ -712,7 +713,6 @@ virDomainMigratePrepare2; virDomainMigratePrepare3; virDomainMigratePrepareTunnel; virDomainMigratePrepareTunnel3; -virDrvSupportsFeature; virRegisterDeviceMonitor; virRegisterDriver; virRegisterInterfaceDriver; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 30541ce..feb7161 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4195,17 +4195,17 @@ libxlListAllDomains(virConnectPtr conn, static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, .name = "xenlight", - .open = libxlOpen, /* 0.9.0 */ - .close = libxlClose, /* 0.9.0 */ - .type = libxlGetType, /* 0.9.0 */ - .version = libxlGetVersion, /* 0.9.0 */ - .getHostname = virGetHostname, /* 0.9.0 */ - .getMaxVcpus = libxlGetMaxVcpus, /* 0.9.0 */ + .connectOpen = libxlOpen, /* 0.9.0 */ + .connectClose = libxlClose, /* 0.9.0 */ + .connectGetType = libxlGetType, /* 0.9.0 */ + .connectGetVersion = libxlGetVersion, /* 0.9.0 */ + .connectGetHostname = virGetHostname, /* 0.9.0 */ + .connectGetMaxVcpus = libxlGetMaxVcpus, /* 0.9.0 */ .nodeGetInfo = libxlNodeGetInfo, /* 0.9.0 */ - .getCapabilities = libxlGetCapabilities, /* 0.9.0 */ - .listDomains = libxlListDomains, /* 0.9.0 */ - .numOfDomains = libxlNumDomains, /* 0.9.0 */ - .listAllDomains = libxlListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = libxlGetCapabilities, /* 0.9.0 */ + .connectListDomains = libxlListDomains, /* 0.9.0 */ + .connectNumOfDomains = libxlNumDomains, /* 0.9.0 */ + .connectListAllDomains = libxlListAllDomains, /* 0.9.13 */ .domainCreateXML = libxlDomainCreateXML, /* 0.9.0 */ .domainLookupByID = libxlDomainLookupByID, /* 0.9.0 */ .domainLookupByUUID = libxlDomainLookupByUUID, /* 0.9.0 */ @@ -4235,10 +4235,10 @@ static virDriver libxlDriver = { .domainPinVcpu = libxlDomainPinVcpu, /* 0.9.0 */ .domainGetVcpus = libxlDomainGetVcpus, /* 0.9.0 */ .domainGetXMLDesc = libxlDomainGetXMLDesc, /* 0.9.0 */ - .domainXMLFromNative = libxlDomainXMLFromNative, /* 0.9.0 */ - .domainXMLToNative = libxlDomainXMLToNative, /* 0.9.0 */ - .listDefinedDomains = libxlListDefinedDomains, /* 0.9.0 */ - .numOfDefinedDomains = libxlNumDefinedDomains, /* 0.9.0 */ + .connectDomainXMLFromNative = libxlDomainXMLFromNative, /* 0.9.0 */ + .connectDomainXMLToNative = libxlDomainXMLToNative, /* 0.9.0 */ + .connectListDefinedDomains = libxlListDefinedDomains, /* 0.9.0 */ + .connectNumOfDefinedDomains = libxlNumDefinedDomains, /* 0.9.0 */ .domainCreate = libxlDomainCreate, /* 0.9.0 */ .domainCreateWithFlags = libxlDomainCreateWithFlags, /* 0.9.0 */ .domainDefineXML = libxlDomainDefineXML, /* 0.9.0 */ @@ -4257,24 +4257,24 @@ static virDriver libxlDriver = { .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */ .domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ - .domainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ - .domainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ + .connectDomainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ + .connectDomainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ .domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */ .domainHasManagedSaveImage = libxlDomainHasManagedSaveImage, /* 0.9.2 */ .domainManagedSaveRemove = libxlDomainManagedSaveRemove, /* 0.9.2 */ .domainIsActive = libxlDomainIsActive, /* 0.9.0 */ .domainIsPersistent = libxlDomainIsPersistent, /* 0.9.0 */ .domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */ - .domainEventRegisterAny = libxlDomainEventRegisterAny, /* 0.9.0 */ - .domainEventDeregisterAny = libxlDomainEventDeregisterAny, /* 0.9.0 */ - .isAlive = libxlIsAlive, /* 0.9.8 */ + .connectDomainEventRegisterAny = libxlDomainEventRegisterAny, /* 0.9.0 */ + .connectDomainEventDeregisterAny = libxlDomainEventDeregisterAny, /* 0.9.0 */ + .connectIsAlive = libxlIsAlive, /* 0.9.8 */ }; static virStateDriver libxlStateDriver = { .name = "LIBXL", - .initialize = libxlStartup, - .cleanup = libxlShutdown, - .reload = libxlReload, + .stateInitialize = libxlStartup, + .stateCleanup = libxlShutdown, + .stateReload = libxlReload, }; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ba0fa0a..2a42b16 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4399,16 +4399,16 @@ lxcGetSysinfo(virConnectPtr conn, unsigned int flags) static virDriver lxcDriver = { .no = VIR_DRV_LXC, .name = LXC_DRIVER_NAME, - .open = lxcOpen, /* 0.4.2 */ - .close = lxcClose, /* 0.4.2 */ - .version = lxcVersion, /* 0.4.6 */ - .getHostname = virGetHostname, /* 0.6.3 */ - .getSysinfo = lxcGetSysinfo, /* 1.0.5 */ + .connectOpen = lxcOpen, /* 0.4.2 */ + .connectClose = lxcClose, /* 0.4.2 */ + .connectGetVersion = lxcVersion, /* 0.4.6 */ + .connectGetHostname = virGetHostname, /* 0.6.3 */ + .connectGetSysinfo = lxcGetSysinfo, /* 1.0.5 */ .nodeGetInfo = nodeGetInfo, /* 0.6.5 */ - .getCapabilities = lxcGetCapabilities, /* 0.6.5 */ - .listDomains = lxcListDomains, /* 0.4.2 */ - .numOfDomains = lxcNumDomains, /* 0.4.2 */ - .listAllDomains = lxcListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = lxcGetCapabilities, /* 0.6.5 */ + .connectListDomains = lxcListDomains, /* 0.4.2 */ + .connectNumOfDomains = lxcNumDomains, /* 0.4.2 */ + .connectListAllDomains = lxcListAllDomains, /* 0.9.13 */ .domainCreateXML = lxcDomainCreateAndStart, /* 0.4.4 */ .domainLookupByID = lxcDomainLookupByID, /* 0.4.2 */ .domainLookupByUUID = lxcDomainLookupByUUID, /* 0.4.2 */ @@ -4430,8 +4430,8 @@ static virDriver lxcDriver = { .domainGetSecurityLabel = lxcDomainGetSecurityLabel, /* 0.9.10 */ .nodeGetSecurityModel = lxcNodeGetSecurityModel, /* 0.9.10 */ .domainGetXMLDesc = lxcDomainGetXMLDesc, /* 0.4.2 */ - .listDefinedDomains = lxcListDefinedDomains, /* 0.4.2 */ - .numOfDefinedDomains = lxcNumDefinedDomains, /* 0.4.2 */ + .connectListDefinedDomains = lxcListDefinedDomains, /* 0.4.2 */ + .connectNumOfDefinedDomains = lxcNumDefinedDomains, /* 0.4.2 */ .domainCreate = lxcDomainStart, /* 0.4.4 */ .domainCreateWithFlags = lxcDomainStartWithFlags, /* 0.8.2 */ .domainDefineXML = lxcDomainDefine, /* 0.4.2 */ @@ -4455,17 +4455,17 @@ static virDriver lxcDriver = { .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.6.5 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.6.5 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .domainEventRegister = lxcDomainEventRegister, /* 0.7.0 */ - .domainEventDeregister = lxcDomainEventDeregister, /* 0.7.0 */ - .isEncrypted = lxcIsEncrypted, /* 0.7.3 */ - .isSecure = lxcIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = lxcDomainEventRegister, /* 0.7.0 */ + .connectDomainEventDeregister = lxcDomainEventDeregister, /* 0.7.0 */ + .connectIsEncrypted = lxcIsEncrypted, /* 0.7.3 */ + .connectIsSecure = lxcIsSecure, /* 0.7.3 */ .domainIsActive = lxcDomainIsActive, /* 0.7.3 */ .domainIsPersistent = lxcDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = lxcDomainIsUpdated, /* 0.8.6 */ - .domainEventRegisterAny = lxcDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = lxcDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = lxcDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = lxcDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = lxcDomainOpenConsole, /* 0.8.6 */ - .isAlive = lxcIsAlive, /* 0.9.8 */ + .connectIsAlive = lxcIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ @@ -4478,9 +4478,9 @@ static virDriver lxcDriver = { static virStateDriver lxcStateDriver = { .name = LXC_DRIVER_NAME, - .initialize = lxcStartup, - .cleanup = lxcShutdown, - .reload = lxcReload, + .stateInitialize = lxcStartup, + .stateCleanup = lxcShutdown, + .stateReload = lxcReload, }; int lxcRegister(void) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 27dd230..ab37d85 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3592,13 +3592,13 @@ cleanup: static virNetworkDriver networkDriver = { "Network", - .open = networkOpenNetwork, /* 0.2.0 */ - .close = networkCloseNetwork, /* 0.2.0 */ - .numOfNetworks = networkNumNetworks, /* 0.2.0 */ - .listNetworks = networkListNetworks, /* 0.2.0 */ - .numOfDefinedNetworks = networkNumDefinedNetworks, /* 0.2.0 */ - .listDefinedNetworks = networkListDefinedNetworks, /* 0.2.0 */ - .listAllNetworks = networkListAllNetworks, /* 0.10.2 */ + .connectOpen = networkOpenNetwork, /* 0.2.0 */ + .connectClose = networkCloseNetwork, /* 0.2.0 */ + .connectNumOfNetworks = networkNumNetworks, /* 0.2.0 */ + .connectListNetworks = networkListNetworks, /* 0.2.0 */ + .connectNumOfDefinedNetworks = networkNumDefinedNetworks, /* 0.2.0 */ + .connectListDefinedNetworks = networkListDefinedNetworks, /* 0.2.0 */ + .connectListAllNetworks = networkListAllNetworks, /* 0.10.2 */ .networkLookupByUUID = networkLookupByUUID, /* 0.2.0 */ .networkLookupByName = networkLookupByName, /* 0.2.0 */ .networkCreateXML = networkCreate, /* 0.2.0 */ @@ -3617,9 +3617,9 @@ static virNetworkDriver networkDriver = { static virStateDriver networkStateDriver = { .name = "Network", - .initialize = networkStartup, - .cleanup = networkShutdown, - .reload = networkReload, + .stateInitialize = networkStartup, + .stateCleanup = networkShutdown, + .stateReload = networkReload, }; int networkRegister(void) { diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 4955c43..16c59d9 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -763,27 +763,27 @@ static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDeviceMonitor halDeviceMonitor = { .name = "halDeviceMonitor", - .open = halNodeDrvOpen, /* 0.5.0 */ - .close = halNodeDrvClose, /* 0.5.0 */ - .numOfDevices = nodeNumOfDevices, /* 0.5.0 */ - .listDevices = nodeListDevices, /* 0.5.0 */ - .listAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ - .deviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */ - .deviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ - .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */ - .deviceGetParent = nodeDeviceGetParent, /* 0.5.0 */ - .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.5.0 */ - .deviceListCaps = nodeDeviceListCaps, /* 0.5.0 */ - .deviceCreateXML = nodeDeviceCreateXML, /* 0.6.5 */ - .deviceDestroy = nodeDeviceDestroy, /* 0.6.5 */ + .connectOpen = halNodeDrvOpen, /* 0.5.0 */ + .connectClose = halNodeDrvClose, /* 0.5.0 */ + .nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */ + .nodeListDevices = nodeListDevices, /* 0.5.0 */ + .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ + .nodeDeviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */ + .nodeDeviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ + .nodeDeviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */ + .nodeDeviceGetParent = nodeDeviceGetParent, /* 0.5.0 */ + .nodeDeviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.5.0 */ + .nodeDeviceListCaps = nodeDeviceListCaps, /* 0.5.0 */ + .nodeDeviceCreateXML = nodeDeviceCreateXML, /* 0.6.5 */ + .nodeDeviceDestroy = nodeDeviceDestroy, /* 0.6.5 */ }; static virStateDriver halStateDriver = { .name = "HAL", - .initialize = halDeviceMonitorStartup, /* 0.5.0 */ - .cleanup = halDeviceMonitorShutdown, /* 0.5.0 */ - .reload = halDeviceMonitorReload, /* 0.5.0 */ + .stateInitialize = halDeviceMonitorStartup, /* 0.5.0 */ + .stateCleanup = halDeviceMonitorShutdown, /* 0.5.0 */ + .stateReload = halDeviceMonitorReload, /* 0.5.0 */ }; int halNodeRegister(void) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 362a47f..353cac5 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1793,26 +1793,26 @@ static int udevNodeDrvClose(virConnectPtr conn) static virDeviceMonitor udevDeviceMonitor = { .name = "udevDeviceMonitor", - .open = udevNodeDrvOpen, /* 0.7.3 */ - .close = udevNodeDrvClose, /* 0.7.3 */ - .numOfDevices = nodeNumOfDevices, /* 0.7.3 */ - .listDevices = nodeListDevices, /* 0.7.3 */ - .listAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ - .deviceLookupByName = nodeDeviceLookupByName, /* 0.7.3 */ - .deviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ - .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.7.3 */ - .deviceGetParent = nodeDeviceGetParent, /* 0.7.3 */ - .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.7.3 */ - .deviceListCaps = nodeDeviceListCaps, /* 0.7.3 */ - .deviceCreateXML = nodeDeviceCreateXML, /* 0.7.3 */ - .deviceDestroy = nodeDeviceDestroy, /* 0.7.3 */ + .connectOpen = udevNodeDrvOpen, /* 0.7.3 */ + .connectClose = udevNodeDrvClose, /* 0.7.3 */ + .nodeNumOfDevices = nodeNumOfDevices, /* 0.7.3 */ + .nodeListDevices = nodeListDevices, /* 0.7.3 */ + .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ + .nodeDeviceLookupByName = nodeDeviceLookupByName, /* 0.7.3 */ + .nodeDeviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ + .nodeDeviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.7.3 */ + .nodeDeviceGetParent = nodeDeviceGetParent, /* 0.7.3 */ + .nodeDeviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.7.3 */ + .nodeDeviceListCaps = nodeDeviceListCaps, /* 0.7.3 */ + .nodeDeviceCreateXML = nodeDeviceCreateXML, /* 0.7.3 */ + .nodeDeviceDestroy = nodeDeviceDestroy, /* 0.7.3 */ }; static virStateDriver udevStateDriver = { .name = "udev", - .initialize = udevDeviceMonitorStartup, /* 0.7.3 */ - .cleanup = udevDeviceMonitorShutdown, /* 0.7.3 */ - .reload = udevDeviceMonitorReload, /* 0.7.3 */ + .stateInitialize = udevDeviceMonitorStartup, /* 0.7.3 */ + .stateCleanup = udevDeviceMonitorShutdown, /* 0.7.3 */ + .stateReload = udevDeviceMonitorReload, /* 0.7.3 */ }; int udevNodeRegister(void) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 19ebb03..b2ffd73 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -659,24 +659,24 @@ nwfilterTeardownFilter(virDomainNetDefPtr net) { static virNWFilterDriver nwfilterDriver = { .name = "nwfilter", - .open = nwfilterOpen, /* 0.8.0 */ - .close = nwfilterClose, /* 0.8.0 */ - .numOfNWFilters = nwfilterNumNWFilters, /* 0.8.0 */ - .listNWFilters = nwfilterListNWFilters, /* 0.8.0 */ - .listAllNWFilters = nwfilterListAllNWFilters, /* 0.10.2 */ + .connectOpen = nwfilterOpen, /* 0.8.0 */ + .connectClose = nwfilterClose, /* 0.8.0 */ + .connectNumOfNWFilters = nwfilterNumNWFilters, /* 0.8.0 */ + .connectListNWFilters = nwfilterListNWFilters, /* 0.8.0 */ + .connectListAllNWFilters = nwfilterListAllNWFilters, /* 0.10.2 */ .nwfilterLookupByName = nwfilterLookupByName, /* 0.8.0 */ .nwfilterLookupByUUID = nwfilterLookupByUUID, /* 0.8.0 */ - .defineXML = nwfilterDefine, /* 0.8.0 */ - .undefine = nwfilterUndefine, /* 0.8.0 */ - .getXMLDesc = nwfilterGetXMLDesc, /* 0.8.0 */ + .nwfilterDefineXML = nwfilterDefine, /* 0.8.0 */ + .nwfilterUndefine = nwfilterUndefine, /* 0.8.0 */ + .nwfilterGetXMLDesc = nwfilterGetXMLDesc, /* 0.8.0 */ }; static virStateDriver stateDriver = { .name = "NWFilter", - .initialize = nwfilterDriverStartup, - .cleanup = nwfilterDriverShutdown, - .reload = nwfilterDriverReload, + .stateInitialize = nwfilterDriverStartup, + .stateCleanup = nwfilterDriverShutdown, + .stateReload = nwfilterDriverReload, }; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 5d22c63..0e3d91d 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2166,22 +2166,22 @@ openvzListAllDomains(virConnectPtr conn, static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", - .open = openvzOpen, /* 0.3.1 */ - .close = openvzClose, /* 0.3.1 */ - .type = openvzGetType, /* 0.3.1 */ - .version = openvzGetVersion, /* 0.5.0 */ - .getHostname = virGetHostname, /* 0.9.12 */ - .getMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ + .connectOpen = openvzOpen, /* 0.3.1 */ + .connectClose = openvzClose, /* 0.3.1 */ + .connectGetType = openvzGetType, /* 0.3.1 */ + .connectGetVersion = openvzGetVersion, /* 0.5.0 */ + .connectGetHostname = virGetHostname, /* 0.9.12 */ + .connectGetMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ .nodeGetInfo = nodeGetInfo, /* 0.3.2 */ .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.12 */ .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.12 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.9.12 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.9.12 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .getCapabilities = openvzGetCapabilities, /* 0.4.6 */ - .listDomains = openvzListDomains, /* 0.3.1 */ - .numOfDomains = openvzNumDomains, /* 0.3.1 */ - .listAllDomains = openvzListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = openvzGetCapabilities, /* 0.4.6 */ + .connectListDomains = openvzListDomains, /* 0.3.1 */ + .connectNumOfDomains = openvzNumDomains, /* 0.3.1 */ + .connectListAllDomains = openvzListAllDomains, /* 0.9.13 */ .domainCreateXML = openvzDomainCreateXML, /* 0.3.3 */ .domainLookupByID = openvzDomainLookupByID, /* 0.3.1 */ .domainLookupByUUID = openvzDomainLookupByUUID, /* 0.3.1 */ @@ -2203,8 +2203,8 @@ static virDriver openvzDriver = { .domainGetVcpusFlags = openvzDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = openvzDomainGetMaxVcpus, /* 0.4.6 */ .domainGetXMLDesc = openvzDomainGetXMLDesc, /* 0.4.6 */ - .listDefinedDomains = openvzListDefinedDomains, /* 0.3.1 */ - .numOfDefinedDomains = openvzNumDefinedDomains, /* 0.3.1 */ + .connectListDefinedDomains = openvzListDefinedDomains, /* 0.3.1 */ + .connectNumOfDefinedDomains = openvzNumDefinedDomains, /* 0.3.1 */ .domainCreate = openvzDomainCreate, /* 0.3.1 */ .domainCreateWithFlags = openvzDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = openvzDomainDefineXML, /* 0.3.3 */ @@ -2213,12 +2213,12 @@ static virDriver openvzDriver = { .domainGetAutostart = openvzDomainGetAutostart, /* 0.4.6 */ .domainSetAutostart = openvzDomainSetAutostart, /* 0.4.6 */ .domainInterfaceStats = openvzDomainInterfaceStats, /* 0.9.12 */ - .isEncrypted = openvzIsEncrypted, /* 0.7.3 */ - .isSecure = openvzIsSecure, /* 0.7.3 */ + .connectIsEncrypted = openvzIsEncrypted, /* 0.7.3 */ + .connectIsSecure = openvzIsSecure, /* 0.7.3 */ .domainIsActive = openvzDomainIsActive, /* 0.7.3 */ .domainIsPersistent = openvzDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = openvzDomainIsUpdated, /* 0.8.6 */ - .isAlive = openvzIsAlive, /* 0.9.8 */ + .connectIsAlive = openvzIsAlive, /* 0.9.8 */ .domainUpdateDeviceFlags = openvzDomainUpdateDeviceFlags, /* 0.9.13 */ .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ }; diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 0c0bfcb..851881e 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -2390,17 +2390,17 @@ parallelsDomainDefineXML(virConnectPtr conn, const char *xml) static virDriver parallelsDriver = { .no = VIR_DRV_PARALLELS, .name = "Parallels", - .open = parallelsOpen, /* 0.10.0 */ - .close = parallelsClose, /* 0.10.0 */ - .version = parallelsGetVersion, /* 0.10.0 */ - .getHostname = virGetHostname, /* 0.10.0 */ + .connectOpen = parallelsOpen, /* 0.10.0 */ + .connectClose = parallelsClose, /* 0.10.0 */ + .connectGetVersion = parallelsGetVersion, /* 0.10.0 */ + .connectGetHostname = virGetHostname, /* 0.10.0 */ .nodeGetInfo = nodeGetInfo, /* 0.10.0 */ - .getCapabilities = parallelsGetCapabilities, /* 0.10.0 */ - .listDomains = parallelsListDomains, /* 0.10.0 */ - .numOfDomains = parallelsNumOfDomains, /* 0.10.0 */ - .listDefinedDomains = parallelsListDefinedDomains, /* 0.10.0 */ - .numOfDefinedDomains = parallelsNumOfDefinedDomains, /* 0.10.0 */ - .listAllDomains = parallelsListAllDomains, /* 0.10.0 */ + .connectGetCapabilities = parallelsGetCapabilities, /* 0.10.0 */ + .connectListDomains = parallelsListDomains, /* 0.10.0 */ + .connectNumOfDomains = parallelsNumOfDomains, /* 0.10.0 */ + .connectListDefinedDomains = parallelsListDefinedDomains, /* 0.10.0 */ + .connectNumOfDefinedDomains = parallelsNumOfDefinedDomains, /* 0.10.0 */ + .connectListAllDomains = parallelsListAllDomains, /* 0.10.0 */ .domainLookupByID = parallelsLookupDomainByID, /* 0.10.0 */ .domainLookupByUUID = parallelsLookupDomainByUUID, /* 0.10.0 */ .domainLookupByName = parallelsLookupDomainByName, /* 0.10.0 */ diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index c5ece79..21de3bf 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -614,13 +614,13 @@ cleanup: } static virNetworkDriver parallelsNetworkDriver = { "Parallels", - .open = parallelsOpenNetwork, /* 1.0.1 */ - .close = parallelsCloseNetwork, /* 1.0.1 */ - .numOfNetworks = parallelsNumNetworks, /* 1.0.1 */ - .listNetworks = parallelsListNetworks, /* 1.0.1 */ - .numOfDefinedNetworks = parallelsNumDefinedNetworks, /* 1.0.1 */ - .listDefinedNetworks = parallelsListDefinedNetworks, /* 1.0.1 */ - .listAllNetworks = parallelsListAllNetworks, /* 1.0.1 */ + .connectOpen = parallelsOpenNetwork, /* 1.0.1 */ + .connectClose = parallelsCloseNetwork, /* 1.0.1 */ + .connectNumOfNetworks = parallelsNumNetworks, /* 1.0.1 */ + .connectListNetworks = parallelsListNetworks, /* 1.0.1 */ + .connectNumOfDefinedNetworks = parallelsNumDefinedNetworks, /* 1.0.1 */ + .connectListDefinedNetworks = parallelsListDefinedNetworks, /* 1.0.1 */ + .connectListAllNetworks = parallelsListAllNetworks, /* 1.0.1 */ .networkLookupByUUID = parallelsNetworkLookupByUUID, /* 1.0.1 */ .networkLookupByName = parallelsNetworkLookupByName, /* 1.0.1 */ .networkGetXMLDesc = parallelsNetworkGetXMLDesc, /* 1.0.1 */ diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index ac65a1d..efa7d12 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -1671,39 +1671,39 @@ cleanup: static virStorageDriver parallelsStorageDriver = { .name = "Parallels", - .open = parallelsStorageOpen, /* 0.10.0 */ - .close = parallelsStorageClose, /* 0.10.0 */ - - .numOfPools = parallelsStorageNumPools, /* 0.10.0 */ - .listPools = parallelsStorageListPools, /* 0.10.0 */ - .numOfDefinedPools = parallelsStorageNumDefinedPools, /* 0.10.0 */ - .listDefinedPools = parallelsStorageListDefinedPools, /* 0.10.0 */ - .poolLookupByName = parallelsStoragePoolLookupByName, /* 0.10.0 */ - .poolLookupByUUID = parallelsStoragePoolLookupByUUID, /* 0.10.0 */ - .poolLookupByVolume = parallelsStoragePoolLookupByVolume, /* 0.10.0 */ - .poolDefineXML = parallelsStoragePoolDefine, /* 0.10.0 */ - .poolUndefine = parallelsStoragePoolUndefine, /* 0.10.0 */ - .poolCreate = parallelsStoragePoolStart, /* 0.10.0 */ - .poolDestroy = parallelsStoragePoolDestroy, /* 0.10.0 */ - .poolRefresh = parallelsStoragePoolRefresh, /* 0.10.0 */ - .poolGetInfo = parallelsStoragePoolGetInfo, /* 0.10.0 */ - .poolGetXMLDesc = parallelsStoragePoolGetXMLDesc, /* 0.10.0 */ - .poolGetAutostart = parallelsStoragePoolGetAutostart, /* 0.10.0 */ - .poolSetAutostart = parallelsStoragePoolSetAutostart, /* 0.10.0 */ - .poolNumOfVolumes = parallelsStoragePoolNumVolumes, /* 0.10.0 */ - .poolListVolumes = parallelsStoragePoolListVolumes, /* 0.10.0 */ - - .volLookupByName = parallelsStorageVolumeLookupByName, /* 0.10.0 */ - .volLookupByKey = parallelsStorageVolumeLookupByKey, /* 0.10.0 */ - .volLookupByPath = parallelsStorageVolumeLookupByPath, /* 0.10.0 */ - .volCreateXML = parallelsStorageVolumeCreateXML, /* 0.10.0 */ - .volCreateXMLFrom = parallelsStorageVolumeCreateXMLFrom, /* 0.10.0 */ - .volDelete = parallelsStorageVolumeDelete, /* 0.10.0 */ - .volGetInfo = parallelsStorageVolumeGetInfo, /* 0.10.0 */ - .volGetXMLDesc = parallelsStorageVolumeGetXMLDesc, /* 0.10.0 */ - .volGetPath = parallelsStorageVolumeGetPath, /* 0.10.0 */ - .poolIsActive = parallelsStoragePoolIsActive, /* 0.10.0 */ - .poolIsPersistent = parallelsStoragePoolIsPersistent, /* 0.10.0 */ + .connectOpen = parallelsStorageOpen, /* 0.10.0 */ + .connectClose = parallelsStorageClose, /* 0.10.0 */ + + .connectNumOfStoragePools = parallelsStorageNumPools, /* 0.10.0 */ + .connectListStoragePools = parallelsStorageListPools, /* 0.10.0 */ + .connectNumOfDefinedStoragePools = parallelsStorageNumDefinedPools, /* 0.10.0 */ + .connectListDefinedStoragePools = parallelsStorageListDefinedPools, /* 0.10.0 */ + .storagePoolLookupByName = parallelsStoragePoolLookupByName, /* 0.10.0 */ + .storagePoolLookupByUUID = parallelsStoragePoolLookupByUUID, /* 0.10.0 */ + .storagePoolLookupByVolume = parallelsStoragePoolLookupByVolume, /* 0.10.0 */ + .storagePoolDefineXML = parallelsStoragePoolDefine, /* 0.10.0 */ + .storagePoolUndefine = parallelsStoragePoolUndefine, /* 0.10.0 */ + .storagePoolCreate = parallelsStoragePoolStart, /* 0.10.0 */ + .storagePoolDestroy = parallelsStoragePoolDestroy, /* 0.10.0 */ + .storagePoolRefresh = parallelsStoragePoolRefresh, /* 0.10.0 */ + .storagePoolGetInfo = parallelsStoragePoolGetInfo, /* 0.10.0 */ + .storagePoolGetXMLDesc = parallelsStoragePoolGetXMLDesc, /* 0.10.0 */ + .storagePoolGetAutostart = parallelsStoragePoolGetAutostart, /* 0.10.0 */ + .storagePoolSetAutostart = parallelsStoragePoolSetAutostart, /* 0.10.0 */ + .storagePoolNumOfVolumes = parallelsStoragePoolNumVolumes, /* 0.10.0 */ + .storagePoolListVolumes = parallelsStoragePoolListVolumes, /* 0.10.0 */ + + .storageVolLookupByName = parallelsStorageVolumeLookupByName, /* 0.10.0 */ + .storageVolLookupByKey = parallelsStorageVolumeLookupByKey, /* 0.10.0 */ + .storageVolLookupByPath = parallelsStorageVolumeLookupByPath, /* 0.10.0 */ + .storageVolCreateXML = parallelsStorageVolumeCreateXML, /* 0.10.0 */ + .storageVolCreateXMLFrom = parallelsStorageVolumeCreateXMLFrom, /* 0.10.0 */ + .storageVolDelete = parallelsStorageVolumeDelete, /* 0.10.0 */ + .storageVolGetInfo = parallelsStorageVolumeGetInfo, /* 0.10.0 */ + .storageVolGetXMLDesc = parallelsStorageVolumeGetXMLDesc, /* 0.10.0 */ + .storageVolGetPath = parallelsStorageVolumeGetPath, /* 0.10.0 */ + .storagePoolIsActive = parallelsStoragePoolIsActive, /* 0.10.0 */ + .storagePoolIsPersistent = parallelsStoragePoolIsPersistent, /* 0.10.0 */ }; int diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index d6d9b0c..e188785 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3764,11 +3764,11 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDriver phypDriver = { .no = VIR_DRV_PHYP, .name = "PHYP", - .open = phypOpen, /* 0.7.0 */ - .close = phypClose, /* 0.7.0 */ - .getCapabilities = phypConnectGetCapabilities, /* 0.7.3 */ - .listDomains = phypListDomains, /* 0.7.0 */ - .numOfDomains = phypNumDomains, /* 0.7.0 */ + .connectOpen = phypOpen, /* 0.7.0 */ + .connectClose = phypClose, /* 0.7.0 */ + .connectGetCapabilities = phypConnectGetCapabilities, /* 0.7.3 */ + .connectListDomains = phypListDomains, /* 0.7.0 */ + .connectNumOfDomains = phypNumDomains, /* 0.7.0 */ .domainCreateXML = phypDomainCreateAndStart, /* 0.7.3 */ .domainLookupByID = phypDomainLookupByID, /* 0.7.0 */ .domainLookupByName = phypDomainLookupByName, /* 0.7.0 */ @@ -3784,43 +3784,43 @@ static virDriver phypDriver = { .domainGetVcpusFlags = phypDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = phypGetLparCPUMAX, /* 0.7.3 */ .domainGetXMLDesc = phypDomainGetXMLDesc, /* 0.7.0 */ - .listDefinedDomains = phypListDefinedDomains, /* 0.7.0 */ - .numOfDefinedDomains = phypNumDefinedDomains, /* 0.7.0 */ + .connectListDefinedDomains = phypListDefinedDomains, /* 0.7.0 */ + .connectNumOfDefinedDomains = phypNumDefinedDomains, /* 0.7.0 */ .domainAttachDevice = phypAttachDevice, /* 0.8.2 */ - .isEncrypted = phypIsEncrypted, /* 0.7.3 */ - .isSecure = phypIsSecure, /* 0.7.3 */ + .connectIsEncrypted = phypIsEncrypted, /* 0.7.3 */ + .connectIsSecure = phypIsSecure, /* 0.7.3 */ .domainIsUpdated = phypIsUpdated, /* 0.8.6 */ - .isAlive = phypIsAlive, /* 0.9.8 */ + .connectIsAlive = phypIsAlive, /* 0.9.8 */ }; static virStorageDriver phypStorageDriver = { .name = "PHYP", - .open = phypVIOSDriverOpen, /* 0.8.2 */ - .close = phypVIOSDriverClose, /* 0.8.2 */ - - .numOfPools = phypNumOfStoragePools, /* 0.8.2 */ - .listPools = phypListStoragePools, /* 0.8.2 */ - .poolLookupByName = phypStoragePoolLookupByName, /* 0.8.2 */ - .poolLookupByUUID = phypGetStoragePoolLookUpByUUID, /* 0.8.2 */ - .poolCreateXML = phypStoragePoolCreateXML, /* 0.8.2 */ - .poolDestroy = phypDestroyStoragePool, /* 0.8.2 */ - .poolGetXMLDesc = phypGetStoragePoolXMLDesc, /* 0.8.2 */ - .poolNumOfVolumes = phypStoragePoolNumOfVolumes, /* 0.8.2 */ - .poolListVolumes = phypStoragePoolListVolumes, /* 0.8.2 */ - - .volLookupByName = phypVolumeLookupByName, /* 0.8.2 */ - .volLookupByPath = phypVolumeLookupByPath, /* 0.8.2 */ - .volCreateXML = phypStorageVolCreateXML, /* 0.8.2 */ - .volGetXMLDesc = phypVolumeGetXMLDesc, /* 0.8.2 */ - .volGetPath = phypVolumeGetPath, /* 0.8.2 */ + .connectOpen = phypVIOSDriverOpen, /* 0.8.2 */ + .connectClose = phypVIOSDriverClose, /* 0.8.2 */ + + .connectNumOfStoragePools = phypNumOfStoragePools, /* 0.8.2 */ + .connectListStoragePools = phypListStoragePools, /* 0.8.2 */ + .storagePoolLookupByName = phypStoragePoolLookupByName, /* 0.8.2 */ + .storagePoolLookupByUUID = phypGetStoragePoolLookUpByUUID, /* 0.8.2 */ + .storagePoolCreateXML = phypStoragePoolCreateXML, /* 0.8.2 */ + .storagePoolDestroy = phypDestroyStoragePool, /* 0.8.2 */ + .storagePoolGetXMLDesc = phypGetStoragePoolXMLDesc, /* 0.8.2 */ + .storagePoolNumOfVolumes = phypStoragePoolNumOfVolumes, /* 0.8.2 */ + .storagePoolListVolumes = phypStoragePoolListVolumes, /* 0.8.2 */ + + .storageVolLookupByName = phypVolumeLookupByName, /* 0.8.2 */ + .storageVolLookupByPath = phypVolumeLookupByPath, /* 0.8.2 */ + .storageVolCreateXML = phypStorageVolCreateXML, /* 0.8.2 */ + .storageVolGetXMLDesc = phypVolumeGetXMLDesc, /* 0.8.2 */ + .storageVolGetPath = phypVolumeGetPath, /* 0.8.2 */ }; static virInterfaceDriver phypInterfaceDriver = { .name = "PHYP", - .open = phypVIOSDriverOpen, /* 0.9.1 */ - .close = phypVIOSDriverClose, /* 0.9.1 */ - .numOfInterfaces = phypNumOfInterfaces, /* 0.9.1 */ - .listInterfaces = phypListInterfaces, /* 0.9.1 */ + .connectOpen = phypVIOSDriverOpen, /* 0.9.1 */ + .connectClose = phypVIOSDriverClose, /* 0.9.1 */ + .connectNumOfInterfaces = phypNumOfInterfaces, /* 0.9.1 */ + .connectListInterfaces = phypListInterfaces, /* 0.9.1 */ .interfaceLookupByName = phypInterfaceLookupByName, /* 0.9.1 */ .interfaceDefineXML = phypInterfaceDefineXML, /* 0.9.1 */ .interfaceDestroy = phypInterfaceDestroy, /* 0.9.1 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 05c12b2..8670c5c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2076,8 +2076,8 @@ qemuBuildRBDString(virConnectPtr conn, if (sec) { char *base64 = NULL; - secret = (char *)conn->secretDriver->getValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); + secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); if (secret == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get the value of the secret for username %s"), @@ -2522,8 +2522,8 @@ qemuBuildDriveURIString(virConnectPtr conn, } if (sec) { - secret = (char *)conn->secretDriver->getValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); + secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); if (secret == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get the value of the secret for username %s"), diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d23c26a..0dc5e80 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14626,19 +14626,19 @@ cleanup: static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, - .open = qemuOpen, /* 0.2.0 */ - .close = qemuClose, /* 0.2.0 */ - .supports_feature = qemuSupportsFeature, /* 0.5.0 */ - .type = qemuGetType, /* 0.2.0 */ - .version = qemuGetVersion, /* 0.2.0 */ - .getHostname = virGetHostname, /* 0.3.3 */ - .getSysinfo = qemuGetSysinfo, /* 0.8.8 */ - .getMaxVcpus = qemuGetMaxVCPUs, /* 0.2.1 */ + .connectOpen = qemuOpen, /* 0.2.0 */ + .connectClose = qemuClose, /* 0.2.0 */ + .connectSupportsFeature = qemuSupportsFeature, /* 0.5.0 */ + .connectGetType = qemuGetType, /* 0.2.0 */ + .connectGetVersion = qemuGetVersion, /* 0.2.0 */ + .connectGetHostname = virGetHostname, /* 0.3.3 */ + .connectGetSysinfo = qemuGetSysinfo, /* 0.8.8 */ + .connectGetMaxVcpus = qemuGetMaxVCPUs, /* 0.2.1 */ .nodeGetInfo = nodeGetInfo, /* 0.2.0 */ - .getCapabilities = qemuGetCapabilities, /* 0.2.1 */ - .listDomains = qemuListDomains, /* 0.2.0 */ - .numOfDomains = qemuNumDomains, /* 0.2.0 */ - .listAllDomains = qemuListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = qemuGetCapabilities, /* 0.2.1 */ + .connectListDomains = qemuListDomains, /* 0.2.0 */ + .connectNumOfDomains = qemuNumDomains, /* 0.2.0 */ + .connectListAllDomains = qemuListAllDomains, /* 0.9.13 */ .domainCreateXML = qemuDomainCreate, /* 0.2.0 */ .domainLookupByID = qemuDomainLookupByID, /* 0.2.0 */ .domainLookupByUUID = qemuDomainLookupByUUID, /* 0.2.0 */ @@ -14685,10 +14685,10 @@ static virDriver qemuDriver = { .domainGetSecurityLabelList = qemuDomainGetSecurityLabelList, /* 0.10.0 */ .nodeGetSecurityModel = qemuNodeGetSecurityModel, /* 0.6.1 */ .domainGetXMLDesc = qemuDomainGetXMLDesc, /* 0.2.0 */ - .domainXMLFromNative = qemuDomainXMLFromNative, /* 0.6.4 */ - .domainXMLToNative = qemuDomainXMLToNative, /* 0.6.4 */ - .listDefinedDomains = qemuListDefinedDomains, /* 0.2.0 */ - .numOfDefinedDomains = qemuNumDefinedDomains, /* 0.2.0 */ + .connectDomainXMLFromNative = qemuDomainXMLFromNative, /* 0.6.4 */ + .connectDomainXMLToNative = qemuDomainXMLToNative, /* 0.6.4 */ + .connectListDefinedDomains = qemuListDefinedDomains, /* 0.2.0 */ + .connectNumOfDefinedDomains = qemuNumDefinedDomains, /* 0.2.0 */ .domainCreate = qemuDomainStart, /* 0.2.0 */ .domainCreateWithFlags = qemuDomainStartWithFlags, /* 0.8.2 */ .domainDefineXML = qemuDomainDefine, /* 0.2.0 */ @@ -14719,21 +14719,21 @@ static virDriver qemuDriver = { .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.4.4 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.4.4 */ - .domainEventRegister = qemuDomainEventRegister, /* 0.5.0 */ - .domainEventDeregister = qemuDomainEventDeregister, /* 0.5.0 */ + .connectDomainEventRegister = qemuDomainEventRegister, /* 0.5.0 */ + .connectDomainEventDeregister = qemuDomainEventDeregister, /* 0.5.0 */ .domainMigratePrepare2 = qemuDomainMigratePrepare2, /* 0.5.0 */ .domainMigrateFinish2 = qemuDomainMigrateFinish2, /* 0.5.0 */ .nodeDeviceDettach = qemuNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = qemuNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = qemuNodeDeviceReset, /* 0.6.1 */ .domainMigratePrepareTunnel = qemuDomainMigratePrepareTunnel, /* 0.7.2 */ - .isEncrypted = qemuIsEncrypted, /* 0.7.3 */ - .isSecure = qemuIsSecure, /* 0.7.3 */ + .connectIsEncrypted = qemuIsEncrypted, /* 0.7.3 */ + .connectIsSecure = qemuIsSecure, /* 0.7.3 */ .domainIsActive = qemuDomainIsActive, /* 0.7.3 */ .domainIsPersistent = qemuDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = qemuDomainIsUpdated, /* 0.8.6 */ - .cpuCompare = qemuCPUCompare, /* 0.7.5 */ - .cpuBaseline = qemuCPUBaseline, /* 0.7.7 */ + .connectCompareCPU = qemuCPUCompare, /* 0.7.5 */ + .connectBaselineCPU = qemuCPUBaseline, /* 0.7.7 */ .domainGetJobInfo = qemuDomainGetJobInfo, /* 0.7.7 */ .domainGetJobStats = qemuDomainGetJobStats, /* 1.0.3 */ .domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */ @@ -14742,8 +14742,8 @@ static virDriver qemuDriver = { .domainMigrateSetCompressionCache = qemuDomainMigrateSetCompressionCache, /* 1.0.3 */ .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, /* 0.9.0 */ .domainMigrateGetMaxSpeed = qemuDomainMigrateGetMaxSpeed, /* 0.9.5 */ - .domainEventRegisterAny = qemuDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = qemuDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = qemuDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = qemuDomainEventDeregisterAny, /* 0.8.0 */ .domainManagedSave = qemuDomainManagedSave, /* 0.8.0 */ .domainHasManagedSaveImage = qemuDomainHasManagedSaveImage, /* 0.8.0 */ .domainManagedSaveRemove = qemuDomainManagedSaveRemove, /* 0.8.0 */ @@ -14763,9 +14763,9 @@ static virDriver qemuDriver = { .domainSnapshotHasMetadata = qemuDomainSnapshotHasMetadata, /* 0.9.13 */ .domainRevertToSnapshot = qemuDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */ - .qemuDomainMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ - .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ - .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ + .domainQemuMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ + .domainQemuAttach = qemuDomainAttach, /* 0.9.4 */ + .domainQemuAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */ @@ -14782,7 +14782,7 @@ static virDriver qemuDriver = { .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ .domainBlockRebase = qemuDomainBlockRebase, /* 0.9.10 */ .domainBlockCommit = qemuDomainBlockCommit, /* 1.0.0 */ - .isAlive = qemuIsAlive, /* 0.9.8 */ + .connectIsAlive = qemuIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .domainSetBlockIoTune = qemuDomainSetBlockIoTune, /* 0.9.8 */ .domainGetBlockIoTune = qemuDomainGetBlockIoTune, /* 0.9.8 */ @@ -14806,10 +14806,10 @@ static virDriver qemuDriver = { static virStateDriver qemuStateDriver = { .name = "QEMU", - .initialize = qemuStartup, - .cleanup = qemuShutdown, - .reload = qemuReload, - .stop = qemuStop, + .stateInitialize = qemuStartup, + .stateCleanup = qemuShutdown, + .stateReload = qemuReload, + .stateStop = qemuStop, }; int qemuRegister(void) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4988d9b..5fea5e8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -429,8 +429,8 @@ qemuProcessGetVolumeQcowPassphrase(virConnectPtr conn, } if (conn->secretDriver == NULL || - conn->secretDriver->lookupByUUID == NULL || - conn->secretDriver->getValue == NULL) { + conn->secretDriver->secretLookupByUUID == NULL || + conn->secretDriver->secretGetValue == NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("secret storage not supported")); goto cleanup; @@ -445,12 +445,12 @@ qemuProcessGetVolumeQcowPassphrase(virConnectPtr conn, goto cleanup; } - secret = conn->secretDriver->lookupByUUID(conn, - enc->secrets[0]->uuid); + secret = conn->secretDriver->secretLookupByUUID(conn, + enc->secrets[0]->uuid); if (secret == NULL) goto cleanup; - data = conn->secretDriver->getValue(secret, &size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); + data = conn->secretDriver->secretGetValue(secret, &size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); virObjectUnref(secret); if (data == NULL) goto cleanup; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 6790f78..4aec150 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4949,9 +4949,9 @@ static virStreamDriver remoteStreamDrv = { .streamSend = remoteStreamSend, .streamFinish = remoteStreamFinish, .streamAbort = remoteStreamAbort, - .streamAddCallback = remoteStreamEventAddCallback, - .streamUpdateCallback = remoteStreamEventUpdateCallback, - .streamRemoveCallback = remoteStreamEventRemoveCallback, + .streamEventAddCallback = remoteStreamEventAddCallback, + .streamEventUpdateCallback = remoteStreamEventUpdateCallback, + .streamEventRemoveCallback = remoteStreamEventRemoveCallback, }; @@ -6120,20 +6120,20 @@ unsigned long remoteVersion(void) static virDriver remote_driver = { .no = VIR_DRV_REMOTE, .name = "remote", - .open = remoteOpen, /* 0.3.0 */ - .close = remoteClose, /* 0.3.0 */ - .supports_feature = remoteConnectSupportsFeature, /* 0.3.0 */ - .type = remoteConnectGetType, /* 0.3.0 */ - .version = remoteConnectGetVersion, /* 0.3.0 */ - .libvirtVersion = remoteConnectGetLibVersion, /* 0.7.3 */ - .getHostname = remoteConnectGetHostname, /* 0.3.0 */ - .getSysinfo = remoteConnectGetSysinfo, /* 0.8.8 */ - .getMaxVcpus = remoteConnectGetMaxVcpus, /* 0.3.0 */ + .connectOpen = remoteOpen, /* 0.3.0 */ + .connectClose = remoteClose, /* 0.3.0 */ + .connectSupportsFeature = remoteConnectSupportsFeature, /* 0.3.0 */ + .connectGetType = remoteConnectGetType, /* 0.3.0 */ + .connectGetVersion = remoteConnectGetVersion, /* 0.3.0 */ + .connectGetLibVersion = remoteConnectGetLibVersion, /* 0.7.3 */ + .connectGetHostname = remoteConnectGetHostname, /* 0.3.0 */ + .connectGetSysinfo = remoteConnectGetSysinfo, /* 0.8.8 */ + .connectGetMaxVcpus = remoteConnectGetMaxVcpus, /* 0.3.0 */ .nodeGetInfo = remoteNodeGetInfo, /* 0.3.0 */ - .getCapabilities = remoteConnectGetCapabilities, /* 0.3.0 */ - .listDomains = remoteConnectListDomains, /* 0.3.0 */ - .numOfDomains = remoteConnectNumOfDomains, /* 0.3.0 */ - .listAllDomains = remoteConnectListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = remoteConnectGetCapabilities, /* 0.3.0 */ + .connectListDomains = remoteConnectListDomains, /* 0.3.0 */ + .connectNumOfDomains = remoteConnectNumOfDomains, /* 0.3.0 */ + .connectListAllDomains = remoteConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = remoteDomainCreateXML, /* 0.3.0 */ .domainLookupByID = remoteDomainLookupByID, /* 0.3.0 */ .domainLookupByUUID = remoteDomainLookupByUUID, /* 0.3.0 */ @@ -6182,10 +6182,10 @@ static virDriver remote_driver = { .domainGetSecurityLabelList = remoteDomainGetSecurityLabelList, /* 0.10.0 */ .nodeGetSecurityModel = remoteNodeGetSecurityModel, /* 0.6.1 */ .domainGetXMLDesc = remoteDomainGetXMLDesc, /* 0.3.0 */ - .domainXMLFromNative = remoteConnectDomainXMLFromNative, /* 0.6.4 */ - .domainXMLToNative = remoteConnectDomainXMLToNative, /* 0.6.4 */ - .listDefinedDomains = remoteConnectListDefinedDomains, /* 0.3.0 */ - .numOfDefinedDomains = remoteConnectNumOfDefinedDomains, /* 0.3.0 */ + .connectDomainXMLFromNative = remoteConnectDomainXMLFromNative, /* 0.6.4 */ + .connectDomainXMLToNative = remoteConnectDomainXMLToNative, /* 0.6.4 */ + .connectListDefinedDomains = remoteConnectListDefinedDomains, /* 0.3.0 */ + .connectNumOfDefinedDomains = remoteConnectNumOfDefinedDomains, /* 0.3.0 */ .domainCreate = remoteDomainCreate, /* 0.3.0 */ .domainCreateWithFlags = remoteDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = remoteDomainDefineXML, /* 0.3.0 */ @@ -6220,21 +6220,21 @@ static virDriver remote_driver = { .nodeGetMemoryStats = remoteNodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, /* 0.3.3 */ .nodeGetFreeMemory = remoteNodeGetFreeMemory, /* 0.3.3 */ - .domainEventRegister = remoteConnectDomainEventRegister, /* 0.5.0 */ - .domainEventDeregister = remoteConnectDomainEventDeregister, /* 0.5.0 */ + .connectDomainEventRegister = remoteConnectDomainEventRegister, /* 0.5.0 */ + .connectDomainEventDeregister = remoteConnectDomainEventDeregister, /* 0.5.0 */ .domainMigratePrepare2 = remoteDomainMigratePrepare2, /* 0.5.0 */ .domainMigrateFinish2 = remoteDomainMigrateFinish2, /* 0.5.0 */ .nodeDeviceDettach = remoteNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = remoteNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = remoteNodeDeviceReset, /* 0.6.1 */ .domainMigratePrepareTunnel = remoteDomainMigratePrepareTunnel, /* 0.7.2 */ - .isEncrypted = remoteConnectIsEncrypted, /* 0.7.3 */ - .isSecure = remoteConnectIsSecure, /* 0.7.3 */ + .connectIsEncrypted = remoteConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = remoteConnectIsSecure, /* 0.7.3 */ .domainIsActive = remoteDomainIsActive, /* 0.7.3 */ .domainIsPersistent = remoteDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = remoteDomainIsUpdated, /* 0.8.6 */ - .cpuCompare = remoteConnectCompareCPU, /* 0.7.5 */ - .cpuBaseline = remoteConnectBaselineCPU, /* 0.7.7 */ + .connectCompareCPU = remoteConnectCompareCPU, /* 0.7.5 */ + .connectBaselineCPU = remoteConnectBaselineCPU, /* 0.7.7 */ .domainGetJobInfo = remoteDomainGetJobInfo, /* 0.7.7 */ .domainGetJobStats = remoteDomainGetJobStats, /* 1.0.3 */ .domainAbortJob = remoteDomainAbortJob, /* 0.7.7 */ @@ -6243,8 +6243,8 @@ static virDriver remote_driver = { .domainMigrateSetCompressionCache = remoteDomainMigrateSetCompressionCache, /* 1.0.3 */ .domainMigrateSetMaxSpeed = remoteDomainMigrateSetMaxSpeed, /* 0.9.0 */ .domainMigrateGetMaxSpeed = remoteDomainMigrateGetMaxSpeed, /* 0.9.5 */ - .domainEventRegisterAny = remoteConnectDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = remoteConnectDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = remoteConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = remoteConnectDomainEventDeregisterAny, /* 0.8.0 */ .domainManagedSave = remoteDomainManagedSave, /* 0.8.0 */ .domainHasManagedSaveImage = remoteDomainHasManagedSaveImage, /* 0.8.0 */ .domainManagedSaveRemove = remoteDomainManagedSaveRemove, /* 0.8.0 */ @@ -6264,9 +6264,9 @@ static virDriver remote_driver = { .domainSnapshotIsCurrent = remoteDomainSnapshotIsCurrent, /* 0.9.13 */ .domainSnapshotHasMetadata = remoteDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = remoteDomainSnapshotDelete, /* 0.8.0 */ - .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */ - .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ - .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ + .domainQemuMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */ + .domainQemuAttach = qemuDomainAttach, /* 0.9.4 */ + .domainQemuAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = remoteDomainOpenConsole, /* 0.8.6 */ .domainOpenChannel = remoteDomainOpenChannel, /* 1.0.2 */ .domainOpenGraphics = remoteDomainOpenGraphics, /* 0.9.7 */ @@ -6285,8 +6285,8 @@ static virDriver remote_driver = { .domainBlockPull = remoteDomainBlockPull, /* 0.9.4 */ .domainBlockRebase = remoteDomainBlockRebase, /* 0.9.10 */ .domainBlockCommit = remoteDomainBlockCommit, /* 0.10.2 */ - .setKeepAlive = remoteSetKeepAlive, /* 0.9.8 */ - .isAlive = remoteIsAlive, /* 0.9.8 */ + .connectSetKeepAlive = remoteSetKeepAlive, /* 0.9.8 */ + .connectIsAlive = remoteIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = remoteNodeSuspendForDuration, /* 0.9.8 */ .domainSetBlockIoTune = remoteDomainSetBlockIoTune, /* 0.9.8 */ .domainGetBlockIoTune = remoteDomainGetBlockIoTune, /* 0.9.8 */ @@ -6306,13 +6306,13 @@ static virDriver remote_driver = { static virNetworkDriver network_driver = { .name = "remote", - .open = remoteNetworkOpen, /* 0.3.0 */ - .close = remoteNetworkClose, /* 0.3.0 */ - .numOfNetworks = remoteConnectNumOfNetworks, /* 0.3.0 */ - .listNetworks = remoteConnectListNetworks, /* 0.3.0 */ - .numOfDefinedNetworks = remoteConnectNumOfDefinedNetworks, /* 0.3.0 */ - .listDefinedNetworks = remoteConnectListDefinedNetworks, /* 0.3.0 */ - .listAllNetworks = remoteConnectListAllNetworks, /* 0.10.2 */ + .connectOpen = remoteNetworkOpen, /* 0.3.0 */ + .connectClose = remoteNetworkClose, /* 0.3.0 */ + .connectNumOfNetworks = remoteConnectNumOfNetworks, /* 0.3.0 */ + .connectListNetworks = remoteConnectListNetworks, /* 0.3.0 */ + .connectNumOfDefinedNetworks = remoteConnectNumOfDefinedNetworks, /* 0.3.0 */ + .connectListDefinedNetworks = remoteConnectListDefinedNetworks, /* 0.3.0 */ + .connectListAllNetworks = remoteConnectListAllNetworks, /* 0.10.2 */ .networkLookupByUUID = remoteNetworkLookupByUUID, /* 0.3.0 */ .networkLookupByName = remoteNetworkLookupByName, /* 0.3.0 */ .networkCreateXML = remoteNetworkCreateXML, /* 0.3.0 */ @@ -6331,13 +6331,13 @@ static virNetworkDriver network_driver = { static virInterfaceDriver interface_driver = { .name = "remote", - .open = remoteInterfaceOpen, /* 0.7.2 */ - .close = remoteInterfaceClose, /* 0.7.2 */ - .numOfInterfaces = remoteConnectNumOfInterfaces, /* 0.7.2 */ - .listInterfaces = remoteConnectListInterfaces, /* 0.7.2 */ - .numOfDefinedInterfaces = remoteConnectNumOfDefinedInterfaces, /* 0.7.2 */ - .listDefinedInterfaces = remoteConnectListDefinedInterfaces, /* 0.7.2 */ - .listAllInterfaces = remoteConnectListAllInterfaces, /* 0.10.2 */ + .connectOpen = remoteInterfaceOpen, /* 0.7.2 */ + .connectClose = remoteInterfaceClose, /* 0.7.2 */ + .connectNumOfInterfaces = remoteConnectNumOfInterfaces, /* 0.7.2 */ + .connectListInterfaces = remoteConnectListInterfaces, /* 0.7.2 */ + .connectNumOfDefinedInterfaces = remoteConnectNumOfDefinedInterfaces, /* 0.7.2 */ + .connectListDefinedInterfaces = remoteConnectListDefinedInterfaces, /* 0.7.2 */ + .connectListAllInterfaces = remoteConnectListAllInterfaces, /* 0.10.2 */ .interfaceLookupByName = remoteInterfaceLookupByName, /* 0.7.2 */ .interfaceLookupByMACString = remoteInterfaceLookupByMACString, /* 0.7.2 */ .interfaceGetXMLDesc = remoteInterfaceGetXMLDesc, /* 0.7.2 */ @@ -6353,103 +6353,103 @@ static virInterfaceDriver interface_driver = { static virStorageDriver storage_driver = { .name = "remote", - .open = remoteStorageOpen, /* 0.4.1 */ - .close = remoteStorageClose, /* 0.4.1 */ - .numOfPools = remoteConnectNumOfStoragePools, /* 0.4.1 */ - .listPools = remoteConnectListStoragePools, /* 0.4.1 */ - .numOfDefinedPools = remoteConnectNumOfDefinedStoragePools, /* 0.4.1 */ - .listDefinedPools = remoteConnectListDefinedStoragePools, /* 0.4.1 */ - .listAllPools = remoteConnectListAllStoragePools, /* 0.10.2 */ - .findPoolSources = remoteConnectFindStoragePoolSources, /* 0.4.5 */ - .poolLookupByName = remoteStoragePoolLookupByName, /* 0.4.1 */ - .poolLookupByUUID = remoteStoragePoolLookupByUUID, /* 0.4.1 */ - .poolLookupByVolume = remoteStoragePoolLookupByVolume, /* 0.4.1 */ - .poolCreateXML = remoteStoragePoolCreateXML, /* 0.4.1 */ - .poolDefineXML = remoteStoragePoolDefineXML, /* 0.4.1 */ - .poolBuild = remoteStoragePoolBuild, /* 0.4.1 */ - .poolUndefine = remoteStoragePoolUndefine, /* 0.4.1 */ - .poolCreate = remoteStoragePoolCreate, /* 0.4.1 */ - .poolDestroy = remoteStoragePoolDestroy, /* 0.4.1 */ - .poolDelete = remoteStoragePoolDelete, /* 0.4.1 */ - .poolRefresh = remoteStoragePoolRefresh, /* 0.4.1 */ - .poolGetInfo = remoteStoragePoolGetInfo, /* 0.4.1 */ - .poolGetXMLDesc = remoteStoragePoolGetXMLDesc, /* 0.4.1 */ - .poolGetAutostart = remoteStoragePoolGetAutostart, /* 0.4.1 */ - .poolSetAutostart = remoteStoragePoolSetAutostart, /* 0.4.1 */ - .poolNumOfVolumes = remoteStoragePoolNumOfVolumes, /* 0.4.1 */ - .poolListVolumes = remoteStoragePoolListVolumes, /* 0.4.1 */ - .poolListAllVolumes = remoteStoragePoolListAllVolumes, /* 0.10.0 */ - - .volLookupByName = remoteStorageVolLookupByName, /* 0.4.1 */ - .volLookupByKey = remoteStorageVolLookupByKey, /* 0.4.1 */ - .volLookupByPath = remoteStorageVolLookupByPath, /* 0.4.1 */ - .volCreateXML = remoteStorageVolCreateXML, /* 0.4.1 */ - .volCreateXMLFrom = remoteStorageVolCreateXMLFrom, /* 0.6.4 */ - .volDownload = remoteStorageVolDownload, /* 0.9.0 */ - .volUpload = remoteStorageVolUpload, /* 0.9.0 */ - .volDelete = remoteStorageVolDelete, /* 0.4.1 */ - .volWipe = remoteStorageVolWipe, /* 0.8.0 */ - .volWipePattern = remoteStorageVolWipePattern, /* 0.9.10 */ - .volGetInfo = remoteStorageVolGetInfo, /* 0.4.1 */ - .volGetXMLDesc = remoteStorageVolGetXMLDesc, /* 0.4.1 */ - .volGetPath = remoteStorageVolGetPath, /* 0.4.1 */ - .volResize = remoteStorageVolResize, /* 0.9.10 */ - .poolIsActive = remoteStoragePoolIsActive, /* 0.7.3 */ - .poolIsPersistent = remoteStoragePoolIsPersistent, /* 0.7.3 */ + .connectOpen = remoteStorageOpen, /* 0.4.1 */ + .connectClose = remoteStorageClose, /* 0.4.1 */ + .connectNumOfStoragePools = remoteConnectNumOfStoragePools, /* 0.4.1 */ + .connectListStoragePools = remoteConnectListStoragePools, /* 0.4.1 */ + .connectNumOfDefinedStoragePools = remoteConnectNumOfDefinedStoragePools, /* 0.4.1 */ + .connectListDefinedStoragePools = remoteConnectListDefinedStoragePools, /* 0.4.1 */ + .connectListAllStoragePools = remoteConnectListAllStoragePools, /* 0.10.2 */ + .connectFindStoragePoolSources = remoteConnectFindStoragePoolSources, /* 0.4.5 */ + .storagePoolLookupByName = remoteStoragePoolLookupByName, /* 0.4.1 */ + .storagePoolLookupByUUID = remoteStoragePoolLookupByUUID, /* 0.4.1 */ + .storagePoolLookupByVolume = remoteStoragePoolLookupByVolume, /* 0.4.1 */ + .storagePoolCreateXML = remoteStoragePoolCreateXML, /* 0.4.1 */ + .storagePoolDefineXML = remoteStoragePoolDefineXML, /* 0.4.1 */ + .storagePoolBuild = remoteStoragePoolBuild, /* 0.4.1 */ + .storagePoolUndefine = remoteStoragePoolUndefine, /* 0.4.1 */ + .storagePoolCreate = remoteStoragePoolCreate, /* 0.4.1 */ + .storagePoolDestroy = remoteStoragePoolDestroy, /* 0.4.1 */ + .storagePoolDelete = remoteStoragePoolDelete, /* 0.4.1 */ + .storagePoolRefresh = remoteStoragePoolRefresh, /* 0.4.1 */ + .storagePoolGetInfo = remoteStoragePoolGetInfo, /* 0.4.1 */ + .storagePoolGetXMLDesc = remoteStoragePoolGetXMLDesc, /* 0.4.1 */ + .storagePoolGetAutostart = remoteStoragePoolGetAutostart, /* 0.4.1 */ + .storagePoolSetAutostart = remoteStoragePoolSetAutostart, /* 0.4.1 */ + .storagePoolNumOfVolumes = remoteStoragePoolNumOfVolumes, /* 0.4.1 */ + .storagePoolListVolumes = remoteStoragePoolListVolumes, /* 0.4.1 */ + .storagePoolListAllVolumes = remoteStoragePoolListAllVolumes, /* 0.10.0 */ + + .storageVolLookupByName = remoteStorageVolLookupByName, /* 0.4.1 */ + .storageVolLookupByKey = remoteStorageVolLookupByKey, /* 0.4.1 */ + .storageVolLookupByPath = remoteStorageVolLookupByPath, /* 0.4.1 */ + .storageVolCreateXML = remoteStorageVolCreateXML, /* 0.4.1 */ + .storageVolCreateXMLFrom = remoteStorageVolCreateXMLFrom, /* 0.6.4 */ + .storageVolDownload = remoteStorageVolDownload, /* 0.9.0 */ + .storageVolUpload = remoteStorageVolUpload, /* 0.9.0 */ + .storageVolDelete = remoteStorageVolDelete, /* 0.4.1 */ + .storageVolWipe = remoteStorageVolWipe, /* 0.8.0 */ + .storageVolWipePattern = remoteStorageVolWipePattern, /* 0.9.10 */ + .storageVolGetInfo = remoteStorageVolGetInfo, /* 0.4.1 */ + .storageVolGetXMLDesc = remoteStorageVolGetXMLDesc, /* 0.4.1 */ + .storageVolGetPath = remoteStorageVolGetPath, /* 0.4.1 */ + .storageVolResize = remoteStorageVolResize, /* 0.9.10 */ + .storagePoolIsActive = remoteStoragePoolIsActive, /* 0.7.3 */ + .storagePoolIsPersistent = remoteStoragePoolIsPersistent, /* 0.7.3 */ }; static virSecretDriver secret_driver = { .name = "remote", - .open = remoteSecretOpen, /* 0.7.1 */ - .close = remoteSecretClose, /* 0.7.1 */ - .numOfSecrets = remoteConnectNumOfSecrets, /* 0.7.1 */ - .listSecrets = remoteConnectListSecrets, /* 0.7.1 */ - .listAllSecrets = remoteConnectListAllSecrets, /* 0.10.2 */ - .lookupByUUID = remoteSecretLookupByUUID, /* 0.7.1 */ - .lookupByUsage = remoteSecretLookupByUsage, /* 0.7.1 */ - .defineXML = remoteSecretDefineXML, /* 0.7.1 */ - .getXMLDesc = remoteSecretGetXMLDesc, /* 0.7.1 */ - .setValue = remoteSecretSetValue, /* 0.7.1 */ - .getValue = remoteSecretGetValue, /* 0.7.1 */ - .undefine = remoteSecretUndefine /* 0.7.1 */ + .connectOpen = remoteSecretOpen, /* 0.7.1 */ + .connectClose = remoteSecretClose, /* 0.7.1 */ + .connectNumOfSecrets = remoteConnectNumOfSecrets, /* 0.7.1 */ + .connectListSecrets = remoteConnectListSecrets, /* 0.7.1 */ + .connectListAllSecrets = remoteConnectListAllSecrets, /* 0.10.2 */ + .secretLookupByUUID = remoteSecretLookupByUUID, /* 0.7.1 */ + .secretLookupByUsage = remoteSecretLookupByUsage, /* 0.7.1 */ + .secretDefineXML = remoteSecretDefineXML, /* 0.7.1 */ + .secretGetXMLDesc = remoteSecretGetXMLDesc, /* 0.7.1 */ + .secretSetValue = remoteSecretSetValue, /* 0.7.1 */ + .secretGetValue = remoteSecretGetValue, /* 0.7.1 */ + .secretUndefine = remoteSecretUndefine /* 0.7.1 */ }; static virDeviceMonitor dev_monitor = { .name = "remote", - .open = remoteDevMonOpen, /* 0.5.0 */ - .close = remoteDevMonClose, /* 0.5.0 */ - .numOfDevices = remoteNodeNumOfDevices, /* 0.5.0 */ - .listDevices = remoteNodeListDevices, /* 0.5.0 */ - .listAllNodeDevices = remoteConnectListAllNodeDevices, /* 0.10.2 */ - .deviceLookupByName = remoteNodeDeviceLookupByName, /* 0.5.0 */ - .deviceLookupSCSIHostByWWN = remoteNodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ - .deviceGetXMLDesc = remoteNodeDeviceGetXMLDesc, /* 0.5.0 */ - .deviceGetParent = remoteNodeDeviceGetParent, /* 0.5.0 */ - .deviceNumOfCaps = remoteNodeDeviceNumOfCaps, /* 0.5.0 */ - .deviceListCaps = remoteNodeDeviceListCaps, /* 0.5.0 */ - .deviceCreateXML = remoteNodeDeviceCreateXML, /* 0.6.3 */ - .deviceDestroy = remoteNodeDeviceDestroy /* 0.6.3 */ + .connectOpen = remoteDevMonOpen, /* 0.5.0 */ + .connectClose = remoteDevMonClose, /* 0.5.0 */ + .nodeNumOfDevices = remoteNodeNumOfDevices, /* 0.5.0 */ + .nodeListDevices = remoteNodeListDevices, /* 0.5.0 */ + .connectListAllNodeDevices = remoteConnectListAllNodeDevices, /* 0.10.2 */ + .nodeDeviceLookupByName = remoteNodeDeviceLookupByName, /* 0.5.0 */ + .nodeDeviceLookupSCSIHostByWWN = remoteNodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ + .nodeDeviceGetXMLDesc = remoteNodeDeviceGetXMLDesc, /* 0.5.0 */ + .nodeDeviceGetParent = remoteNodeDeviceGetParent, /* 0.5.0 */ + .nodeDeviceNumOfCaps = remoteNodeDeviceNumOfCaps, /* 0.5.0 */ + .nodeDeviceListCaps = remoteNodeDeviceListCaps, /* 0.5.0 */ + .nodeDeviceCreateXML = remoteNodeDeviceCreateXML, /* 0.6.3 */ + .nodeDeviceDestroy = remoteNodeDeviceDestroy /* 0.6.3 */ }; static virNWFilterDriver nwfilter_driver = { .name = "remote", - .open = remoteNWFilterOpen, /* 0.8.0 */ - .close = remoteNWFilterClose, /* 0.8.0 */ + .connectOpen = remoteNWFilterOpen, /* 0.8.0 */ + .connectClose = remoteNWFilterClose, /* 0.8.0 */ .nwfilterLookupByUUID = remoteNWFilterLookupByUUID, /* 0.8.0 */ .nwfilterLookupByName = remoteNWFilterLookupByName, /* 0.8.0 */ - .getXMLDesc = remoteNWFilterGetXMLDesc, /* 0.8.0 */ - .defineXML = remoteNWFilterDefineXML, /* 0.8.0 */ - .undefine = remoteNWFilterUndefine, /* 0.8.0 */ - .numOfNWFilters = remoteConnectNumOfNWFilters, /* 0.8.0 */ - .listNWFilters = remoteConnectListNWFilters, /* 0.8.0 */ - .listAllNWFilters = remoteConnectListAllNWFilters, /* 0.10.2 */ + .nwfilterGetXMLDesc = remoteNWFilterGetXMLDesc, /* 0.8.0 */ + .nwfilterDefineXML = remoteNWFilterDefineXML, /* 0.8.0 */ + .nwfilterUndefine = remoteNWFilterUndefine, /* 0.8.0 */ + .connectNumOfNWFilters = remoteConnectNumOfNWFilters, /* 0.8.0 */ + .connectListNWFilters = remoteConnectListNWFilters, /* 0.8.0 */ + .connectListAllNWFilters = remoteConnectListAllNWFilters, /* 0.10.2 */ }; #ifdef WITH_LIBVIRTD static virStateDriver state_driver = { .name = "Remote", - .initialize = remoteStartup, + .stateInitialize = remoteStartup, }; #endif diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index c577817..9e7d382 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1157,25 +1157,25 @@ secretDriverReload(void) static virSecretDriver secretDriver = { .name = "secret", - .open = secretOpen, /* 0.7.1 */ - .close = secretClose, /* 0.7.1 */ - .numOfSecrets = secretNumOfSecrets, /* 0.7.1 */ - .listSecrets = secretListSecrets, /* 0.7.1 */ - .listAllSecrets = secretListAllSecrets, /* 0.10.2 */ - .lookupByUUID = secretLookupByUUID, /* 0.7.1 */ - .lookupByUsage = secretLookupByUsage, /* 0.7.1 */ - .defineXML = secretDefineXML, /* 0.7.1 */ - .getXMLDesc = secretGetXMLDesc, /* 0.7.1 */ - .setValue = secretSetValue, /* 0.7.1 */ - .getValue = secretGetValue, /* 0.7.1 */ - .undefine = secretUndefine, /* 0.7.1 */ + .connectOpen = secretOpen, /* 0.7.1 */ + .connectClose = secretClose, /* 0.7.1 */ + .connectNumOfSecrets = secretNumOfSecrets, /* 0.7.1 */ + .connectListSecrets = secretListSecrets, /* 0.7.1 */ + .connectListAllSecrets = secretListAllSecrets, /* 0.10.2 */ + .secretLookupByUUID = secretLookupByUUID, /* 0.7.1 */ + .secretLookupByUsage = secretLookupByUsage, /* 0.7.1 */ + .secretDefineXML = secretDefineXML, /* 0.7.1 */ + .secretGetXMLDesc = secretGetXMLDesc, /* 0.7.1 */ + .secretSetValue = secretSetValue, /* 0.7.1 */ + .secretGetValue = secretGetValue, /* 0.7.1 */ + .secretUndefine = secretUndefine, /* 0.7.1 */ }; static virStateDriver stateDriver = { .name = "Secret", - .initialize = secretDriverStartup, - .cleanup = secretDriverCleanup, - .reload = secretDriverReload, + .stateInitialize = secretDriverStartup, + .stateCleanup = secretDriverCleanup, + .stateReload = secretDriverReload, }; int diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index aa3f147..d4aabb6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -432,7 +432,7 @@ virStorageGenerateSecretUUID(virConnectPtr conn, _("unable to generate uuid")); return -1; } - tmp = conn->secretDriver->lookupByUUID(conn, uuid); + tmp = conn->secretDriver->secretLookupByUUID(conn, uuid); if (tmp == NULL) return 0; @@ -459,9 +459,9 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, int ret = -1; if (conn->secretDriver == NULL || - conn->secretDriver->lookupByUUID == NULL || - conn->secretDriver->defineXML == NULL || - conn->secretDriver->setValue == NULL) { + conn->secretDriver->secretLookupByUUID == NULL || + conn->secretDriver->secretDefineXML == NULL || + conn->secretDriver->secretSetValue == NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("secret storage not supported")); goto cleanup; @@ -497,7 +497,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, if (xml == NULL) goto cleanup; - secret = conn->secretDriver->defineXML(conn, xml, 0); + secret = conn->secretDriver->secretDefineXML(conn, xml, 0); if (secret == NULL) { VIR_FREE(xml); goto cleanup; @@ -507,7 +507,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, if (virStorageGenerateQcowPassphrase(value) < 0) goto cleanup; - if (conn->secretDriver->setValue(secret, value, sizeof(value), 0) < 0) + if (conn->secretDriver->secretSetValue(secret, value, sizeof(value), 0) < 0) goto cleanup; enc_secret->type = VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE; @@ -522,8 +522,8 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, cleanup: if (secret != NULL) { if (ret != 0 && - conn->secretDriver->undefine != NULL) - conn->secretDriver->undefine(secret); + conn->secretDriver->secretUndefine != NULL) + conn->secretDriver->secretUndefine(secret); virSecretFree(secret); } virBufferFreeAndReset(&buf); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index bf9db47..9613b3b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2369,58 +2369,58 @@ storageListAllPools(virConnectPtr conn, static virStorageDriver storageDriver = { .name = "storage", - .open = storageOpen, /* 0.4.0 */ - .close = storageClose, /* 0.4.0 */ - .numOfPools = storageNumPools, /* 0.4.0 */ - .listPools = storageListPools, /* 0.4.0 */ - .numOfDefinedPools = storageNumDefinedPools, /* 0.4.0 */ - .listDefinedPools = storageListDefinedPools, /* 0.4.0 */ - .listAllPools = storageListAllPools, /* 0.10.2 */ - .findPoolSources = storageFindPoolSources, /* 0.4.0 */ - .poolLookupByName = storagePoolLookupByName, /* 0.4.0 */ - .poolLookupByUUID = storagePoolLookupByUUID, /* 0.4.0 */ - .poolLookupByVolume = storagePoolLookupByVolume, /* 0.4.0 */ - .poolCreateXML = storagePoolCreate, /* 0.4.0 */ - .poolDefineXML = storagePoolDefine, /* 0.4.0 */ - .poolBuild = storagePoolBuild, /* 0.4.0 */ - .poolUndefine = storagePoolUndefine, /* 0.4.0 */ - .poolCreate = storagePoolStart, /* 0.4.0 */ - .poolDestroy = storagePoolDestroy, /* 0.4.0 */ - .poolDelete = storagePoolDelete, /* 0.4.0 */ - .poolRefresh = storagePoolRefresh, /* 0.4.0 */ - .poolGetInfo = storagePoolGetInfo, /* 0.4.0 */ - .poolGetXMLDesc = storagePoolGetXMLDesc, /* 0.4.0 */ - .poolGetAutostart = storagePoolGetAutostart, /* 0.4.0 */ - .poolSetAutostart = storagePoolSetAutostart, /* 0.4.0 */ - .poolNumOfVolumes = storagePoolNumVolumes, /* 0.4.0 */ - .poolListVolumes = storagePoolListVolumes, /* 0.4.0 */ - .poolListAllVolumes = storagePoolListAllVolumes, /* 0.10.2 */ - - .volLookupByName = storageVolumeLookupByName, /* 0.4.0 */ - .volLookupByKey = storageVolumeLookupByKey, /* 0.4.0 */ - .volLookupByPath = storageVolumeLookupByPath, /* 0.4.0 */ - .volCreateXML = storageVolumeCreateXML, /* 0.4.0 */ - .volCreateXMLFrom = storageVolumeCreateXMLFrom, /* 0.6.4 */ - .volDownload = storageVolumeDownload, /* 0.9.0 */ - .volUpload = storageVolumeUpload, /* 0.9.0 */ - .volDelete = storageVolumeDelete, /* 0.4.0 */ - .volWipe = storageVolumeWipe, /* 0.8.0 */ - .volWipePattern = storageVolumeWipePattern, /* 0.9.10 */ - .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ - .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ - .volGetPath = storageVolumeGetPath, /* 0.4.0 */ - .volResize = storageVolumeResize, /* 0.9.10 */ - - .poolIsActive = storagePoolIsActive, /* 0.7.3 */ - .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ + .connectOpen = storageOpen, /* 0.4.0 */ + .connectClose = storageClose, /* 0.4.0 */ + .connectNumOfStoragePools = storageNumPools, /* 0.4.0 */ + .connectListStoragePools = storageListPools, /* 0.4.0 */ + .connectNumOfDefinedStoragePools = storageNumDefinedPools, /* 0.4.0 */ + .connectListDefinedStoragePools = storageListDefinedPools, /* 0.4.0 */ + .connectListAllStoragePools = storageListAllPools, /* 0.10.2 */ + .connectFindStoragePoolSources = storageFindPoolSources, /* 0.4.0 */ + .storagePoolLookupByName = storagePoolLookupByName, /* 0.4.0 */ + .storagePoolLookupByUUID = storagePoolLookupByUUID, /* 0.4.0 */ + .storagePoolLookupByVolume = storagePoolLookupByVolume, /* 0.4.0 */ + .storagePoolCreateXML = storagePoolCreate, /* 0.4.0 */ + .storagePoolDefineXML = storagePoolDefine, /* 0.4.0 */ + .storagePoolBuild = storagePoolBuild, /* 0.4.0 */ + .storagePoolUndefine = storagePoolUndefine, /* 0.4.0 */ + .storagePoolCreate = storagePoolStart, /* 0.4.0 */ + .storagePoolDestroy = storagePoolDestroy, /* 0.4.0 */ + .storagePoolDelete = storagePoolDelete, /* 0.4.0 */ + .storagePoolRefresh = storagePoolRefresh, /* 0.4.0 */ + .storagePoolGetInfo = storagePoolGetInfo, /* 0.4.0 */ + .storagePoolGetXMLDesc = storagePoolGetXMLDesc, /* 0.4.0 */ + .storagePoolGetAutostart = storagePoolGetAutostart, /* 0.4.0 */ + .storagePoolSetAutostart = storagePoolSetAutostart, /* 0.4.0 */ + .storagePoolNumOfVolumes = storagePoolNumVolumes, /* 0.4.0 */ + .storagePoolListVolumes = storagePoolListVolumes, /* 0.4.0 */ + .storagePoolListAllVolumes = storagePoolListAllVolumes, /* 0.10.2 */ + + .storageVolLookupByName = storageVolumeLookupByName, /* 0.4.0 */ + .storageVolLookupByKey = storageVolumeLookupByKey, /* 0.4.0 */ + .storageVolLookupByPath = storageVolumeLookupByPath, /* 0.4.0 */ + .storageVolCreateXML = storageVolumeCreateXML, /* 0.4.0 */ + .storageVolCreateXMLFrom = storageVolumeCreateXMLFrom, /* 0.6.4 */ + .storageVolDownload = storageVolumeDownload, /* 0.9.0 */ + .storageVolUpload = storageVolumeUpload, /* 0.9.0 */ + .storageVolDelete = storageVolumeDelete, /* 0.4.0 */ + .storageVolWipe = storageVolumeWipe, /* 0.8.0 */ + .storageVolWipePattern = storageVolumeWipePattern, /* 0.9.10 */ + .storageVolGetInfo = storageVolumeGetInfo, /* 0.4.0 */ + .storageVolGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ + .storageVolGetPath = storageVolumeGetPath, /* 0.4.0 */ + .storageVolResize = storageVolumeResize, /* 0.9.10 */ + + .storagePoolIsActive = storagePoolIsActive, /* 0.7.3 */ + .storagePoolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ }; static virStateDriver stateDriver = { .name = "Storage", - .initialize = storageDriverStartup, - .cleanup = storageDriverShutdown, - .reload = storageDriverReload, + .stateInitialize = storageDriverStartup, + .stateCleanup = storageDriverShutdown, + .stateReload = storageDriverReload, }; int storageRegister(void) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 76fbfda..5272f06 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5793,16 +5793,16 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, static virDriver testDriver = { .no = VIR_DRV_TEST, .name = "Test", - .open = testOpen, /* 0.1.1 */ - .close = testClose, /* 0.1.1 */ - .version = testGetVersion, /* 0.1.1 */ - .getHostname = virGetHostname, /* 0.6.3 */ - .getMaxVcpus = testGetMaxVCPUs, /* 0.3.2 */ + .connectOpen = testOpen, /* 0.1.1 */ + .connectClose = testClose, /* 0.1.1 */ + .connectGetVersion = testGetVersion, /* 0.1.1 */ + .connectGetHostname = virGetHostname, /* 0.6.3 */ + .connectGetMaxVcpus = testGetMaxVCPUs, /* 0.3.2 */ .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ - .getCapabilities = testGetCapabilities, /* 0.2.1 */ - .listDomains = testListDomains, /* 0.1.1 */ - .numOfDomains = testNumOfDomains, /* 0.1.1 */ - .listAllDomains = testListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = testGetCapabilities, /* 0.2.1 */ + .connectListDomains = testListDomains, /* 0.1.1 */ + .connectNumOfDomains = testNumOfDomains, /* 0.1.1 */ + .connectListAllDomains = testListAllDomains, /* 0.9.13 */ .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ .domainLookupByID = testLookupDomainByID, /* 0.1.1 */ .domainLookupByUUID = testLookupDomainByUUID, /* 0.1.1 */ @@ -5831,8 +5831,8 @@ static virDriver testDriver = { .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ - .listDefinedDomains = testListDefinedDomains, /* 0.1.11 */ - .numOfDefinedDomains = testNumOfDefinedDomains, /* 0.1.11 */ + .connectListDefinedDomains = testListDefinedDomains, /* 0.1.11 */ + .connectNumOfDefinedDomains = testNumOfDefinedDomains, /* 0.1.11 */ .domainCreate = testDomainCreate, /* 0.1.11 */ .domainCreateWithFlags = testDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = testDomainDefineXML, /* 0.1.11 */ @@ -5848,29 +5848,29 @@ static virDriver testDriver = { .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ - .domainEventRegister = testDomainEventRegister, /* 0.6.0 */ - .domainEventDeregister = testDomainEventDeregister, /* 0.6.0 */ - .isEncrypted = testIsEncrypted, /* 0.7.3 */ - .isSecure = testIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = testDomainEventRegister, /* 0.6.0 */ + .connectDomainEventDeregister = testDomainEventDeregister, /* 0.6.0 */ + .connectIsEncrypted = testIsEncrypted, /* 0.7.3 */ + .connectIsSecure = testIsSecure, /* 0.7.3 */ .domainIsActive = testDomainIsActive, /* 0.7.3 */ .domainIsPersistent = testDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = testDomainIsUpdated, /* 0.8.6 */ - .domainEventRegisterAny = testDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ - .isAlive = testIsAlive, /* 0.9.8 */ + .connectDomainEventRegisterAny = testDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ + .connectIsAlive = testIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ }; static virNetworkDriver testNetworkDriver = { "Test", - .open = testOpenNetwork, /* 0.3.2 */ - .close = testCloseNetwork, /* 0.3.2 */ - .numOfNetworks = testNumNetworks, /* 0.3.2 */ - .listNetworks = testListNetworks, /* 0.3.2 */ - .numOfDefinedNetworks = testNumDefinedNetworks, /* 0.3.2 */ - .listDefinedNetworks = testListDefinedNetworks, /* 0.3.2 */ - .listAllNetworks = testNetworkListAllNetworks, /* 0.10.2 */ + .connectOpen = testOpenNetwork, /* 0.3.2 */ + .connectClose = testCloseNetwork, /* 0.3.2 */ + .connectNumOfNetworks = testNumNetworks, /* 0.3.2 */ + .connectListNetworks = testListNetworks, /* 0.3.2 */ + .connectNumOfDefinedNetworks = testNumDefinedNetworks, /* 0.3.2 */ + .connectListDefinedNetworks = testListDefinedNetworks, /* 0.3.2 */ + .connectListAllNetworks = testNetworkListAllNetworks, /* 0.10.2 */ .networkLookupByUUID = testLookupNetworkByUUID, /* 0.3.2 */ .networkLookupByName = testLookupNetworkByName, /* 0.3.2 */ .networkCreateXML = testNetworkCreate, /* 0.3.2 */ @@ -5889,12 +5889,12 @@ static virNetworkDriver testNetworkDriver = { static virInterfaceDriver testInterfaceDriver = { "Test", /* name */ - .open = testOpenInterface, /* 0.7.0 */ - .close = testCloseInterface, /* 0.7.0 */ - .numOfInterfaces = testNumOfInterfaces, /* 0.7.0 */ - .listInterfaces = testListInterfaces, /* 0.7.0 */ - .numOfDefinedInterfaces = testNumOfDefinedInterfaces, /* 0.7.0 */ - .listDefinedInterfaces = testListDefinedInterfaces, /* 0.7.0 */ + .connectOpen = testOpenInterface, /* 0.7.0 */ + .connectClose = testCloseInterface, /* 0.7.0 */ + .connectNumOfInterfaces = testNumOfInterfaces, /* 0.7.0 */ + .connectListInterfaces = testListInterfaces, /* 0.7.0 */ + .connectNumOfDefinedInterfaces = testNumOfDefinedInterfaces, /* 0.7.0 */ + .connectListDefinedInterfaces = testListDefinedInterfaces, /* 0.7.0 */ .interfaceLookupByName = testLookupInterfaceByName, /* 0.7.0 */ .interfaceLookupByMACString = testLookupInterfaceByMACString, /* 0.7.0 */ .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ @@ -5911,74 +5911,74 @@ static virInterfaceDriver testInterfaceDriver = { static virStorageDriver testStorageDriver = { .name = "Test", - .open = testStorageOpen, /* 0.4.1 */ - .close = testStorageClose, /* 0.4.1 */ - - .numOfPools = testStorageNumPools, /* 0.5.0 */ - .listPools = testStorageListPools, /* 0.5.0 */ - .numOfDefinedPools = testStorageNumDefinedPools, /* 0.5.0 */ - .listDefinedPools = testStorageListDefinedPools, /* 0.5.0 */ - .listAllPools = testStorageListAllPools, /* 0.10.2 */ - .findPoolSources = testStorageFindPoolSources, /* 0.5.0 */ - .poolLookupByName = testStoragePoolLookupByName, /* 0.5.0 */ - .poolLookupByUUID = testStoragePoolLookupByUUID, /* 0.5.0 */ - .poolLookupByVolume = testStoragePoolLookupByVolume, /* 0.5.0 */ - .poolCreateXML = testStoragePoolCreate, /* 0.5.0 */ - .poolDefineXML = testStoragePoolDefine, /* 0.5.0 */ - .poolBuild = testStoragePoolBuild, /* 0.5.0 */ - .poolUndefine = testStoragePoolUndefine, /* 0.5.0 */ - .poolCreate = testStoragePoolStart, /* 0.5.0 */ - .poolDestroy = testStoragePoolDestroy, /* 0.5.0 */ - .poolDelete = testStoragePoolDelete, /* 0.5.0 */ - .poolRefresh = testStoragePoolRefresh, /* 0.5.0 */ - .poolGetInfo = testStoragePoolGetInfo, /* 0.5.0 */ - .poolGetXMLDesc = testStoragePoolGetXMLDesc, /* 0.5.0 */ - .poolGetAutostart = testStoragePoolGetAutostart, /* 0.5.0 */ - .poolSetAutostart = testStoragePoolSetAutostart, /* 0.5.0 */ - .poolNumOfVolumes = testStoragePoolNumVolumes, /* 0.5.0 */ - .poolListVolumes = testStoragePoolListVolumes, /* 0.5.0 */ - .poolListAllVolumes = testStoragePoolListAllVolumes, /* 0.10.2 */ - - .volLookupByName = testStorageVolumeLookupByName, /* 0.5.0 */ - .volLookupByKey = testStorageVolumeLookupByKey, /* 0.5.0 */ - .volLookupByPath = testStorageVolumeLookupByPath, /* 0.5.0 */ - .volCreateXML = testStorageVolumeCreateXML, /* 0.5.0 */ - .volCreateXMLFrom = testStorageVolumeCreateXMLFrom, /* 0.6.4 */ - .volDelete = testStorageVolumeDelete, /* 0.5.0 */ - .volGetInfo = testStorageVolumeGetInfo, /* 0.5.0 */ - .volGetXMLDesc = testStorageVolumeGetXMLDesc, /* 0.5.0 */ - .volGetPath = testStorageVolumeGetPath, /* 0.5.0 */ - .poolIsActive = testStoragePoolIsActive, /* 0.7.3 */ - .poolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ + .connectOpen = testStorageOpen, /* 0.4.1 */ + .connectClose = testStorageClose, /* 0.4.1 */ + + .connectNumOfStoragePools = testStorageNumPools, /* 0.5.0 */ + .connectListStoragePools = testStorageListPools, /* 0.5.0 */ + .connectNumOfDefinedStoragePools = testStorageNumDefinedPools, /* 0.5.0 */ + .connectListDefinedStoragePools = testStorageListDefinedPools, /* 0.5.0 */ + .connectListAllStoragePools = testStorageListAllPools, /* 0.10.2 */ + .connectFindStoragePoolSources = testStorageFindPoolSources, /* 0.5.0 */ + .storagePoolLookupByName = testStoragePoolLookupByName, /* 0.5.0 */ + .storagePoolLookupByUUID = testStoragePoolLookupByUUID, /* 0.5.0 */ + .storagePoolLookupByVolume = testStoragePoolLookupByVolume, /* 0.5.0 */ + .storagePoolCreateXML = testStoragePoolCreate, /* 0.5.0 */ + .storagePoolDefineXML = testStoragePoolDefine, /* 0.5.0 */ + .storagePoolBuild = testStoragePoolBuild, /* 0.5.0 */ + .storagePoolUndefine = testStoragePoolUndefine, /* 0.5.0 */ + .storagePoolCreate = testStoragePoolStart, /* 0.5.0 */ + .storagePoolDestroy = testStoragePoolDestroy, /* 0.5.0 */ + .storagePoolDelete = testStoragePoolDelete, /* 0.5.0 */ + .storagePoolRefresh = testStoragePoolRefresh, /* 0.5.0 */ + .storagePoolGetInfo = testStoragePoolGetInfo, /* 0.5.0 */ + .storagePoolGetXMLDesc = testStoragePoolGetXMLDesc, /* 0.5.0 */ + .storagePoolGetAutostart = testStoragePoolGetAutostart, /* 0.5.0 */ + .storagePoolSetAutostart = testStoragePoolSetAutostart, /* 0.5.0 */ + .storagePoolNumOfVolumes = testStoragePoolNumVolumes, /* 0.5.0 */ + .storagePoolListVolumes = testStoragePoolListVolumes, /* 0.5.0 */ + .storagePoolListAllVolumes = testStoragePoolListAllVolumes, /* 0.10.2 */ + + .storageVolLookupByName = testStorageVolumeLookupByName, /* 0.5.0 */ + .storageVolLookupByKey = testStorageVolumeLookupByKey, /* 0.5.0 */ + .storageVolLookupByPath = testStorageVolumeLookupByPath, /* 0.5.0 */ + .storageVolCreateXML = testStorageVolumeCreateXML, /* 0.5.0 */ + .storageVolCreateXMLFrom = testStorageVolumeCreateXMLFrom, /* 0.6.4 */ + .storageVolDelete = testStorageVolumeDelete, /* 0.5.0 */ + .storageVolGetInfo = testStorageVolumeGetInfo, /* 0.5.0 */ + .storageVolGetXMLDesc = testStorageVolumeGetXMLDesc, /* 0.5.0 */ + .storageVolGetPath = testStorageVolumeGetPath, /* 0.5.0 */ + .storagePoolIsActive = testStoragePoolIsActive, /* 0.7.3 */ + .storagePoolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ }; static virDeviceMonitor testDevMonitor = { .name = "Test", - .open = testDevMonOpen, /* 0.6.0 */ - .close = testDevMonClose, /* 0.6.0 */ - - .numOfDevices = testNodeNumOfDevices, /* 0.7.2 */ - .listDevices = testNodeListDevices, /* 0.7.2 */ - .deviceLookupByName = testNodeDeviceLookupByName, /* 0.7.2 */ - .deviceGetXMLDesc = testNodeDeviceGetXMLDesc, /* 0.7.2 */ - .deviceGetParent = testNodeDeviceGetParent, /* 0.7.2 */ - .deviceNumOfCaps = testNodeDeviceNumOfCaps, /* 0.7.2 */ - .deviceListCaps = testNodeDeviceListCaps, /* 0.7.2 */ - .deviceCreateXML = testNodeDeviceCreateXML, /* 0.7.3 */ - .deviceDestroy = testNodeDeviceDestroy, /* 0.7.3 */ + .connectOpen = testDevMonOpen, /* 0.6.0 */ + .connectClose = testDevMonClose, /* 0.6.0 */ + + .nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */ + .nodeListDevices = testNodeListDevices, /* 0.7.2 */ + .nodeDeviceLookupByName = testNodeDeviceLookupByName, /* 0.7.2 */ + .nodeDeviceGetXMLDesc = testNodeDeviceGetXMLDesc, /* 0.7.2 */ + .nodeDeviceGetParent = testNodeDeviceGetParent, /* 0.7.2 */ + .nodeDeviceNumOfCaps = testNodeDeviceNumOfCaps, /* 0.7.2 */ + .nodeDeviceListCaps = testNodeDeviceListCaps, /* 0.7.2 */ + .nodeDeviceCreateXML = testNodeDeviceCreateXML, /* 0.7.3 */ + .nodeDeviceDestroy = testNodeDeviceDestroy, /* 0.7.3 */ }; static virSecretDriver testSecretDriver = { .name = "Test", - .open = testSecretOpen, /* 0.7.1 */ - .close = testSecretClose, /* 0.7.1 */ + .connectOpen = testSecretOpen, /* 0.7.1 */ + .connectClose = testSecretClose, /* 0.7.1 */ }; static virNWFilterDriver testNWFilterDriver = { .name = "Test", - .open = testNWFilterOpen, /* 0.8.0 */ - .close = testNWFilterClose, /* 0.8.0 */ + .connectOpen = testNWFilterOpen, /* 0.8.0 */ + .connectClose = testNWFilterClose, /* 0.8.0 */ }; /** diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 498d1d9..e30f067 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2593,16 +2593,16 @@ static int umlListAllDomains(virConnectPtr conn, static virDriver umlDriver = { .no = VIR_DRV_UML, .name = "UML", - .open = umlOpen, /* 0.5.0 */ - .close = umlClose, /* 0.5.0 */ - .type = umlGetType, /* 0.5.0 */ - .version = umlGetVersion, /* 0.5.0 */ - .getHostname = virGetHostname, /* 0.5.0 */ + .connectOpen = umlOpen, /* 0.5.0 */ + .connectClose = umlClose, /* 0.5.0 */ + .connectGetType = umlGetType, /* 0.5.0 */ + .connectGetVersion = umlGetVersion, /* 0.5.0 */ + .connectGetHostname = virGetHostname, /* 0.5.0 */ .nodeGetInfo = nodeGetInfo, /* 0.5.0 */ - .getCapabilities = umlGetCapabilities, /* 0.5.0 */ - .listDomains = umlListDomains, /* 0.5.0 */ - .numOfDomains = umlNumDomains, /* 0.5.0 */ - .listAllDomains = umlListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = umlGetCapabilities, /* 0.5.0 */ + .connectListDomains = umlListDomains, /* 0.5.0 */ + .connectNumOfDomains = umlNumDomains, /* 0.5.0 */ + .connectListAllDomains = umlListAllDomains, /* 0.9.13 */ .domainCreateXML = umlDomainCreate, /* 0.5.0 */ .domainLookupByID = umlDomainLookupByID, /* 0.5.0 */ .domainLookupByUUID = umlDomainLookupByUUID, /* 0.5.0 */ @@ -2618,8 +2618,8 @@ static virDriver umlDriver = { .domainGetInfo = umlDomainGetInfo, /* 0.5.0 */ .domainGetState = umlDomainGetState, /* 0.9.2 */ .domainGetXMLDesc = umlDomainGetXMLDesc, /* 0.5.0 */ - .listDefinedDomains = umlListDefinedDomains, /* 0.5.0 */ - .numOfDefinedDomains = umlNumDefinedDomains, /* 0.5.0 */ + .connectListDefinedDomains = umlListDefinedDomains, /* 0.5.0 */ + .connectNumOfDefinedDomains = umlNumDefinedDomains, /* 0.5.0 */ .domainCreate = umlDomainStart, /* 0.5.0 */ .domainCreateWithFlags = umlDomainStartWithFlags, /* 0.8.2 */ .domainDefineXML = umlDomainDefine, /* 0.5.0 */ @@ -2637,17 +2637,17 @@ static virDriver umlDriver = { .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.5.0 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.5.0 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .domainEventRegister = umlDomainEventRegister, /* 0.9.4 */ - .domainEventDeregister = umlDomainEventDeregister, /* 0.9.4 */ - .isEncrypted = umlIsEncrypted, /* 0.7.3 */ - .isSecure = umlIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = umlDomainEventRegister, /* 0.9.4 */ + .connectDomainEventDeregister = umlDomainEventDeregister, /* 0.9.4 */ + .connectIsEncrypted = umlIsEncrypted, /* 0.7.3 */ + .connectIsSecure = umlIsSecure, /* 0.7.3 */ .domainIsActive = umlDomainIsActive, /* 0.7.3 */ .domainIsPersistent = umlDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = umlDomainIsUpdated, /* 0.8.6 */ - .domainEventRegisterAny = umlDomainEventRegisterAny, /* 0.9.4 */ - .domainEventDeregisterAny = umlDomainEventDeregisterAny, /* 0.9.4 */ + .connectDomainEventRegisterAny = umlDomainEventRegisterAny, /* 0.9.4 */ + .connectDomainEventDeregisterAny = umlDomainEventDeregisterAny, /* 0.9.4 */ .domainOpenConsole = umlDomainOpenConsole, /* 0.8.6 */ - .isAlive = umlIsAlive, /* 0.9.8 */ + .connectIsAlive = umlIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ @@ -2655,9 +2655,9 @@ static virDriver umlDriver = { static virStateDriver umlStateDriver = { .name = "UML", - .initialize = umlStartup, - .cleanup = umlShutdown, - .reload = umlReload, + .stateInitialize = umlStartup, + .stateCleanup = umlShutdown, + .stateReload = umlReload, }; int umlRegister(void) { diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 736c895..c2e17e4 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -184,5 +184,5 @@ static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn, static virDriver vboxDriverDummy = { VIR_DRV_VBOX, "VBOX", - .open = vboxOpenDummy, + .connectOpen = vboxOpenDummy, }; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 0c82675..e9c4d5b 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -9405,16 +9405,16 @@ no_memory: virDriver NAME(Driver) = { .no = VIR_DRV_VBOX, .name = "VBOX", - .open = vboxOpen, /* 0.6.3 */ - .close = vboxClose, /* 0.6.3 */ - .version = vboxGetVersion, /* 0.6.3 */ - .getHostname = virGetHostname, /* 0.6.3 */ - .getMaxVcpus = vboxGetMaxVcpus, /* 0.6.3 */ + .connectOpen = vboxOpen, /* 0.6.3 */ + .connectClose = vboxClose, /* 0.6.3 */ + .connectGetVersion = vboxGetVersion, /* 0.6.3 */ + .connectGetHostname = virGetHostname, /* 0.6.3 */ + .connectGetMaxVcpus = vboxGetMaxVcpus, /* 0.6.3 */ .nodeGetInfo = nodeGetInfo, /* 0.6.3 */ - .getCapabilities = vboxGetCapabilities, /* 0.6.3 */ - .listDomains = vboxListDomains, /* 0.6.3 */ - .numOfDomains = vboxNumOfDomains, /* 0.6.3 */ - .listAllDomains = vboxListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = vboxGetCapabilities, /* 0.6.3 */ + .connectListDomains = vboxListDomains, /* 0.6.3 */ + .connectNumOfDomains = vboxNumOfDomains, /* 0.6.3 */ + .connectListAllDomains = vboxListAllDomains, /* 0.9.13 */ .domainCreateXML = vboxDomainCreateXML, /* 0.6.3 */ .domainLookupByID = vboxDomainLookupByID, /* 0.6.3 */ .domainLookupByUUID = vboxDomainLookupByUUID, /* 0.6.3 */ @@ -9436,8 +9436,8 @@ virDriver NAME(Driver) = { .domainGetVcpusFlags = vboxDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = vboxDomainGetMaxVcpus, /* 0.7.1 */ .domainGetXMLDesc = vboxDomainGetXMLDesc, /* 0.6.3 */ - .listDefinedDomains = vboxListDefinedDomains, /* 0.6.3 */ - .numOfDefinedDomains = vboxNumOfDefinedDomains, /* 0.6.3 */ + .connectListDefinedDomains = vboxListDefinedDomains, /* 0.6.3 */ + .connectNumOfDefinedDomains = vboxNumOfDefinedDomains, /* 0.6.3 */ .domainCreate = vboxDomainCreate, /* 0.6.3 */ .domainCreateWithFlags = vboxDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = vboxDomainDefineXML, /* 0.6.3 */ @@ -9454,17 +9454,17 @@ virDriver NAME(Driver) = { .domainScreenshot = vboxDomainScreenshot, /* 0.9.2 */ #endif #if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 - .domainEventRegister = vboxDomainEventRegister, /* 0.7.0 */ - .domainEventDeregister = vboxDomainEventDeregister, /* 0.7.0 */ + .connectDomainEventRegister = vboxDomainEventRegister, /* 0.7.0 */ + .connectDomainEventDeregister = vboxDomainEventDeregister, /* 0.7.0 */ #endif - .isEncrypted = vboxIsEncrypted, /* 0.7.3 */ - .isSecure = vboxIsSecure, /* 0.7.3 */ + .connectIsEncrypted = vboxIsEncrypted, /* 0.7.3 */ + .connectIsSecure = vboxIsSecure, /* 0.7.3 */ .domainIsActive = vboxDomainIsActive, /* 0.7.3 */ .domainIsPersistent = vboxDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = vboxDomainIsUpdated, /* 0.8.6 */ #if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 - .domainEventRegisterAny = vboxDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = vboxDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = vboxDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = vboxDomainEventDeregisterAny, /* 0.8.0 */ #endif .domainSnapshotCreateXML = vboxDomainSnapshotCreateXML, /* 0.8.0 */ .domainSnapshotGetXMLDesc = vboxDomainSnapshotGetXMLDesc, /* 0.8.0 */ @@ -9478,43 +9478,43 @@ virDriver NAME(Driver) = { .domainSnapshotHasMetadata = vboxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainRevertToSnapshot = vboxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = vboxDomainSnapshotDelete, /* 0.8.0 */ - .isAlive = vboxIsAlive, /* 0.9.8 */ + .connectIsAlive = vboxIsAlive, /* 0.9.8 */ }; virNetworkDriver NAME(NetworkDriver) = { "VBOX", - .open = vboxNetworkOpen, /* 0.6.4 */ - .close = vboxNetworkClose, /* 0.6.4 */ - .numOfNetworks = vboxNumOfNetworks, /* 0.6.4 */ - .listNetworks = vboxListNetworks, /* 0.6.4 */ - .numOfDefinedNetworks = vboxNumOfDefinedNetworks, /* 0.6.4 */ - .listDefinedNetworks = vboxListDefinedNetworks, /* 0.6.4 */ - .networkLookupByUUID = vboxNetworkLookupByUUID, /* 0.6.4 */ - .networkLookupByName = vboxNetworkLookupByName, /* 0.6.4 */ - .networkCreateXML = vboxNetworkCreateXML, /* 0.6.4 */ - .networkDefineXML = vboxNetworkDefineXML, /* 0.6.4 */ - .networkUndefine = vboxNetworkUndefine, /* 0.6.4 */ - .networkCreate = vboxNetworkCreate, /* 0.6.4 */ - .networkDestroy = vboxNetworkDestroy, /* 0.6.4 */ - .networkGetXMLDesc = vboxNetworkGetXMLDesc, /* 0.6.4 */ + .connectOpen = vboxNetworkOpen, /* 0.6.4 */ + .connectClose = vboxNetworkClose, /* 0.6.4 */ + .connectNumOfNetworks = vboxNumOfNetworks, /* 0.6.4 */ + .connectListNetworks = vboxListNetworks, /* 0.6.4 */ + .connectNumOfDefinedNetworks = vboxNumOfDefinedNetworks, /* 0.6.4 */ + .connectListDefinedNetworks = vboxListDefinedNetworks, /* 0.6.4 */ + .networkLookupByUUID = vboxNetworkLookupByUUID, /* 0.6.4 */ + .networkLookupByName = vboxNetworkLookupByName, /* 0.6.4 */ + .networkCreateXML = vboxNetworkCreateXML, /* 0.6.4 */ + .networkDefineXML = vboxNetworkDefineXML, /* 0.6.4 */ + .networkUndefine = vboxNetworkUndefine, /* 0.6.4 */ + .networkCreate = vboxNetworkCreate, /* 0.6.4 */ + .networkDestroy = vboxNetworkDestroy, /* 0.6.4 */ + .networkGetXMLDesc = vboxNetworkGetXMLDesc, /* 0.6.4 */ }; virStorageDriver NAME(StorageDriver) = { .name = "VBOX", - .open = vboxStorageOpen, /* 0.7.1 */ - .close = vboxStorageClose, /* 0.7.1 */ - .numOfPools = vboxStorageNumOfPools, /* 0.7.1 */ - .listPools = vboxStorageListPools, /* 0.7.1 */ - .poolLookupByName = vboxStoragePoolLookupByName, /* 0.7.1 */ - .poolNumOfVolumes = vboxStoragePoolNumOfVolumes, /* 0.7.1 */ - .poolListVolumes = vboxStoragePoolListVolumes, /* 0.7.1 */ - - .volLookupByName = vboxStorageVolLookupByName, /* 0.7.1 */ - .volLookupByKey = vboxStorageVolLookupByKey, /* 0.7.1 */ - .volLookupByPath = vboxStorageVolLookupByPath, /* 0.7.1 */ - .volCreateXML = vboxStorageVolCreateXML, /* 0.7.1 */ - .volDelete = vboxStorageVolDelete, /* 0.7.1 */ - .volGetInfo = vboxStorageVolGetInfo, /* 0.7.1 */ - .volGetXMLDesc = vboxStorageVolGetXMLDesc, /* 0.7.1 */ - .volGetPath = vboxStorageVolGetPath /* 0.7.1 */ + .connectOpen = vboxStorageOpen, /* 0.7.1 */ + .connectClose = vboxStorageClose, /* 0.7.1 */ + .connectNumOfStoragePools = vboxStorageNumOfPools, /* 0.7.1 */ + .connectListStoragePools = vboxStorageListPools, /* 0.7.1 */ + .storagePoolLookupByName = vboxStoragePoolLookupByName, /* 0.7.1 */ + .storagePoolNumOfVolumes = vboxStoragePoolNumOfVolumes, /* 0.7.1 */ + .storagePoolListVolumes = vboxStoragePoolListVolumes, /* 0.7.1 */ + + .storageVolLookupByName = vboxStorageVolLookupByName, /* 0.7.1 */ + .storageVolLookupByKey = vboxStorageVolLookupByKey, /* 0.7.1 */ + .storageVolLookupByPath = vboxStorageVolLookupByPath, /* 0.7.1 */ + .storageVolCreateXML = vboxStorageVolCreateXML, /* 0.7.1 */ + .storageVolDelete = vboxStorageVolDelete, /* 0.7.1 */ + .storageVolGetInfo = vboxStorageVolGetInfo, /* 0.7.1 */ + .storageVolGetXMLDesc = vboxStorageVolGetXMLDesc, /* 0.7.1 */ + .storageVolGetPath = vboxStorageVolGetPath /* 0.7.1 */ }; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index c7e493f..e42c8e5 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1120,13 +1120,13 @@ vmwareListAllDomains(virConnectPtr conn, static virDriver vmwareDriver = { .no = VIR_DRV_VMWARE, .name = "VMWARE", - .open = vmwareOpen, /* 0.8.7 */ - .close = vmwareClose, /* 0.8.7 */ - .type = vmwareGetType, /* 0.8.7 */ - .version = vmwareGetVersion, /* 0.8.7 */ - .listDomains = vmwareListDomains, /* 0.8.7 */ - .numOfDomains = vmwareNumDomains, /* 0.8.7 */ - .listAllDomains = vmwareListAllDomains, /* 0.9.13 */ + .connectOpen = vmwareOpen, /* 0.8.7 */ + .connectClose = vmwareClose, /* 0.8.7 */ + .connectGetType = vmwareGetType, /* 0.8.7 */ + .connectGetVersion = vmwareGetVersion, /* 0.8.7 */ + .connectListDomains = vmwareListDomains, /* 0.8.7 */ + .connectNumOfDomains = vmwareNumDomains, /* 0.8.7 */ + .connectListAllDomains = vmwareListAllDomains, /* 0.9.13 */ .domainCreateXML = vmwareDomainCreateXML, /* 0.8.7 */ .domainLookupByID = vmwareDomainLookupByID, /* 0.8.7 */ .domainLookupByUUID = vmwareDomainLookupByUUID, /* 0.8.7 */ @@ -1142,9 +1142,9 @@ static virDriver vmwareDriver = { .domainGetInfo = vmwareDomainGetInfo, /* 0.8.7 */ .domainGetState = vmwareDomainGetState, /* 0.9.2 */ .domainGetXMLDesc = vmwareDomainGetXMLDesc, /* 0.8.7 */ - .domainXMLFromNative = vmwareDomainXMLFromNative, /* 0.9.11 */ - .listDefinedDomains = vmwareListDefinedDomains, /* 0.8.7 */ - .numOfDefinedDomains = vmwareNumDefinedDomains, /* 0.8.7 */ + .connectDomainXMLFromNative = vmwareDomainXMLFromNative, /* 0.9.11 */ + .connectListDefinedDomains = vmwareListDefinedDomains, /* 0.8.7 */ + .connectNumOfDefinedDomains = vmwareNumDefinedDomains, /* 0.8.7 */ .domainCreate = vmwareDomainCreate, /* 0.8.7 */ .domainCreateWithFlags = vmwareDomainCreateWithFlags, /* 0.8.7 */ .domainDefineXML = vmwareDomainDefineXML, /* 0.8.7 */ @@ -1152,7 +1152,7 @@ static virDriver vmwareDriver = { .domainUndefineFlags = vmwareDomainUndefineFlags, /* 0.9.4 */ .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ - .isAlive = vmwareIsAlive, /* 0.9.8 */ + .connectIsAlive = vmwareIsAlive, /* 0.9.8 */ }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 5a15b58..04f4206 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -213,7 +213,7 @@ xenInitialize(bool privileged ATTRIBUTE_UNUSED, static virStateDriver state_driver = { .name = "Xen", - .initialize = xenInitialize, + .stateInitialize = xenInitialize, }; #endif @@ -2330,17 +2330,17 @@ cleanup: static virDriver xenUnifiedDriver = { .no = VIR_DRV_XEN_UNIFIED, .name = "Xen", - .open = xenUnifiedOpen, /* 0.0.3 */ - .close = xenUnifiedClose, /* 0.0.3 */ - .supports_feature = xenUnifiedSupportsFeature, /* 0.3.2 */ - .type = xenUnifiedType, /* 0.0.3 */ - .version = xenUnifiedGetVersion, /* 0.0.3 */ - .getHostname = virGetHostname, /* 0.7.3 */ - .getMaxVcpus = xenUnifiedGetMaxVcpus, /* 0.2.1 */ + .connectOpen = xenUnifiedOpen, /* 0.0.3 */ + .connectClose = xenUnifiedClose, /* 0.0.3 */ + .connectSupportsFeature = xenUnifiedSupportsFeature, /* 0.3.2 */ + .connectGetType = xenUnifiedType, /* 0.0.3 */ + .connectGetVersion = xenUnifiedGetVersion, /* 0.0.3 */ + .connectGetHostname = virGetHostname, /* 0.7.3 */ + .connectGetMaxVcpus = xenUnifiedGetMaxVcpus, /* 0.2.1 */ .nodeGetInfo = xenUnifiedNodeGetInfo, /* 0.1.0 */ - .getCapabilities = xenUnifiedGetCapabilities, /* 0.2.1 */ - .listDomains = xenUnifiedListDomains, /* 0.0.3 */ - .numOfDomains = xenUnifiedNumOfDomains, /* 0.0.3 */ + .connectGetCapabilities = xenUnifiedGetCapabilities, /* 0.2.1 */ + .connectListDomains = xenUnifiedListDomains, /* 0.0.3 */ + .connectNumOfDomains = xenUnifiedNumOfDomains, /* 0.0.3 */ .domainCreateXML = xenUnifiedDomainCreateXML, /* 0.0.3 */ .domainLookupByID = xenUnifiedDomainLookupByID, /* 0.0.3 */ .domainLookupByUUID = xenUnifiedDomainLookupByUUID, /* 0.0.5 */ @@ -2373,10 +2373,10 @@ static virDriver xenUnifiedDriver = { .domainGetVcpus = xenUnifiedDomainGetVcpus, /* 0.1.4 */ .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, /* 0.2.1 */ .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, /* 0.0.3 */ - .domainXMLFromNative = xenUnifiedDomainXMLFromNative, /* 0.6.4 */ - .domainXMLToNative = xenUnifiedDomainXMLToNative, /* 0.6.4 */ - .listDefinedDomains = xenUnifiedListDefinedDomains, /* 0.1.1 */ - .numOfDefinedDomains = xenUnifiedNumOfDefinedDomains, /* 0.1.5 */ + .connectDomainXMLFromNative = xenUnifiedDomainXMLFromNative, /* 0.6.4 */ + .connectDomainXMLToNative = xenUnifiedDomainXMLToNative, /* 0.6.4 */ + .connectListDefinedDomains = xenUnifiedListDefinedDomains, /* 0.1.1 */ + .connectNumOfDefinedDomains = xenUnifiedNumOfDefinedDomains, /* 0.1.5 */ .domainCreate = xenUnifiedDomainCreate, /* 0.1.1 */ .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = xenUnifiedDomainDefineXML, /* 0.1.1 */ @@ -2402,20 +2402,20 @@ static virDriver xenUnifiedDriver = { .domainBlockPeek = xenUnifiedDomainBlockPeek, /* 0.4.4 */ .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory, /* 0.3.3 */ .nodeGetFreeMemory = xenUnifiedNodeGetFreeMemory, /* 0.3.3 */ - .domainEventRegister = xenUnifiedDomainEventRegister, /* 0.5.0 */ - .domainEventDeregister = xenUnifiedDomainEventDeregister, /* 0.5.0 */ + .connectDomainEventRegister = xenUnifiedDomainEventRegister, /* 0.5.0 */ + .connectDomainEventDeregister = xenUnifiedDomainEventDeregister, /* 0.5.0 */ .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = xenUnifiedNodeDeviceReset, /* 0.6.1 */ - .isEncrypted = xenUnifiedIsEncrypted, /* 0.7.3 */ - .isSecure = xenUnifiedIsSecure, /* 0.7.3 */ + .connectIsEncrypted = xenUnifiedIsEncrypted, /* 0.7.3 */ + .connectIsSecure = xenUnifiedIsSecure, /* 0.7.3 */ .domainIsActive = xenUnifiedDomainIsActive, /* 0.7.3 */ .domainIsPersistent = xenUnifiedDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = xenUnifiedDomainIsUpdated, /* 0.8.6 */ - .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, /* 0.8.0 */ - .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = xenUnifiedDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = xenUnifiedDomainOpenConsole, /* 0.8.6 */ - .isAlive = xenUnifiedIsAlive, /* 0.9.8 */ + .connectIsAlive = xenUnifiedIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 123c4f2..fb81184 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1934,17 +1934,17 @@ xenapiIsAlive(virConnectPtr conn) static virDriver xenapiDriver = { .no = VIR_DRV_XENAPI, .name = "XenAPI", - .open = xenapiOpen, /* 0.8.0 */ - .close = xenapiClose, /* 0.8.0 */ - .supports_feature = xenapiSupportsFeature, /* 0.8.0 */ - .type = xenapiType, /* 0.8.0 */ - .version = xenapiGetVersion, /* 0.8.0 */ - .getHostname = xenapiGetHostname, /* 0.8.0 */ - .getMaxVcpus = xenapiGetMaxVcpus, /* 0.8.0 */ + .connectOpen = xenapiOpen, /* 0.8.0 */ + .connectClose = xenapiClose, /* 0.8.0 */ + .connectSupportsFeature = xenapiSupportsFeature, /* 0.8.0 */ + .connectGetType = xenapiType, /* 0.8.0 */ + .connectGetVersion = xenapiGetVersion, /* 0.8.0 */ + .connectGetHostname = xenapiGetHostname, /* 0.8.0 */ + .connectGetMaxVcpus = xenapiGetMaxVcpus, /* 0.8.0 */ .nodeGetInfo = xenapiNodeGetInfo, /* 0.8.0 */ - .getCapabilities = xenapiGetCapabilities, /* 0.8.0 */ - .listDomains = xenapiListDomains, /* 0.8.0 */ - .numOfDomains = xenapiNumOfDomains, /* 0.8.0 */ + .connectGetCapabilities = xenapiGetCapabilities, /* 0.8.0 */ + .connectListDomains = xenapiListDomains, /* 0.8.0 */ + .connectNumOfDomains = xenapiNumOfDomains, /* 0.8.0 */ .domainCreateXML = xenapiDomainCreateXML, /* 0.8.0 */ .domainLookupByID = xenapiDomainLookupByID, /* 0.8.0 */ .domainLookupByUUID = xenapiDomainLookupByUUID, /* 0.8.0 */ @@ -1968,8 +1968,8 @@ static virDriver xenapiDriver = { .domainGetVcpus = xenapiDomainGetVcpus, /* 0.8.0 */ .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, /* 0.8.0 */ .domainGetXMLDesc = xenapiDomainGetXMLDesc, /* 0.8.0 */ - .listDefinedDomains = xenapiListDefinedDomains, /* 0.8.0 */ - .numOfDefinedDomains = xenapiNumOfDefinedDomains, /* 0.8.0 */ + .connectListDefinedDomains = xenapiListDefinedDomains, /* 0.8.0 */ + .connectNumOfDefinedDomains = xenapiNumOfDefinedDomains, /* 0.8.0 */ .domainCreate = xenapiDomainCreate, /* 0.8.0 */ .domainCreateWithFlags = xenapiDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = xenapiDomainDefineXML, /* 0.8.0 */ @@ -1981,7 +1981,7 @@ static virDriver xenapiDriver = { .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, /* 0.8.0 */ .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ - .isAlive = xenapiIsAlive, /* 0.9.8 */ + .connectIsAlive = xenapiIsAlive, /* 0.9.8 */ }; /** diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ae73509..25722f3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -60,17 +60,17 @@ fakeSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virSecretDriver fakeSecretDriver = { .name = "fake_secret", - .open = NULL, - .close = fakeSecretClose, - .numOfSecrets = NULL, - .listSecrets = NULL, - .lookupByUUID = NULL, - .lookupByUsage = fakeSecretLookupByUsage, - .defineXML = NULL, - .getXMLDesc = NULL, - .setValue = NULL, - .getValue = fakeSecretGetValue, - .undefine = NULL, + .connectOpen = NULL, + .connectClose = fakeSecretClose, + .connectNumOfSecrets = NULL, + .connectListSecrets = NULL, + .secretLookupByUUID = NULL, + .secretLookupByUsage = fakeSecretLookupByUsage, + .secretDefineXML = NULL, + .secretGetXMLDesc = NULL, + .secretSetValue = NULL, + .secretGetValue = fakeSecretGetValue, + .secretUndefine = NULL, }; typedef enum { -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; The driver.h file has no consistent indentation usage across all the typedefs. Attempts to vertically align struct field members have also been inconsistently applied. Sanitize the whitespace used for typedefs & remove all vertical alignment from structs Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/driver.h | 2561 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 1376 insertions(+), 1185 deletions(-) diff --git a/src/driver.h b/src/driver.h index 8c1a9d1..8eb25ea 100644 --- a/src/driver.h +++ b/src/driver.h @@ -67,879 +67,967 @@ typedef enum { (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0) typedef virDrvOpenStatus - (*virDrvConnectOpen) (virConnectPtr conn, - virConnectAuthPtr auth, - unsigned int flags); +(*virDrvConnectOpen)(virConnectPtr conn, + virConnectAuthPtr auth, + unsigned int flags); + typedef int - (*virDrvConnectClose) (virConnectPtr conn); +(*virDrvConnectClose)(virConnectPtr conn); + typedef int - (*virDrvConnectSupportsFeature) (virConnectPtr conn, int feature); +(*virDrvConnectSupportsFeature)(virConnectPtr conn, + int feature); + typedef const char * - (*virDrvConnectGetType) (virConnectPtr conn); +(*virDrvConnectGetType)(virConnectPtr conn); + typedef int - (*virDrvConnectGetVersion) (virConnectPtr conn, - unsigned long *hvVer); +(*virDrvConnectGetVersion)(virConnectPtr conn, + unsigned long *hvVer); + typedef int - (*virDrvConnectGetLibVersion) (virConnectPtr conn, - unsigned long *libVer); +(*virDrvConnectGetLibVersion)(virConnectPtr conn, + unsigned long *libVer); + typedef char * - (*virDrvConnectGetHostname) (virConnectPtr conn); +(*virDrvConnectGetHostname)(virConnectPtr conn); + typedef char * - (*virDrvConnectGetURI) (virConnectPtr conn); +(*virDrvConnectGetURI)(virConnectPtr conn); + typedef char * - (*virDrvConnectGetSysinfo) (virConnectPtr conn, - unsigned int flags); +(*virDrvConnectGetSysinfo)(virConnectPtr conn, + unsigned int flags); + typedef int - (*virDrvConnectGetMaxVcpus) (virConnectPtr conn, - const char *type); +(*virDrvConnectGetMaxVcpus)(virConnectPtr conn, + const char *type); + typedef int - (*virDrvNodeGetInfo) (virConnectPtr conn, - virNodeInfoPtr info); +(*virDrvNodeGetInfo)(virConnectPtr conn, + virNodeInfoPtr info); + typedef char * - (*virDrvConnectGetCapabilities) (virConnectPtr conn); +(*virDrvConnectGetCapabilities)(virConnectPtr conn); + typedef int - (*virDrvConnectListDomains) (virConnectPtr conn, - int *ids, - int maxids); +(*virDrvConnectListDomains)(virConnectPtr conn, + int *ids, + int maxids); + typedef int - (*virDrvConnectNumOfDomains) (virConnectPtr conn); +(*virDrvConnectNumOfDomains)(virConnectPtr conn); + typedef virDomainPtr - (*virDrvDomainCreateXML) (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +(*virDrvDomainCreateXML)(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + typedef virDomainPtr - (*virDrvDomainLookupByID) (virConnectPtr conn, - int id); +(*virDrvDomainLookupByID)(virConnectPtr conn, + int id); + typedef virDomainPtr - (*virDrvDomainLookupByUUID) (virConnectPtr conn, - const unsigned char *uuid); +(*virDrvDomainLookupByUUID)(virConnectPtr conn, + const unsigned char *uuid); + typedef virDomainPtr - (*virDrvDomainLookupByName) (virConnectPtr conn, - const char *name); +(*virDrvDomainLookupByName)(virConnectPtr conn, + const char *name); + typedef int - (*virDrvDomainSuspend) (virDomainPtr domain); +(*virDrvDomainSuspend)(virDomainPtr domain); + typedef int - (*virDrvDomainResume) (virDomainPtr domain); +(*virDrvDomainResume)(virDomainPtr domain); + typedef int - (*virDrvDomainPMSuspendForDuration) (virDomainPtr, - unsigned int target, - unsigned long long duration, - unsigned int flags); + (*virDrvDomainPMSuspendForDuration)(virDomainPtr, + unsigned int target, + unsigned long long duration, + unsigned int flags); + typedef int - (*virDrvDomainPMWakeup) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainPMWakeup)(virDomainPtr domain, + unsigned int flags); + typedef int - (*virDrvDomainShutdown) (virDomainPtr domain); +(*virDrvDomainShutdown)(virDomainPtr domain); + typedef int - (*virDrvDomainReboot) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainReboot)(virDomainPtr domain, + unsigned int flags); + typedef int - (*virDrvDomainReset) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainReset)(virDomainPtr domain, + unsigned int flags); + typedef int - (*virDrvDomainDestroy) (virDomainPtr domain); +(*virDrvDomainDestroy)(virDomainPtr domain); + typedef int - (*virDrvDomainDestroyFlags) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainDestroyFlags)(virDomainPtr domain, + unsigned int flags); + typedef char * - (*virDrvDomainGetOSType) (virDomainPtr domain); +(*virDrvDomainGetOSType)(virDomainPtr domain); typedef char * - (*virDrvDomainGetHostname) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainGetHostname)(virDomainPtr domain, + unsigned int flags); typedef unsigned long long - (*virDrvDomainGetMaxMemory) (virDomainPtr domain); +(*virDrvDomainGetMaxMemory)(virDomainPtr domain); + typedef int - (*virDrvDomainSetMaxMemory) (virDomainPtr domain, - unsigned long memory); +(*virDrvDomainSetMaxMemory)(virDomainPtr domain, + unsigned long memory); + typedef int - (*virDrvDomainSetMemory) (virDomainPtr domain, - unsigned long memory); +(*virDrvDomainSetMemory)(virDomainPtr domain, + unsigned long memory); + typedef int - (*virDrvDomainSetMemoryFlags) (virDomainPtr domain, - unsigned long memory, - unsigned int flags); +(*virDrvDomainSetMemoryFlags)(virDomainPtr domain, + unsigned long memory, + unsigned int flags); + typedef int - (*virDrvDomainSetMemoryParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvDomainSetMemoryParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetMemoryParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetMemoryParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); + typedef int - (*virDrvDomainSetNumaParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvDomainSetNumaParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetNumaParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetNumaParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvDomainSetBlkioParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvDomainSetBlkioParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetBlkioParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetBlkioParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetInfo) (virDomainPtr domain, - virDomainInfoPtr info); +(*virDrvDomainGetInfo)(virDomainPtr domain, + virDomainInfoPtr info); + typedef int - (*virDrvDomainGetState) (virDomainPtr domain, - int *state, - int *reason, - unsigned int flags); +(*virDrvDomainGetState)(virDomainPtr domain, + int *state, + int *reason, + unsigned int flags); + typedef int - (*virDrvDomainGetControlInfo) (virDomainPtr domain, - virDomainControlInfoPtr info, - unsigned int flags); +(*virDrvDomainGetControlInfo)(virDomainPtr domain, + virDomainControlInfoPtr info, + unsigned int flags); + typedef int - (*virDrvDomainSave) (virDomainPtr domain, - const char *to); +(*virDrvDomainSave)(virDomainPtr domain, + const char *to); + typedef int - (*virDrvDomainSaveFlags) (virDomainPtr domain, - const char *to, - const char *dxml, - unsigned int flags); +(*virDrvDomainSaveFlags)(virDomainPtr domain, + const char *to, + const char *dxml, + unsigned int flags); + typedef int - (*virDrvDomainRestore) (virConnectPtr conn, - const char *from); +(*virDrvDomainRestore)(virConnectPtr conn, + const char *from); + typedef int - (*virDrvDomainRestoreFlags) (virConnectPtr conn, - const char *from, - const char *dxml, - unsigned int flags); +(*virDrvDomainRestoreFlags)(virConnectPtr conn, + const char *from, + const char *dxml, + unsigned int flags); + typedef char * - (*virDrvDomainSaveImageGetXMLDesc) (virConnectPtr conn, - const char *file, - unsigned int flags); +(*virDrvDomainSaveImageGetXMLDesc)(virConnectPtr conn, + const char *file, + unsigned int flags); + typedef int - (*virDrvDomainSaveImageDefineXML) (virConnectPtr conn, - const char *file, - const char *dxml, - unsigned int flags); +(*virDrvDomainSaveImageDefineXML)(virConnectPtr conn, + const char *file, + const char *dxml, + unsigned int flags); + typedef int - (*virDrvDomainCoreDump) (virDomainPtr domain, - const char *to, - unsigned int flags); +(*virDrvDomainCoreDump)(virDomainPtr domain, + const char *to, + unsigned int flags); + typedef char * - (*virDrvDomainScreenshot) (virDomainPtr domain, - virStreamPtr stream, - unsigned int screen, - unsigned int flags); +(*virDrvDomainScreenshot)(virDomainPtr domain, + virStreamPtr stream, + unsigned int screen, + unsigned int flags); + typedef char * - (*virDrvDomainGetXMLDesc) (virDomainPtr dom, - unsigned int flags); +(*virDrvDomainGetXMLDesc)(virDomainPtr dom, + unsigned int flags); + typedef char * - (*virDrvConnectDomainXMLFromNative) (virConnectPtr conn, - const char *nativeFormat, - const char *nativeConfig, - unsigned int flags); +(*virDrvConnectDomainXMLFromNative)(virConnectPtr conn, + const char *nativeFormat, + const char *nativeConfig, + unsigned int flags); + typedef char * - (*virDrvConnectDomainXMLToNative) (virConnectPtr conn, - const char *nativeFormat, - const char *domainXml, - unsigned int flags); +(*virDrvConnectDomainXMLToNative)(virConnectPtr conn, + const char *nativeFormat, + const char *domainXml, + unsigned int flags); + typedef int - (*virDrvConnectListDefinedDomains) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListDefinedDomains)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectListAllDomains) (virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags); +(*virDrvConnectListAllDomains)(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags); + typedef int - (*virDrvConnectNumOfDefinedDomains) (virConnectPtr conn); +(*virDrvConnectNumOfDefinedDomains)(virConnectPtr conn); + typedef int - (*virDrvDomainCreate) (virDomainPtr dom); +(*virDrvDomainCreate)(virDomainPtr dom); + typedef int - (*virDrvDomainCreateWithFlags) (virDomainPtr dom, - unsigned int flags); +(*virDrvDomainCreateWithFlags)(virDomainPtr dom, + unsigned int flags); + typedef virDomainPtr - (*virDrvDomainDefineXML) (virConnectPtr conn, - const char *xml); +(*virDrvDomainDefineXML)(virConnectPtr conn, + const char *xml); + typedef int - (*virDrvDomainUndefine) (virDomainPtr dom); +(*virDrvDomainUndefine)(virDomainPtr dom); + typedef int - (*virDrvDomainUndefineFlags) (virDomainPtr dom, - unsigned int flags); +(*virDrvDomainUndefineFlags)(virDomainPtr dom, + unsigned int flags); + typedef int - (*virDrvDomainSetVcpus) (virDomainPtr domain, - unsigned int nvcpus); +(*virDrvDomainSetVcpus)(virDomainPtr domain, + unsigned int nvcpus); + typedef int - (*virDrvDomainSetVcpusFlags) (virDomainPtr domain, - unsigned int nvcpus, - unsigned int flags); +(*virDrvDomainSetVcpusFlags)(virDomainPtr domain, + unsigned int nvcpus, + unsigned int flags); + typedef int - (*virDrvDomainGetVcpusFlags) (virDomainPtr domain, - unsigned int flags); +(*virDrvDomainGetVcpusFlags)(virDomainPtr domain, + unsigned int flags); + typedef int - (*virDrvDomainPinVcpu) (virDomainPtr domain, - unsigned int vcpu, - unsigned char *cpumap, - int maplen); +(*virDrvDomainPinVcpu)(virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen); + typedef int - (*virDrvDomainPinVcpuFlags) (virDomainPtr domain, - unsigned int vcpu, - unsigned char *cpumap, - int maplen, - unsigned int flags); +(*virDrvDomainPinVcpuFlags)(virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags); + typedef int - (*virDrvDomainGetVcpuPinInfo) (virDomainPtr domain, - int ncpumaps, - unsigned char *cpumaps, - int maplen, - unsigned int flags); - typedef int - (*virDrvDomainPinEmulator) (virDomainPtr domain, - unsigned char *cpumap, - int maplen, - unsigned int flags); +(*virDrvDomainGetVcpuPinInfo)(virDomainPtr domain, + int ncpumaps, + unsigned char *cpumaps, + int maplen, + unsigned int flags); + typedef int - (*virDrvDomainGetEmulatorPinInfo) (virDomainPtr domain, - unsigned char *cpumaps, - int maplen, - unsigned int flags); +(*virDrvDomainPinEmulator)(virDomainPtr domain, + unsigned char *cpumap, + int maplen, + unsigned int flags); typedef int - (*virDrvDomainGetVcpus) (virDomainPtr domain, - virVcpuInfoPtr info, - int maxinfo, - unsigned char *cpumaps, - int maplen); +(*virDrvDomainGetEmulatorPinInfo)(virDomainPtr domain, + unsigned char *cpumaps, + int maplen, + unsigned int flags); + typedef int - (*virDrvDomainGetMaxVcpus) (virDomainPtr domain); +(*virDrvDomainGetVcpus)(virDomainPtr domain, + virVcpuInfoPtr info, + int maxinfo, + unsigned char *cpumaps, + int maplen); typedef int - (*virDrvDomainGetSecurityLabel) (virDomainPtr domain, - virSecurityLabelPtr seclabel); +(*virDrvDomainGetMaxVcpus)(virDomainPtr domain); + +typedef int +(*virDrvDomainGetSecurityLabel)(virDomainPtr domain, + virSecurityLabelPtr seclabel); + typedef int - (*virDrvDomainGetSecurityLabelList) (virDomainPtr domain, - virSecurityLabelPtr* seclabels); +(*virDrvDomainGetSecurityLabelList)(virDomainPtr domain, + virSecurityLabelPtr* seclabels); + typedef int - (*virDrvNodeGetSecurityModel) (virConnectPtr conn, - virSecurityModelPtr secmodel); +(*virDrvNodeGetSecurityModel)(virConnectPtr conn, + virSecurityModelPtr secmodel); + typedef int - (*virDrvDomainAttachDevice) (virDomainPtr domain, - const char *xml); +(*virDrvDomainAttachDevice)(virDomainPtr domain, + const char *xml); + typedef int - (*virDrvDomainAttachDeviceFlags) (virDomainPtr domain, - const char *xml, - unsigned int flags); +(*virDrvDomainAttachDeviceFlags)(virDomainPtr domain, + const char *xml, + unsigned int flags); + typedef int - (*virDrvDomainDetachDevice) (virDomainPtr domain, - const char *xml); +(*virDrvDomainDetachDevice)(virDomainPtr domain, + const char *xml); + typedef int - (*virDrvDomainDetachDeviceFlags) (virDomainPtr domain, - const char *xml, - unsigned int flags); +(*virDrvDomainDetachDeviceFlags)(virDomainPtr domain, + const char *xml, + unsigned int flags); + typedef int - (*virDrvDomainUpdateDeviceFlags) (virDomainPtr domain, - const char *xml, - unsigned int flags); +(*virDrvDomainUpdateDeviceFlags)(virDomainPtr domain, + const char *xml, + unsigned int flags); + typedef int - (*virDrvDomainGetAutostart) (virDomainPtr domain, - int *autostart); +(*virDrvDomainGetAutostart)(virDomainPtr domain, + int *autostart); + typedef int - (*virDrvDomainSetAutostart) (virDomainPtr domain, - int autostart); +(*virDrvDomainSetAutostart)(virDomainPtr domain, + int autostart); typedef char * - (*virDrvDomainGetSchedulerType) (virDomainPtr domain, - int *nparams); +(*virDrvDomainGetSchedulerType)(virDomainPtr domain, + int *nparams); typedef int - (*virDrvDomainGetSchedulerParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams); +(*virDrvDomainGetSchedulerParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams); typedef int - (*virDrvDomainGetSchedulerParametersFlags) - (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetSchedulerParametersFlags)(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvDomainSetSchedulerParameters) - (virDomainPtr domain, - virTypedParameterPtr params, - int nparams); +(*virDrvDomainSetSchedulerParameters)(virDomainPtr domain, + virTypedParameterPtr params, + int nparams); typedef int - (*virDrvDomainSetSchedulerParametersFlags) - (virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvDomainSetSchedulerParametersFlags)(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags); typedef int - (*virDrvDomainBlockStats) - (virDomainPtr domain, - const char *path, - struct _virDomainBlockStats *stats); +(*virDrvDomainBlockStats)(virDomainPtr domain, + const char *path, + struct _virDomainBlockStats *stats); + typedef int - (*virDrvDomainBlockStatsFlags) - (virDomainPtr domain, - const char *path, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainBlockStatsFlags)(virDomainPtr domain, + const char *path, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); + typedef int - (*virDrvDomainInterfaceStats) - (virDomainPtr domain, - const char *path, - struct _virDomainInterfaceStats *stats); +(*virDrvDomainInterfaceStats)(virDomainPtr domain, + const char *path, + struct _virDomainInterfaceStats *stats); + typedef int - (*virDrvDomainSetInterfaceParameters) (virDomainPtr dom, - const char *device, - virTypedParameterPtr params, - int nparams, unsigned int flags); +(*virDrvDomainSetInterfaceParameters)(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetInterfaceParameters) (virDomainPtr dom, - const char *device, - virTypedParameterPtr params, - int *nparams, unsigned int flags); +(*virDrvDomainGetInterfaceParameters)(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvDomainMemoryStats) - (virDomainPtr domain, - struct _virDomainMemoryStat *stats, - unsigned int nr_stats, - unsigned int flags); +(*virDrvDomainMemoryStats)(virDomainPtr domain, + struct _virDomainMemoryStat *stats, + unsigned int nr_stats, + unsigned int flags); typedef int - (*virDrvDomainBlockPeek) - (virDomainPtr domain, - const char *path, - unsigned long long offset, size_t size, - void *buffer, - unsigned int flags); +(*virDrvDomainBlockPeek)(virDomainPtr domain, + const char *path, + unsigned long long offset, + size_t size, + void *buffer, + unsigned int flags); + typedef int - (*virDrvDomainBlockResize) - (virDomainPtr domain, - const char *path, - unsigned long long size, - unsigned int flags); +(*virDrvDomainBlockResize)(virDomainPtr domain, + const char *path, + unsigned long long size, + unsigned int flags); + typedef int - (*virDrvDomainMemoryPeek) - (virDomainPtr domain, - unsigned long long start, size_t size, - void *buffer, - unsigned int flags); +(*virDrvDomainMemoryPeek)(virDomainPtr domain, + unsigned long long start, + size_t size, + void *buffer, + unsigned int flags); + typedef int - (*virDrvDomainGetBlockInfo) - (virDomainPtr domain, - const char *path, - virDomainBlockInfoPtr info, - unsigned int flags); +(*virDrvDomainGetBlockInfo)(virDomainPtr domain, + const char *path, + virDomainBlockInfoPtr info, + unsigned int flags); typedef int - (*virDrvDomainMigratePrepare) - (virConnectPtr dconn, - char **cookie, - int *cookielen, - const char *uri_in, - char **uri_out, - unsigned long flags, - const char *dname, - unsigned long resource); +(*virDrvDomainMigratePrepare)(virConnectPtr dconn, + char **cookie, + int *cookielen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource); typedef int - (*virDrvDomainMigratePerform) - (virDomainPtr domain, - const char *cookie, - int cookielen, - const char *uri, - unsigned long flags, - const char *dname, - unsigned long resource); +(*virDrvDomainMigratePerform)(virDomainPtr domain, + const char *cookie, + int cookielen, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); typedef virDomainPtr - (*virDrvDomainMigrateFinish) - (virConnectPtr dconn, - const char *dname, - const char *cookie, - int cookielen, - const char *uri, - unsigned long flags); - -typedef struct _virDriver virDriver; -typedef virDriver *virDriverPtr; +(*virDrvDomainMigrateFinish)(virConnectPtr dconn, + const char *dname, + const char *cookie, + int cookielen, + const char *uri, + unsigned long flags); typedef int - (*virDrvNodeGetCPUStats) - (virConnectPtr conn, - int cpuNum, - virNodeCPUStatsPtr params, - int *nparams, - unsigned int flags); +(*virDrvNodeGetCPUStats)(virConnectPtr conn, + int cpuNum, + virNodeCPUStatsPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvNodeGetMemoryStats) - (virConnectPtr conn, - int cellNum, - virNodeMemoryStatsPtr params, - int *nparams, - unsigned int flags); +(*virDrvNodeGetMemoryStats)(virConnectPtr conn, + int cellNum, + virNodeMemoryStatsPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvNodeGetCellsFreeMemory) - (virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells); +(*virDrvNodeGetCellsFreeMemory)(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells); typedef unsigned long long - (*virDrvNodeGetFreeMemory) - (virConnectPtr conn); +(*virDrvNodeGetFreeMemory)(virConnectPtr conn); typedef int - (*virDrvConnectDomainEventRegister) - (virConnectPtr conn, - virConnectDomainEventCallback cb, - void *opaque, - virFreeCallback freecb); +(*virDrvConnectDomainEventRegister)(virConnectPtr conn, + virConnectDomainEventCallback cb, + void *opaque, + virFreeCallback freecb); typedef int - (*virDrvConnectDomainEventDeregister) - (virConnectPtr conn, - virConnectDomainEventCallback cb); +(*virDrvConnectDomainEventDeregister)(virConnectPtr conn, + virConnectDomainEventCallback cb); typedef int - (*virDrvDomainMigratePrepare2) - (virConnectPtr dconn, - char **cookie, - int *cookielen, - const char *uri_in, - char **uri_out, - unsigned long flags, - const char *dname, - unsigned long resource, - const char *dom_xml); +(*virDrvDomainMigratePrepare2)(virConnectPtr dconn, + char **cookie, + int *cookielen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); typedef virDomainPtr - (*virDrvDomainMigrateFinish2) - (virConnectPtr dconn, - const char *dname, - const char *cookie, - int cookielen, - const char *uri, - unsigned long flags, - int retcode); +(*virDrvDomainMigrateFinish2)(virConnectPtr dconn, + const char *dname, + const char *cookie, + int cookielen, + const char *uri, + unsigned long flags, + int retcode); typedef int - (*virDrvNodeDeviceDettach) - (virNodeDevicePtr dev); +(*virDrvNodeDeviceDettach)(virNodeDevicePtr dev); + typedef int - (*virDrvNodeDeviceReAttach) - (virNodeDevicePtr dev); +(*virDrvNodeDeviceReAttach)(virNodeDevicePtr dev); + typedef int - (*virDrvNodeDeviceReset) - (virNodeDevicePtr dev); +(*virDrvNodeDeviceReset)(virNodeDevicePtr dev); typedef int - (*virDrvDomainMigratePrepareTunnel) - (virConnectPtr dconn, - virStreamPtr st, - unsigned long flags, - const char *dname, - unsigned long resource, - const char *dom_xml); +(*virDrvDomainMigratePrepareTunnel)(virConnectPtr dconn, + virStreamPtr st, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); typedef int - (*virDrvConnectIsEncrypted)(virConnectPtr conn); +(*virDrvConnectIsEncrypted)(virConnectPtr conn); + typedef int - (*virDrvConnectIsSecure)(virConnectPtr conn); +(*virDrvConnectIsSecure)(virConnectPtr conn); + typedef int - (*virDrvConnectIsAlive)(virConnectPtr conn); +(*virDrvConnectIsAlive)(virConnectPtr conn); + typedef int - (*virDrvDomainIsActive)(virDomainPtr dom); +(*virDrvDomainIsActive)(virDomainPtr dom); + typedef int - (*virDrvDomainIsPersistent)(virDomainPtr dom); +(*virDrvDomainIsPersistent)(virDomainPtr dom); + typedef int - (*virDrvDomainIsUpdated)(virDomainPtr dom); +(*virDrvDomainIsUpdated)(virDomainPtr dom); typedef int - (*virDrvConnectCompareCPU)(virConnectPtr conn, - const char *cpu, - unsigned int flags); +(*virDrvConnectCompareCPU)(virConnectPtr conn, + const char *cpu, + unsigned int flags); + typedef char * - (*virDrvConnectBaselineCPU)(virConnectPtr conn, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags); +(*virDrvConnectBaselineCPU)(virConnectPtr conn, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags); typedef int - (*virDrvDomainGetJobInfo)(virDomainPtr domain, - virDomainJobInfoPtr info); +(*virDrvDomainGetJobInfo)(virDomainPtr domain, + virDomainJobInfoPtr info); + typedef int - (*virDrvDomainGetJobStats)(virDomainPtr domain, - int *type, - virTypedParameterPtr *params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetJobStats)(virDomainPtr domain, + int *type, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags); typedef int - (*virDrvDomainAbortJob)(virDomainPtr domain); +(*virDrvDomainAbortJob)(virDomainPtr domain); typedef int - (*virDrvDomainMigrateSetMaxDowntime)(virDomainPtr domain, - unsigned long long downtime, - unsigned int flags); +(*virDrvDomainMigrateSetMaxDowntime)(virDomainPtr domain, + unsigned long long downtime, + unsigned int flags); + typedef int - (*virDrvDomainMigrateGetCompressionCache)(virDomainPtr domain, - unsigned long long *cacheSize, - unsigned int flags); +(*virDrvDomainMigrateGetCompressionCache)(virDomainPtr domain, + unsigned long long *cacheSize, + unsigned int flags); + typedef int - (*virDrvDomainMigrateSetCompressionCache)(virDomainPtr domain, - unsigned long long cacheSize, - unsigned int flags); +(*virDrvDomainMigrateSetCompressionCache)(virDomainPtr domain, + unsigned long long cacheSize, + unsigned int flags); typedef int - (*virDrvDomainMigrateSetMaxSpeed)(virDomainPtr domain, - unsigned long bandwidth, - unsigned int flags); +(*virDrvDomainMigrateSetMaxSpeed)(virDomainPtr domain, + unsigned long bandwidth, + unsigned int flags); typedef int - (*virDrvDomainMigrateGetMaxSpeed)(virDomainPtr domain, - unsigned long *bandwidth, - unsigned int flags); +(*virDrvDomainMigrateGetMaxSpeed)(virDomainPtr domain, + unsigned long *bandwidth, + unsigned int flags); typedef int - (*virDrvConnectDomainEventRegisterAny)(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback cb, - void *opaque, - virFreeCallback freecb); +(*virDrvConnectDomainEventRegisterAny)(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback cb, + void *opaque, + virFreeCallback freecb); typedef int - (*virDrvConnectDomainEventDeregisterAny)(virConnectPtr conn, - int callbackID); +(*virDrvConnectDomainEventDeregisterAny)(virConnectPtr conn, + int callbackID); typedef int - (*virDrvDomainManagedSave)(virDomainPtr domain, unsigned int flags); +(*virDrvDomainManagedSave)(virDomainPtr domain, + unsigned int flags); typedef int - (*virDrvDomainHasManagedSaveImage)(virDomainPtr domain, unsigned int flags); +(*virDrvDomainHasManagedSaveImage)(virDomainPtr domain, + unsigned int flags); typedef int - (*virDrvDomainManagedSaveRemove)(virDomainPtr domain, unsigned int flags); +(*virDrvDomainManagedSaveRemove)(virDomainPtr domain, + unsigned int flags); typedef virDomainSnapshotPtr - (*virDrvDomainSnapshotCreateXML)(virDomainPtr domain, - const char *xmlDesc, - unsigned int flags); +(*virDrvDomainSnapshotCreateXML)(virDomainPtr domain, + const char *xmlDesc, + unsigned int flags); typedef char * - (*virDrvDomainSnapshotGetXMLDesc)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotGetXMLDesc)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainSnapshotNum)(virDomainPtr domain, unsigned int flags); +(*virDrvDomainSnapshotNum)(virDomainPtr domain, + unsigned int flags); typedef int - (*virDrvDomainSnapshotListNames)(virDomainPtr domain, char **names, - int nameslen, - unsigned int flags); +(*virDrvDomainSnapshotListNames)(virDomainPtr domain, + char **names, + int nameslen, + unsigned int flags); typedef int - (*virDrvDomainListAllSnapshots)(virDomainPtr domain, - virDomainSnapshotPtr **snaps, - unsigned int flags); +(*virDrvDomainListAllSnapshots)(virDomainPtr domain, + virDomainSnapshotPtr **snaps, + unsigned int flags); typedef int - (*virDrvDomainSnapshotNumChildren)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotNumChildren)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainSnapshotListChildrenNames)(virDomainSnapshotPtr snapshot, - char **names, - int nameslen, - unsigned int flags); +(*virDrvDomainSnapshotListChildrenNames)(virDomainSnapshotPtr snapshot, + char **names, + int nameslen, + unsigned int flags); typedef int - (*virDrvDomainSnapshotListAllChildren)(virDomainSnapshotPtr snapshot, - virDomainSnapshotPtr **snaps, - unsigned int flags); +(*virDrvDomainSnapshotListAllChildren)(virDomainSnapshotPtr snapshot, + virDomainSnapshotPtr **snaps, + unsigned int flags); typedef virDomainSnapshotPtr - (*virDrvDomainSnapshotLookupByName)(virDomainPtr domain, - const char *name, - unsigned int flags); +(*virDrvDomainSnapshotLookupByName)(virDomainPtr domain, + const char *name, + unsigned int flags); typedef int - (*virDrvDomainHasCurrentSnapshot)(virDomainPtr domain, unsigned int flags); +(*virDrvDomainHasCurrentSnapshot)(virDomainPtr domain, + unsigned int flags); typedef virDomainSnapshotPtr - (*virDrvDomainSnapshotGetParent)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotGetParent)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef virDomainSnapshotPtr - (*virDrvDomainSnapshotCurrent)(virDomainPtr domain, - unsigned int flags); +(*virDrvDomainSnapshotCurrent)(virDomainPtr domain, + unsigned int flags); typedef int - (*virDrvDomainSnapshotIsCurrent)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotIsCurrent)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainSnapshotHasMetadata)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotHasMetadata)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainRevertToSnapshot)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainRevertToSnapshot)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainSnapshotDelete)(virDomainSnapshotPtr snapshot, - unsigned int flags); +(*virDrvDomainSnapshotDelete)(virDomainSnapshotPtr snapshot, + unsigned int flags); typedef int - (*virDrvDomainQemuMonitorCommand)(virDomainPtr domain, const char *cmd, - char **result, unsigned int flags); +(*virDrvDomainQemuMonitorCommand)(virDomainPtr domain, + const char *cmd, + char **result, + unsigned int flags); + typedef char * - (*virDrvDomainQemuAgentCommand)(virDomainPtr domain, const char *cmd, - int timeout, unsigned int flags); +(*virDrvDomainQemuAgentCommand)(virDomainPtr domain, + const char *cmd, + int timeout, + unsigned int flags); /* Choice of unsigned int rather than pid_t is intentional. */ typedef virDomainPtr - (*virDrvDomainQemuAttach)(virConnectPtr conn, - unsigned int pid_value, - unsigned int flags); +(*virDrvDomainQemuAttach)(virConnectPtr conn, + unsigned int pid_value, + unsigned int flags); typedef int - (*virDrvDomainOpenConsole)(virDomainPtr dom, - const char *dev_name, - virStreamPtr st, - unsigned int flags); +(*virDrvDomainOpenConsole)(virDomainPtr dom, + const char *dev_name, + virStreamPtr st, + unsigned int flags); + typedef int - (*virDrvDomainOpenChannel)(virDomainPtr dom, - const char *name, - virStreamPtr st, - unsigned int flags); +(*virDrvDomainOpenChannel)(virDomainPtr dom, + const char *name, + virStreamPtr st, + unsigned int flags); typedef int - (*virDrvDomainOpenGraphics)(virDomainPtr dom, - unsigned int idx, - int fd, - unsigned int flags); +(*virDrvDomainOpenGraphics)(virDomainPtr dom, + unsigned int idx, + int fd, + unsigned int flags); typedef int - (*virDrvDomainInjectNMI)(virDomainPtr dom, unsigned int flags); +(*virDrvDomainInjectNMI)(virDomainPtr dom, + unsigned int flags); typedef int - (*virDrvDomainSendKey)(virDomainPtr dom, unsigned int codeset, - unsigned int holdtime, - unsigned int *keycodes, - int nkeycodes, - unsigned int flags); +(*virDrvDomainSendKey)(virDomainPtr dom, + unsigned int codeset, + unsigned int holdtime, + unsigned int *keycodes, + int nkeycodes, + unsigned int flags); typedef int - (*virDrvDomainSendProcessSignal)(virDomainPtr dom, - long long pid_value, - unsigned int signum, - unsigned int flags); +(*virDrvDomainSendProcessSignal)(virDomainPtr dom, + long long pid_value, + unsigned int signum, + unsigned int flags); typedef char * - (*virDrvDomainMigrateBegin3) - (virDomainPtr domain, - const char *xmlin, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - const char *dname, - unsigned long resource); - -typedef int - (*virDrvDomainMigratePrepare3) - (virConnectPtr dconn, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - const char *uri_in, - char **uri_out, - unsigned long flags, - const char *dname, - unsigned long resource, - const char *dom_xml); - -typedef int - (*virDrvDomainMigratePrepareTunnel3) - (virConnectPtr dconn, - virStreamPtr st, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - const char *dname, - unsigned long resource, - const char *dom_xml); - - -typedef int - (*virDrvDomainMigratePerform3) - (virDomainPtr dom, - const char *xmlin, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - const char *dconnuri, - const char *uri, - unsigned long flags, - const char *dname, - unsigned long resource); +(*virDrvDomainMigrateBegin3)(virDomainPtr domain, + const char *xmlin, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dname, + unsigned long resource); + +typedef int +(*virDrvDomainMigratePrepare3)(virConnectPtr dconn, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); + +typedef int +(*virDrvDomainMigratePrepareTunnel3)(virConnectPtr dconn, + virStreamPtr st, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); + + +typedef int +(*virDrvDomainMigratePerform3)(virDomainPtr dom, + const char *xmlin, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + const char *dconnuri, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); typedef virDomainPtr - (*virDrvDomainMigrateFinish3) - (virConnectPtr dconn, - const char *dname, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - const char *dconnuri, - const char *uri, - unsigned long flags, - int cancelled); - -typedef int - (*virDrvDomainMigrateConfirm3) - (virDomainPtr domain, - const char *cookiein, - int cookieinlen, - unsigned long flags, - int cancelled); - -typedef int - (*virDrvNodeSuspendForDuration)(virConnectPtr conn, unsigned int target, - unsigned long long duration, - unsigned int flags); - +(*virDrvDomainMigrateFinish3)(virConnectPtr dconn, + const char *dname, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + const char *dconnuri, + const char *uri, + unsigned long flags, + int cancelled); + +typedef int +(*virDrvDomainMigrateConfirm3)(virDomainPtr domain, + const char *cookiein, + int cookieinlen, + unsigned long flags, + int cancelled); + +typedef int +(*virDrvNodeSuspendForDuration)(virConnectPtr conn, + unsigned int target, + unsigned long long duration, + unsigned int flags); typedef int - (*virDrvDomainBlockJobAbort)(virDomainPtr dom, const char *path, - unsigned int flags); +(*virDrvDomainBlockJobAbort)(virDomainPtr dom, + const char *path, + unsigned int flags); typedef int - (*virDrvDomainGetBlockJobInfo)(virDomainPtr dom, const char *path, - virDomainBlockJobInfoPtr info, - unsigned int flags); +(*virDrvDomainGetBlockJobInfo)(virDomainPtr dom, + const char *path, + virDomainBlockJobInfoPtr info, + unsigned int flags); typedef int - (*virDrvDomainBlockJobSetSpeed)(virDomainPtr dom, - const char *path, unsigned long bandwidth, - unsigned int flags); +(*virDrvDomainBlockJobSetSpeed)(virDomainPtr dom, + const char *path, + unsigned long bandwidth, + unsigned int flags); typedef int - (*virDrvDomainBlockPull)(virDomainPtr dom, const char *path, - unsigned long bandwidth, unsigned int flags); +(*virDrvDomainBlockPull)(virDomainPtr dom, + const char *path, + unsigned long bandwidth, + unsigned int flags); + typedef int - (*virDrvDomainBlockRebase)(virDomainPtr dom, const char *path, - const char *base, unsigned long bandwidth, - unsigned int flags); +(*virDrvDomainBlockRebase)(virDomainPtr dom, + const char *path, + const char *base, + unsigned long bandwidth, + unsigned int flags); + typedef int - (*virDrvDomainBlockCommit)(virDomainPtr dom, const char *disk, - const char *base, const char *top, - unsigned long bandwidth, unsigned int flags); +(*virDrvDomainBlockCommit)(virDomainPtr dom, + const char *disk, + const char *base, + const char *top, + unsigned long bandwidth, + unsigned int flags); typedef int - (*virDrvConnectSetKeepAlive)(virConnectPtr conn, - int interval, - unsigned int count); +(*virDrvConnectSetKeepAlive)(virConnectPtr conn, + int interval, + unsigned int count); typedef int - (*virDrvDomainSetBlockIoTune)(virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvDomainSetBlockIoTune)(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int nparams, + unsigned int flags); + typedef int - (*virDrvDomainGetBlockIoTune)(virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvDomainGetBlockIoTune)(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); + typedef int - (*virDrvDomainShutdownFlags)(virDomainPtr domain, - unsigned int flags); +(*virDrvDomainShutdownFlags)(virDomainPtr domain, + unsigned int flags); typedef int - (*virDrvDomainGetCPUStats)(virDomainPtr domain, - virTypedParameterPtr params, - unsigned int nparams, - int start_cpu, - unsigned int ncpus, - unsigned int flags); +(*virDrvDomainGetCPUStats)(virDomainPtr domain, + virTypedParameterPtr params, + unsigned int nparams, + int start_cpu, + unsigned int ncpus, + unsigned int flags); typedef int - (*virDrvDomainGetDiskErrors)(virDomainPtr dom, - virDomainDiskErrorPtr errors, - unsigned int maxerrors, - unsigned int flags); +(*virDrvDomainGetDiskErrors)(virDomainPtr dom, + virDomainDiskErrorPtr errors, + unsigned int maxerrors, + unsigned int flags); typedef int - (*virDrvDomainSetMetadata)(virDomainPtr dom, - int type, - const char *metadata, - const char *key, - const char *uri, - unsigned int flags); +(*virDrvDomainSetMetadata)(virDomainPtr dom, + int type, + const char *metadata, + const char *key, + const char *uri, + unsigned int flags); typedef char * - (*virDrvDomainGetMetadata)(virDomainPtr dom, - int type, - const char *uri, - unsigned int flags); +(*virDrvDomainGetMetadata)(virDomainPtr dom, + int type, + const char *uri, + unsigned int flags); typedef int - (*virDrvNodeGetMemoryParameters)(virConnectPtr conn, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); +(*virDrvNodeGetMemoryParameters)(virConnectPtr conn, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); typedef int - (*virDrvNodeSetMemoryParameters)(virConnectPtr conn, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +(*virDrvNodeSetMemoryParameters)(virConnectPtr conn, + virTypedParameterPtr params, + int nparams, + unsigned int flags); typedef int - (*virDrvNodeGetCPUMap)(virConnectPtr conn, - unsigned char **cpumap, - unsigned int *online, - unsigned int flags); +(*virDrvNodeGetCPUMap)(virConnectPtr conn, + unsigned char **cpumap, + unsigned int *online, + unsigned int flags); + typedef int - (*virDrvDomainFSTrim)(virDomainPtr dom, - const char *mountPoint, - unsigned long long minimum, - unsigned int flags); +(*virDrvDomainFSTrim)(virDomainPtr dom, + const char *mountPoint, + unsigned long long minimum, + unsigned int flags); typedef int - (*virDrvDomainLxcOpenNamespace)(virDomainPtr dom, - int **fdlist, - unsigned int flags); +(*virDrvDomainLxcOpenNamespace)(virDomainPtr dom, + int **fdlist, + unsigned int flags); + +typedef struct _virDriver virDriver; +typedef virDriver *virDriverPtr; /** * _virDriver: @@ -954,249 +1042,266 @@ typedef int * - close */ struct _virDriver { - int no; /* the number virDrvNo */ - const char *name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - virDrvConnectSupportsFeature connectSupportsFeature; - virDrvConnectGetType connectGetType; - virDrvConnectGetVersion connectGetVersion; - virDrvConnectGetLibVersion connectGetLibVersion; - virDrvConnectGetHostname connectGetHostname; - virDrvConnectGetSysinfo connectGetSysinfo; - virDrvConnectGetMaxVcpus connectGetMaxVcpus; - virDrvNodeGetInfo nodeGetInfo; - virDrvConnectGetCapabilities connectGetCapabilities; - virDrvConnectListDomains connectListDomains; - virDrvConnectNumOfDomains connectNumOfDomains; - virDrvConnectListAllDomains connectListAllDomains; - virDrvDomainCreateXML domainCreateXML; - virDrvDomainLookupByID domainLookupByID; - virDrvDomainLookupByUUID domainLookupByUUID; - virDrvDomainLookupByName domainLookupByName; - virDrvDomainSuspend domainSuspend; - virDrvDomainResume domainResume; - virDrvDomainPMSuspendForDuration domainPMSuspendForDuration; - virDrvDomainPMWakeup domainPMWakeup; - virDrvDomainShutdown domainShutdown; - virDrvDomainShutdownFlags domainShutdownFlags; - virDrvDomainReboot domainReboot; - virDrvDomainReset domainReset; - virDrvDomainDestroy domainDestroy; - virDrvDomainDestroyFlags domainDestroyFlags; - virDrvDomainGetOSType domainGetOSType; - virDrvDomainGetHostname domainGetHostname; - virDrvDomainGetMaxMemory domainGetMaxMemory; - virDrvDomainSetMaxMemory domainSetMaxMemory; - virDrvDomainSetMemory domainSetMemory; - virDrvDomainSetMemoryFlags domainSetMemoryFlags; - virDrvDomainSetMemoryParameters domainSetMemoryParameters; - virDrvDomainGetMemoryParameters domainGetMemoryParameters; - virDrvDomainSetNumaParameters domainSetNumaParameters; - virDrvDomainGetNumaParameters domainGetNumaParameters; - virDrvDomainSetBlkioParameters domainSetBlkioParameters; - virDrvDomainGetBlkioParameters domainGetBlkioParameters; - virDrvDomainGetInfo domainGetInfo; - virDrvDomainGetState domainGetState; - virDrvDomainGetControlInfo domainGetControlInfo; - virDrvDomainSave domainSave; - virDrvDomainSaveFlags domainSaveFlags; - virDrvDomainRestore domainRestore; - virDrvDomainRestoreFlags domainRestoreFlags; - virDrvDomainSaveImageGetXMLDesc domainSaveImageGetXMLDesc; - virDrvDomainSaveImageDefineXML domainSaveImageDefineXML; - virDrvDomainCoreDump domainCoreDump; - virDrvDomainScreenshot domainScreenshot; - virDrvDomainSetVcpus domainSetVcpus; - virDrvDomainSetVcpusFlags domainSetVcpusFlags; - virDrvDomainGetVcpusFlags domainGetVcpusFlags; - virDrvDomainPinVcpu domainPinVcpu; - virDrvDomainPinVcpuFlags domainPinVcpuFlags; - virDrvDomainGetVcpuPinInfo domainGetVcpuPinInfo; - virDrvDomainPinEmulator domainPinEmulator; - virDrvDomainGetEmulatorPinInfo domainGetEmulatorPinInfo; - virDrvDomainGetVcpus domainGetVcpus; - virDrvDomainGetMaxVcpus domainGetMaxVcpus; - virDrvDomainGetSecurityLabel domainGetSecurityLabel; - virDrvDomainGetSecurityLabelList domainGetSecurityLabelList; - virDrvNodeGetSecurityModel nodeGetSecurityModel; - virDrvDomainGetXMLDesc domainGetXMLDesc; - virDrvConnectDomainXMLFromNative connectDomainXMLFromNative; - virDrvConnectDomainXMLToNative connectDomainXMLToNative; - virDrvConnectListDefinedDomains connectListDefinedDomains; - virDrvConnectNumOfDefinedDomains connectNumOfDefinedDomains; - virDrvDomainCreate domainCreate; - virDrvDomainCreateWithFlags domainCreateWithFlags; - virDrvDomainDefineXML domainDefineXML; - virDrvDomainUndefine domainUndefine; - virDrvDomainUndefineFlags domainUndefineFlags; - virDrvDomainAttachDevice domainAttachDevice; - virDrvDomainAttachDeviceFlags domainAttachDeviceFlags; - virDrvDomainDetachDevice domainDetachDevice; - virDrvDomainDetachDeviceFlags domainDetachDeviceFlags; - virDrvDomainUpdateDeviceFlags domainUpdateDeviceFlags; - virDrvDomainGetAutostart domainGetAutostart; - virDrvDomainSetAutostart domainSetAutostart; - virDrvDomainGetSchedulerType domainGetSchedulerType; - virDrvDomainGetSchedulerParameters domainGetSchedulerParameters; + int no; /* the number virDrvNo */ + const char *name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectSupportsFeature connectSupportsFeature; + virDrvConnectGetType connectGetType; + virDrvConnectGetVersion connectGetVersion; + virDrvConnectGetLibVersion connectGetLibVersion; + virDrvConnectGetHostname connectGetHostname; + virDrvConnectGetSysinfo connectGetSysinfo; + virDrvConnectGetMaxVcpus connectGetMaxVcpus; + virDrvNodeGetInfo nodeGetInfo; + virDrvConnectGetCapabilities connectGetCapabilities; + virDrvConnectListDomains connectListDomains; + virDrvConnectNumOfDomains connectNumOfDomains; + virDrvConnectListAllDomains connectListAllDomains; + virDrvDomainCreateXML domainCreateXML; + virDrvDomainLookupByID domainLookupByID; + virDrvDomainLookupByUUID domainLookupByUUID; + virDrvDomainLookupByName domainLookupByName; + virDrvDomainSuspend domainSuspend; + virDrvDomainResume domainResume; + virDrvDomainPMSuspendForDuration domainPMSuspendForDuration; + virDrvDomainPMWakeup domainPMWakeup; + virDrvDomainShutdown domainShutdown; + virDrvDomainShutdownFlags domainShutdownFlags; + virDrvDomainReboot domainReboot; + virDrvDomainReset domainReset; + virDrvDomainDestroy domainDestroy; + virDrvDomainDestroyFlags domainDestroyFlags; + virDrvDomainGetOSType domainGetOSType; + virDrvDomainGetHostname domainGetHostname; + virDrvDomainGetMaxMemory domainGetMaxMemory; + virDrvDomainSetMaxMemory domainSetMaxMemory; + virDrvDomainSetMemory domainSetMemory; + virDrvDomainSetMemoryFlags domainSetMemoryFlags; + virDrvDomainSetMemoryParameters domainSetMemoryParameters; + virDrvDomainGetMemoryParameters domainGetMemoryParameters; + virDrvDomainSetNumaParameters domainSetNumaParameters; + virDrvDomainGetNumaParameters domainGetNumaParameters; + virDrvDomainSetBlkioParameters domainSetBlkioParameters; + virDrvDomainGetBlkioParameters domainGetBlkioParameters; + virDrvDomainGetInfo domainGetInfo; + virDrvDomainGetState domainGetState; + virDrvDomainGetControlInfo domainGetControlInfo; + virDrvDomainSave domainSave; + virDrvDomainSaveFlags domainSaveFlags; + virDrvDomainRestore domainRestore; + virDrvDomainRestoreFlags domainRestoreFlags; + virDrvDomainSaveImageGetXMLDesc domainSaveImageGetXMLDesc; + virDrvDomainSaveImageDefineXML domainSaveImageDefineXML; + virDrvDomainCoreDump domainCoreDump; + virDrvDomainScreenshot domainScreenshot; + virDrvDomainSetVcpus domainSetVcpus; + virDrvDomainSetVcpusFlags domainSetVcpusFlags; + virDrvDomainGetVcpusFlags domainGetVcpusFlags; + virDrvDomainPinVcpu domainPinVcpu; + virDrvDomainPinVcpuFlags domainPinVcpuFlags; + virDrvDomainGetVcpuPinInfo domainGetVcpuPinInfo; + virDrvDomainPinEmulator domainPinEmulator; + virDrvDomainGetEmulatorPinInfo domainGetEmulatorPinInfo; + virDrvDomainGetVcpus domainGetVcpus; + virDrvDomainGetMaxVcpus domainGetMaxVcpus; + virDrvDomainGetSecurityLabel domainGetSecurityLabel; + virDrvDomainGetSecurityLabelList domainGetSecurityLabelList; + virDrvNodeGetSecurityModel nodeGetSecurityModel; + virDrvDomainGetXMLDesc domainGetXMLDesc; + virDrvConnectDomainXMLFromNative connectDomainXMLFromNative; + virDrvConnectDomainXMLToNative connectDomainXMLToNative; + virDrvConnectListDefinedDomains connectListDefinedDomains; + virDrvConnectNumOfDefinedDomains connectNumOfDefinedDomains; + virDrvDomainCreate domainCreate; + virDrvDomainCreateWithFlags domainCreateWithFlags; + virDrvDomainDefineXML domainDefineXML; + virDrvDomainUndefine domainUndefine; + virDrvDomainUndefineFlags domainUndefineFlags; + virDrvDomainAttachDevice domainAttachDevice; + virDrvDomainAttachDeviceFlags domainAttachDeviceFlags; + virDrvDomainDetachDevice domainDetachDevice; + virDrvDomainDetachDeviceFlags domainDetachDeviceFlags; + virDrvDomainUpdateDeviceFlags domainUpdateDeviceFlags; + virDrvDomainGetAutostart domainGetAutostart; + virDrvDomainSetAutostart domainSetAutostart; + virDrvDomainGetSchedulerType domainGetSchedulerType; + virDrvDomainGetSchedulerParameters domainGetSchedulerParameters; virDrvDomainGetSchedulerParametersFlags domainGetSchedulerParametersFlags; - virDrvDomainSetSchedulerParameters domainSetSchedulerParameters; + virDrvDomainSetSchedulerParameters domainSetSchedulerParameters; virDrvDomainSetSchedulerParametersFlags domainSetSchedulerParametersFlags; - virDrvDomainMigratePrepare domainMigratePrepare; - virDrvDomainMigratePerform domainMigratePerform; - virDrvDomainMigrateFinish domainMigrateFinish; - virDrvDomainBlockResize domainBlockResize; - virDrvDomainBlockStats domainBlockStats; - virDrvDomainBlockStatsFlags domainBlockStatsFlags; - virDrvDomainInterfaceStats domainInterfaceStats; - virDrvDomainSetInterfaceParameters domainSetInterfaceParameters; - virDrvDomainGetInterfaceParameters domainGetInterfaceParameters; - virDrvDomainMemoryStats domainMemoryStats; - virDrvDomainBlockPeek domainBlockPeek; - virDrvDomainMemoryPeek domainMemoryPeek; - virDrvDomainGetBlockInfo domainGetBlockInfo; - virDrvNodeGetCPUStats nodeGetCPUStats; - virDrvNodeGetMemoryStats nodeGetMemoryStats; - virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; - virDrvNodeGetFreeMemory nodeGetFreeMemory; - virDrvConnectDomainEventRegister connectDomainEventRegister; - virDrvConnectDomainEventDeregister connectDomainEventDeregister; - virDrvDomainMigratePrepare2 domainMigratePrepare2; - virDrvDomainMigrateFinish2 domainMigrateFinish2; - virDrvNodeDeviceDettach nodeDeviceDettach; - virDrvNodeDeviceReAttach nodeDeviceReAttach; - virDrvNodeDeviceReset nodeDeviceReset; - virDrvDomainMigratePrepareTunnel domainMigratePrepareTunnel; - virDrvConnectIsEncrypted connectIsEncrypted; - virDrvConnectIsSecure connectIsSecure; - virDrvDomainIsActive domainIsActive; - virDrvDomainIsPersistent domainIsPersistent; - virDrvDomainIsUpdated domainIsUpdated; - virDrvConnectCompareCPU connectCompareCPU; - virDrvConnectBaselineCPU connectBaselineCPU; - virDrvDomainGetJobInfo domainGetJobInfo; - virDrvDomainGetJobStats domainGetJobStats; - virDrvDomainAbortJob domainAbortJob; - virDrvDomainMigrateSetMaxDowntime domainMigrateSetMaxDowntime; + virDrvDomainMigratePrepare domainMigratePrepare; + virDrvDomainMigratePerform domainMigratePerform; + virDrvDomainMigrateFinish domainMigrateFinish; + virDrvDomainBlockResize domainBlockResize; + virDrvDomainBlockStats domainBlockStats; + virDrvDomainBlockStatsFlags domainBlockStatsFlags; + virDrvDomainInterfaceStats domainInterfaceStats; + virDrvDomainSetInterfaceParameters domainSetInterfaceParameters; + virDrvDomainGetInterfaceParameters domainGetInterfaceParameters; + virDrvDomainMemoryStats domainMemoryStats; + virDrvDomainBlockPeek domainBlockPeek; + virDrvDomainMemoryPeek domainMemoryPeek; + virDrvDomainGetBlockInfo domainGetBlockInfo; + virDrvNodeGetCPUStats nodeGetCPUStats; + virDrvNodeGetMemoryStats nodeGetMemoryStats; + virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; + virDrvNodeGetFreeMemory nodeGetFreeMemory; + virDrvConnectDomainEventRegister connectDomainEventRegister; + virDrvConnectDomainEventDeregister connectDomainEventDeregister; + virDrvDomainMigratePrepare2 domainMigratePrepare2; + virDrvDomainMigrateFinish2 domainMigrateFinish2; + virDrvNodeDeviceDettach nodeDeviceDettach; + virDrvNodeDeviceReAttach nodeDeviceReAttach; + virDrvNodeDeviceReset nodeDeviceReset; + virDrvDomainMigratePrepareTunnel domainMigratePrepareTunnel; + virDrvConnectIsEncrypted connectIsEncrypted; + virDrvConnectIsSecure connectIsSecure; + virDrvDomainIsActive domainIsActive; + virDrvDomainIsPersistent domainIsPersistent; + virDrvDomainIsUpdated domainIsUpdated; + virDrvConnectCompareCPU connectCompareCPU; + virDrvConnectBaselineCPU connectBaselineCPU; + virDrvDomainGetJobInfo domainGetJobInfo; + virDrvDomainGetJobStats domainGetJobStats; + virDrvDomainAbortJob domainAbortJob; + virDrvDomainMigrateSetMaxDowntime domainMigrateSetMaxDowntime; virDrvDomainMigrateGetCompressionCache domainMigrateGetCompressionCache; virDrvDomainMigrateSetCompressionCache domainMigrateSetCompressionCache; - virDrvDomainMigrateGetMaxSpeed domainMigrateGetMaxSpeed; - virDrvDomainMigrateSetMaxSpeed domainMigrateSetMaxSpeed; - virDrvConnectDomainEventRegisterAny connectDomainEventRegisterAny; - virDrvConnectDomainEventDeregisterAny connectDomainEventDeregisterAny; - virDrvDomainManagedSave domainManagedSave; - virDrvDomainHasManagedSaveImage domainHasManagedSaveImage; - virDrvDomainManagedSaveRemove domainManagedSaveRemove; - virDrvDomainSnapshotCreateXML domainSnapshotCreateXML; - virDrvDomainSnapshotGetXMLDesc domainSnapshotGetXMLDesc; - virDrvDomainSnapshotNum domainSnapshotNum; - virDrvDomainSnapshotListNames domainSnapshotListNames; - virDrvDomainListAllSnapshots domainListAllSnapshots; - virDrvDomainSnapshotNumChildren domainSnapshotNumChildren; + virDrvDomainMigrateGetMaxSpeed domainMigrateGetMaxSpeed; + virDrvDomainMigrateSetMaxSpeed domainMigrateSetMaxSpeed; + virDrvConnectDomainEventRegisterAny connectDomainEventRegisterAny; + virDrvConnectDomainEventDeregisterAny connectDomainEventDeregisterAny; + virDrvDomainManagedSave domainManagedSave; + virDrvDomainHasManagedSaveImage domainHasManagedSaveImage; + virDrvDomainManagedSaveRemove domainManagedSaveRemove; + virDrvDomainSnapshotCreateXML domainSnapshotCreateXML; + virDrvDomainSnapshotGetXMLDesc domainSnapshotGetXMLDesc; + virDrvDomainSnapshotNum domainSnapshotNum; + virDrvDomainSnapshotListNames domainSnapshotListNames; + virDrvDomainListAllSnapshots domainListAllSnapshots; + virDrvDomainSnapshotNumChildren domainSnapshotNumChildren; virDrvDomainSnapshotListChildrenNames domainSnapshotListChildrenNames; virDrvDomainSnapshotListAllChildren domainSnapshotListAllChildren; - virDrvDomainSnapshotLookupByName domainSnapshotLookupByName; - virDrvDomainHasCurrentSnapshot domainHasCurrentSnapshot; - virDrvDomainSnapshotGetParent domainSnapshotGetParent; - virDrvDomainSnapshotCurrent domainSnapshotCurrent; - virDrvDomainSnapshotIsCurrent domainSnapshotIsCurrent; - virDrvDomainSnapshotHasMetadata domainSnapshotHasMetadata; - virDrvDomainRevertToSnapshot domainRevertToSnapshot; - virDrvDomainSnapshotDelete domainSnapshotDelete; - virDrvDomainQemuMonitorCommand domainQemuMonitorCommand; - virDrvDomainQemuAttach domainQemuAttach; - virDrvDomainQemuAgentCommand domainQemuAgentCommand; - virDrvDomainOpenConsole domainOpenConsole; - virDrvDomainOpenChannel domainOpenChannel; - virDrvDomainOpenGraphics domainOpenGraphics; - virDrvDomainInjectNMI domainInjectNMI; - virDrvDomainMigrateBegin3 domainMigrateBegin3; - virDrvDomainMigratePrepare3 domainMigratePrepare3; - virDrvDomainMigratePrepareTunnel3 domainMigratePrepareTunnel3; - virDrvDomainMigratePerform3 domainMigratePerform3; - virDrvDomainMigrateFinish3 domainMigrateFinish3; - virDrvDomainMigrateConfirm3 domainMigrateConfirm3; - virDrvDomainSendKey domainSendKey; - virDrvDomainBlockJobAbort domainBlockJobAbort; - virDrvDomainGetBlockJobInfo domainGetBlockJobInfo; - virDrvDomainBlockJobSetSpeed domainBlockJobSetSpeed; - virDrvDomainBlockPull domainBlockPull; - virDrvDomainBlockRebase domainBlockRebase; - virDrvDomainBlockCommit domainBlockCommit; - virDrvConnectSetKeepAlive connectSetKeepAlive; - virDrvConnectIsAlive connectIsAlive; - virDrvNodeSuspendForDuration nodeSuspendForDuration; - virDrvDomainSetBlockIoTune domainSetBlockIoTune; - virDrvDomainGetBlockIoTune domainGetBlockIoTune; - virDrvDomainGetCPUStats domainGetCPUStats; - virDrvDomainGetDiskErrors domainGetDiskErrors; - virDrvDomainSetMetadata domainSetMetadata; - virDrvDomainGetMetadata domainGetMetadata; - virDrvNodeGetMemoryParameters nodeGetMemoryParameters; - virDrvNodeSetMemoryParameters nodeSetMemoryParameters; - virDrvNodeGetCPUMap nodeGetCPUMap; - virDrvDomainFSTrim domainFSTrim; - virDrvDomainSendProcessSignal domainSendProcessSignal; - virDrvDomainLxcOpenNamespace domainLxcOpenNamespace; + virDrvDomainSnapshotLookupByName domainSnapshotLookupByName; + virDrvDomainHasCurrentSnapshot domainHasCurrentSnapshot; + virDrvDomainSnapshotGetParent domainSnapshotGetParent; + virDrvDomainSnapshotCurrent domainSnapshotCurrent; + virDrvDomainSnapshotIsCurrent domainSnapshotIsCurrent; + virDrvDomainSnapshotHasMetadata domainSnapshotHasMetadata; + virDrvDomainRevertToSnapshot domainRevertToSnapshot; + virDrvDomainSnapshotDelete domainSnapshotDelete; + virDrvDomainQemuMonitorCommand domainQemuMonitorCommand; + virDrvDomainQemuAttach domainQemuAttach; + virDrvDomainQemuAgentCommand domainQemuAgentCommand; + virDrvDomainOpenConsole domainOpenConsole; + virDrvDomainOpenChannel domainOpenChannel; + virDrvDomainOpenGraphics domainOpenGraphics; + virDrvDomainInjectNMI domainInjectNMI; + virDrvDomainMigrateBegin3 domainMigrateBegin3; + virDrvDomainMigratePrepare3 domainMigratePrepare3; + virDrvDomainMigratePrepareTunnel3 domainMigratePrepareTunnel3; + virDrvDomainMigratePerform3 domainMigratePerform3; + virDrvDomainMigrateFinish3 domainMigrateFinish3; + virDrvDomainMigrateConfirm3 domainMigrateConfirm3; + virDrvDomainSendKey domainSendKey; + virDrvDomainBlockJobAbort domainBlockJobAbort; + virDrvDomainGetBlockJobInfo domainGetBlockJobInfo; + virDrvDomainBlockJobSetSpeed domainBlockJobSetSpeed; + virDrvDomainBlockPull domainBlockPull; + virDrvDomainBlockRebase domainBlockRebase; + virDrvDomainBlockCommit domainBlockCommit; + virDrvConnectSetKeepAlive connectSetKeepAlive; + virDrvConnectIsAlive connectIsAlive; + virDrvNodeSuspendForDuration nodeSuspendForDuration; + virDrvDomainSetBlockIoTune domainSetBlockIoTune; + virDrvDomainGetBlockIoTune domainGetBlockIoTune; + virDrvDomainGetCPUStats domainGetCPUStats; + virDrvDomainGetDiskErrors domainGetDiskErrors; + virDrvDomainSetMetadata domainSetMetadata; + virDrvDomainGetMetadata domainGetMetadata; + virDrvNodeGetMemoryParameters nodeGetMemoryParameters; + virDrvNodeSetMemoryParameters nodeSetMemoryParameters; + virDrvNodeGetCPUMap nodeGetCPUMap; + virDrvDomainFSTrim domainFSTrim; + virDrvDomainSendProcessSignal domainSendProcessSignal; + virDrvDomainLxcOpenNamespace domainLxcOpenNamespace; }; typedef int - (*virDrvConnectNumOfNetworks) (virConnectPtr conn); +(*virDrvConnectNumOfNetworks)(virConnectPtr conn); + typedef int - (*virDrvConnectListNetworks) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListNetworks)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectNumOfDefinedNetworks) (virConnectPtr conn); +(*virDrvConnectNumOfDefinedNetworks)(virConnectPtr conn); + typedef int - (*virDrvConnectListDefinedNetworks) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListDefinedNetworks)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectListAllNetworks) (virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags); +(*virDrvConnectListAllNetworks)(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags); + typedef virNetworkPtr - (*virDrvNetworkLookupByUUID) (virConnectPtr conn, - const unsigned char *uuid); +(*virDrvNetworkLookupByUUID)(virConnectPtr conn, + const unsigned char *uuid); + typedef virNetworkPtr - (*virDrvNetworkLookupByName) (virConnectPtr conn, - const char *name); +(*virDrvNetworkLookupByName)(virConnectPtr conn, + const char *name); + typedef virNetworkPtr - (*virDrvNetworkCreateXML) (virConnectPtr conn, - const char *xmlDesc); +(*virDrvNetworkCreateXML)(virConnectPtr conn, + const char *xmlDesc); + typedef virNetworkPtr - (*virDrvNetworkDefineXML) (virConnectPtr conn, - const char *xml); +(*virDrvNetworkDefineXML)(virConnectPtr conn, + const char *xml); + typedef int - (*virDrvNetworkUndefine) (virNetworkPtr network); +(*virDrvNetworkUndefine)(virNetworkPtr network); + typedef int - (*virDrvNetworkUpdate) (virNetworkPtr network, - unsigned int command, /* virNetworkUpdateCommand */ - unsigned int section, /* virNetworkUpdateSection */ - int parentIndex, - const char *xml, - unsigned int flags); +(*virDrvNetworkUpdate)(virNetworkPtr network, + unsigned int command, /* virNetworkUpdateCommand */ + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); + typedef int - (*virDrvNetworkCreate) (virNetworkPtr network); +(*virDrvNetworkCreate)(virNetworkPtr network); + typedef int - (*virDrvNetworkDestroy) (virNetworkPtr network); +(*virDrvNetworkDestroy)(virNetworkPtr network); + typedef char * - (*virDrvNetworkGetXMLDesc) (virNetworkPtr network, - unsigned int flags); +(*virDrvNetworkGetXMLDesc)(virNetworkPtr network, + unsigned int flags); + typedef char * - (*virDrvNetworkGetBridgeName) (virNetworkPtr network); +(*virDrvNetworkGetBridgeName)(virNetworkPtr network); + typedef int - (*virDrvNetworkGetAutostart) (virNetworkPtr network, - int *autostart); +(*virDrvNetworkGetAutostart)(virNetworkPtr network, + int *autostart); + typedef int - (*virDrvNetworkSetAutostart) (virNetworkPtr network, - int autostart); +(*virDrvNetworkSetAutostart)(virNetworkPtr network, + int autostart); typedef int - (*virDrvNetworkIsActive) (virNetworkPtr net); +(*virDrvNetworkIsActive)(virNetworkPtr net); + typedef int - (*virDrvNetworkIsPersistent) (virNetworkPtr net); +(*virDrvNetworkIsPersistent)(virNetworkPtr net); @@ -1214,83 +1319,94 @@ typedef virNetworkDriver *virNetworkDriverPtr; * - close */ struct _virNetworkDriver { - const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - virDrvConnectNumOfNetworks connectNumOfNetworks; - virDrvConnectListNetworks connectListNetworks; - virDrvConnectNumOfDefinedNetworks connectNumOfDefinedNetworks; - virDrvConnectListDefinedNetworks connectListDefinedNetworks; - virDrvConnectListAllNetworks connectListAllNetworks; - virDrvNetworkLookupByUUID networkLookupByUUID; - virDrvNetworkLookupByName networkLookupByName; - virDrvNetworkCreateXML networkCreateXML; - virDrvNetworkDefineXML networkDefineXML; - virDrvNetworkUndefine networkUndefine; - virDrvNetworkUpdate networkUpdate; - virDrvNetworkCreate networkCreate; - virDrvNetworkDestroy networkDestroy; - virDrvNetworkGetXMLDesc networkGetXMLDesc; - virDrvNetworkGetBridgeName networkGetBridgeName; - virDrvNetworkGetAutostart networkGetAutostart; - virDrvNetworkSetAutostart networkSetAutostart; - virDrvNetworkIsActive networkIsActive; - virDrvNetworkIsPersistent networkIsPersistent; + const char * name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfNetworks connectNumOfNetworks; + virDrvConnectListNetworks connectListNetworks; + virDrvConnectNumOfDefinedNetworks connectNumOfDefinedNetworks; + virDrvConnectListDefinedNetworks connectListDefinedNetworks; + virDrvConnectListAllNetworks connectListAllNetworks; + virDrvNetworkLookupByUUID networkLookupByUUID; + virDrvNetworkLookupByName networkLookupByName; + virDrvNetworkCreateXML networkCreateXML; + virDrvNetworkDefineXML networkDefineXML; + virDrvNetworkUndefine networkUndefine; + virDrvNetworkUpdate networkUpdate; + virDrvNetworkCreate networkCreate; + virDrvNetworkDestroy networkDestroy; + virDrvNetworkGetXMLDesc networkGetXMLDesc; + virDrvNetworkGetBridgeName networkGetBridgeName; + virDrvNetworkGetAutostart networkGetAutostart; + virDrvNetworkSetAutostart networkSetAutostart; + virDrvNetworkIsActive networkIsActive; + virDrvNetworkIsPersistent networkIsPersistent; }; -/*-------*/ + typedef int - (*virDrvConnectNumOfInterfaces) (virConnectPtr conn); +(*virDrvConnectNumOfInterfaces)(virConnectPtr conn); + typedef int - (*virDrvConnectListInterfaces) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListInterfaces)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectNumOfDefinedInterfaces) (virConnectPtr conn); +(*virDrvConnectNumOfDefinedInterfaces)(virConnectPtr conn); + typedef int - (*virDrvConnectListDefinedInterfaces) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListDefinedInterfaces)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectListAllInterfaces) (virConnectPtr conn, - virInterfacePtr **ifaces, - unsigned int flags); +(*virDrvConnectListAllInterfaces)(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags); + typedef virInterfacePtr - (*virDrvInterfaceLookupByName) (virConnectPtr conn, - const char *name); +(*virDrvInterfaceLookupByName)(virConnectPtr conn, + const char *name); + typedef virInterfacePtr - (*virDrvInterfaceLookupByMACString) (virConnectPtr conn, - const char *mac); +(*virDrvInterfaceLookupByMACString)(virConnectPtr conn, + const char *mac); typedef char * - (*virDrvInterfaceGetXMLDesc) (virInterfacePtr iface, - unsigned int flags); +(*virDrvInterfaceGetXMLDesc)(virInterfacePtr iface, + unsigned int flags); typedef virInterfacePtr - (*virDrvInterfaceDefineXML) (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +(*virDrvInterfaceDefineXML)(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + typedef int - (*virDrvInterfaceUndefine) (virInterfacePtr iface); +(*virDrvInterfaceUndefine)(virInterfacePtr iface); + typedef int - (*virDrvInterfaceCreate) (virInterfacePtr iface, - unsigned int flags); +(*virDrvInterfaceCreate)(virInterfacePtr iface, + unsigned int flags); + typedef int - (*virDrvInterfaceDestroy) (virInterfacePtr iface, - unsigned int flags); +(*virDrvInterfaceDestroy)(virInterfacePtr iface, + unsigned int flags); typedef int - (*virDrvInterfaceIsActive) (virInterfacePtr iface); +(*virDrvInterfaceIsActive)(virInterfacePtr iface); typedef int - (*virDrvInterfaceChangeBegin) (virConnectPtr conn, - unsigned int flags); +(*virDrvInterfaceChangeBegin)(virConnectPtr conn, + unsigned int flags); + typedef int - (*virDrvInterfaceChangeCommit) (virConnectPtr conn, - unsigned int flags); +(*virDrvInterfaceChangeCommit)(virConnectPtr conn, + unsigned int flags); + typedef int - (*virDrvInterfaceChangeRollback)(virConnectPtr conn, - unsigned int flags); +(*virDrvInterfaceChangeRollback)(virConnectPtr conn, + unsigned int flags); typedef struct _virInterfaceDriver virInterfaceDriver; typedef virInterfaceDriver *virInterfaceDriverPtr; @@ -1306,166 +1422,198 @@ typedef virInterfaceDriver *virInterfaceDriverPtr; * - close */ struct _virInterfaceDriver { - const char *name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - virDrvConnectNumOfInterfaces connectNumOfInterfaces; - virDrvConnectListInterfaces connectListInterfaces; - virDrvConnectNumOfDefinedInterfaces connectNumOfDefinedInterfaces; - virDrvConnectListDefinedInterfaces connectListDefinedInterfaces; - virDrvConnectListAllInterfaces connectListAllInterfaces; - virDrvInterfaceLookupByName interfaceLookupByName; + const char *name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfInterfaces connectNumOfInterfaces; + virDrvConnectListInterfaces connectListInterfaces; + virDrvConnectNumOfDefinedInterfaces connectNumOfDefinedInterfaces; + virDrvConnectListDefinedInterfaces connectListDefinedInterfaces; + virDrvConnectListAllInterfaces connectListAllInterfaces; + virDrvInterfaceLookupByName interfaceLookupByName; virDrvInterfaceLookupByMACString interfaceLookupByMACString; - virDrvInterfaceGetXMLDesc interfaceGetXMLDesc; - virDrvInterfaceDefineXML interfaceDefineXML; - virDrvInterfaceUndefine interfaceUndefine; - virDrvInterfaceCreate interfaceCreate; - virDrvInterfaceDestroy interfaceDestroy; - virDrvInterfaceIsActive interfaceIsActive; - virDrvInterfaceChangeBegin interfaceChangeBegin; - virDrvInterfaceChangeCommit interfaceChangeCommit; - virDrvInterfaceChangeRollback interfaceChangeRollback; + virDrvInterfaceGetXMLDesc interfaceGetXMLDesc; + virDrvInterfaceDefineXML interfaceDefineXML; + virDrvInterfaceUndefine interfaceUndefine; + virDrvInterfaceCreate interfaceCreate; + virDrvInterfaceDestroy interfaceDestroy; + virDrvInterfaceIsActive interfaceIsActive; + virDrvInterfaceChangeBegin interfaceChangeBegin; + virDrvInterfaceChangeCommit interfaceChangeCommit; + virDrvInterfaceChangeRollback interfaceChangeRollback; }; typedef int - (*virDrvConnectNumOfStoragePools) (virConnectPtr conn); +(*virDrvConnectNumOfStoragePools)(virConnectPtr conn); + typedef int - (*virDrvConnectListStoragePools) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListStoragePools)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectNumOfDefinedStoragePools) (virConnectPtr conn); +(*virDrvConnectNumOfDefinedStoragePools)(virConnectPtr conn); + typedef int - (*virDrvConnectListDefinedStoragePools) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListDefinedStoragePools)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectListAllStoragePools) (virConnectPtr conn, - virStoragePoolPtr **pools, - unsigned int flags); +(*virDrvConnectListAllStoragePools)(virConnectPtr conn, + virStoragePoolPtr **pools, + unsigned int flags); + typedef char * - (*virDrvConnectFindStoragePoolSources) (virConnectPtr conn, - const char *type, - const char *srcSpec, - unsigned int flags); +(*virDrvConnectFindStoragePoolSources)(virConnectPtr conn, + const char *type, + const char *srcSpec, + unsigned int flags); + typedef virStoragePoolPtr - (*virDrvStoragePoolLookupByName) (virConnectPtr conn, - const char *name); +(*virDrvStoragePoolLookupByName)(virConnectPtr conn, + const char *name); + typedef virStoragePoolPtr - (*virDrvStoragePoolLookupByUUID) (virConnectPtr conn, - const unsigned char *uuid); +(*virDrvStoragePoolLookupByUUID)(virConnectPtr conn, + const unsigned char *uuid); + typedef virStoragePoolPtr - (*virDrvStoragePoolLookupByVolume) (virStorageVolPtr vol); +(*virDrvStoragePoolLookupByVolume)(virStorageVolPtr vol); + typedef virStoragePoolPtr - (*virDrvStoragePoolCreateXML) (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +(*virDrvStoragePoolCreateXML)(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + typedef virStoragePoolPtr - (*virDrvStoragePoolDefineXML) (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +(*virDrvStoragePoolDefineXML)(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + typedef int - (*virDrvStoragePoolUndefine) (virStoragePoolPtr pool); +(*virDrvStoragePoolUndefine)(virStoragePoolPtr pool); + typedef int - (*virDrvStoragePoolBuild) (virStoragePoolPtr pool, - unsigned int flags); +(*virDrvStoragePoolBuild)(virStoragePoolPtr pool, + unsigned int flags); + typedef int - (*virDrvStoragePoolCreate) (virStoragePoolPtr pool, - unsigned int flags); +(*virDrvStoragePoolCreate)(virStoragePoolPtr pool, + unsigned int flags); + typedef int - (*virDrvStoragePoolDestroy) (virStoragePoolPtr pool); +(*virDrvStoragePoolDestroy)(virStoragePoolPtr pool); + typedef int - (*virDrvStoragePoolDelete) (virStoragePoolPtr pool, - unsigned int flags); +(*virDrvStoragePoolDelete)(virStoragePoolPtr pool, + unsigned int flags); + typedef int - (*virDrvStoragePoolRefresh) (virStoragePoolPtr pool, - unsigned int flags); +(*virDrvStoragePoolRefresh)(virStoragePoolPtr pool, + unsigned int flags); + typedef int - (*virDrvStoragePoolGetInfo) (virStoragePoolPtr vol, - virStoragePoolInfoPtr info); +(*virDrvStoragePoolGetInfo)(virStoragePoolPtr vol, + virStoragePoolInfoPtr info); + typedef char * - (*virDrvStoragePoolGetXMLDesc) (virStoragePoolPtr pool, - unsigned int flags); +(*virDrvStoragePoolGetXMLDesc)(virStoragePoolPtr pool, + unsigned int flags); + typedef int - (*virDrvStoragePoolGetAutostart) (virStoragePoolPtr pool, - int *autostart); +(*virDrvStoragePoolGetAutostart)(virStoragePoolPtr pool, + int *autostart); + typedef int - (*virDrvStoragePoolSetAutostart) (virStoragePoolPtr pool, - int autostart); +(*virDrvStoragePoolSetAutostart)(virStoragePoolPtr pool, + int autostart); + typedef int - (*virDrvStoragePoolNumOfVolumes) (virStoragePoolPtr pool); +(*virDrvStoragePoolNumOfVolumes)(virStoragePoolPtr pool); + typedef int - (*virDrvStoragePoolListVolumes) (virStoragePoolPtr pool, - char **const names, - int maxnames); +(*virDrvStoragePoolListVolumes)(virStoragePoolPtr pool, + char **const names, + int maxnames); + typedef int - (*virDrvStoragePoolListAllVolumes) (virStoragePoolPtr pool, - virStorageVolPtr **vols, - unsigned int flags); +(*virDrvStoragePoolListAllVolumes)(virStoragePoolPtr pool, + virStorageVolPtr **vols, + unsigned int flags); typedef virStorageVolPtr - (*virDrvStorageVolLookupByName) (virStoragePoolPtr pool, - const char *name); -typedef virStorageVolPtr - (*virDrvStorageVolLookupByKey) (virConnectPtr pool, - const char *key); +(*virDrvStorageVolLookupByName)(virStoragePoolPtr pool, + const char *name); + typedef virStorageVolPtr - (*virDrvStorageVolLookupByPath) (virConnectPtr pool, - const char *path); +(*virDrvStorageVolLookupByKey)(virConnectPtr pool, + const char *key); +typedef virStorageVolPtr +(*virDrvStorageVolLookupByPath)(virConnectPtr pool, + const char *path); typedef virStorageVolPtr - (*virDrvStorageVolCreateXML) (virStoragePoolPtr pool, - const char *xmldesc, - unsigned int flags); +(*virDrvStorageVolCreateXML)(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags); + typedef int - (*virDrvStorageVolDelete) (virStorageVolPtr vol, - unsigned int flags); +(*virDrvStorageVolDelete)(virStorageVolPtr vol, + unsigned int flags); typedef int - (*virDrvStorageVolWipe) (virStorageVolPtr vol, - unsigned int flags); +(*virDrvStorageVolWipe)(virStorageVolPtr vol, + unsigned int flags); + typedef int - (*virDrvStorageVolWipePattern) (virStorageVolPtr vol, - unsigned int algorithm, - unsigned int flags); +(*virDrvStorageVolWipePattern)(virStorageVolPtr vol, + unsigned int algorithm, + unsigned int flags); typedef int - (*virDrvStorageVolGetInfo) (virStorageVolPtr vol, - virStorageVolInfoPtr info); +(*virDrvStorageVolGetInfo)(virStorageVolPtr vol, + virStorageVolInfoPtr info); + typedef char * - (*virDrvStorageVolGetXMLDesc) (virStorageVolPtr pool, - unsigned int flags); +(*virDrvStorageVolGetXMLDesc)(virStorageVolPtr pool, + unsigned int flags); + typedef char * - (*virDrvStorageVolGetPath) (virStorageVolPtr vol); +(*virDrvStorageVolGetPath)(virStorageVolPtr vol); typedef virStorageVolPtr - (*virDrvStorageVolCreateXMLFrom) (virStoragePoolPtr pool, - const char *xmldesc, - virStorageVolPtr clonevol, - unsigned int flags); -typedef int - (*virDrvStorageVolDownload) (virStorageVolPtr vol, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, +(*virDrvStorageVolCreateXMLFrom)(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr clonevol, unsigned int flags); + typedef int - (*virDrvStorageVolUpload) (virStorageVolPtr vol, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, - unsigned int flags); +(*virDrvStorageVolDownload)(virStorageVolPtr vol, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags); + typedef int - (*virDrvStorageVolResize) (virStorageVolPtr vol, - unsigned long long capacity, - unsigned int flags); +(*virDrvStorageVolUpload)(virStorageVolPtr vol, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags); typedef int - (*virDrvStoragePoolIsActive)(virStoragePoolPtr pool); +(*virDrvStorageVolResize)(virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); + typedef int - (*virDrvStoragePoolIsPersistent)(virStoragePoolPtr pool); +(*virDrvStoragePoolIsActive)(virStoragePoolPtr pool); + +typedef int +(*virDrvStoragePoolIsPersistent)(virStoragePoolPtr pool); @@ -1483,114 +1631,134 @@ typedef virStorageDriver *virStorageDriverPtr; * - close */ struct _virStorageDriver { - const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - - virDrvConnectNumOfStoragePools connectNumOfStoragePools; - virDrvConnectListStoragePools connectListStoragePools; - virDrvConnectNumOfDefinedStoragePools connectNumOfDefinedStoragePools; - virDrvConnectListDefinedStoragePools connectListDefinedStoragePools; - virDrvConnectListAllStoragePools connectListAllStoragePools; - virDrvConnectFindStoragePoolSources connectFindStoragePoolSources; - virDrvStoragePoolLookupByName storagePoolLookupByName; - virDrvStoragePoolLookupByUUID storagePoolLookupByUUID; - virDrvStoragePoolLookupByVolume storagePoolLookupByVolume; - virDrvStoragePoolCreateXML storagePoolCreateXML; - virDrvStoragePoolDefineXML storagePoolDefineXML; - virDrvStoragePoolBuild storagePoolBuild; - virDrvStoragePoolUndefine storagePoolUndefine; - virDrvStoragePoolCreate storagePoolCreate; - virDrvStoragePoolDestroy storagePoolDestroy; - virDrvStoragePoolDelete storagePoolDelete; - virDrvStoragePoolRefresh storagePoolRefresh; - virDrvStoragePoolGetInfo storagePoolGetInfo; - virDrvStoragePoolGetXMLDesc storagePoolGetXMLDesc; - virDrvStoragePoolGetAutostart storagePoolGetAutostart; - virDrvStoragePoolSetAutostart storagePoolSetAutostart; - virDrvStoragePoolNumOfVolumes storagePoolNumOfVolumes; - virDrvStoragePoolListVolumes storagePoolListVolumes; - virDrvStoragePoolListAllVolumes storagePoolListAllVolumes; - - virDrvStorageVolLookupByName storageVolLookupByName; - virDrvStorageVolLookupByKey storageVolLookupByKey; - virDrvStorageVolLookupByPath storageVolLookupByPath; - virDrvStorageVolCreateXML storageVolCreateXML; - virDrvStorageVolCreateXMLFrom storageVolCreateXMLFrom; - virDrvStorageVolDownload storageVolDownload; - virDrvStorageVolUpload storageVolUpload; - virDrvStorageVolDelete storageVolDelete; - virDrvStorageVolWipe storageVolWipe; - virDrvStorageVolWipePattern storageVolWipePattern; - virDrvStorageVolGetInfo storageVolGetInfo; - virDrvStorageVolGetXMLDesc storageVolGetXMLDesc; - virDrvStorageVolGetPath storageVolGetPath; - virDrvStorageVolResize storageVolResize; - virDrvStoragePoolIsActive storagePoolIsActive; - virDrvStoragePoolIsPersistent storagePoolIsPersistent; + const char * name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfStoragePools connectNumOfStoragePools; + virDrvConnectListStoragePools connectListStoragePools; + virDrvConnectNumOfDefinedStoragePools connectNumOfDefinedStoragePools; + virDrvConnectListDefinedStoragePools connectListDefinedStoragePools; + virDrvConnectListAllStoragePools connectListAllStoragePools; + virDrvConnectFindStoragePoolSources connectFindStoragePoolSources; + virDrvStoragePoolLookupByName storagePoolLookupByName; + virDrvStoragePoolLookupByUUID storagePoolLookupByUUID; + virDrvStoragePoolLookupByVolume storagePoolLookupByVolume; + virDrvStoragePoolCreateXML storagePoolCreateXML; + virDrvStoragePoolDefineXML storagePoolDefineXML; + virDrvStoragePoolBuild storagePoolBuild; + virDrvStoragePoolUndefine storagePoolUndefine; + virDrvStoragePoolCreate storagePoolCreate; + virDrvStoragePoolDestroy storagePoolDestroy; + virDrvStoragePoolDelete storagePoolDelete; + virDrvStoragePoolRefresh storagePoolRefresh; + virDrvStoragePoolGetInfo storagePoolGetInfo; + virDrvStoragePoolGetXMLDesc storagePoolGetXMLDesc; + virDrvStoragePoolGetAutostart storagePoolGetAutostart; + virDrvStoragePoolSetAutostart storagePoolSetAutostart; + virDrvStoragePoolNumOfVolumes storagePoolNumOfVolumes; + virDrvStoragePoolListVolumes storagePoolListVolumes; + virDrvStoragePoolListAllVolumes storagePoolListAllVolumes; + virDrvStorageVolLookupByName storageVolLookupByName; + virDrvStorageVolLookupByKey storageVolLookupByKey; + virDrvStorageVolLookupByPath storageVolLookupByPath; + virDrvStorageVolCreateXML storageVolCreateXML; + virDrvStorageVolCreateXMLFrom storageVolCreateXMLFrom; + virDrvStorageVolDownload storageVolDownload; + virDrvStorageVolUpload storageVolUpload; + virDrvStorageVolDelete storageVolDelete; + virDrvStorageVolWipe storageVolWipe; + virDrvStorageVolWipePattern storageVolWipePattern; + virDrvStorageVolGetInfo storageVolGetInfo; + virDrvStorageVolGetXMLDesc storageVolGetXMLDesc; + virDrvStorageVolGetPath storageVolGetPath; + virDrvStorageVolResize storageVolResize; + virDrvStoragePoolIsActive storagePoolIsActive; + virDrvStoragePoolIsPersistent storagePoolIsPersistent; }; # ifdef WITH_LIBVIRTD -typedef int (*virDrvStateInitialize) (bool privileged, - virStateInhibitCallback callback, - void *opaque); -typedef int (*virDrvStateCleanup) (void); -typedef int (*virDrvStateReload) (void); -typedef int (*virDrvStateStop) (void); +typedef int +(*virDrvStateInitialize)(bool privileged, + virStateInhibitCallback callback, + void *opaque); + +typedef int +(*virDrvStateCleanup)(void); + +typedef int +(*virDrvStateReload)(void); + +typedef int +(*virDrvStateStop)(void); typedef struct _virStateDriver virStateDriver; typedef virStateDriver *virStateDriverPtr; struct _virStateDriver { const char *name; - virDrvStateInitialize stateInitialize; - virDrvStateCleanup stateCleanup; - virDrvStateReload stateReload; - virDrvStateStop stateStop; + virDrvStateInitialize stateInitialize; + virDrvStateCleanup stateCleanup; + virDrvStateReload stateReload; + virDrvStateStop stateStop; }; # endif -typedef struct _virDeviceMonitor virDeviceMonitor; -typedef virDeviceMonitor *virDeviceMonitorPtr; +typedef int +(*virDrvNodeNumOfDevices)(virConnectPtr conn, + const char *cap, + unsigned int flags); -typedef int (*virDrvNodeNumOfDevices)(virConnectPtr conn, - const char *cap, - unsigned int flags); +typedef int +(*virDrvNodeListDevices)(virConnectPtr conn, + const char *cap, + char **const names, + int maxnames, + unsigned int flags); -typedef int (*virDrvNodeListDevices)(virConnectPtr conn, - const char *cap, - char **const names, - int maxnames, - unsigned int flags); -typedef int (*virDrvConnectListAllNodeDevices)(virConnectPtr conn, - virNodeDevicePtr **devices, - unsigned int flags); +typedef int +(*virDrvConnectListAllNodeDevices)(virConnectPtr conn, + virNodeDevicePtr **devices, + unsigned int flags); + +typedef virNodeDevicePtr +(*virDrvNodeDeviceLookupByName)(virConnectPtr conn, + const char *name); + +typedef virNodeDevicePtr +(*virDrvNodeDeviceLookupSCSIHostByWWN)(virConnectPtr conn, + const char *wwnn, + const char *wwpn, + unsigned int flags); + +typedef char * +(*virDrvNodeDeviceGetXMLDesc)(virNodeDevicePtr dev, + unsigned int flags); -typedef virNodeDevicePtr (*virDrvNodeDeviceLookupByName)(virConnectPtr conn, - const char *name); +typedef char * +(*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); -typedef virNodeDevicePtr (*virDrvNodeDeviceLookupSCSIHostByWWN)(virConnectPtr conn, - const char *wwnn, - const char *wwpn, - unsigned int flags); +typedef int +(*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); -typedef char * (*virDrvNodeDeviceGetXMLDesc)(virNodeDevicePtr dev, - unsigned int flags); +typedef int +(*virDrvNodeDeviceListCaps)(virNodeDevicePtr dev, + char **const names, + int maxnames); -typedef char * (*virDrvNodeDeviceGetParent)(virNodeDevicePtr dev); +typedef virNodeDevicePtr +(*virDrvNodeDeviceCreateXML)(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); -typedef int (*virDrvNodeDeviceNumOfCaps)(virNodeDevicePtr dev); +typedef int +(*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev); -typedef int (*virDrvNodeDeviceListCaps)(virNodeDevicePtr dev, - char **const names, - int maxnames); -typedef virNodeDevicePtr (*virDrvNodeDeviceCreateXML)(virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); -typedef int (*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev); + +typedef struct _virDeviceMonitor virDeviceMonitor; +typedef virDeviceMonitor *virDeviceMonitorPtr; /** * _virDeviceMonitor: @@ -1600,20 +1768,20 @@ typedef int (*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev); * */ struct _virDeviceMonitor { - const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - virDrvNodeNumOfDevices nodeNumOfDevices; - virDrvNodeListDevices nodeListDevices; + const char * name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvNodeNumOfDevices nodeNumOfDevices; + virDrvNodeListDevices nodeListDevices; virDrvConnectListAllNodeDevices connectListAllNodeDevices; virDrvNodeDeviceLookupByName nodeDeviceLookupByName; - virDrvNodeDeviceLookupSCSIHostByWWN nodeDeviceLookupSCSIHostByWWN; - virDrvNodeDeviceGetXMLDesc nodeDeviceGetXMLDesc; - virDrvNodeDeviceGetParent nodeDeviceGetParent; - virDrvNodeDeviceNumOfCaps nodeDeviceNumOfCaps; - virDrvNodeDeviceListCaps nodeDeviceListCaps; - virDrvNodeDeviceCreateXML nodeDeviceCreateXML; - virDrvNodeDeviceDestroy nodeDeviceDestroy; + virDrvNodeDeviceLookupSCSIHostByWWN nodeDeviceLookupSCSIHostByWWN; + virDrvNodeDeviceGetXMLDesc nodeDeviceGetXMLDesc; + virDrvNodeDeviceGetParent nodeDeviceGetParent; + virDrvNodeDeviceNumOfCaps nodeDeviceNumOfCaps; + virDrvNodeDeviceListCaps nodeDeviceListCaps; + virDrvNodeDeviceCreateXML nodeDeviceCreateXML; + virDrvNodeDeviceDestroy nodeDeviceDestroy; }; enum { @@ -1623,41 +1791,50 @@ enum { }; typedef virSecretPtr - (*virDrvSecretLookupByUUID) (virConnectPtr conn, - const unsigned char *uuid); +(*virDrvSecretLookupByUUID)(virConnectPtr conn, + const unsigned char *uuid); + typedef virSecretPtr - (*virDrvSecretLookupByUsage) (virConnectPtr conn, - int usageType, - const char *usageID); +(*virDrvSecretLookupByUsage)(virConnectPtr conn, + int usageType, + const char *usageID); + typedef virSecretPtr - (*virDrvSecretDefineXML) (virConnectPtr conn, - const char *xml, - unsigned int flags); +(*virDrvSecretDefineXML)(virConnectPtr conn, + const char *xml, + unsigned int flags); + typedef char * - (*virDrvSecretGetXMLDesc) (virSecretPtr secret, - unsigned int flags); +(*virDrvSecretGetXMLDesc)(virSecretPtr secret, + unsigned int flags); + typedef int - (*virDrvSecretSetValue) (virSecretPtr secret, - const unsigned char *value, - size_t value_size, - unsigned int flags); +(*virDrvSecretSetValue)(virSecretPtr secret, + const unsigned char *value, + size_t value_size, + unsigned int flags); + typedef unsigned char * - (*virDrvSecretGetValue) (virSecretPtr secret, - size_t *value_size, - unsigned int flags, - unsigned int internalFlags); +(*virDrvSecretGetValue)(virSecretPtr secret, + size_t *value_size, + unsigned int flags, + unsigned int internalFlags); + typedef int - (*virDrvSecretUndefine) (virSecretPtr secret); +(*virDrvSecretUndefine)(virSecretPtr secret); + typedef int - (*virDrvConnectNumOfSecrets) (virConnectPtr conn); +(*virDrvConnectNumOfSecrets)(virConnectPtr conn); + typedef int - (*virDrvConnectListSecrets) (virConnectPtr conn, - char **uuids, - int maxuuids); +(*virDrvConnectListSecrets)(virConnectPtr conn, + char **uuids, + int maxuuids); + typedef int - (*virDrvConnectListAllSecrets) (virConnectPtr conn, - virSecretPtr **secrets, - unsigned int flags); +(*virDrvConnectListAllSecrets)(virConnectPtr conn, + virSecretPtr **secrets, + unsigned int flags); typedef struct _virSecretDriver virSecretDriver; typedef virSecretDriver *virSecretDriverPtr; @@ -1674,81 +1851,96 @@ typedef virSecretDriver *virSecretDriverPtr; */ struct _virSecretDriver { const char *name; - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - - virDrvConnectNumOfSecrets connectNumOfSecrets; - virDrvConnectListSecrets connectListSecrets; - virDrvConnectListAllSecrets connectListAllSecrets; - virDrvSecretLookupByUUID secretLookupByUUID; - virDrvSecretLookupByUsage secretLookupByUsage; - virDrvSecretDefineXML secretDefineXML; - virDrvSecretGetXMLDesc secretGetXMLDesc; - virDrvSecretSetValue secretSetValue; - virDrvSecretGetValue secretGetValue; - virDrvSecretUndefine secretUndefine; + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; + virDrvConnectNumOfSecrets connectNumOfSecrets; + virDrvConnectListSecrets connectListSecrets; + virDrvConnectListAllSecrets connectListAllSecrets; + virDrvSecretLookupByUUID secretLookupByUUID; + virDrvSecretLookupByUsage secretLookupByUsage; + virDrvSecretDefineXML secretDefineXML; + virDrvSecretGetXMLDesc secretGetXMLDesc; + virDrvSecretSetValue secretSetValue; + virDrvSecretGetValue secretGetValue; + virDrvSecretUndefine secretUndefine; }; -typedef struct _virStreamDriver virStreamDriver; -typedef virStreamDriver *virStreamDriverPtr; +typedef int +(*virDrvStreamSend)(virStreamPtr st, + const char *data, + size_t nbytes); -typedef int (*virDrvStreamSend)(virStreamPtr st, - const char *data, - size_t nbytes); -typedef int (*virDrvStreamRecv)(virStreamPtr st, - char *data, - size_t nbytes); +typedef int +(*virDrvStreamRecv)(virStreamPtr st, + char *data, + size_t nbytes); + +typedef int +(*virDrvStreamEventAddCallback)(virStreamPtr stream, + int events, + virStreamEventCallback cb, + void *opaque, + virFreeCallback ff); + +typedef int +(*virDrvStreamEventUpdateCallback)(virStreamPtr stream, + int events); + +typedef int +(*virDrvStreamEventRemoveCallback)(virStreamPtr stream); -typedef int (*virDrvStreamEventAddCallback)(virStreamPtr stream, - int events, - virStreamEventCallback cb, - void *opaque, - virFreeCallback ff); +typedef int +(*virDrvStreamFinish)(virStreamPtr st); -typedef int (*virDrvStreamEventUpdateCallback)(virStreamPtr stream, - int events); -typedef int (*virDrvStreamEventRemoveCallback)(virStreamPtr stream); -typedef int (*virDrvStreamFinish)(virStreamPtr st); -typedef int (*virDrvStreamAbort)(virStreamPtr st); +typedef int +(*virDrvStreamAbort)(virStreamPtr st); +typedef struct _virStreamDriver virStreamDriver; +typedef virStreamDriver *virStreamDriverPtr; struct _virStreamDriver { - virDrvStreamSend streamSend; - virDrvStreamRecv streamRecv; - virDrvStreamEventAddCallback streamEventAddCallback; + virDrvStreamSend streamSend; + virDrvStreamRecv streamRecv; + virDrvStreamEventAddCallback streamEventAddCallback; virDrvStreamEventUpdateCallback streamEventUpdateCallback; virDrvStreamEventRemoveCallback streamEventRemoveCallback; - virDrvStreamFinish streamFinish; - virDrvStreamAbort streamAbort; + virDrvStreamFinish streamFinish; + virDrvStreamAbort streamAbort; }; typedef int - (*virDrvConnectNumOfNWFilters) (virConnectPtr conn); +(*virDrvConnectNumOfNWFilters)(virConnectPtr conn); + typedef int - (*virDrvConnectListNWFilters) (virConnectPtr conn, - char **const names, - int maxnames); +(*virDrvConnectListNWFilters)(virConnectPtr conn, + char **const names, + int maxnames); + typedef int - (*virDrvConnectListAllNWFilters) (virConnectPtr conn, - virNWFilterPtr **filters, - unsigned int flags); +(*virDrvConnectListAllNWFilters)(virConnectPtr conn, + virNWFilterPtr **filters, + unsigned int flags); + typedef virNWFilterPtr - (*virDrvNWFilterLookupByName) (virConnectPtr conn, - const char *name); +(*virDrvNWFilterLookupByName)(virConnectPtr conn, + const char *name); + typedef virNWFilterPtr - (*virDrvNWFilterLookupByUUID) (virConnectPtr conn, - const unsigned char *uuid); +(*virDrvNWFilterLookupByUUID)(virConnectPtr conn, + const unsigned char *uuid); + typedef virNWFilterPtr - (*virDrvNWFilterDefineXML) (virConnectPtr conn, - const char *xmlDesc); +(*virDrvNWFilterDefineXML)(virConnectPtr conn, + const char *xmlDesc); + typedef int - (*virDrvNWFilterUndefine) (virNWFilterPtr nwfilter); +(*virDrvNWFilterUndefine)(virNWFilterPtr nwfilter); typedef char * - (*virDrvNWFilterGetXMLDesc) (virNWFilterPtr nwfilter, - unsigned int flags); +(*virDrvNWFilterGetXMLDesc)(virNWFilterPtr nwfilter, + unsigned int flags); typedef struct _virNWFilterDriver virNWFilterDriver; @@ -1765,18 +1957,17 @@ typedef virNWFilterDriver *virNWFilterDriverPtr; * - close */ struct _virNWFilterDriver { - const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; - + const char * name; /* the name of the driver */ + virDrvConnectOpen connectOpen; + virDrvConnectClose connectClose; virDrvConnectNumOfNWFilters connectNumOfNWFilters; - virDrvConnectListNWFilters connectListNWFilters; - virDrvConnectListAllNWFilters connectListAllNWFilters; - virDrvNWFilterLookupByName nwfilterLookupByName; - virDrvNWFilterLookupByUUID nwfilterLookupByUUID; - virDrvNWFilterDefineXML nwfilterDefineXML; - virDrvNWFilterUndefine nwfilterUndefine; - virDrvNWFilterGetXMLDesc nwfilterGetXMLDesc; + virDrvConnectListNWFilters connectListNWFilters; + virDrvConnectListAllNWFilters connectListAllNWFilters; + virDrvNWFilterLookupByName nwfilterLookupByName; + virDrvNWFilterLookupByUUID nwfilterLookupByUUID; + virDrvNWFilterDefineXML nwfilterDefineXML; + virDrvNWFilterUndefine nwfilterUndefine; + virDrvNWFilterGetXMLDesc nwfilterGetXMLDesc; }; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; The driver.h struct for node devices used an inconsistent naming scheme 'DeviceMonitor' instead of the more usual 'NodeDeviceDriver'. Fix this everywhere it has leaked out to. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- docs/hvsupport.pl | 4 +- src/conf/node_device_conf.h | 6 +-- src/datatypes.c | 4 +- src/datatypes.h | 4 +- src/driver.h | 10 ++--- src/esx/esx_device_monitor.c | 8 ++-- src/hyperv/hyperv_device_monitor.c | 8 ++-- src/libvirt.c | 76 ++++++++++++++++++------------------ src/libvirt_private.syms | 2 +- src/node_device/node_device_driver.c | 28 ++++++------- src/node_device/node_device_driver.h | 4 +- src/node_device/node_device_hal.c | 30 +++++++------- src/node_device/node_device_udev.c | 30 +++++++------- src/remote/remote_driver.c | 24 ++++++------ src/rpc/gendispatch.pl | 4 +- src/test/test_driver.c | 20 +++++----- tests/object-locking.ml | 4 +- 17 files changed, 133 insertions(+), 133 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index baebfc4..707b512 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -18,7 +18,7 @@ my %groupheaders = ( "virDriver" => "Hypervisor APIs", "virNetworkDriver" => "Virtual Network APIs", "virInterfaceDriver" => "Host Interface APIs", - "virDeviceMonitor" => "Host Device APIs", + "virNodeDeviceDriver" => "Host Device APIs", "virStorageDriver" => "Storage Pool APIs", "virSecretDriver" => "Secret APIs", "virNWFilterDriver" => "Network Filter APIs", @@ -182,7 +182,7 @@ open FILE, "<$drivertable" my %groups; my $ingrp; while (defined($line = <FILE>)) { - if ($line =~ /struct _(vir\w*(?:Driver|Monitor))/) { + if ($line =~ /struct _(vir\w*Driver)/) { my $grp = $1; if ($grp ne "virStateDriver" && $grp ne "virStreamDriver") { diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index ca5ec72..1c5855c 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -200,9 +200,9 @@ struct _virNodeDeviceObjList { virNodeDeviceObjPtr *objs; }; -typedef struct _virDeviceMonitorState virDeviceMonitorState; -typedef virDeviceMonitorState *virDeviceMonitorStatePtr; -struct _virDeviceMonitorState { +typedef struct _virNodeDeviceDriverState virNodeDeviceDriverState; +typedef virNodeDeviceDriverState *virNodeDeviceDriverStatePtr; +struct _virNodeDeviceDriverState { virMutex lock; virNodeDeviceObjList devs; /* currently-known devices */ diff --git a/src/datatypes.c b/src/datatypes.c index f8b6f49..f6c01ce 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -149,8 +149,8 @@ virConnectDispose(void *obj) conn->interfaceDriver->connectClose(conn); if (conn->storageDriver) conn->storageDriver->connectClose(conn); - if (conn->deviceMonitor) - conn->deviceMonitor->connectClose(conn); + if (conn->nodeDeviceDriver) + conn->nodeDeviceDriver->connectClose(conn); if (conn->secretDriver) conn->secretDriver->connectClose(conn); if (conn->nwfilterDriver) diff --git a/src/datatypes.h b/src/datatypes.h index e5ecf18..6026bb0 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -128,7 +128,7 @@ struct _virConnect { virNetworkDriverPtr networkDriver; virInterfaceDriverPtr interfaceDriver; virStorageDriverPtr storageDriver; - virDeviceMonitorPtr deviceMonitor; + virNodeDeviceDriverPtr nodeDeviceDriver; virSecretDriverPtr secretDriver; virNWFilterDriverPtr nwfilterDriver; @@ -140,7 +140,7 @@ struct _virConnect { void * networkPrivateData; void * interfacePrivateData; void * storagePrivateData; - void * devMonPrivateData; + void * nodeDevicePrivateData; void * secretPrivateData; void * nwfilterPrivateData; diff --git a/src/driver.h b/src/driver.h index 8eb25ea..8b4f603 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1757,17 +1757,17 @@ typedef int -typedef struct _virDeviceMonitor virDeviceMonitor; -typedef virDeviceMonitor *virDeviceMonitorPtr; +typedef struct _virNodeDeviceDriver virNodeDeviceDriver; +typedef virNodeDeviceDriver *virNodeDeviceDriverPtr; /** - * _virDeviceMonitor: + * _virNodeDeviceDriver: * * Structure associated with monitoring the devices * on a virtualized node. * */ -struct _virDeviceMonitor { +struct _virNodeDeviceDriver { const char * name; /* the name of the driver */ virDrvConnectOpen connectOpen; virDrvConnectClose connectClose; @@ -1980,7 +1980,7 @@ int virRegisterDriver(virDriverPtr); int virRegisterNetworkDriver(virNetworkDriverPtr); int virRegisterInterfaceDriver(virInterfaceDriverPtr); int virRegisterStorageDriver(virStorageDriverPtr); -int virRegisterDeviceMonitor(virDeviceMonitorPtr); +int virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr); int virRegisterSecretDriver(virSecretDriverPtr); int virRegisterNWFilterDriver(virNWFilterDriverPtr); # ifdef WITH_LIBVIRTD diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 826b171..0812bdf 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -50,7 +50,7 @@ esxDeviceOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; } - conn->devMonPrivateData = conn->privateData; + conn->nodeDevicePrivateData = conn->privateData; return VIR_DRV_OPEN_SUCCESS; } @@ -60,14 +60,14 @@ esxDeviceOpen(virConnectPtr conn, static int esxDeviceClose(virConnectPtr conn) { - conn->devMonPrivateData = NULL; + conn->nodeDevicePrivateData = NULL; return 0; } -static virDeviceMonitor esxDeviceMonitor = { +static virNodeDeviceDriver esxNodeDeviceDriver = { .name = "ESX", .connectOpen = esxDeviceOpen, /* 0.7.6 */ .connectClose = esxDeviceClose, /* 0.7.6 */ @@ -78,5 +78,5 @@ static virDeviceMonitor esxDeviceMonitor = { int esxDeviceRegister(void) { - return virRegisterDeviceMonitor(&esxDeviceMonitor); + return virRegisterNodeDeviceDriver(&esxNodeDeviceDriver); } diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c index cf3ba25..ace9e71 100644 --- a/src/hyperv/hyperv_device_monitor.c +++ b/src/hyperv/hyperv_device_monitor.c @@ -47,7 +47,7 @@ hypervDeviceOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; } - conn->devMonPrivateData = conn->privateData; + conn->nodeDevicePrivateData = conn->privateData; return VIR_DRV_OPEN_SUCCESS; } @@ -57,14 +57,14 @@ hypervDeviceOpen(virConnectPtr conn, static int hypervDeviceClose(virConnectPtr conn) { - conn->devMonPrivateData = NULL; + conn->nodeDevicePrivateData = NULL; return 0; } -static virDeviceMonitor hypervDeviceMonitor = { +static virNodeDeviceDriver hypervNodeDeviceDriver = { "Hyper-V", .connectOpen = hypervDeviceOpen, /* 0.9.5 */ .connectClose = hypervDeviceClose, /* 0.9.5 */ @@ -75,5 +75,5 @@ static virDeviceMonitor hypervDeviceMonitor = { int hypervDeviceRegister(void) { - return virRegisterDeviceMonitor(&hypervDeviceMonitor); + return virRegisterNodeDeviceDriver(&hypervNodeDeviceDriver); } diff --git a/src/libvirt.c b/src/libvirt.c index 7818e7f..b784bee 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -112,8 +112,8 @@ static virInterfaceDriverPtr virInterfaceDriverTab[MAX_DRIVERS]; static int virInterfaceDriverTabCount = 0; static virStorageDriverPtr virStorageDriverTab[MAX_DRIVERS]; static int virStorageDriverTabCount = 0; -static virDeviceMonitorPtr virDeviceMonitorTab[MAX_DRIVERS]; -static int virDeviceMonitorTabCount = 0; +static virNodeDeviceDriverPtr virNodeDeviceDriverTab[MAX_DRIVERS]; +static int virNodeDeviceDriverTabCount = 0; static virSecretDriverPtr virSecretDriverTab[MAX_DRIVERS]; static int virSecretDriverTabCount = 0; static virNWFilterDriverPtr virNWFilterDriverTab[MAX_DRIVERS]; @@ -672,7 +672,7 @@ virRegisterStorageDriver(virStorageDriverPtr driver) } /** - * virRegisterDeviceMonitor: + * virRegisterNodeDeviceDriver: * @driver: pointer to a device monitor block * * Register a device monitor @@ -680,11 +680,11 @@ virRegisterStorageDriver(virStorageDriverPtr driver) * Returns the driver priority or -1 in case of error. */ int -virRegisterDeviceMonitor(virDeviceMonitorPtr driver) +virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr driver) { virCheckNonNullArgReturn(driver, -1); - if (virDeviceMonitorTabCount >= MAX_DRIVERS) { + if (virNodeDeviceDriverTabCount >= MAX_DRIVERS) { virLibConnError(VIR_ERR_INTERNAL_ERROR, _("Too many drivers, cannot register %s"), driver->name); @@ -692,10 +692,10 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) } VIR_DEBUG("registering %s as device driver %d", - driver->name, virDeviceMonitorTabCount); + driver->name, virNodeDeviceDriverTabCount); - virDeviceMonitorTab[virDeviceMonitorTabCount] = driver; - return virDeviceMonitorTabCount++; + virNodeDeviceDriverTab[virNodeDeviceDriverTabCount] = driver; + return virNodeDeviceDriverTabCount++; } /** @@ -1282,16 +1282,16 @@ do_open(const char *name, } /* Node driver (optional) */ - for (i = 0; i < virDeviceMonitorTabCount; i++) { - res = virDeviceMonitorTab[i]->connectOpen(ret, auth, flags); + for (i = 0; i < virNodeDeviceDriverTabCount; i++) { + res = virNodeDeviceDriverTab[i]->connectOpen(ret, auth, flags); VIR_DEBUG("node driver %d %s returned %s", - i, virDeviceMonitorTab[i]->name, + i, virNodeDeviceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_SUCCESS) { - ret->deviceMonitor = virDeviceMonitorTab[i]; + ret->nodeDeviceDriver = virNodeDeviceDriverTab[i]; break; } else if (res == VIR_DRV_OPEN_ERROR) { break; @@ -14220,9 +14220,9 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) return -1; } - if (conn->deviceMonitor && conn->deviceMonitor->nodeNumOfDevices) { + if (conn->nodeDeviceDriver && conn->nodeDeviceDriver->nodeNumOfDevices) { int ret; - ret = conn->deviceMonitor->nodeNumOfDevices(conn, cap, flags); + ret = conn->nodeDeviceDriver->nodeNumOfDevices(conn, cap, flags); if (ret < 0) goto error; return ret; @@ -14291,10 +14291,10 @@ virConnectListAllNodeDevices(virConnectPtr conn, return -1; } - if (conn->deviceMonitor && - conn->deviceMonitor->connectListAllNodeDevices) { + if (conn->nodeDeviceDriver && + conn->nodeDeviceDriver->connectListAllNodeDevices) { int ret; - ret = conn->deviceMonitor->connectListAllNodeDevices(conn, devices, flags); + ret = conn->nodeDeviceDriver->connectListAllNodeDevices(conn, devices, flags); if (ret < 0) goto error; return ret; @@ -14343,9 +14343,9 @@ virNodeListDevices(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->deviceMonitor && conn->deviceMonitor->nodeListDevices) { + if (conn->nodeDeviceDriver && conn->nodeDeviceDriver->nodeListDevices) { int ret; - ret = conn->deviceMonitor->nodeListDevices(conn, cap, names, maxnames, flags); + ret = conn->nodeDeviceDriver->nodeListDevices(conn, cap, names, maxnames, flags); if (ret < 0) goto error; return ret; @@ -14382,9 +14382,9 @@ virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) virCheckNonNullArgGoto(name, error); - if (conn->deviceMonitor && conn->deviceMonitor->nodeDeviceLookupByName) { + if (conn->nodeDeviceDriver && conn->nodeDeviceDriver->nodeDeviceLookupByName) { virNodeDevicePtr ret; - ret = conn->deviceMonitor->nodeDeviceLookupByName(conn, name); + ret = conn->nodeDeviceDriver->nodeDeviceLookupByName(conn, name); if (!ret) goto error; return ret; @@ -14427,10 +14427,10 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virCheckNonNullArgGoto(wwnn, error); virCheckNonNullArgGoto(wwpn, error); - if (conn->deviceMonitor && - conn->deviceMonitor->nodeDeviceLookupSCSIHostByWWN) { + if (conn->nodeDeviceDriver && + conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN) { virNodeDevicePtr ret; - ret = conn->deviceMonitor->nodeDeviceLookupSCSIHostByWWN(conn, wwnn, + ret = conn->nodeDeviceDriver->nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, flags); if (!ret) goto error; @@ -14466,9 +14466,9 @@ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) return NULL; } - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceGetXMLDesc) { + if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceGetXMLDesc) { char *ret; - ret = dev->conn->deviceMonitor->nodeDeviceGetXMLDesc(dev, flags); + ret = dev->conn->nodeDeviceDriver->nodeDeviceGetXMLDesc(dev, flags); if (!ret) goto error; return ret; @@ -14525,8 +14525,8 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) } if (!dev->parent) { - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceGetParent) { - dev->parent = dev->conn->deviceMonitor->nodeDeviceGetParent(dev); + if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceGetParent) { + dev->parent = dev->conn->nodeDeviceDriver->nodeDeviceGetParent(dev); } else { virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); virDispatchError(dev->conn); @@ -14556,9 +14556,9 @@ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) return -1; } - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceNumOfCaps) { + if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceNumOfCaps) { int ret; - ret = dev->conn->deviceMonitor->nodeDeviceNumOfCaps(dev); + ret = dev->conn->nodeDeviceDriver->nodeDeviceNumOfCaps(dev); if (ret < 0) goto error; return ret; @@ -14599,9 +14599,9 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->nodeDeviceListCaps) { + if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceListCaps) { int ret; - ret = dev->conn->deviceMonitor->nodeDeviceListCaps(dev, names, maxnames); + ret = dev->conn->nodeDeviceDriver->nodeDeviceListCaps(dev, names, maxnames); if (ret < 0) goto error; return ret; @@ -14854,9 +14854,9 @@ virNodeDeviceCreateXML(virConnectPtr conn, virCheckNonNullArgGoto(xmlDesc, error); - if (conn->deviceMonitor && - conn->deviceMonitor->nodeDeviceCreateXML) { - virNodeDevicePtr dev = conn->deviceMonitor->nodeDeviceCreateXML(conn, xmlDesc, flags); + if (conn->nodeDeviceDriver && + conn->nodeDeviceDriver->nodeDeviceCreateXML) { + virNodeDevicePtr dev = conn->nodeDeviceDriver->nodeDeviceCreateXML(conn, xmlDesc, flags); if (dev == NULL) goto error; return dev; @@ -14897,9 +14897,9 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) goto error; } - if (dev->conn->deviceMonitor && - dev->conn->deviceMonitor->nodeDeviceDestroy) { - int retval = dev->conn->deviceMonitor->nodeDeviceDestroy(dev); + if (dev->conn->nodeDeviceDriver && + dev->conn->nodeDeviceDriver->nodeDeviceDestroy) { + int retval = dev->conn->nodeDeviceDriver->nodeDeviceDestroy(dev); if (retval < 0) { goto error; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c4ae681..b3f8521 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -713,10 +713,10 @@ virDomainMigratePrepare2; virDomainMigratePrepare3; virDomainMigratePrepareTunnel; virDomainMigratePrepareTunnel3; -virRegisterDeviceMonitor; virRegisterDriver; virRegisterInterfaceDriver; virRegisterNetworkDriver; +virRegisterNodeDeviceDriver; virRegisterNWFilterDriver; virRegisterSecretDriver; virRegisterStorageDriver; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 6be7a25..c9bd68b 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -112,11 +112,11 @@ static int update_driver_name(virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) #endif -void nodeDeviceLock(virDeviceMonitorStatePtr driver) +void nodeDeviceLock(virNodeDeviceDriverStatePtr driver) { virMutexLock(&driver->lock); } -void nodeDeviceUnlock(virDeviceMonitorStatePtr driver) +void nodeDeviceUnlock(virNodeDeviceDriverStatePtr driver) { virMutexUnlock(&driver->lock); } @@ -126,7 +126,7 @@ nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; int ndevs = 0; unsigned int i; @@ -151,7 +151,7 @@ nodeListDevices(virConnectPtr conn, char **const names, int maxnames, unsigned int flags) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; int ndevs = 0; unsigned int i; @@ -187,7 +187,7 @@ nodeListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; int ret = -1; virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP, -1); @@ -201,7 +201,7 @@ nodeListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *name) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj; virNodeDevicePtr ret = NULL; @@ -230,7 +230,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, unsigned int flags) { unsigned int i; - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; virNodeDeviceObjListPtr devs = &driver->devs; virNodeDevCapsDefPtr cap = NULL; virNodeDeviceObjPtr obj = NULL; @@ -274,7 +274,7 @@ char * nodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = dev->conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj; char *ret = NULL; @@ -306,7 +306,7 @@ cleanup: char * nodeDeviceGetParent(virNodeDevicePtr dev) { - virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = dev->conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj; char *ret = NULL; @@ -340,7 +340,7 @@ cleanup: int nodeDeviceNumOfCaps(virNodeDevicePtr dev) { - virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = dev->conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj; virNodeDevCapsDefPtr caps; int ncaps = 0; @@ -371,7 +371,7 @@ cleanup: int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) { - virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = dev->conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj; virNodeDevCapsDefPtr caps; int ncaps = 0; @@ -442,7 +442,7 @@ get_time(time_t *t) static virNodeDevicePtr find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; virNodeDevicePtr dev = NULL; time_t start = 0, now = 0; @@ -481,7 +481,7 @@ nodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - virDeviceMonitorStatePtr driver = conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; virNodeDeviceDefPtr def = NULL; char *wwnn = NULL, *wwpn = NULL; int parent_host = -1; @@ -537,7 +537,7 @@ int nodeDeviceDestroy(virNodeDevicePtr dev) { int ret = -1; - virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; + virNodeDeviceDriverStatePtr driver = dev->conn->nodeDevicePrivateData; virNodeDeviceObjPtr obj = NULL; char *parent_name = NULL, *wwnn = NULL, *wwpn = NULL; int parent_host = -1; diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index ea81917..b6c6f18 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -46,8 +46,8 @@ int halNodeRegister(void); int udevNodeRegister(void); # endif -void nodeDeviceLock(virDeviceMonitorStatePtr driver); -void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); +void nodeDeviceLock(virNodeDeviceDriverStatePtr driver); +void nodeDeviceUnlock(virNodeDeviceDriverStatePtr driver); int nodedevRegister(void); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 16c59d9..682b66a 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -46,10 +46,10 @@ * Host device enumeration (HAL implementation) */ -static virDeviceMonitorStatePtr driverState; +static virNodeDeviceDriverStatePtr driverState; #define CONN_DRV_STATE(conn) \ - ((virDeviceMonitorStatePtr)((conn)->devMonPrivateData)) + ((virNodeDeviceDriverStatePtr)((conn)->nodeDevicePrivateData)) #define DRV_STATE_HAL_CTX(ds) ((LibHalContext *)((ds)->privateData)) #define CONN_HAL_CTX(conn) DRV_STATE_HAL_CTX(CONN_DRV_STATE(conn)) @@ -590,9 +590,9 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static int halDeviceMonitorStartup(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int halNodeDeviceDriverStartup(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; char **udi = NULL; @@ -691,7 +691,7 @@ static int halDeviceMonitorStartup(bool privileged ATTRIBUTE_UNUSED, } -static int halDeviceMonitorShutdown(void) +static int halNodeDeviceDriverShutdown(void) { if (driverState) { nodeDeviceLock(driverState); @@ -708,7 +708,7 @@ static int halDeviceMonitorShutdown(void) } -static int halDeviceMonitorReload(void) +static int halNodeDeviceDriverReload(void) { DBusError err; char **udi = NULL; @@ -749,20 +749,20 @@ static virDrvOpenStatus halNodeDrvOpen(virConnectPtr conn, if (driverState == NULL) return VIR_DRV_OPEN_DECLINED; - conn->devMonPrivateData = driverState; + conn->nodeDevicePrivateData = driverState; return VIR_DRV_OPEN_SUCCESS; } static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) { - conn->devMonPrivateData = NULL; + conn->nodeDevicePrivateData = NULL; return 0; } -static virDeviceMonitor halDeviceMonitor = { - .name = "halDeviceMonitor", +static virNodeDeviceDriver halNodeDeviceDriver = { + .name = "halNodeDeviceDriver", .connectOpen = halNodeDrvOpen, /* 0.5.0 */ .connectClose = halNodeDrvClose, /* 0.5.0 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */ @@ -781,14 +781,14 @@ static virDeviceMonitor halDeviceMonitor = { static virStateDriver halStateDriver = { .name = "HAL", - .stateInitialize = halDeviceMonitorStartup, /* 0.5.0 */ - .stateCleanup = halDeviceMonitorShutdown, /* 0.5.0 */ - .stateReload = halDeviceMonitorReload, /* 0.5.0 */ + .stateInitialize = halNodeDeviceDriverStartup, /* 0.5.0 */ + .stateCleanup = halNodeDeviceDriverShutdown, /* 0.5.0 */ + .stateReload = halNodeDeviceDriverReload, /* 0.5.0 */ }; int halNodeRegister(void) { - if (virRegisterDeviceMonitor(&halDeviceMonitor) < 0) + if (virRegisterNodeDeviceDriver(&halNodeDeviceDriver) < 0) return -1; return virRegisterStateDriver(&halStateDriver); } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 353cac5..5a9c6e3 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -50,7 +50,7 @@ struct _udevPrivate { int watch; }; -static virDeviceMonitorStatePtr driverState = NULL; +static virNodeDeviceDriverStatePtr driverState = NULL; static int udevStrToLong_ull(char const *s, char **end_ptr, @@ -1437,7 +1437,7 @@ out: } -static int udevDeviceMonitorShutdown(void) +static int udevNodeDeviceDriverShutdown(void) { int ret = 0; @@ -1649,9 +1649,9 @@ out: return ret; } -static int udevDeviceMonitorStartup(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int udevNodeDeviceDriverStartup(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { udevPrivate *priv = NULL; struct udev *udev = NULL; @@ -1758,13 +1758,13 @@ out_unlock: out: if (ret == -1) { - udevDeviceMonitorShutdown(); + udevNodeDeviceDriverShutdown(); } return ret; } -static int udevDeviceMonitorReload(void) +static int udevNodeDeviceDriverReload(void) { return 0; } @@ -1780,19 +1780,19 @@ static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; } - conn->devMonPrivateData = driverState; + conn->nodeDevicePrivateData = driverState; return VIR_DRV_OPEN_SUCCESS; } static int udevNodeDrvClose(virConnectPtr conn) { - conn->devMonPrivateData = NULL; + conn->nodeDevicePrivateData = NULL; return 0; } -static virDeviceMonitor udevDeviceMonitor = { - .name = "udevDeviceMonitor", +static virNodeDeviceDriver udevNodeDeviceDriver = { + .name = "udevNodeDeviceDriver", .connectOpen = udevNodeDrvOpen, /* 0.7.3 */ .connectClose = udevNodeDrvClose, /* 0.7.3 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.7.3 */ @@ -1810,16 +1810,16 @@ static virDeviceMonitor udevDeviceMonitor = { static virStateDriver udevStateDriver = { .name = "udev", - .stateInitialize = udevDeviceMonitorStartup, /* 0.7.3 */ - .stateCleanup = udevDeviceMonitorShutdown, /* 0.7.3 */ - .stateReload = udevDeviceMonitorReload, /* 0.7.3 */ + .stateInitialize = udevNodeDeviceDriverStartup, /* 0.7.3 */ + .stateCleanup = udevNodeDeviceDriverShutdown, /* 0.7.3 */ + .stateReload = udevNodeDeviceDriverReload, /* 0.7.3 */ }; int udevNodeRegister(void) { VIR_DEBUG("Registering udev node device backend"); - if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { + if (virRegisterNodeDeviceDriver(&udevNodeDeviceDriver) < 0) { return -1; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4aec150..83dc0fe 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3367,16 +3367,16 @@ done: /*----------------------------------------------------------------------*/ static virDrvOpenStatus ATTRIBUTE_NONNULL(1) -remoteDevMonOpen(virConnectPtr conn, virConnectAuthPtr auth, - unsigned int flags) +remoteNodeDeviceOpen(virConnectPtr conn, virConnectAuthPtr auth, + unsigned int flags) { - return remoteGenericOpen(conn, auth, flags, &conn->devMonPrivateData); + return remoteGenericOpen(conn, auth, flags, &conn->nodeDevicePrivateData); } static int -remoteDevMonClose(virConnectPtr conn) +remoteNodeDeviceClose(virConnectPtr conn) { - return remoteGenericClose(conn, &conn->devMonPrivateData); + return remoteGenericClose(conn, &conn->nodeDevicePrivateData); } static int @@ -3385,7 +3385,7 @@ remoteNodeDeviceDettach(virNodeDevicePtr dev) int rv = -1; remote_node_device_dettach_args args; /* This method is unusual in that it uses the HV driver, not the devMon driver - * hence its use of privateData, instead of devMonPrivateData */ + * hence its use of privateData, instead of nodeDevicePrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -3410,7 +3410,7 @@ remoteNodeDeviceReAttach(virNodeDevicePtr dev) int rv = -1; remote_node_device_re_attach_args args; /* This method is unusual in that it uses the HV driver, not the devMon driver - * hence its use of privateData, instead of devMonPrivateData */ + * hence its use of privateData, instead of nodeDevicePrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -3435,7 +3435,7 @@ remoteNodeDeviceReset(virNodeDevicePtr dev) int rv = -1; remote_node_device_reset_args args; /* This method is unusual in that it uses the HV driver, not the devMon driver - * hence its use of privateData, instead of devMonPrivateData */ + * hence its use of privateData, instead of nodeDevicePrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -6414,10 +6414,10 @@ static virSecretDriver secret_driver = { .secretUndefine = remoteSecretUndefine /* 0.7.1 */ }; -static virDeviceMonitor dev_monitor = { +static virNodeDeviceDriver node_device_driver = { .name = "remote", - .connectOpen = remoteDevMonOpen, /* 0.5.0 */ - .connectClose = remoteDevMonClose, /* 0.5.0 */ + .connectOpen = remoteNodeDeviceOpen, /* 0.5.0 */ + .connectClose = remoteNodeDeviceClose, /* 0.5.0 */ .nodeNumOfDevices = remoteNodeNumOfDevices, /* 0.5.0 */ .nodeListDevices = remoteNodeListDevices, /* 0.5.0 */ .connectListAllNodeDevices = remoteConnectListAllNodeDevices, /* 0.10.2 */ @@ -6469,7 +6469,7 @@ remoteRegister(void) if (virRegisterNetworkDriver(&network_driver) == -1) return -1; if (virRegisterInterfaceDriver(&interface_driver) == -1) return -1; if (virRegisterStorageDriver(&storage_driver) == -1) return -1; - if (virRegisterDeviceMonitor(&dev_monitor) == -1) return -1; + if (virRegisterNodeDeviceDriver(&node_device_driver) == -1) return -1; if (virRegisterSecretDriver(&secret_driver) == -1) return -1; if (virRegisterNWFilterDriver(&nwfilter_driver) == -1) return -1; #ifdef WITH_LIBVIRTD diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 7bbc76a..d364e1c 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1072,7 +1072,7 @@ elsif ($mode eq "client") { !($argtype =~ m/^remote_node_device_lookup_by_name_/) and !($argtype =~ m/^remote_node_device_create_xml_/)) { $has_node_device = 1; - $priv_name = "devMonPrivateData"; + $priv_name = "nodeDevicePrivateData"; } foreach my $args_member (@{$call->{args_members}}) { @@ -1309,7 +1309,7 @@ elsif ($mode eq "client") { my $type_name = name_to_TypeName($name); if ($name eq "node_device") { - $priv_name = "devMonPrivateData"; + $priv_name = "nodeDevicePrivateData"; } elsif ($name =~ m/^storage_/) { $priv_name = "storagePrivateData"; } elsif (!($name =~ m/^domain/)) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5272f06..ebcb160 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5245,21 +5245,21 @@ cleanup: /* Node device implementations */ -static virDrvOpenStatus testDevMonOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus testNodeDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (STRNEQ(conn->driver->name, "Test")) return VIR_DRV_OPEN_DECLINED; - conn->devMonPrivateData = conn->privateData; + conn->nodeDevicePrivateData = conn->privateData; return VIR_DRV_OPEN_SUCCESS; } -static int testDevMonClose(virConnectPtr conn) { - conn->devMonPrivateData = NULL; +static int testNodeDeviceClose(virConnectPtr conn) { + conn->nodeDevicePrivateData = NULL; return 0; } @@ -5952,10 +5952,10 @@ static virStorageDriver testStorageDriver = { .storagePoolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ }; -static virDeviceMonitor testDevMonitor = { +static virNodeDeviceDriver testNodeDeviceDriver = { .name = "Test", - .connectOpen = testDevMonOpen, /* 0.6.0 */ - .connectClose = testDevMonClose, /* 0.6.0 */ + .connectOpen = testNodeDeviceOpen, /* 0.6.0 */ + .connectClose = testNodeDeviceClose, /* 0.6.0 */ .nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */ .nodeListDevices = testNodeListDevices, /* 0.7.2 */ @@ -5997,7 +5997,7 @@ testRegister(void) return -1; if (virRegisterStorageDriver(&testStorageDriver) < 0) return -1; - if (virRegisterDeviceMonitor(&testDevMonitor) < 0) + if (virRegisterNodeDeviceDriver(&testNodeDeviceDriver) < 0) return -1; if (virRegisterSecretDriver(&testSecretDriver) < 0) return -1; diff --git a/tests/object-locking.ml b/tests/object-locking.ml index 88485fc..009b8f8 100644 --- a/tests/object-locking.ml +++ b/tests/object-locking.ml @@ -47,7 +47,7 @@ let driverTables = [ "virDriver"; "virNetworkDriver"; "virStorageDriver"; - "virDeviceMonitor"; + "virNodeDeviceDriver"; (* "virStateDriver"; Disable for now, since shutdown/startup have weird locking rules *) ] @@ -160,7 +160,7 @@ let lockableDrivers = [ "uml_driver"; "virStorageDriverStatePtr"; "network_driver"; - "virDeviceMonitorState"; + "virNodeDeviceState"; "one_driver_t"; ] -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; It will simplify later work if the sub-drivers have dedicated APIs / field names. ie virNetworkDriver should have virDrvNetworkOpen and virDrvNetworkClose methods Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- docs/hvsupport.pl | 4 +++ src/datatypes.c | 12 ++++----- src/driver.h | 47 ++++++++++++++++++++++++--------- src/esx/esx_device_monitor.c | 4 +-- src/esx/esx_interface_driver.c | 4 +-- src/esx/esx_network_driver.c | 4 +-- src/esx/esx_nwfilter_driver.c | 4 +-- src/esx/esx_secret_driver.c | 4 +-- src/esx/esx_storage_driver.c | 4 +-- src/hyperv/hyperv_device_monitor.c | 4 +-- src/hyperv/hyperv_interface_driver.c | 4 +-- src/hyperv/hyperv_network_driver.c | 4 +-- src/hyperv/hyperv_nwfilter_driver.c | 4 +-- src/hyperv/hyperv_secret_driver.c | 4 +-- src/hyperv/hyperv_storage_driver.c | 4 +-- src/interface/interface_backend_netcf.c | 4 +-- src/interface/interface_backend_udev.c | 4 +-- src/libvirt.c | 12 ++++----- src/network/bridge_driver.c | 4 +-- src/node_device/node_device_hal.c | 4 +-- src/node_device/node_device_udev.c | 4 +-- src/nwfilter/nwfilter_driver.c | 4 +-- src/parallels/parallels_network.c | 4 +-- src/parallels/parallels_storage.c | 4 +-- src/phyp/phyp_driver.c | 8 +++--- src/remote/remote_driver.c | 24 ++++++++--------- src/secret/secret_driver.c | 4 +-- src/storage/storage_driver.c | 4 +-- src/test/test_driver.c | 24 ++++++++--------- src/vbox/vbox_tmpl.c | 8 +++--- tests/qemuxml2argvtest.c | 4 +-- 31 files changed, 129 insertions(+), 102 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 707b512..b415abc 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -197,6 +197,8 @@ while (defined($line = <FILE>)) { my $api; if (exists $apis{"vir$name"}) { $api = "vir$name"; + } elsif ($name =~ /\w+(Open|Close)/) { + next; } else { die "driver $name does not have a public API"; } @@ -254,6 +256,8 @@ foreach my $src (@srcs) { die "Driver method for $api is NULL in $src" if $meth eq "NULL"; if (!exists($groups{$ingrp}->{apis}->{$api})) { + next if $api =~ /\w(Open|Close)/; + die "Found unexpected method $api in $ingrp\n"; } diff --git a/src/datatypes.c b/src/datatypes.c index f6c01ce..0e1dbb1 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -144,17 +144,17 @@ virConnectDispose(void *obj) virConnectPtr conn = obj; if (conn->networkDriver) - conn->networkDriver->connectClose(conn); + conn->networkDriver->networkClose(conn); if (conn->interfaceDriver) - conn->interfaceDriver->connectClose(conn); + conn->interfaceDriver->interfaceClose(conn); if (conn->storageDriver) - conn->storageDriver->connectClose(conn); + conn->storageDriver->storageClose(conn); if (conn->nodeDeviceDriver) - conn->nodeDeviceDriver->connectClose(conn); + conn->nodeDeviceDriver->nodeDeviceClose(conn); if (conn->secretDriver) - conn->secretDriver->connectClose(conn); + conn->secretDriver->secretClose(conn); if (conn->nwfilterDriver) - conn->nwfilterDriver->connectClose(conn); + conn->nwfilterDriver->nwfilterClose(conn); if (conn->driver) conn->driver->connectClose(conn); diff --git a/src/driver.h b/src/driver.h index 8b4f603..1a3517e 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1228,6 +1228,10 @@ struct _virDriver { virDrvDomainLxcOpenNamespace domainLxcOpenNamespace; }; + +typedef virDrvConnectOpen virDrvNetworkOpen; +typedef virDrvConnectClose virDrvNetworkClose; + typedef int (*virDrvConnectNumOfNetworks)(virConnectPtr conn); @@ -1320,8 +1324,8 @@ typedef virNetworkDriver *virNetworkDriverPtr; */ struct _virNetworkDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvNetworkOpen networkOpen; + virDrvNetworkClose networkClose; virDrvConnectNumOfNetworks connectNumOfNetworks; virDrvConnectListNetworks connectListNetworks; virDrvConnectNumOfDefinedNetworks connectNumOfDefinedNetworks; @@ -1344,6 +1348,9 @@ struct _virNetworkDriver { }; +typedef virDrvConnectOpen virDrvInterfaceOpen; +typedef virDrvConnectClose virDrvInterfaceClose; + typedef int (*virDrvConnectNumOfInterfaces)(virConnectPtr conn); @@ -1423,8 +1430,8 @@ typedef virInterfaceDriver *virInterfaceDriverPtr; */ struct _virInterfaceDriver { const char *name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvInterfaceOpen interfaceOpen; + virDrvInterfaceClose interfaceClose; virDrvConnectNumOfInterfaces connectNumOfInterfaces; virDrvConnectListInterfaces connectListInterfaces; virDrvConnectNumOfDefinedInterfaces connectNumOfDefinedInterfaces; @@ -1444,6 +1451,10 @@ struct _virInterfaceDriver { }; +typedef virDrvConnectOpen virDrvStorageOpen; +typedef virDrvConnectClose virDrvStorageClose; + + typedef int (*virDrvConnectNumOfStoragePools)(virConnectPtr conn); @@ -1632,8 +1643,8 @@ typedef virStorageDriver *virStorageDriverPtr; */ struct _virStorageDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvStorageOpen storageOpen; + virDrvStorageClose storageClose; virDrvConnectNumOfStoragePools connectNumOfStoragePools; virDrvConnectListStoragePools connectListStoragePools; virDrvConnectNumOfDefinedStoragePools connectNumOfDefinedStoragePools; @@ -1705,6 +1716,10 @@ struct _virStateDriver { # endif +typedef virDrvConnectOpen virDrvNodeDeviceOpen; +typedef virDrvConnectClose virDrvNodeDeviceClose; + + typedef int (*virDrvNodeNumOfDevices)(virConnectPtr conn, const char *cap, @@ -1769,8 +1784,8 @@ typedef virNodeDeviceDriver *virNodeDeviceDriverPtr; */ struct _virNodeDeviceDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvNodeDeviceOpen nodeDeviceOpen; + virDrvNodeDeviceClose nodeDeviceClose; virDrvNodeNumOfDevices nodeNumOfDevices; virDrvNodeListDevices nodeListDevices; virDrvConnectListAllNodeDevices connectListAllNodeDevices; @@ -1790,6 +1805,10 @@ enum { VIR_SECRET_GET_VALUE_INTERNAL_CALL = 1 << 0, }; +typedef virDrvConnectOpen virDrvSecretOpen; +typedef virDrvConnectClose virDrvSecretClose; + + typedef virSecretPtr (*virDrvSecretLookupByUUID)(virConnectPtr conn, const unsigned char *uuid); @@ -1851,8 +1870,8 @@ typedef virSecretDriver *virSecretDriverPtr; */ struct _virSecretDriver { const char *name; - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvSecretOpen secretOpen; + virDrvSecretClose secretClose; virDrvConnectNumOfSecrets connectNumOfSecrets; virDrvConnectListSecrets connectListSecrets; virDrvConnectListAllSecrets connectListAllSecrets; @@ -1910,6 +1929,10 @@ struct _virStreamDriver { }; +typedef virDrvConnectOpen virDrvNWFilterOpen; +typedef virDrvConnectClose virDrvNWFilterClose; + + typedef int (*virDrvConnectNumOfNWFilters)(virConnectPtr conn); @@ -1958,8 +1981,8 @@ typedef virNWFilterDriver *virNWFilterDriverPtr; */ struct _virNWFilterDriver { const char * name; /* the name of the driver */ - virDrvConnectOpen connectOpen; - virDrvConnectClose connectClose; + virDrvNWFilterOpen nwfilterOpen; + virDrvNWFilterClose nwfilterClose; virDrvConnectNumOfNWFilters connectNumOfNWFilters; virDrvConnectListNWFilters connectListNWFilters; virDrvConnectListAllNWFilters connectListAllNWFilters; diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 0812bdf..8b688e4 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -69,8 +69,8 @@ esxDeviceClose(virConnectPtr conn) static virNodeDeviceDriver esxNodeDeviceDriver = { .name = "ESX", - .connectOpen = esxDeviceOpen, /* 0.7.6 */ - .connectClose = esxDeviceClose, /* 0.7.6 */ + .nodeDeviceOpen = esxDeviceOpen, /* 0.7.6 */ + .nodeDeviceClose = esxDeviceClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index ec19051..5a1267b 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -298,8 +298,8 @@ esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .connectOpen = esxInterfaceOpen, /* 0.7.6 */ - .connectClose = esxInterfaceClose, /* 0.7.6 */ + .interfaceOpen = esxInterfaceOpen, /* 0.7.6 */ + .interfaceClose = esxInterfaceClose, /* 0.7.6 */ .connectNumOfInterfaces = esxNumberOfInterfaces, /* 0.10.0 */ .connectListInterfaces = esxListInterfaces, /* 0.10.0 */ .connectNumOfDefinedInterfaces = esxNumberOfDefinedInterfaces, /* 0.10.0 */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index c657c82..d403638 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -933,8 +933,8 @@ esxNetworkIsPersistent(virNetworkPtr network ATTRIBUTE_UNUSED) static virNetworkDriver esxNetworkDriver = { .name = "ESX", - .connectOpen = esxNetworkOpen, /* 0.7.6 */ - .connectClose = esxNetworkClose, /* 0.7.6 */ + .networkOpen = esxNetworkOpen, /* 0.7.6 */ + .networkClose = esxNetworkClose, /* 0.7.6 */ .connectNumOfNetworks = esxNumberOfNetworks, /* 0.10.0 */ .connectListNetworks = esxListNetworks, /* 0.10.0 */ .connectNumOfDefinedNetworks = esxNumberOfDefinedNetworks, /* 0.10.0 */ diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index 1181c33..03b7417 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -69,8 +69,8 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { .name = "ESX", - .connectOpen = esxNWFilterOpen, /* 0.8.1 */ - .connectClose = esxNWFilterClose, /* 0.8.1 */ + .nwfilterOpen = esxNWFilterOpen, /* 0.8.1 */ + .nwfilterClose = esxNWFilterClose, /* 0.8.1 */ }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index a840895..2e36e15 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -67,8 +67,8 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { .name = "ESX", - .connectOpen = esxSecretOpen, /* 0.7.6 */ - .connectClose = esxSecretClose, /* 0.7.6 */ + .secretOpen = esxSecretOpen, /* 0.7.6 */ + .secretClose = esxSecretClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9ab7a9c..854ee01 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -575,8 +575,8 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { .name = "ESX", - .connectOpen = esxStorageOpen, /* 0.7.6 */ - .connectClose = esxStorageClose, /* 0.7.6 */ + .storageOpen = esxStorageOpen, /* 0.7.6 */ + .storageClose = esxStorageClose, /* 0.7.6 */ .connectNumOfStoragePools = esxNumberOfStoragePools, /* 0.8.2 */ .connectListStoragePools = esxListStoragePools, /* 0.8.2 */ .connectNumOfDefinedStoragePools = esxNumberOfDefinedStoragePools, /* 0.8.2 */ diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c index ace9e71..370fa3e 100644 --- a/src/hyperv/hyperv_device_monitor.c +++ b/src/hyperv/hyperv_device_monitor.c @@ -66,8 +66,8 @@ hypervDeviceClose(virConnectPtr conn) static virNodeDeviceDriver hypervNodeDeviceDriver = { "Hyper-V", - .connectOpen = hypervDeviceOpen, /* 0.9.5 */ - .connectClose = hypervDeviceClose, /* 0.9.5 */ + .nodeDeviceOpen = hypervDeviceOpen, /* 0.9.5 */ + .nodeDeviceClose = hypervDeviceClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c index db909f3..477b661 100644 --- a/src/hyperv/hyperv_interface_driver.c +++ b/src/hyperv/hyperv_interface_driver.c @@ -66,8 +66,8 @@ hypervInterfaceClose(virConnectPtr conn) static virInterfaceDriver hypervInterfaceDriver = { .name = "Hyper-V", - .connectOpen = hypervInterfaceOpen, /* 0.9.5 */ - .connectClose = hypervInterfaceClose, /* 0.9.5 */ + .interfaceOpen = hypervInterfaceOpen, /* 0.9.5 */ + .interfaceClose = hypervInterfaceClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index 5ede105..336d722 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -66,8 +66,8 @@ hypervNetworkClose(virConnectPtr conn) static virNetworkDriver hypervNetworkDriver = { .name = "Hyper-V", - .connectOpen = hypervNetworkOpen, /* 0.9.5 */ - .connectClose = hypervNetworkClose, /* 0.9.5 */ + .networkOpen = hypervNetworkOpen, /* 0.9.5 */ + .networkClose = hypervNetworkClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c index 07d8275..e748971 100644 --- a/src/hyperv/hyperv_nwfilter_driver.c +++ b/src/hyperv/hyperv_nwfilter_driver.c @@ -66,8 +66,8 @@ hypervNWFilterClose(virConnectPtr conn) static virNWFilterDriver hypervNWFilterDriver = { .name = "Hyper-V", - .connectOpen = hypervNWFilterOpen, /* 0.9.5 */ - .connectClose = hypervNWFilterClose, /* 0.9.5 */ + .nwfilterOpen = hypervNWFilterOpen, /* 0.9.5 */ + .nwfilterClose = hypervNWFilterClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c index 6554667..09d9b9e 100644 --- a/src/hyperv/hyperv_secret_driver.c +++ b/src/hyperv/hyperv_secret_driver.c @@ -66,8 +66,8 @@ hypervSecretClose(virConnectPtr conn) static virSecretDriver hypervSecretDriver = { .name = "Hyper-V", - .connectOpen = hypervSecretOpen, /* 0.9.5 */ - .connectClose = hypervSecretClose, /* 0.9.5 */ + .secretOpen = hypervSecretOpen, /* 0.9.5 */ + .secretClose = hypervSecretClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c index a908a0c..b701dc6 100644 --- a/src/hyperv/hyperv_storage_driver.c +++ b/src/hyperv/hyperv_storage_driver.c @@ -66,8 +66,8 @@ hypervStorageClose(virConnectPtr conn) static virStorageDriver hypervStorageDriver = { .name = "Hyper-V", - .connectOpen = hypervStorageOpen, /* 0.9.5*/ - .connectClose = hypervStorageClose, /* 0.9.5 */ + .storageOpen = hypervStorageOpen, /* 0.9.5*/ + .storageClose = hypervStorageClose, /* 0.9.5 */ }; diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 8394b06..0af9cd7 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -784,8 +784,8 @@ static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) static virInterfaceDriver interfaceDriver = { "netcf", - .connectOpen = interfaceOpenInterface, /* 0.7.0 */ - .connectClose = interfaceCloseInterface, /* 0.7.0 */ + .interfaceOpen = interfaceOpenInterface, /* 0.7.0 */ + .interfaceClose = interfaceCloseInterface, /* 0.7.0 */ .connectNumOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ .connectListInterfaces = interfaceListInterfaces, /* 0.7.0 */ .connectNumOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1c317f0..57e4465 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1149,8 +1149,8 @@ cleanup: static virInterfaceDriver udevIfaceDriver = { "udev", - .connectOpen = udevIfaceOpenInterface, /* 1.0.0 */ - .connectClose = udevIfaceCloseInterface, /* 1.0.0 */ + .interfaceOpen = udevIfaceOpenInterface, /* 1.0.0 */ + .interfaceClose = udevIfaceCloseInterface, /* 1.0.0 */ .connectNumOfInterfaces = udevIfaceNumOfInterfaces, /* 1.0.0 */ .connectListInterfaces = udevIfaceListInterfaces, /* 1.0.0 */ .connectNumOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 1.0.0 */ diff --git a/src/libvirt.c b/src/libvirt.c index b784bee..c236152 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1233,7 +1233,7 @@ do_open(const char *name, } for (i = 0; i < virNetworkDriverTabCount; i++) { - res = virNetworkDriverTab[i]->connectOpen(ret, auth, flags); + res = virNetworkDriverTab[i]->networkOpen(ret, auth, flags); VIR_DEBUG("network driver %d %s returned %s", i, virNetworkDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1249,7 +1249,7 @@ do_open(const char *name, } for (i = 0; i < virInterfaceDriverTabCount; i++) { - res = virInterfaceDriverTab[i]->connectOpen(ret, auth, flags); + res = virInterfaceDriverTab[i]->interfaceOpen(ret, auth, flags); VIR_DEBUG("interface driver %d %s returned %s", i, virInterfaceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1266,7 +1266,7 @@ do_open(const char *name, /* Secondary driver for storage. Optional */ for (i = 0; i < virStorageDriverTabCount; i++) { - res = virStorageDriverTab[i]->connectOpen(ret, auth, flags); + res = virStorageDriverTab[i]->storageOpen(ret, auth, flags); VIR_DEBUG("storage driver %d %s returned %s", i, virStorageDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1283,7 +1283,7 @@ do_open(const char *name, /* Node driver (optional) */ for (i = 0; i < virNodeDeviceDriverTabCount; i++) { - res = virNodeDeviceDriverTab[i]->connectOpen(ret, auth, flags); + res = virNodeDeviceDriverTab[i]->nodeDeviceOpen(ret, auth, flags); VIR_DEBUG("node driver %d %s returned %s", i, virNodeDeviceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1300,7 +1300,7 @@ do_open(const char *name, /* Secret manipulation driver. Optional */ for (i = 0; i < virSecretDriverTabCount; i++) { - res = virSecretDriverTab[i]->connectOpen(ret, auth, flags); + res = virSecretDriverTab[i]->secretOpen(ret, auth, flags); VIR_DEBUG("secret driver %d %s returned %s", i, virSecretDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : @@ -1317,7 +1317,7 @@ do_open(const char *name, /* Network filter driver. Optional */ for (i = 0; i < virNWFilterDriverTabCount; i++) { - res = virNWFilterDriverTab[i]->connectOpen(ret, auth, flags); + res = virNWFilterDriverTab[i]->nwfilterOpen(ret, auth, flags); VIR_DEBUG("nwfilter driver %d %s returned %s", i, virNWFilterDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ab37d85..1c0bd7e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3592,8 +3592,8 @@ cleanup: static virNetworkDriver networkDriver = { "Network", - .connectOpen = networkOpenNetwork, /* 0.2.0 */ - .connectClose = networkCloseNetwork, /* 0.2.0 */ + .networkOpen = networkOpenNetwork, /* 0.2.0 */ + .networkClose = networkCloseNetwork, /* 0.2.0 */ .connectNumOfNetworks = networkNumNetworks, /* 0.2.0 */ .connectListNetworks = networkListNetworks, /* 0.2.0 */ .connectNumOfDefinedNetworks = networkNumDefinedNetworks, /* 0.2.0 */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 682b66a..53c9712 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -763,8 +763,8 @@ static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virNodeDeviceDriver halNodeDeviceDriver = { .name = "halNodeDeviceDriver", - .connectOpen = halNodeDrvOpen, /* 0.5.0 */ - .connectClose = halNodeDrvClose, /* 0.5.0 */ + .nodeDeviceOpen = halNodeDrvOpen, /* 0.5.0 */ + .nodDeviceClose = halNodeDrvClose, /* 0.5.0 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */ .nodeListDevices = nodeListDevices, /* 0.5.0 */ .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 5a9c6e3..b8e64c9 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1793,8 +1793,8 @@ static int udevNodeDrvClose(virConnectPtr conn) static virNodeDeviceDriver udevNodeDeviceDriver = { .name = "udevNodeDeviceDriver", - .connectOpen = udevNodeDrvOpen, /* 0.7.3 */ - .connectClose = udevNodeDrvClose, /* 0.7.3 */ + .nodeDeviceOpen = udevNodeDrvOpen, /* 0.7.3 */ + .nodeDeviceClose = udevNodeDrvClose, /* 0.7.3 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.7.3 */ .nodeListDevices = nodeListDevices, /* 0.7.3 */ .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index b2ffd73..2934fec 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -659,8 +659,8 @@ nwfilterTeardownFilter(virDomainNetDefPtr net) { static virNWFilterDriver nwfilterDriver = { .name = "nwfilter", - .connectOpen = nwfilterOpen, /* 0.8.0 */ - .connectClose = nwfilterClose, /* 0.8.0 */ + .nwfilterOpen = nwfilterOpen, /* 0.8.0 */ + .nwfilterClose = nwfilterClose, /* 0.8.0 */ .connectNumOfNWFilters = nwfilterNumNWFilters, /* 0.8.0 */ .connectListNWFilters = nwfilterListNWFilters, /* 0.8.0 */ .connectListAllNWFilters = nwfilterListAllNWFilters, /* 0.10.2 */ diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 21de3bf..1f55b19 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -614,8 +614,8 @@ cleanup: } static virNetworkDriver parallelsNetworkDriver = { "Parallels", - .connectOpen = parallelsOpenNetwork, /* 1.0.1 */ - .connectClose = parallelsCloseNetwork, /* 1.0.1 */ + .networkOpen = parallelsOpenNetwork, /* 1.0.1 */ + .networkClose = parallelsCloseNetwork, /* 1.0.1 */ .connectNumOfNetworks = parallelsNumNetworks, /* 1.0.1 */ .connectListNetworks = parallelsListNetworks, /* 1.0.1 */ .connectNumOfDefinedNetworks = parallelsNumDefinedNetworks, /* 1.0.1 */ diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index efa7d12..6bd117a 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -1671,8 +1671,8 @@ cleanup: static virStorageDriver parallelsStorageDriver = { .name = "Parallels", - .connectOpen = parallelsStorageOpen, /* 0.10.0 */ - .connectClose = parallelsStorageClose, /* 0.10.0 */ + .storageOpen = parallelsStorageOpen, /* 0.10.0 */ + .storageClose = parallelsStorageClose, /* 0.10.0 */ .connectNumOfStoragePools = parallelsStorageNumPools, /* 0.10.0 */ .connectListStoragePools = parallelsStorageListPools, /* 0.10.0 */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index e188785..722e56f 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3795,8 +3795,8 @@ static virDriver phypDriver = { static virStorageDriver phypStorageDriver = { .name = "PHYP", - .connectOpen = phypVIOSDriverOpen, /* 0.8.2 */ - .connectClose = phypVIOSDriverClose, /* 0.8.2 */ + .storageOpen = phypVIOSDriverOpen, /* 0.8.2 */ + .storageClose = phypVIOSDriverClose, /* 0.8.2 */ .connectNumOfStoragePools = phypNumOfStoragePools, /* 0.8.2 */ .connectListStoragePools = phypListStoragePools, /* 0.8.2 */ @@ -3817,8 +3817,8 @@ static virStorageDriver phypStorageDriver = { static virInterfaceDriver phypInterfaceDriver = { .name = "PHYP", - .connectOpen = phypVIOSDriverOpen, /* 0.9.1 */ - .connectClose = phypVIOSDriverClose, /* 0.9.1 */ + .interfaceOpen = phypVIOSDriverOpen, /* 0.9.1 */ + .interfaceClose = phypVIOSDriverClose, /* 0.9.1 */ .connectNumOfInterfaces = phypNumOfInterfaces, /* 0.9.1 */ .connectListInterfaces = phypListInterfaces, /* 0.9.1 */ .interfaceLookupByName = phypInterfaceLookupByName, /* 0.9.1 */ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83dc0fe..132637e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6306,8 +6306,8 @@ static virDriver remote_driver = { static virNetworkDriver network_driver = { .name = "remote", - .connectOpen = remoteNetworkOpen, /* 0.3.0 */ - .connectClose = remoteNetworkClose, /* 0.3.0 */ + .networkOpen = remoteNetworkOpen, /* 0.3.0 */ + .networkClose = remoteNetworkClose, /* 0.3.0 */ .connectNumOfNetworks = remoteConnectNumOfNetworks, /* 0.3.0 */ .connectListNetworks = remoteConnectListNetworks, /* 0.3.0 */ .connectNumOfDefinedNetworks = remoteConnectNumOfDefinedNetworks, /* 0.3.0 */ @@ -6331,8 +6331,8 @@ static virNetworkDriver network_driver = { static virInterfaceDriver interface_driver = { .name = "remote", - .connectOpen = remoteInterfaceOpen, /* 0.7.2 */ - .connectClose = remoteInterfaceClose, /* 0.7.2 */ + .interfaceOpen = remoteInterfaceOpen, /* 0.7.2 */ + .interfaceClose = remoteInterfaceClose, /* 0.7.2 */ .connectNumOfInterfaces = remoteConnectNumOfInterfaces, /* 0.7.2 */ .connectListInterfaces = remoteConnectListInterfaces, /* 0.7.2 */ .connectNumOfDefinedInterfaces = remoteConnectNumOfDefinedInterfaces, /* 0.7.2 */ @@ -6353,8 +6353,8 @@ static virInterfaceDriver interface_driver = { static virStorageDriver storage_driver = { .name = "remote", - .connectOpen = remoteStorageOpen, /* 0.4.1 */ - .connectClose = remoteStorageClose, /* 0.4.1 */ + .storageOpen = remoteStorageOpen, /* 0.4.1 */ + .storageClose = remoteStorageClose, /* 0.4.1 */ .connectNumOfStoragePools = remoteConnectNumOfStoragePools, /* 0.4.1 */ .connectListStoragePools = remoteConnectListStoragePools, /* 0.4.1 */ .connectNumOfDefinedStoragePools = remoteConnectNumOfDefinedStoragePools, /* 0.4.1 */ @@ -6400,8 +6400,8 @@ static virStorageDriver storage_driver = { static virSecretDriver secret_driver = { .name = "remote", - .connectOpen = remoteSecretOpen, /* 0.7.1 */ - .connectClose = remoteSecretClose, /* 0.7.1 */ + .secretOpen = remoteSecretOpen, /* 0.7.1 */ + .secretClose = remoteSecretClose, /* 0.7.1 */ .connectNumOfSecrets = remoteConnectNumOfSecrets, /* 0.7.1 */ .connectListSecrets = remoteConnectListSecrets, /* 0.7.1 */ .connectListAllSecrets = remoteConnectListAllSecrets, /* 0.10.2 */ @@ -6416,8 +6416,8 @@ static virSecretDriver secret_driver = { static virNodeDeviceDriver node_device_driver = { .name = "remote", - .connectOpen = remoteNodeDeviceOpen, /* 0.5.0 */ - .connectClose = remoteNodeDeviceClose, /* 0.5.0 */ + .nodeDeviceOpen = remoteNodeDeviceOpen, /* 0.5.0 */ + .nodeDeviceClose = remoteNodeDeviceClose, /* 0.5.0 */ .nodeNumOfDevices = remoteNodeNumOfDevices, /* 0.5.0 */ .nodeListDevices = remoteNodeListDevices, /* 0.5.0 */ .connectListAllNodeDevices = remoteConnectListAllNodeDevices, /* 0.10.2 */ @@ -6433,8 +6433,8 @@ static virNodeDeviceDriver node_device_driver = { static virNWFilterDriver nwfilter_driver = { .name = "remote", - .connectOpen = remoteNWFilterOpen, /* 0.8.0 */ - .connectClose = remoteNWFilterClose, /* 0.8.0 */ + .nwfilterOpen = remoteNWFilterOpen, /* 0.8.0 */ + .nwfilterClose = remoteNWFilterClose, /* 0.8.0 */ .nwfilterLookupByUUID = remoteNWFilterLookupByUUID, /* 0.8.0 */ .nwfilterLookupByName = remoteNWFilterLookupByName, /* 0.8.0 */ .nwfilterGetXMLDesc = remoteNWFilterGetXMLDesc, /* 0.8.0 */ diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9e7d382..327051d 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1157,8 +1157,8 @@ secretDriverReload(void) static virSecretDriver secretDriver = { .name = "secret", - .connectOpen = secretOpen, /* 0.7.1 */ - .connectClose = secretClose, /* 0.7.1 */ + .secretOpen = secretOpen, /* 0.7.1 */ + .secretClose = secretClose, /* 0.7.1 */ .connectNumOfSecrets = secretNumOfSecrets, /* 0.7.1 */ .connectListSecrets = secretListSecrets, /* 0.7.1 */ .connectListAllSecrets = secretListAllSecrets, /* 0.10.2 */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9613b3b..9965b69 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2369,8 +2369,8 @@ storageListAllPools(virConnectPtr conn, static virStorageDriver storageDriver = { .name = "storage", - .connectOpen = storageOpen, /* 0.4.0 */ - .connectClose = storageClose, /* 0.4.0 */ + .storageOpen = storageOpen, /* 0.4.0 */ + .storageClose = storageClose, /* 0.4.0 */ .connectNumOfStoragePools = storageNumPools, /* 0.4.0 */ .connectListStoragePools = storageListPools, /* 0.4.0 */ .connectNumOfDefinedStoragePools = storageNumDefinedPools, /* 0.4.0 */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ebcb160..0b1950d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5864,8 +5864,8 @@ static virDriver testDriver = { static virNetworkDriver testNetworkDriver = { "Test", - .connectOpen = testOpenNetwork, /* 0.3.2 */ - .connectClose = testCloseNetwork, /* 0.3.2 */ + .networkOpen = testOpenNetwork, /* 0.3.2 */ + .networkClose = testCloseNetwork, /* 0.3.2 */ .connectNumOfNetworks = testNumNetworks, /* 0.3.2 */ .connectListNetworks = testListNetworks, /* 0.3.2 */ .connectNumOfDefinedNetworks = testNumDefinedNetworks, /* 0.3.2 */ @@ -5889,8 +5889,8 @@ static virNetworkDriver testNetworkDriver = { static virInterfaceDriver testInterfaceDriver = { "Test", /* name */ - .connectOpen = testOpenInterface, /* 0.7.0 */ - .connectClose = testCloseInterface, /* 0.7.0 */ + .interfaceOpen = testOpenInterface, /* 0.7.0 */ + .interfaceClose = testCloseInterface, /* 0.7.0 */ .connectNumOfInterfaces = testNumOfInterfaces, /* 0.7.0 */ .connectListInterfaces = testListInterfaces, /* 0.7.0 */ .connectNumOfDefinedInterfaces = testNumOfDefinedInterfaces, /* 0.7.0 */ @@ -5911,8 +5911,8 @@ static virInterfaceDriver testInterfaceDriver = { static virStorageDriver testStorageDriver = { .name = "Test", - .connectOpen = testStorageOpen, /* 0.4.1 */ - .connectClose = testStorageClose, /* 0.4.1 */ + .storageOpen = testStorageOpen, /* 0.4.1 */ + .storageClose = testStorageClose, /* 0.4.1 */ .connectNumOfStoragePools = testStorageNumPools, /* 0.5.0 */ .connectListStoragePools = testStorageListPools, /* 0.5.0 */ @@ -5954,8 +5954,8 @@ static virStorageDriver testStorageDriver = { static virNodeDeviceDriver testNodeDeviceDriver = { .name = "Test", - .connectOpen = testNodeDeviceOpen, /* 0.6.0 */ - .connectClose = testNodeDeviceClose, /* 0.6.0 */ + .nodeDeviceOpen = testNodeDeviceOpen, /* 0.6.0 */ + .nodeDeviceClose = testNodeDeviceClose, /* 0.6.0 */ .nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */ .nodeListDevices = testNodeListDevices, /* 0.7.2 */ @@ -5970,15 +5970,15 @@ static virNodeDeviceDriver testNodeDeviceDriver = { static virSecretDriver testSecretDriver = { .name = "Test", - .connectOpen = testSecretOpen, /* 0.7.1 */ - .connectClose = testSecretClose, /* 0.7.1 */ + .secretOpen = testSecretOpen, /* 0.7.1 */ + .secretClose = testSecretClose, /* 0.7.1 */ }; static virNWFilterDriver testNWFilterDriver = { .name = "Test", - .connectOpen = testNWFilterOpen, /* 0.8.0 */ - .connectClose = testNWFilterClose, /* 0.8.0 */ + .nwfilterOpen = testNWFilterOpen, /* 0.8.0 */ + .nwfilterClose = testNWFilterClose, /* 0.8.0 */ }; /** diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index e9c4d5b..8ef16ba 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -9483,8 +9483,8 @@ virDriver NAME(Driver) = { virNetworkDriver NAME(NetworkDriver) = { "VBOX", - .connectOpen = vboxNetworkOpen, /* 0.6.4 */ - .connectClose = vboxNetworkClose, /* 0.6.4 */ + .networkOpen = vboxNetworkOpen, /* 0.6.4 */ + .networkClose = vboxNetworkClose, /* 0.6.4 */ .connectNumOfNetworks = vboxNumOfNetworks, /* 0.6.4 */ .connectListNetworks = vboxListNetworks, /* 0.6.4 */ .connectNumOfDefinedNetworks = vboxNumOfDefinedNetworks, /* 0.6.4 */ @@ -9501,8 +9501,8 @@ virNetworkDriver NAME(NetworkDriver) = { virStorageDriver NAME(StorageDriver) = { .name = "VBOX", - .connectOpen = vboxStorageOpen, /* 0.7.1 */ - .connectClose = vboxStorageClose, /* 0.7.1 */ + .storageOpen = vboxStorageOpen, /* 0.7.1 */ + .storageClose = vboxStorageClose, /* 0.7.1 */ .connectNumOfStoragePools = vboxStorageNumOfPools, /* 0.7.1 */ .connectListStoragePools = vboxStorageListPools, /* 0.7.1 */ .storagePoolLookupByName = vboxStoragePoolLookupByName, /* 0.7.1 */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 25722f3..b4b1505 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -60,8 +60,8 @@ fakeSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virSecretDriver fakeSecretDriver = { .name = "fake_secret", - .connectOpen = NULL, - .connectClose = fakeSecretClose, + .secretOpen = NULL, + .secretClose = fakeSecretClose, .connectNumOfSecrets = NULL, .connectListSecrets = NULL, .secretLookupByUUID = NULL, -- 1.8.1.4

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Ensure that all drivers implementing public APIs use a naming convention for their implementation that matches the public API name. eg for the public API virDomainCreate make sure QEMU uses qemuDomainCreate and not qemuDomainStart Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/Makefile.am | 46 ++++ src/check-driverimpls.pl | 64 +++++ src/esx/esx_device_monitor.c | 12 +- src/esx/esx_driver.c | 82 +++--- src/esx/esx_interface_driver.c | 20 +- src/esx/esx_network_driver.c | 20 +- src/esx/esx_storage_driver.c | 74 +++--- src/hyperv/hyperv_device_monitor.c | 12 +- src/hyperv/hyperv_driver.c | 52 ++-- src/interface/interface_backend_netcf.c | 94 +++---- src/interface/interface_backend_udev.c | 148 +++++------ src/libxl/libxl_driver.c | 120 ++++----- src/lxc/lxc_driver.c | 210 ++++++++-------- src/network/bridge_driver.c | 74 +++--- src/node_device/node_device_hal.c | 24 +- src/node_device/node_device_udev.c | 30 +-- src/nwfilter/nwfilter_driver.c | 56 ++--- src/openvz/openvz_driver.c | 94 ++++--- src/parallels/parallels_driver.c | 88 +++---- src/parallels/parallels_network.c | 40 +-- src/parallels/parallels_storage.c | 90 +++---- src/parallels/parallels_utils.h | 8 +- src/phyp/phyp_driver.c | 179 +++++++------ src/qemu/qemu_driver.c | 279 ++++++++++----------- src/remote/remote_driver.c | 36 +-- src/rpc/gendispatch.pl | 10 +- src/secret/secret_driver.c | 34 +-- src/storage/storage_driver.c | 218 ++++++++-------- src/test/test_driver.c | 428 ++++++++++++++++---------------- src/uml/uml_driver.c | 142 +++++------ src/vbox/vbox_driver.c | 8 +- src/vbox/vbox_tmpl.c | 126 +++++----- src/vmware/vmware_driver.c | 79 +++--- src/xen/xen_driver.c | 126 +++++----- src/xen/xen_driver.h | 2 +- src/xen/xm_internal.c | 2 +- src/xenapi/xenapi_driver.c | 82 +++--- 37 files changed, 1686 insertions(+), 1523 deletions(-) create mode 100644 src/check-driverimpls.pl diff --git a/src/Makefile.am b/src/Makefile.am index 02fb2ab..1f6a245 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -435,6 +435,52 @@ check-drivername: $(srcdir)/libvirt_qemu.syms \ $(srcdir)/libvirt_lxc.syms +DRIVER_SOURCE_FILES = \ + esx/esx_device_monitor.c \ + esx/esx_driver.c \ + esx/esx_interface_driver.c \ + esx/esx_network_driver.c \ + esx/esx_nwfilter_driver.c \ + esx/esx_secret_driver.c \ + esx/esx_storage_driver.c \ + hyperv/hyperv_device_monitor.c \ + hyperv/hyperv_driver.c \ + hyperv/hyperv_interface_driver.c \ + hyperv/hyperv_network_driver.c \ + hyperv/hyperv_nwfilter_driver.c \ + hyperv/hyperv_secret_driver.c \ + hyperv/hyperv_storage_driver.c \ + interface/interface_backend_netcf.c \ + interface/interface_backend_udev.c \ + libxl/libxl_driver.c \ + lxc/lxc_driver.c \ + network/bridge_driver.c \ + node_device/node_device_hal.c \ + node_device/node_device_udev.c \ + nwfilter/nwfilter_driver.c \ + openvz/openvz_driver.c \ + parallels/parallels_driver.c \ + parallels/parallels_network.c \ + parallels/parallels_storage.c \ + phyp/phyp_driver.c \ + qemu/qemu_driver.c \ + remote/remote_driver.c \ + secret/secret_driver.c \ + storage/storage_driver.c \ + test/test_driver.c \ + uml/uml_driver.c \ + vbox/vbox_driver.c \ + vbox/vbox_tmpl.c \ + vmware/vmware_driver.c \ + xen/xen_driver.c \ + xenapi/xenapi_driver.c \ + $(NULL) + + +check-driverimpls: + $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ + $(DRIVER_SOURCE_FILES) + check-local: check-protocol check-symfile check-symsorting \ check-drivername .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) diff --git a/src/check-driverimpls.pl b/src/check-driverimpls.pl new file mode 100644 index 0000000..2c7f8b1 --- /dev/null +++ b/src/check-driverimpls.pl @@ -0,0 +1,64 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +my $intable = 0; +my $table; +my $mainprefix; + +my $status = 0; +while (<>) { + if ($intable) { + if (/}/) { + $intable = 0; + $table = undef; + $mainprefix = undef; + } elsif (/\.(\w+)\s*=\s*(\w+),?/) { + my $api = $1; + my $impl = $2; + + next if $api eq "no"; + next if $api eq "name"; + + my $suffix = $impl; + my $prefix = $impl; + $prefix =~ s/^([a-z]+(?:Unified)?)(.*?)$/$1/; + + # External impls + next if $prefix eq "node"; + next if $prefix eq "vir"; + + if (defined $mainprefix) { + if ($mainprefix ne $prefix) { + print "$ARGV:$. Bad prefix '$prefix' for API '$api', expecting '$mainprefix'\n"; + $status = 1; + } + } else { + $mainprefix = $prefix; + } + + if ($api !~ /^$mainprefix/) { + $suffix =~ s/^[a-z]+(?:Unified)?//; + $suffix =~ s/^([A-Z]+)/lc $1/e; + } + + if ($api ne $suffix) { + my $want = $api; + $want =~ s/^nwf/NWF/; + if ($api !~ /^$mainprefix/) { + $want =~ s/^([a-z])/uc $1/e; + $want = $mainprefix . $want; + } + print "$ARGV:$. Bad impl name '$impl' for API '$api', expecting '$want'\n"; + $status = 1; + } + } + } elsif (/^(?:static\s+)?(vir(?:\w+)?Driver)\s+/) { + next if $1 eq "virNWFilterCallbackDriver"; + $intable = 1; + $table = $1; + } +} + +exit $status; diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 8b688e4..0f3421c 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -40,9 +40,9 @@ static virDrvOpenStatus -esxDeviceOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +esxNodeDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -58,7 +58,7 @@ esxDeviceOpen(virConnectPtr conn, static int -esxDeviceClose(virConnectPtr conn) +esxNodeDeviceClose(virConnectPtr conn) { conn->nodeDevicePrivateData = NULL; @@ -69,8 +69,8 @@ esxDeviceClose(virConnectPtr conn) static virNodeDeviceDriver esxNodeDeviceDriver = { .name = "ESX", - .nodeDeviceOpen = esxDeviceOpen, /* 0.7.6 */ - .nodeDeviceClose = esxDeviceClose, /* 0.7.6 */ + .nodeDeviceOpen = esxNodeDeviceOpen, /* 0.7.6 */ + .nodeDeviceClose = esxNodeDeviceClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 40b9f7f..50ff723 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -925,8 +925,8 @@ esxConnectToVCenter(esxPrivate *priv, * socks5. The optional <port> part allows to override the default port 1080. */ static virDrvOpenStatus -esxOpen(virConnectPtr conn, virConnectAuthPtr auth, - unsigned int flags) +esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, + unsigned int flags) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; char *plus; @@ -1107,7 +1107,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, static int -esxClose(virConnectPtr conn) +esxConnectClose(virConnectPtr conn) { esxPrivate *priv = conn->privateData; int result = 0; @@ -1173,7 +1173,7 @@ esxSupportsVMotion(esxPrivate *priv) static int -esxSupportsFeature(virConnectPtr conn, int feature) +esxConnectSupportsFeature(virConnectPtr conn, int feature) { esxPrivate *priv = conn->privateData; esxVI_Boolean supportsVMotion = esxVI_Boolean_Undefined; @@ -1198,7 +1198,7 @@ esxSupportsFeature(virConnectPtr conn, int feature) static const char * -esxGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "ESX"; } @@ -1206,7 +1206,7 @@ esxGetType(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxGetVersion(virConnectPtr conn, unsigned long *version) +esxConnectGetVersion(virConnectPtr conn, unsigned long *version) { esxPrivate *priv = conn->privateData; @@ -1225,7 +1225,7 @@ esxGetVersion(virConnectPtr conn, unsigned long *version) static char * -esxGetHostname(virConnectPtr conn) +esxConnectGetHostname(virConnectPtr conn) { esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; @@ -1450,7 +1450,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) static char * -esxGetCapabilities(virConnectPtr conn) +esxConnectGetCapabilities(virConnectPtr conn) { esxPrivate *priv = conn->privateData; char *xml = virCapabilitiesFormatXML(priv->caps); @@ -1466,7 +1466,7 @@ esxGetCapabilities(virConnectPtr conn) static int -esxListDomains(virConnectPtr conn, int *ids, int maxids) +esxConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bool success = false; esxPrivate *priv = conn->privateData; @@ -1530,7 +1530,7 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) static int -esxNumberOfDomains(virConnectPtr conn) +esxConnectNumOfDomains(virConnectPtr conn) { esxPrivate *priv = conn->privateData; @@ -2807,9 +2807,9 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) static char * -esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, - const char *nativeConfig, - unsigned int flags) +esxConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, + const char *nativeConfig, + unsigned int flags) { esxPrivate *priv = conn->privateData; virVMXContext ctx; @@ -2849,9 +2849,9 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, static char * -esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, - const char *domainXml, - unsigned int flags) +esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, + const char *domainXml, + unsigned int flags) { esxPrivate *priv = conn->privateData; int virtualHW_version; @@ -2902,7 +2902,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, static int -esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) +esxConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->privateData; @@ -2974,7 +2974,7 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) static int -esxNumberOfDefinedDomains(virConnectPtr conn) +esxConnectNumOfDefinedDomains(virConnectPtr conn) { esxPrivate *priv = conn->privateData; @@ -4109,7 +4109,7 @@ esxNodeGetFreeMemory(virConnectPtr conn) static int -esxIsEncrypted(virConnectPtr conn) +esxConnectIsEncrypted(virConnectPtr conn) { esxPrivate *priv = conn->privateData; @@ -4123,7 +4123,7 @@ esxIsEncrypted(virConnectPtr conn) static int -esxIsSecure(virConnectPtr conn) +esxConnectIsSecure(virConnectPtr conn) { esxPrivate *priv = conn->privateData; @@ -4137,7 +4137,7 @@ esxIsSecure(virConnectPtr conn) static int -esxIsAlive(virConnectPtr conn) +esxConnectIsAlive(virConnectPtr conn) { esxPrivate *priv = conn->privateData; @@ -5004,9 +5004,9 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, #define MATCH(FLAG) (flags & (FLAG)) static int -esxListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +esxConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { int ret = -1; esxPrivate *priv = conn->privateData; @@ -5236,17 +5236,17 @@ no_memory: static virDriver esxDriver = { .no = VIR_DRV_ESX, .name = "ESX", - .connectOpen = esxOpen, /* 0.7.0 */ - .connectClose = esxClose, /* 0.7.0 */ - .connectSupportsFeature = esxSupportsFeature, /* 0.7.0 */ - .connectGetType = esxGetType, /* 0.7.0 */ - .connectGetVersion = esxGetVersion, /* 0.7.0 */ - .connectGetHostname = esxGetHostname, /* 0.7.0 */ + .connectOpen = esxConnectOpen, /* 0.7.0 */ + .connectClose = esxConnectClose, /* 0.7.0 */ + .connectSupportsFeature = esxConnectSupportsFeature, /* 0.7.0 */ + .connectGetType = esxConnectGetType, /* 0.7.0 */ + .connectGetVersion = esxConnectGetVersion, /* 0.7.0 */ + .connectGetHostname = esxConnectGetHostname, /* 0.7.0 */ .nodeGetInfo = esxNodeGetInfo, /* 0.7.0 */ - .connectGetCapabilities = esxGetCapabilities, /* 0.7.1 */ - .connectListDomains = esxListDomains, /* 0.7.0 */ - .connectNumOfDomains = esxNumberOfDomains, /* 0.7.0 */ - .connectListAllDomains = esxListAllDomains, /* 0.10.2 */ + .connectGetCapabilities = esxConnectGetCapabilities, /* 0.7.1 */ + .connectListDomains = esxConnectListDomains, /* 0.7.0 */ + .connectNumOfDomains = esxConnectNumOfDomains, /* 0.7.0 */ + .connectListAllDomains = esxConnectListAllDomains, /* 0.10.2 */ .domainLookupByID = esxDomainLookupByID, /* 0.7.0 */ .domainLookupByUUID = esxDomainLookupByUUID, /* 0.7.0 */ .domainLookupByName = esxDomainLookupByName, /* 0.7.0 */ @@ -5270,10 +5270,10 @@ static virDriver esxDriver = { .domainGetVcpusFlags = esxDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = esxDomainGetMaxVcpus, /* 0.7.0 */ .domainGetXMLDesc = esxDomainGetXMLDesc, /* 0.7.0 */ - .connectDomainXMLFromNative = esxDomainXMLFromNative, /* 0.7.0 */ - .connectDomainXMLToNative = esxDomainXMLToNative, /* 0.7.2 */ - .connectListDefinedDomains = esxListDefinedDomains, /* 0.7.0 */ - .connectNumOfDefinedDomains = esxNumberOfDefinedDomains, /* 0.7.0 */ + .connectDomainXMLFromNative = esxConnectDomainXMLFromNative, /* 0.7.0 */ + .connectDomainXMLToNative = esxConnectDomainXMLToNative, /* 0.7.2 */ + .connectListDefinedDomains = esxConnectListDefinedDomains, /* 0.7.0 */ + .connectNumOfDefinedDomains = esxConnectNumOfDefinedDomains, /* 0.7.0 */ .domainCreate = esxDomainCreate, /* 0.7.0 */ .domainCreateWithFlags = esxDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = esxDomainDefineXML, /* 0.7.2 */ @@ -5290,8 +5290,8 @@ static virDriver esxDriver = { .domainMigratePerform = esxDomainMigratePerform, /* 0.7.0 */ .domainMigrateFinish = esxDomainMigrateFinish, /* 0.7.0 */ .nodeGetFreeMemory = esxNodeGetFreeMemory, /* 0.7.2 */ - .connectIsEncrypted = esxIsEncrypted, /* 0.7.3 */ - .connectIsSecure = esxIsSecure, /* 0.7.3 */ + .connectIsEncrypted = esxConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = esxConnectIsSecure, /* 0.7.3 */ .domainIsActive = esxDomainIsActive, /* 0.7.3 */ .domainIsPersistent = esxDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = esxDomainIsUpdated, /* 0.8.6 */ @@ -5309,7 +5309,7 @@ static virDriver esxDriver = { .domainSnapshotIsCurrent = esxDomainSnapshotIsCurrent, /* 0.9.13 */ .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ - .connectIsAlive = esxIsAlive, /* 0.9.8 */ + .connectIsAlive = esxConnectIsAlive, /* 0.9.8 */ }; diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5a1267b..44055a1 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -70,7 +70,7 @@ esxInterfaceClose(virConnectPtr conn) static int -esxNumberOfInterfaces(virConnectPtr conn) +esxConnectNumOfInterfaces(virConnectPtr conn) { esxPrivate *priv = conn->interfacePrivateData; esxVI_PhysicalNic *physicalNicList = NULL; @@ -95,7 +95,7 @@ esxNumberOfInterfaces(virConnectPtr conn) static int -esxListInterfaces(virConnectPtr conn, char **const names, int maxnames) +esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->interfacePrivateData; @@ -144,7 +144,7 @@ esxListInterfaces(virConnectPtr conn, char **const names, int maxnames) static int -esxNumberOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -153,9 +153,9 @@ esxNumberOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -300,10 +300,10 @@ static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", .interfaceOpen = esxInterfaceOpen, /* 0.7.6 */ .interfaceClose = esxInterfaceClose, /* 0.7.6 */ - .connectNumOfInterfaces = esxNumberOfInterfaces, /* 0.10.0 */ - .connectListInterfaces = esxListInterfaces, /* 0.10.0 */ - .connectNumOfDefinedInterfaces = esxNumberOfDefinedInterfaces, /* 0.10.0 */ - .connectListDefinedInterfaces = esxListDefinedInterfaces, /* 0.10.0 */ + .connectNumOfInterfaces = esxConnectNumOfInterfaces, /* 0.10.0 */ + .connectListInterfaces = esxConnectListInterfaces, /* 0.10.0 */ + .connectNumOfDefinedInterfaces = esxConnectNumOfDefinedInterfaces, /* 0.10.0 */ + .connectListDefinedInterfaces = esxConnectListDefinedInterfaces, /* 0.10.0 */ .interfaceLookupByName = esxInterfaceLookupByName, /* 0.10.0 */ .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.10.0 */ .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.10.0 */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index d403638..c5be208 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -76,7 +76,7 @@ esxNetworkClose(virConnectPtr conn) static int -esxNumberOfNetworks(virConnectPtr conn) +esxConnectNumOfNetworks(virConnectPtr conn) { esxPrivate *priv = conn->networkPrivateData; esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; @@ -102,7 +102,7 @@ esxNumberOfNetworks(virConnectPtr conn) static int -esxListNetworks(virConnectPtr conn, char **const names, int maxnames) +esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->networkPrivateData; @@ -152,7 +152,7 @@ esxListNetworks(virConnectPtr conn, char **const names, int maxnames) static int -esxNumberOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) { /* ESX networks are always active */ return 0; @@ -161,9 +161,9 @@ esxNumberOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { /* ESX networks are always active */ return 0; @@ -935,10 +935,10 @@ static virNetworkDriver esxNetworkDriver = { .name = "ESX", .networkOpen = esxNetworkOpen, /* 0.7.6 */ .networkClose = esxNetworkClose, /* 0.7.6 */ - .connectNumOfNetworks = esxNumberOfNetworks, /* 0.10.0 */ - .connectListNetworks = esxListNetworks, /* 0.10.0 */ - .connectNumOfDefinedNetworks = esxNumberOfDefinedNetworks, /* 0.10.0 */ - .connectListDefinedNetworks = esxListDefinedNetworks, /* 0.10.0 */ + .connectNumOfNetworks = esxConnectNumOfNetworks, /* 0.10.0 */ + .connectListNetworks = esxConnectListNetworks, /* 0.10.0 */ + .connectNumOfDefinedNetworks = esxConnectNumOfDefinedNetworks, /* 0.10.0 */ + .connectListDefinedNetworks = esxConnectListDefinedNetworks, /* 0.10.0 */ .networkLookupByUUID = esxNetworkLookupByUUID, /* 0.10.0 */ .networkLookupByName = esxNetworkLookupByName, /* 0.10.0 */ .networkDefineXML = esxNetworkDefineXML, /* 0.10.0 */ diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 854ee01..3c60f00 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -83,7 +83,7 @@ esxStorageClose(virConnectPtr conn) static int -esxNumberOfStoragePools(virConnectPtr conn) +esxConnectNumOfStoragePools(virConnectPtr conn) { int count = 0; esxPrivate *priv = conn->storagePrivateData; @@ -110,7 +110,7 @@ esxNumberOfStoragePools(virConnectPtr conn) static int -esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) +esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) { bool success = false; esxPrivate *priv = conn->storagePrivateData; @@ -153,7 +153,7 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) static int -esxNumberOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -162,9 +162,9 @@ esxNumberOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -324,7 +324,7 @@ esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static int -esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) +esxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { esxPrivate *priv = pool->conn->storagePrivateData; virStorageDriverPtr backend = pool->privateData; @@ -341,8 +341,8 @@ esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) static int -esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, - int maxnames) +esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, + int maxnames) { esxPrivate *priv = pool->conn->storagePrivateData; virStorageDriverPtr backend = pool->privateData; @@ -359,7 +359,7 @@ esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, static virStorageVolPtr -esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) +esxStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { esxPrivate *priv = pool->conn->storagePrivateData; virStorageDriverPtr backend = pool->privateData; @@ -376,7 +376,7 @@ esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) static virStorageVolPtr -esxStorageVolumeLookupByPath(virConnectPtr conn, const char *path) +esxStorageVolLookupByPath(virConnectPtr conn, const char *path) { esxPrivate *priv = conn->storagePrivateData; @@ -407,7 +407,7 @@ esxStorageVolumeLookupByPath(virConnectPtr conn, const char *path) static virStorageVolPtr -esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key) +esxStorageVolLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume; esxPrivate *priv = conn->storagePrivateData; @@ -435,8 +435,8 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key) static virStorageVolPtr -esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, - unsigned int flags) +esxStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc, + unsigned int flags) { esxPrivate *priv = pool->conn->storagePrivateData; virStorageDriverPtr backend = pool->privateData; @@ -453,8 +453,8 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, static virStorageVolPtr -esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, - virStorageVolPtr sourceVolume, unsigned int flags) +esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, + virStorageVolPtr sourceVolume, unsigned int flags) { esxPrivate *priv = pool->conn->storagePrivateData; virStorageDriverPtr backend = pool->privateData; @@ -471,7 +471,7 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, static int -esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) +esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) { esxPrivate *priv = volume->conn->storagePrivateData; virStorageDriverPtr backend = volume->privateData; @@ -488,7 +488,7 @@ esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) static int -esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) +esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) { esxPrivate *priv = volume->conn->storagePrivateData; virStorageDriverPtr backend = volume->privateData; @@ -505,7 +505,7 @@ esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) static int -esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) +esxStorageVolGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { esxPrivate *priv = volume->conn->storagePrivateData; virStorageDriverPtr backend = volume->privateData; @@ -522,7 +522,7 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) static char * -esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) +esxStorageVolGetXMLDesc(virStorageVolPtr volume, unsigned int flags) { esxPrivate *priv = volume->conn->storagePrivateData; virStorageDriverPtr backend = volume->privateData; @@ -539,7 +539,7 @@ esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) static char * -esxStorageVolumeGetPath(virStorageVolPtr volume) +esxStorageVolGetPath(virStorageVolPtr volume) { esxPrivate *priv = volume->conn->storagePrivateData; virStorageDriverPtr backend = volume->privateData; @@ -577,10 +577,10 @@ static virStorageDriver esxStorageDriver = { .name = "ESX", .storageOpen = esxStorageOpen, /* 0.7.6 */ .storageClose = esxStorageClose, /* 0.7.6 */ - .connectNumOfStoragePools = esxNumberOfStoragePools, /* 0.8.2 */ - .connectListStoragePools = esxListStoragePools, /* 0.8.2 */ - .connectNumOfDefinedStoragePools = esxNumberOfDefinedStoragePools, /* 0.8.2 */ - .connectListDefinedStoragePools = esxListDefinedStoragePools, /* 0.8.2 */ + .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 0.8.2 */ + .connectListStoragePools = esxConnectListStoragePools, /* 0.8.2 */ + .connectNumOfDefinedStoragePools = esxConnectNumOfDefinedStoragePools, /* 0.8.2 */ + .connectListDefinedStoragePools = esxConnectListDefinedStoragePools, /* 0.8.2 */ .storagePoolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */ .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */ .storagePoolLookupByVolume = esxStoragePoolLookupByVolume, /* 0.8.4 */ @@ -589,18 +589,18 @@ static virStorageDriver esxStorageDriver = { .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */ .storagePoolGetAutostart = esxStoragePoolGetAutostart, /* 0.8.2 */ .storagePoolSetAutostart = esxStoragePoolSetAutostart, /* 0.8.2 */ - .storagePoolNumOfVolumes = esxStoragePoolNumberOfStorageVolumes, /* 0.8.4 */ - .storagePoolListVolumes = esxStoragePoolListStorageVolumes, /* 0.8.4 */ - .storageVolLookupByName = esxStorageVolumeLookupByName, /* 0.8.4 */ - .storageVolLookupByPath = esxStorageVolumeLookupByPath, /* 0.8.4 */ - .storageVolLookupByKey = esxStorageVolumeLookupByKey, /* 0.8.4 */ - .storageVolCreateXML = esxStorageVolumeCreateXML, /* 0.8.4 */ - .storageVolCreateXMLFrom = esxStorageVolumeCreateXMLFrom, /* 0.8.7 */ - .storageVolDelete = esxStorageVolumeDelete, /* 0.8.7 */ - .storageVolWipe = esxStorageVolumeWipe, /* 0.8.7 */ - .storageVolGetInfo = esxStorageVolumeGetInfo, /* 0.8.4 */ - .storageVolGetXMLDesc = esxStorageVolumeGetXMLDesc, /* 0.8.4 */ - .storageVolGetPath = esxStorageVolumeGetPath, /* 0.8.4 */ + .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 0.8.4 */ + .storagePoolListVolumes = esxStoragePoolListVolumes, /* 0.8.4 */ + .storageVolLookupByName = esxStorageVolLookupByName, /* 0.8.4 */ + .storageVolLookupByPath = esxStorageVolLookupByPath, /* 0.8.4 */ + .storageVolLookupByKey = esxStorageVolLookupByKey, /* 0.8.4 */ + .storageVolCreateXML = esxStorageVolCreateXML, /* 0.8.4 */ + .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 0.8.7 */ + .storageVolDelete = esxStorageVolDelete, /* 0.8.7 */ + .storageVolWipe = esxStorageVolWipe, /* 0.8.7 */ + .storageVolGetInfo = esxStorageVolGetInfo, /* 0.8.4 */ + .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 0.8.4 */ + .storageVolGetPath = esxStorageVolGetPath, /* 0.8.4 */ .storagePoolIsActive = esxStoragePoolIsActive, /* 0.8.2 */ .storagePoolIsPersistent = esxStoragePoolIsPersistent, /* 0.8.2 */ }; diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c index 370fa3e..c362a12 100644 --- a/src/hyperv/hyperv_device_monitor.c +++ b/src/hyperv/hyperv_device_monitor.c @@ -37,9 +37,9 @@ static virDrvOpenStatus -hypervDeviceOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +hypervNodeDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -55,7 +55,7 @@ hypervDeviceOpen(virConnectPtr conn, static int -hypervDeviceClose(virConnectPtr conn) +hypervNodeDeviceClose(virConnectPtr conn) { conn->nodeDevicePrivateData = NULL; @@ -66,8 +66,8 @@ hypervDeviceClose(virConnectPtr conn) static virNodeDeviceDriver hypervNodeDeviceDriver = { "Hyper-V", - .nodeDeviceOpen = hypervDeviceOpen, /* 0.9.5 */ - .nodeDeviceClose = hypervDeviceClose, /* 0.9.5 */ + .nodeDeviceOpen = hypervNodeDeviceOpen, /* 0.9.5 */ + .nodeDeviceClose = hypervNodeDeviceClose, /* 0.9.5 */ }; diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 828e3fe..3b381de 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -66,7 +66,7 @@ hypervFreePrivate(hypervPrivate **priv) static virDrvOpenStatus -hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) +hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; char *plus; @@ -215,7 +215,7 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) static int -hypervClose(virConnectPtr conn) +hypervConnectClose(virConnectPtr conn) { hypervPrivate *priv = conn->privateData; @@ -229,7 +229,7 @@ hypervClose(virConnectPtr conn) static const char * -hypervGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +hypervConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "Hyper-V"; } @@ -237,7 +237,7 @@ hypervGetType(virConnectPtr conn ATTRIBUTE_UNUSED) static char * -hypervGetHostname(virConnectPtr conn) +hypervConnectGetHostname(virConnectPtr conn) { char *hostname = NULL; hypervPrivate *priv = conn->privateData; @@ -371,7 +371,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) static int -hypervListDomains(virConnectPtr conn, int *ids, int maxids) +hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bool success = false; hypervPrivate *priv = conn->privateData; @@ -415,7 +415,7 @@ hypervListDomains(virConnectPtr conn, int *ids, int maxids) static int -hypervNumberOfDomains(virConnectPtr conn) +hypervConnectNumOfDomains(virConnectPtr conn) { bool success = false; hypervPrivate *priv = conn->privateData; @@ -954,7 +954,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) static int -hypervListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) +hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { bool success = false; hypervPrivate *priv = conn->privateData; @@ -1014,7 +1014,7 @@ hypervListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) static int -hypervNumberOfDefinedDomains(virConnectPtr conn) +hypervConnectNumOfDefinedDomains(virConnectPtr conn) { bool success = false; hypervPrivate *priv = conn->privateData; @@ -1088,7 +1088,7 @@ hypervDomainCreate(virDomainPtr domain) static int -hypervIsEncrypted(virConnectPtr conn) +hypervConnectIsEncrypted(virConnectPtr conn) { hypervPrivate *priv = conn->privateData; @@ -1102,7 +1102,7 @@ hypervIsEncrypted(virConnectPtr conn) static int -hypervIsSecure(virConnectPtr conn) +hypervConnectIsSecure(virConnectPtr conn) { hypervPrivate *priv = conn->privateData; @@ -1116,7 +1116,7 @@ hypervIsSecure(virConnectPtr conn) static int -hypervIsAlive(virConnectPtr conn) +hypervConnectIsAlive(virConnectPtr conn) { hypervPrivate *priv = conn->privateData; @@ -1258,9 +1258,9 @@ hypervDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) #define MATCH(FLAG) (flags & (FLAG)) static int -hypervListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +hypervConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { hypervPrivate *priv = conn->privateData; virBuffer query = VIR_BUFFER_INITIALIZER; @@ -1398,14 +1398,14 @@ no_memory: static virDriver hypervDriver = { .no = VIR_DRV_HYPERV, .name = "Hyper-V", - .connectOpen = hypervOpen, /* 0.9.5 */ - .connectClose = hypervClose, /* 0.9.5 */ - .connectGetType = hypervGetType, /* 0.9.5 */ - .connectGetHostname = hypervGetHostname, /* 0.9.5 */ + .connectOpen = hypervConnectOpen, /* 0.9.5 */ + .connectClose = hypervConnectClose, /* 0.9.5 */ + .connectGetType = hypervConnectGetType, /* 0.9.5 */ + .connectGetHostname = hypervConnectGetHostname, /* 0.9.5 */ .nodeGetInfo = hypervNodeGetInfo, /* 0.9.5 */ - .connectListDomains = hypervListDomains, /* 0.9.5 */ - .connectNumOfDomains = hypervNumberOfDomains, /* 0.9.5 */ - .connectListAllDomains = hypervListAllDomains, /* 0.10.2 */ + .connectListDomains = hypervConnectListDomains, /* 0.9.5 */ + .connectNumOfDomains = hypervConnectNumOfDomains, /* 0.9.5 */ + .connectListAllDomains = hypervConnectListAllDomains, /* 0.10.2 */ .domainLookupByID = hypervDomainLookupByID, /* 0.9.5 */ .domainLookupByUUID = hypervDomainLookupByUUID, /* 0.9.5 */ .domainLookupByName = hypervDomainLookupByName, /* 0.9.5 */ @@ -1417,19 +1417,19 @@ static virDriver hypervDriver = { .domainGetInfo = hypervDomainGetInfo, /* 0.9.5 */ .domainGetState = hypervDomainGetState, /* 0.9.5 */ .domainGetXMLDesc = hypervDomainGetXMLDesc, /* 0.9.5 */ - .connectListDefinedDomains = hypervListDefinedDomains, /* 0.9.5 */ - .connectNumOfDefinedDomains = hypervNumberOfDefinedDomains, /* 0.9.5 */ + .connectListDefinedDomains = hypervConnectListDefinedDomains, /* 0.9.5 */ + .connectNumOfDefinedDomains = hypervConnectNumOfDefinedDomains, /* 0.9.5 */ .domainCreate = hypervDomainCreate, /* 0.9.5 */ .domainCreateWithFlags = hypervDomainCreateWithFlags, /* 0.9.5 */ - .connectIsEncrypted = hypervIsEncrypted, /* 0.9.5 */ - .connectIsSecure = hypervIsSecure, /* 0.9.5 */ + .connectIsEncrypted = hypervConnectIsEncrypted, /* 0.9.5 */ + .connectIsSecure = hypervConnectIsSecure, /* 0.9.5 */ .domainIsActive = hypervDomainIsActive, /* 0.9.5 */ .domainIsPersistent = hypervDomainIsPersistent, /* 0.9.5 */ .domainIsUpdated = hypervDomainIsUpdated, /* 0.9.5 */ .domainManagedSave = hypervDomainManagedSave, /* 0.9.5 */ .domainHasManagedSaveImage = hypervDomainHasManagedSaveImage, /* 0.9.5 */ .domainManagedSaveRemove = hypervDomainManagedSaveRemove, /* 0.9.5 */ - .connectIsAlive = hypervIsAlive, /* 0.9.8 */ + .connectIsAlive = hypervConnectIsAlive, /* 0.9.8 */ }; diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 0af9cd7..cbba4fd 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -116,9 +116,9 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac return iface; } -static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus netcfInterfaceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { struct interface_driver *driverState; @@ -159,7 +159,7 @@ alloc_error: return VIR_DRV_OPEN_ERROR; } -static int interfaceCloseInterface(virConnectPtr conn) +static int netcfInterfaceClose(virConnectPtr conn) { if (conn->interfacePrivateData != NULL) @@ -177,7 +177,7 @@ static int interfaceCloseInterface(virConnectPtr conn) return 0; } -static int interfaceNumOfInterfaces(virConnectPtr conn) +static int netcfConnectNumOfInterfaces(virConnectPtr conn) { int count; struct interface_driver *driver = conn->interfacePrivateData; @@ -196,7 +196,7 @@ static int interfaceNumOfInterfaces(virConnectPtr conn) return count; } -static int interfaceListInterfaces(virConnectPtr conn, char **const names, int nnames) +static int netcfConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) { struct interface_driver *driver = conn->interfacePrivateData; int count; @@ -218,7 +218,7 @@ static int interfaceListInterfaces(virConnectPtr conn, char **const names, int n } -static int interfaceNumOfDefinedInterfaces(virConnectPtr conn) +static int netcfConnectNumOfDefinedInterfaces(virConnectPtr conn) { int count; struct interface_driver *driver = conn->interfacePrivateData; @@ -238,7 +238,7 @@ static int interfaceNumOfDefinedInterfaces(virConnectPtr conn) return count; } -static int interfaceListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) +static int netcfConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) { struct interface_driver *driver = conn->interfacePrivateData; int count; @@ -261,9 +261,9 @@ static int interfaceListDefinedInterfaces(virConnectPtr conn, char **const names } static int -interfaceListAllInterfaces(virConnectPtr conn, - virInterfacePtr **ifaces, - unsigned int flags) +netcfConnectListAllInterfaces(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags) { struct interface_driver *driver = conn->interfacePrivateData; int count; @@ -407,8 +407,8 @@ cleanup: } -static virInterfacePtr interfaceLookupByName(virConnectPtr conn, - const char *name) +static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, + const char *name) { struct interface_driver *driver = conn->interfacePrivateData; struct netcf_if *iface; @@ -439,8 +439,8 @@ cleanup: return ret; } -static virInterfacePtr interfaceLookupByMACString(virConnectPtr conn, - const char *macstr) +static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, + const char *macstr) { struct interface_driver *driver = conn->interfacePrivateData; struct netcf_if *iface; @@ -479,8 +479,8 @@ cleanup: return ret; } -static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, - unsigned int flags) +static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, + unsigned int flags) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -533,9 +533,9 @@ cleanup: return ret; } -static virInterfacePtr interfaceDefineXML(virConnectPtr conn, - const char *xml, - unsigned int flags) +static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { struct interface_driver *driver = conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -580,7 +580,7 @@ cleanup: return ret; } -static int interfaceUndefine(virInterfacePtr ifinfo) { +static int netcfInterfaceUndefine(virInterfacePtr ifinfo) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; int ret = -1; @@ -610,8 +610,8 @@ cleanup: return ret; } -static int interfaceCreate(virInterfacePtr ifinfo, - unsigned int flags) +static int netcfInterfaceCreate(virInterfacePtr ifinfo, + unsigned int flags) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -644,8 +644,8 @@ cleanup: return ret; } -static int interfaceDestroy(virInterfacePtr ifinfo, - unsigned int flags) +static int netcfInterfaceDestroy(virInterfacePtr ifinfo, + unsigned int flags) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -678,7 +678,7 @@ cleanup: return ret; } -static int interfaceIsActive(virInterfacePtr ifinfo) +static int netcfInterfaceIsActive(virInterfacePtr ifinfo) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; @@ -712,7 +712,7 @@ cleanup: } #ifdef HAVE_NETCF_TRANSACTIONS -static int interfaceChangeBegin(virConnectPtr conn, unsigned int flags) +static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { struct interface_driver *driver = conn->interfacePrivateData; int ret; @@ -735,7 +735,7 @@ static int interfaceChangeBegin(virConnectPtr conn, unsigned int flags) return ret; } -static int interfaceChangeCommit(virConnectPtr conn, unsigned int flags) +static int netcfInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) { struct interface_driver *driver = conn->interfacePrivateData; int ret; @@ -758,7 +758,7 @@ static int interfaceChangeCommit(virConnectPtr conn, unsigned int flags) return ret; } -static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) +static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) { struct interface_driver *driver = conn->interfacePrivateData; int ret; @@ -784,25 +784,25 @@ static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) static virInterfaceDriver interfaceDriver = { "netcf", - .interfaceOpen = interfaceOpenInterface, /* 0.7.0 */ - .interfaceClose = interfaceCloseInterface, /* 0.7.0 */ - .connectNumOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ - .connectListInterfaces = interfaceListInterfaces, /* 0.7.0 */ - .connectNumOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ - .connectListDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ - .connectListAllInterfaces = interfaceListAllInterfaces, /* 0.10.2 */ - .interfaceLookupByName = interfaceLookupByName, /* 0.7.0 */ - .interfaceLookupByMACString = interfaceLookupByMACString, /* 0.7.0 */ - .interfaceGetXMLDesc = interfaceGetXMLDesc, /* 0.7.0 */ - .interfaceDefineXML = interfaceDefineXML, /* 0.7.0 */ - .interfaceUndefine = interfaceUndefine, /* 0.7.0 */ - .interfaceCreate = interfaceCreate, /* 0.7.0 */ - .interfaceDestroy = interfaceDestroy, /* 0.7.0 */ - .interfaceIsActive = interfaceIsActive, /* 0.7.3 */ + .interfaceOpen = netcfInterfaceOpen, /* 0.7.0 */ + .interfaceClose = netcfInterfaceClose, /* 0.7.0 */ + .connectNumOfInterfaces = netcfConnectNumOfInterfaces, /* 0.7.0 */ + .connectListInterfaces = netcfConnectListInterfaces, /* 0.7.0 */ + .connectNumOfDefinedInterfaces = netcfConnectNumOfDefinedInterfaces, /* 0.7.0 */ + .connectListDefinedInterfaces = netcfConnectListDefinedInterfaces, /* 0.7.0 */ + .connectListAllInterfaces = netcfConnectListAllInterfaces, /* 0.10.2 */ + .interfaceLookupByName = netcfInterfaceLookupByName, /* 0.7.0 */ + .interfaceLookupByMACString = netcfInterfaceLookupByMACString, /* 0.7.0 */ + .interfaceGetXMLDesc = netcfInterfaceGetXMLDesc, /* 0.7.0 */ + .interfaceDefineXML = netcfInterfaceDefineXML, /* 0.7.0 */ + .interfaceUndefine = netcfInterfaceUndefine, /* 0.7.0 */ + .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ + .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ + .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ #ifdef HAVE_NETCF_TRANSACTIONS - .interfaceChangeBegin = interfaceChangeBegin, /* 0.9.2 */ - .interfaceChangeCommit = interfaceChangeCommit, /* 0.9.2 */ - .interfaceChangeRollback = interfaceChangeRollback, /* 0.9.2 */ + .interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */ + .interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */ + .interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */ #endif /* HAVE_NETCF_TRANSACTIONS */ }; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 57e4465..3613987 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -43,7 +43,7 @@ typedef enum { VIR_UDEV_IFACE_ALL } virUdevStatus ; -static virInterfaceDef *udevIfaceGetIfaceDef(struct udev *udev, const char *name); +static virInterfaceDef *udevGetIfaceDef(struct udev *udev, const char *name); static const char * virUdevStatusString(virUdevStatus status) @@ -61,7 +61,7 @@ virUdevStatusString(virUdevStatus status) } static struct udev_enumerate * ATTRIBUTE_NONNULL(1) -udevIfaceGetDevices(struct udev *udev, virUdevStatus status) +udevGetDevices(struct udev *udev, virUdevStatus status) { struct udev_enumerate *enumerate; @@ -101,9 +101,9 @@ udevIfaceGetDevices(struct udev *udev, virUdevStatus status) } static virDrvOpenStatus -udevIfaceOpenInterface(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +udevInterfaceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { struct udev_iface_driver *driverState = NULL; @@ -132,7 +132,7 @@ err: } static int -udevIfaceCloseInterface(virConnectPtr conn) +udevInterfaceClose(virConnectPtr conn) { struct udev_iface_driver *driverState; @@ -149,7 +149,7 @@ udevIfaceCloseInterface(virConnectPtr conn) } static int -udevIfaceNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status) +udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status) { struct udev_iface_driver *driverState = conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -158,7 +158,7 @@ udevIfaceNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status) struct udev_list_entry *dev_entry; int count = 0; - enumerate = udevIfaceGetDevices(udev, status); + enumerate = udevGetDevices(udev, status); if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -188,10 +188,10 @@ err: } static int -udevIfaceListInterfacesByStatus(virConnectPtr conn, - char **const names, - int names_len, - virUdevStatus status) +udevListInterfacesByStatus(virConnectPtr conn, + char **const names, + int names_len, + virUdevStatus status) { struct udev_iface_driver *driverState = conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -200,7 +200,7 @@ udevIfaceListInterfacesByStatus(virConnectPtr conn, struct udev_list_entry *dev_entry; int count = 0; - enumerate = udevIfaceGetDevices(udev, status); + enumerate = udevGetDevices(udev, status); if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -255,39 +255,39 @@ err: } static int -udevIfaceNumOfInterfaces(virConnectPtr conn) +udevConnectNumOfInterfaces(virConnectPtr conn) { - return udevIfaceNumOfInterfacesByStatus(conn, VIR_UDEV_IFACE_ACTIVE); + return udevNumOfInterfacesByStatus(conn, VIR_UDEV_IFACE_ACTIVE); } static int -udevIfaceListInterfaces(virConnectPtr conn, - char **const names, - int names_len) +udevConnectListInterfaces(virConnectPtr conn, + char **const names, + int names_len) { - return udevIfaceListInterfacesByStatus(conn, names, names_len, - VIR_UDEV_IFACE_ACTIVE); + return udevListInterfacesByStatus(conn, names, names_len, + VIR_UDEV_IFACE_ACTIVE); } static int -udevIfaceNumOfDefinedInterfaces(virConnectPtr conn) +udevConnectNumOfDefinedInterfaces(virConnectPtr conn) { - return udevIfaceNumOfInterfacesByStatus(conn, VIR_UDEV_IFACE_INACTIVE); + return udevNumOfInterfacesByStatus(conn, VIR_UDEV_IFACE_INACTIVE); } static int -udevIfaceListDefinedInterfaces(virConnectPtr conn, - char **const names, - int names_len) +udevConnectListDefinedInterfaces(virConnectPtr conn, + char **const names, + int names_len) { - return udevIfaceListInterfacesByStatus(conn, names, names_len, - VIR_UDEV_IFACE_INACTIVE); + return udevListInterfacesByStatus(conn, names, names_len, + VIR_UDEV_IFACE_INACTIVE); } static int -udevIfaceListAllInterfaces(virConnectPtr conn, - virInterfacePtr **ifaces, - unsigned int flags) +udevConnectListAllInterfaces(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags) { struct udev_iface_driver *driverState = conn->interfacePrivateData; struct udev *udev; @@ -308,7 +308,7 @@ udevIfaceListAllInterfaces(virConnectPtr conn, udev = udev_ref(driverState->udev); /* List all interfaces in case we support more filter flags in the future */ - enumerate = udevIfaceGetDevices(udev, VIR_UDEV_IFACE_ALL); + enumerate = udevGetDevices(udev, VIR_UDEV_IFACE_ALL); if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -410,7 +410,7 @@ cleanup: } static virInterfacePtr -udevIfaceLookupByName(virConnectPtr conn, const char *name) +udevInterfaceLookupByName(virConnectPtr conn, const char *name) { struct udev_iface_driver *driverState = conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -438,7 +438,7 @@ err: } static virInterfacePtr -udevIfaceLookupByMACString(virConnectPtr conn, const char *macstr) +udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) { struct udev_iface_driver *driverState = conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -448,7 +448,7 @@ udevIfaceLookupByMACString(virConnectPtr conn, const char *macstr) const char *name; virInterfacePtr ret = NULL; - enumerate = udevIfaceGetDevices(udev, VIR_UDEV_IFACE_ALL); + enumerate = udevGetDevices(udev, VIR_UDEV_IFACE_ALL); if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -503,7 +503,7 @@ err: * @return 1 if we want to add it to scandir's list, 0 if not. */ static int -udevIfaceBondScanDirFilter(const struct dirent *entry) +udevBondScanDirFilter(const struct dirent *entry) { /* This is ugly so if anyone has a better suggestion, please improve * this. Unfortunately the kernel stores everything in the top level @@ -524,7 +524,7 @@ udevIfaceBondScanDirFilter(const struct dirent *entry) * @return 1 if we want to add it to scandir's list, 0 if not. */ static int -udevIfaceBridgeScanDirFilter(const struct dirent *entry) +udevBridgeScanDirFilter(const struct dirent *entry) { if (STREQ(entry->d_name, ".") || STREQ(entry->d_name, "..")) return 0; @@ -543,12 +543,12 @@ udevIfaceBridgeScanDirFilter(const struct dirent *entry) } /** - * Frees any memory allocated by udevIfaceGetIfaceDef() + * Frees any memory allocated by udevGetIfaceDef() * * @param ifacedef - interface to free and cleanup */ static void -udevIfaceFreeIfaceDef(virInterfaceDef *ifacedef) +udevFreeIfaceDef(virInterfaceDef *ifacedef) { int i; @@ -558,7 +558,7 @@ udevIfaceFreeIfaceDef(virInterfaceDef *ifacedef) if (ifacedef->type == VIR_INTERFACE_TYPE_BOND) { VIR_FREE(ifacedef->data.bond.target); for (i = 0; i < ifacedef->data.bond.nbItf; i++) { - udevIfaceFreeIfaceDef(ifacedef->data.bond.itf[i]); + udevFreeIfaceDef(ifacedef->data.bond.itf[i]); } VIR_FREE(ifacedef->data.bond.itf); } @@ -566,7 +566,7 @@ udevIfaceFreeIfaceDef(virInterfaceDef *ifacedef) if (ifacedef->type == VIR_INTERFACE_TYPE_BRIDGE) { VIR_FREE(ifacedef->data.bridge.delay); for (i = 0; i < ifacedef->data.bridge.nbItf; i++) { - udevIfaceFreeIfaceDef(ifacedef->data.bridge.itf[i]); + udevFreeIfaceDef(ifacedef->data.bridge.itf[i]); } VIR_FREE(ifacedef->data.bridge.itf); } @@ -584,7 +584,7 @@ udevIfaceFreeIfaceDef(virInterfaceDef *ifacedef) static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK -udevIfaceGetIfaceDefBond(struct udev *udev, +udevGetIfaceDefBond(struct udev *udev, struct udev_device *dev, const char *name, virInterfaceDef *ifacedef) @@ -759,7 +759,7 @@ udevIfaceGetIfaceDefBond(struct udev *udev, /* Slaves of the bond */ /* Get each slave in the bond */ slave_count = scandir(udev_device_get_syspath(dev), &slave_list, - udevIfaceBondScanDirFilter, alphasort); + udevBondScanDirFilter, alphasort); if (slave_count < 0) { virReportSystemError(errno, @@ -789,7 +789,7 @@ udevIfaceGetIfaceDefBond(struct udev *udev, tmp_str++; ifacedef->data.bond.itf[i] = - udevIfaceGetIfaceDef(udev, tmp_str); + udevGetIfaceDef(udev, tmp_str); if (!ifacedef->data.bond.itf[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get interface information for '%s', which is " @@ -815,10 +815,10 @@ cleanup: static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK -udevIfaceGetIfaceDefBridge(struct udev *udev, - struct udev_device *dev, - const char *name, - virInterfaceDef *ifacedef) +udevGetIfaceDefBridge(struct udev *udev, + struct udev_device *dev, + const char *name, + virInterfaceDef *ifacedef) { struct dirent **member_list = NULL; int member_count = 0; @@ -881,7 +881,7 @@ udevIfaceGetIfaceDefBridge(struct udev *udev, /* Get each member of the bridge */ member_count = scandir(member_path, &member_list, - udevIfaceBridgeScanDirFilter, alphasort); + udevBridgeScanDirFilter, alphasort); /* Don't need the path anymore */ VIR_FREE(member_path); @@ -903,7 +903,7 @@ udevIfaceGetIfaceDefBridge(struct udev *udev, /* Get the interface defintions for each member of the bridge */ for (i = 0; i < member_count; i++) { ifacedef->data.bridge.itf[i] = - udevIfaceGetIfaceDef(udev, member_list[i]->d_name); + udevGetIfaceDef(udev, member_list[i]->d_name); if (!ifacedef->data.bridge.itf[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get interface information for '%s', which is " @@ -929,10 +929,10 @@ error: static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK -udevIfaceGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, - struct udev_device *dev ATTRIBUTE_UNUSED, - const char *name, - virInterfaceDef *ifacedef) +udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, + struct udev_device *dev ATTRIBUTE_UNUSED, + const char *name, + virInterfaceDef *ifacedef) { char *vid; char *vlan_parent_dev = NULL; @@ -969,7 +969,7 @@ cleanup: } static virInterfaceDef * ATTRIBUTE_NONNULL(1) -udevIfaceGetIfaceDef(struct udev *udev, const char *name) +udevGetIfaceDef(struct udev *udev, const char *name) { struct udev_device *dev = NULL; virInterfaceDef *ifacedef; @@ -1058,15 +1058,15 @@ udevIfaceGetIfaceDef(struct udev *udev, const char *name) switch (ifacedef->type) { case VIR_INTERFACE_TYPE_VLAN: - if (udevIfaceGetIfaceDefVlan(udev, dev, name, ifacedef) < 0) + if (udevGetIfaceDefVlan(udev, dev, name, ifacedef) < 0) goto cleanup; break; case VIR_INTERFACE_TYPE_BRIDGE: - if (udevIfaceGetIfaceDefBridge(udev, dev, name, ifacedef) < 0) + if (udevGetIfaceDefBridge(udev, dev, name, ifacedef) < 0) goto cleanup; break; case VIR_INTERFACE_TYPE_BOND: - if (udevIfaceGetIfaceDefBond(udev, dev, name, ifacedef) < 0) + if (udevGetIfaceDefBond(udev, dev, name, ifacedef) < 0) goto cleanup; break; case VIR_INTERFACE_TYPE_ETHERNET: @@ -1080,14 +1080,14 @@ udevIfaceGetIfaceDef(struct udev *udev, const char *name) cleanup: udev_device_unref(dev); - udevIfaceFreeIfaceDef(ifacedef); + udevFreeIfaceDef(ifacedef); return NULL; } static char * -udevIfaceGetXMLDesc(virInterfacePtr ifinfo, - unsigned int flags) +udevInterfaceGetXMLDesc(virInterfacePtr ifinfo, + unsigned int flags) { struct udev_iface_driver *driverState = ifinfo->conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -1099,7 +1099,7 @@ udevIfaceGetXMLDesc(virInterfacePtr ifinfo, /* Recursively build up the interface XML based on the requested * interface name */ - ifacedef = udevIfaceGetIfaceDef(udev, ifinfo->name); + ifacedef = udevGetIfaceDef(udev, ifinfo->name); /* We've already printed by it happened */ if (!ifacedef) @@ -1109,7 +1109,7 @@ udevIfaceGetXMLDesc(virInterfacePtr ifinfo, xmlstr = virInterfaceDefFormat(ifacedef); /* Recursively free our interface structures and free the children too */ - udevIfaceFreeIfaceDef(ifacedef); + udevFreeIfaceDef(ifacedef); err: /* decrement our udev ptr */ @@ -1119,7 +1119,7 @@ err: } static int -udevIfaceIsActive(virInterfacePtr ifinfo) +udevInterfaceIsActive(virInterfacePtr ifinfo) { struct udev_iface_driver *driverState = ifinfo->conn->interfacePrivateData; struct udev *udev = udev_ref(driverState->udev); @@ -1149,17 +1149,17 @@ cleanup: static virInterfaceDriver udevIfaceDriver = { "udev", - .interfaceOpen = udevIfaceOpenInterface, /* 1.0.0 */ - .interfaceClose = udevIfaceCloseInterface, /* 1.0.0 */ - .connectNumOfInterfaces = udevIfaceNumOfInterfaces, /* 1.0.0 */ - .connectListInterfaces = udevIfaceListInterfaces, /* 1.0.0 */ - .connectNumOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 1.0.0 */ - .connectListDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 1.0.0 */ - .connectListAllInterfaces = udevIfaceListAllInterfaces, /* 1.0.0 */ - .interfaceLookupByName = udevIfaceLookupByName, /* 1.0.0 */ - .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 1.0.0 */ - .interfaceIsActive = udevIfaceIsActive, /* 1.0.0 */ - .interfaceGetXMLDesc = udevIfaceGetXMLDesc, /* 1.0.0 */ + .interfaceOpen = udevInterfaceOpen, /* 1.0.0 */ + .interfaceClose = udevInterfaceClose, /* 1.0.0 */ + .connectNumOfInterfaces = udevConnectNumOfInterfaces, /* 1.0.0 */ + .connectListInterfaces = udevConnectListInterfaces, /* 1.0.0 */ + .connectNumOfDefinedInterfaces = udevConnectNumOfDefinedInterfaces, /* 1.0.0 */ + .connectListDefinedInterfaces = udevConnectListDefinedInterfaces, /* 1.0.0 */ + .connectListAllInterfaces = udevConnectListAllInterfaces, /* 1.0.0 */ + .interfaceLookupByName = udevInterfaceLookupByName, /* 1.0.0 */ + .interfaceLookupByMACString = udevInterfaceLookupByMACString, /* 1.0.0 */ + .interfaceIsActive = udevInterfaceIsActive, /* 1.0.0 */ + .interfaceGetXMLDesc = udevInterfaceGetXMLDesc, /* 1.0.0 */ }; int diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index feb7161..b4f1889 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1095,7 +1095,7 @@ libxlReconnectDomains(libxlDriverPrivatePtr driver) } static int -libxlShutdown(void) +libxlStateCleanup(void) { if (!libxl_driver) return -1; @@ -1128,9 +1128,9 @@ libxlShutdown(void) } static int -libxlStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +libxlStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { const libxl_version_info *ver_info; char *log_file = NULL; @@ -1308,12 +1308,12 @@ fail: VIR_FREE(log_file); if (libxl_driver) libxlDriverUnlock(libxl_driver); - libxlShutdown(); + libxlStateCleanup(); return ret; } static int -libxlReload(void) +libxlStateReload(void) { if (!libxl_driver) return 0; @@ -1338,9 +1338,9 @@ libxlReload(void) static virDrvOpenStatus -libxlOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +libxlConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1384,20 +1384,20 @@ libxlOpen(virConnectPtr conn, }; static int -libxlClose(virConnectPtr conn ATTRIBUTE_UNUSED) +libxlConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) { conn->privateData = NULL; return 0; } static const char * -libxlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +libxlConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "xenlight"; } static int -libxlGetVersion(virConnectPtr conn, unsigned long *version) +libxlConnectGetVersion(virConnectPtr conn, unsigned long *version) { libxlDriverPrivatePtr driver = conn->privateData; @@ -1408,7 +1408,7 @@ libxlGetVersion(virConnectPtr conn, unsigned long *version) } static int -libxlGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) +libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { int ret; libxlDriverPrivatePtr driver = conn->privateData; @@ -1429,7 +1429,7 @@ libxlNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) } static char * -libxlGetCapabilities(virConnectPtr conn) +libxlConnectGetCapabilities(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; char *xml; @@ -1443,7 +1443,7 @@ libxlGetCapabilities(virConnectPtr conn) } static int -libxlListDomains(virConnectPtr conn, int *ids, int nids) +libxlConnectListDomains(virConnectPtr conn, int *ids, int nids) { libxlDriverPrivatePtr driver = conn->privateData; int n; @@ -1456,7 +1456,7 @@ libxlListDomains(virConnectPtr conn, int *ids, int nids) } static int -libxlNumDomains(virConnectPtr conn) +libxlConnectNumOfDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; int n; @@ -2585,7 +2585,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto cleanup; } - if ((max = libxlGetMaxVcpus(dom->conn, NULL)) < 0) { + if ((max = libxlConnectGetMaxVcpus(dom->conn, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not determine max vcpus for the domain")); goto cleanup; @@ -2889,9 +2889,9 @@ libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } static char * -libxlDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, - const char * nativeConfig, - unsigned int flags) +libxlConnectDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, + const char * nativeConfig, + unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; const libxl_version_info *ver_info; @@ -2931,9 +2931,9 @@ cleanup: #define MAX_CONFIG_SIZE (1024 * 65) static char * -libxlDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, - const char * domainXml, - unsigned int flags) +libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, + const char * domainXml, + unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; const libxl_version_info *ver_info; @@ -2981,8 +2981,8 @@ cleanup: } static int -libxlListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) +libxlConnectListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) { libxlDriverPrivatePtr driver = conn->privateData; int n; @@ -2994,7 +2994,7 @@ libxlListDefinedDomains(virConnectPtr conn, } static int -libxlNumDefinedDomains(virConnectPtr conn) +libxlConnectNumOfDefinedDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; int n; @@ -3715,9 +3715,9 @@ libxlNodeGetFreeMemory(virConnectPtr conn) } static int -libxlDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, void *opaque, - virFreeCallback freecb) +libxlConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, void *opaque, + virFreeCallback freecb) { libxlDriverPrivatePtr driver = conn->privateData; int ret; @@ -3733,8 +3733,8 @@ libxlDomainEventRegister(virConnectPtr conn, static int -libxlDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +libxlConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { libxlDriverPrivatePtr driver = conn->privateData; int ret; @@ -4132,9 +4132,9 @@ cleanup: } static int -libxlDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, virFreeCallback freecb) +libxlConnectDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, virFreeCallback freecb) { libxlDriverPrivatePtr driver = conn->privateData; int ret; @@ -4152,7 +4152,7 @@ libxlDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, int eventID, static int -libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID) +libxlConnectDomainEventDeregisterAny(virConnectPtr conn, int callbackID) { libxlDriverPrivatePtr driver = conn->privateData; int ret; @@ -4168,15 +4168,15 @@ libxlDomainEventDeregisterAny(virConnectPtr conn, int callbackID) static int -libxlIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +libxlConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } static int -libxlListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +libxlConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; int ret = -1; @@ -4195,17 +4195,17 @@ libxlListAllDomains(virConnectPtr conn, static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, .name = "xenlight", - .connectOpen = libxlOpen, /* 0.9.0 */ - .connectClose = libxlClose, /* 0.9.0 */ - .connectGetType = libxlGetType, /* 0.9.0 */ - .connectGetVersion = libxlGetVersion, /* 0.9.0 */ + .connectOpen = libxlConnectOpen, /* 0.9.0 */ + .connectClose = libxlConnectClose, /* 0.9.0 */ + .connectGetType = libxlConnectGetType, /* 0.9.0 */ + .connectGetVersion = libxlConnectGetVersion, /* 0.9.0 */ .connectGetHostname = virGetHostname, /* 0.9.0 */ - .connectGetMaxVcpus = libxlGetMaxVcpus, /* 0.9.0 */ + .connectGetMaxVcpus = libxlConnectGetMaxVcpus, /* 0.9.0 */ .nodeGetInfo = libxlNodeGetInfo, /* 0.9.0 */ - .connectGetCapabilities = libxlGetCapabilities, /* 0.9.0 */ - .connectListDomains = libxlListDomains, /* 0.9.0 */ - .connectNumOfDomains = libxlNumDomains, /* 0.9.0 */ - .connectListAllDomains = libxlListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = libxlConnectGetCapabilities, /* 0.9.0 */ + .connectListDomains = libxlConnectListDomains, /* 0.9.0 */ + .connectNumOfDomains = libxlConnectNumOfDomains, /* 0.9.0 */ + .connectListAllDomains = libxlConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = libxlDomainCreateXML, /* 0.9.0 */ .domainLookupByID = libxlDomainLookupByID, /* 0.9.0 */ .domainLookupByUUID = libxlDomainLookupByUUID, /* 0.9.0 */ @@ -4235,10 +4235,10 @@ static virDriver libxlDriver = { .domainPinVcpu = libxlDomainPinVcpu, /* 0.9.0 */ .domainGetVcpus = libxlDomainGetVcpus, /* 0.9.0 */ .domainGetXMLDesc = libxlDomainGetXMLDesc, /* 0.9.0 */ - .connectDomainXMLFromNative = libxlDomainXMLFromNative, /* 0.9.0 */ - .connectDomainXMLToNative = libxlDomainXMLToNative, /* 0.9.0 */ - .connectListDefinedDomains = libxlListDefinedDomains, /* 0.9.0 */ - .connectNumOfDefinedDomains = libxlNumDefinedDomains, /* 0.9.0 */ + .connectDomainXMLFromNative = libxlConnectDomainXMLFromNative, /* 0.9.0 */ + .connectDomainXMLToNative = libxlConnectDomainXMLToNative, /* 0.9.0 */ + .connectListDefinedDomains = libxlConnectListDefinedDomains, /* 0.9.0 */ + .connectNumOfDefinedDomains = libxlConnectNumOfDefinedDomains, /* 0.9.0 */ .domainCreate = libxlDomainCreate, /* 0.9.0 */ .domainCreateWithFlags = libxlDomainCreateWithFlags, /* 0.9.0 */ .domainDefineXML = libxlDomainDefineXML, /* 0.9.0 */ @@ -4257,24 +4257,24 @@ static virDriver libxlDriver = { .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */ .domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ - .connectDomainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ - .connectDomainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ + .connectDomainEventRegister = libxlConnectDomainEventRegister, /* 0.9.0 */ + .connectDomainEventDeregister = libxlConnectDomainEventDeregister, /* 0.9.0 */ .domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */ .domainHasManagedSaveImage = libxlDomainHasManagedSaveImage, /* 0.9.2 */ .domainManagedSaveRemove = libxlDomainManagedSaveRemove, /* 0.9.2 */ .domainIsActive = libxlDomainIsActive, /* 0.9.0 */ .domainIsPersistent = libxlDomainIsPersistent, /* 0.9.0 */ .domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */ - .connectDomainEventRegisterAny = libxlDomainEventRegisterAny, /* 0.9.0 */ - .connectDomainEventDeregisterAny = libxlDomainEventDeregisterAny, /* 0.9.0 */ - .connectIsAlive = libxlIsAlive, /* 0.9.8 */ + .connectDomainEventRegisterAny = libxlConnectDomainEventRegisterAny, /* 0.9.0 */ + .connectDomainEventDeregisterAny = libxlConnectDomainEventDeregisterAny, /* 0.9.0 */ + .connectIsAlive = libxlConnectIsAlive, /* 0.9.8 */ }; static virStateDriver libxlStateDriver = { .name = "LIBXL", - .stateInitialize = libxlStartup, - .stateCleanup = libxlShutdown, - .stateReload = libxlReload, + .stateInitialize = libxlStateInitialize, + .stateCleanup = libxlStateCleanup, + .stateReload = libxlStateReload, }; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 2a42b16..0becdc7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -74,10 +74,10 @@ #define LXC_NB_MEM_PARAM 3 -static int lxcStartup(bool privileged, - virStateInhibitCallback callback, - void *opaque); -static int lxcShutdown(void); +static int lxcStateInitialize(bool privileged, + virStateInhibitCallback callback, + void *opaque); +static int lxcStateCleanup(void); virLXCDriverPtr lxc_driver = NULL; /* callbacks for nwfilter */ @@ -109,9 +109,9 @@ static virNWFilterCallbackDriver lxcCallbackDriver = { /* Functions */ -static virDrvOpenStatus lxcOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -153,7 +153,7 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int lxcClose(virConnectPtr conn) +static int lxcConnectClose(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; @@ -166,27 +166,27 @@ static int lxcClose(virConnectPtr conn) } -static int lxcIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -static int lxcIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -static int lxcIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static char *lxcGetCapabilities(virConnectPtr conn) { +static char *lxcConnectGetCapabilities(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; char *xml; @@ -355,7 +355,7 @@ cleanup: return ret; } -static int lxcListDomains(virConnectPtr conn, int *ids, int nids) { +static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { virLXCDriverPtr driver = conn->privateData; int n; @@ -366,7 +366,7 @@ static int lxcListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int lxcNumDomains(virConnectPtr conn) { +static int lxcConnectNumOfDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; int n; @@ -377,8 +377,8 @@ static int lxcNumDomains(virConnectPtr conn) { return n; } -static int lxcListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { +static int lxcConnectListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) { virLXCDriverPtr driver = conn->privateData; int n; @@ -390,7 +390,7 @@ static int lxcListDefinedDomains(virConnectPtr conn, } -static int lxcNumDefinedDomains(virConnectPtr conn) { +static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; int n; @@ -403,7 +403,7 @@ static int lxcNumDefinedDomains(virConnectPtr conn) { -static virDomainPtr lxcDomainDefine(virConnectPtr conn, const char *xml) +static virDomainPtr lxcDomainDefineXML(virConnectPtr conn, const char *xml) { virLXCDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; @@ -608,7 +608,7 @@ cleanup: return ret; } -static char *lxcGetOSType(virDomainPtr dom) +static char *lxcDomainGetOSType(virDomainPtr dom) { virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; @@ -937,7 +937,7 @@ cleanup: } /** - * lxcDomainStartWithFlags: + * lxcDomainCreateWithFlags: * @dom: domain to start * @flags: Must be 0 for now * @@ -945,7 +945,7 @@ cleanup: * * Returns 0 on success or -1 in case of error */ -static int lxcDomainStartWithFlags(virDomainPtr dom, unsigned int flags) +static int lxcDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; @@ -999,20 +999,20 @@ cleanup: } /** - * lxcDomainStart: + * lxcDomainCreate: * @dom: domain to start * * Looks up domain and starts it. * * Returns 0 on success or -1 in case of error */ -static int lxcDomainStart(virDomainPtr dom) +static int lxcDomainCreate(virDomainPtr dom) { - return lxcDomainStartWithFlags(dom, 0); + return lxcDomainCreateWithFlags(dom, 0); } /** - * lxcDomainCreateAndStart: + * lxcDomainCreateXML: * @conn: pointer to connection * @xml: XML definition of domain * @flags: Must be 0 for now @@ -1022,9 +1022,9 @@ static int lxcDomainStart(virDomainPtr dom) * Returns 0 on success or -1 in case of error */ static virDomainPtr -lxcDomainCreateAndStart(virConnectPtr conn, - const char *xml, - unsigned int flags) { +lxcDomainCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { virLXCDriverPtr driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr def; @@ -1190,10 +1190,10 @@ cleanup: static int -lxcDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +lxcConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { virLXCDriverPtr driver = conn->privateData; int ret; @@ -1209,8 +1209,8 @@ lxcDomainEventRegister(virConnectPtr conn, static int -lxcDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +lxcConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { virLXCDriverPtr driver = conn->privateData; int ret; @@ -1226,12 +1226,12 @@ lxcDomainEventDeregister(virConnectPtr conn, static int -lxcDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +lxcConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { virLXCDriverPtr driver = conn->privateData; int ret; @@ -1249,8 +1249,8 @@ lxcDomainEventRegisterAny(virConnectPtr conn, static int -lxcDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +lxcConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { virLXCDriverPtr driver = conn->privateData; int ret; @@ -1376,9 +1376,9 @@ error: } -static int lxcStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int lxcStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { char *ld; @@ -1475,7 +1475,7 @@ static int lxcStartup(bool privileged, cleanup: lxcDriverUnlock(lxc_driver); - lxcShutdown(); + lxcStateCleanup(); return -1; } @@ -1494,13 +1494,13 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) } /** - * lxcReload: + * lxcStateReload: * * Function to restart the LXC driver, it will recheck the configuration * files and perform autostart */ static int -lxcReload(void) { +lxcStateReload(void) { if (!lxc_driver) return 0; @@ -1517,7 +1517,7 @@ lxcReload(void) { return 0; } -static int lxcShutdown(void) +static int lxcStateCleanup(void) { if (lxc_driver == NULL) return -1; @@ -1547,7 +1547,7 @@ static int lxcShutdown(void) } -static int lxcVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *version) +static int lxcConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *version) { struct utsname ver; @@ -1595,8 +1595,8 @@ cleanup: } -static char *lxcGetSchedulerType(virDomainPtr dom, - int *nparams) +static char *lxcDomainGetSchedulerType(virDomainPtr dom, + int *nparams) { virLXCDriverPtr driver = dom->conn->privateData; char *ret = NULL; @@ -1715,10 +1715,10 @@ cleanup: static int -lxcSetSchedulerParametersFlags(virDomainPtr dom, - virTypedParameterPtr params, - int nparams, - unsigned int flags) +lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; int i; @@ -1841,18 +1841,18 @@ cleanup: } static int -lxcSetSchedulerParameters(virDomainPtr domain, - virTypedParameterPtr params, - int nparams) +lxcDomainSetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams) { - return lxcSetSchedulerParametersFlags(domain, params, nparams, 0); + return lxcDomainSetSchedulerParametersFlags(domain, params, nparams, 0); } static int -lxcGetSchedulerParametersFlags(virDomainPtr dom, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; @@ -1954,11 +1954,11 @@ cleanup: } static int -lxcGetSchedulerParameters(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams) +lxcDomainGetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams) { - return lxcGetSchedulerParametersFlags(domain, params, nparams, 0); + return lxcDomainGetSchedulerParametersFlags(domain, params, nparams, 0); } @@ -2661,8 +2661,8 @@ cleanup: static int -lxcListAllDomains(virConnectPtr conn, - virDomainPtr **domains, +lxcConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, unsigned int flags) { virLXCDriverPtr driver = conn->privateData; @@ -4323,9 +4323,9 @@ static int lxcDomainDetachDevice(virDomainPtr dom, } -static int lxcDomainOpenNamespace(virDomainPtr dom, - int **fdlist, - unsigned int flags) +static int lxcDomainLxcOpenNamespace(virDomainPtr dom, + int **fdlist, + unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; @@ -4372,7 +4372,7 @@ cleanup: static char * -lxcGetSysinfo(virConnectPtr conn, unsigned int flags) +lxcConnectGetSysinfo(virConnectPtr conn, unsigned int flags) { virLXCDriverPtr driver = conn->privateData; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4399,17 +4399,17 @@ lxcGetSysinfo(virConnectPtr conn, unsigned int flags) static virDriver lxcDriver = { .no = VIR_DRV_LXC, .name = LXC_DRIVER_NAME, - .connectOpen = lxcOpen, /* 0.4.2 */ - .connectClose = lxcClose, /* 0.4.2 */ - .connectGetVersion = lxcVersion, /* 0.4.6 */ + .connectOpen = lxcConnectOpen, /* 0.4.2 */ + .connectClose = lxcConnectClose, /* 0.4.2 */ + .connectGetVersion = lxcConnectGetVersion, /* 0.4.6 */ .connectGetHostname = virGetHostname, /* 0.6.3 */ - .connectGetSysinfo = lxcGetSysinfo, /* 1.0.5 */ + .connectGetSysinfo = lxcConnectGetSysinfo, /* 1.0.5 */ .nodeGetInfo = nodeGetInfo, /* 0.6.5 */ - .connectGetCapabilities = lxcGetCapabilities, /* 0.6.5 */ - .connectListDomains = lxcListDomains, /* 0.4.2 */ - .connectNumOfDomains = lxcNumDomains, /* 0.4.2 */ - .connectListAllDomains = lxcListAllDomains, /* 0.9.13 */ - .domainCreateXML = lxcDomainCreateAndStart, /* 0.4.4 */ + .connectGetCapabilities = lxcConnectGetCapabilities, /* 0.6.5 */ + .connectListDomains = lxcConnectListDomains, /* 0.4.2 */ + .connectNumOfDomains = lxcConnectNumOfDomains, /* 0.4.2 */ + .connectListAllDomains = lxcConnectListAllDomains, /* 0.9.13 */ + .domainCreateXML = lxcDomainCreateXML, /* 0.4.4 */ .domainLookupByID = lxcDomainLookupByID, /* 0.4.2 */ .domainLookupByUUID = lxcDomainLookupByUUID, /* 0.4.2 */ .domainLookupByName = lxcDomainLookupByName, /* 0.4.2 */ @@ -4417,7 +4417,7 @@ static virDriver lxcDriver = { .domainResume = lxcDomainResume, /* 0.7.2 */ .domainDestroy = lxcDomainDestroy, /* 0.4.4 */ .domainDestroyFlags = lxcDomainDestroyFlags, /* 0.9.4 */ - .domainGetOSType = lxcGetOSType, /* 0.4.2 */ + .domainGetOSType = lxcDomainGetOSType, /* 0.4.2 */ .domainGetMaxMemory = lxcDomainGetMaxMemory, /* 0.7.2 */ .domainSetMaxMemory = lxcDomainSetMaxMemory, /* 0.7.2 */ .domainSetMemory = lxcDomainSetMemory, /* 0.7.2 */ @@ -4430,11 +4430,11 @@ static virDriver lxcDriver = { .domainGetSecurityLabel = lxcDomainGetSecurityLabel, /* 0.9.10 */ .nodeGetSecurityModel = lxcNodeGetSecurityModel, /* 0.9.10 */ .domainGetXMLDesc = lxcDomainGetXMLDesc, /* 0.4.2 */ - .connectListDefinedDomains = lxcListDefinedDomains, /* 0.4.2 */ - .connectNumOfDefinedDomains = lxcNumDefinedDomains, /* 0.4.2 */ - .domainCreate = lxcDomainStart, /* 0.4.4 */ - .domainCreateWithFlags = lxcDomainStartWithFlags, /* 0.8.2 */ - .domainDefineXML = lxcDomainDefine, /* 0.4.2 */ + .connectListDefinedDomains = lxcConnectListDefinedDomains, /* 0.4.2 */ + .connectNumOfDefinedDomains = lxcConnectNumOfDefinedDomains, /* 0.4.2 */ + .domainCreate = lxcDomainCreate, /* 0.4.4 */ + .domainCreateWithFlags = lxcDomainCreateWithFlags, /* 0.8.2 */ + .domainDefineXML = lxcDomainDefineXML, /* 0.4.2 */ .domainUndefine = lxcDomainUndefine, /* 0.4.2 */ .domainUndefineFlags = lxcDomainUndefineFlags, /* 0.9.4 */ .domainAttachDevice = lxcDomainAttachDevice, /* 1.0.1 */ @@ -4444,28 +4444,28 @@ static virDriver lxcDriver = { .domainUpdateDeviceFlags = lxcDomainUpdateDeviceFlags, /* 1.0.1 */ .domainGetAutostart = lxcDomainGetAutostart, /* 0.7.0 */ .domainSetAutostart = lxcDomainSetAutostart, /* 0.7.0 */ - .domainGetSchedulerType = lxcGetSchedulerType, /* 0.5.0 */ - .domainGetSchedulerParameters = lxcGetSchedulerParameters, /* 0.5.0 */ - .domainGetSchedulerParametersFlags = lxcGetSchedulerParametersFlags, /* 0.9.2 */ - .domainSetSchedulerParameters = lxcSetSchedulerParameters, /* 0.5.0 */ - .domainSetSchedulerParametersFlags = lxcSetSchedulerParametersFlags, /* 0.9.2 */ + .domainGetSchedulerType = lxcDomainGetSchedulerType, /* 0.5.0 */ + .domainGetSchedulerParameters = lxcDomainGetSchedulerParameters, /* 0.5.0 */ + .domainGetSchedulerParametersFlags = lxcDomainGetSchedulerParametersFlags, /* 0.9.2 */ + .domainSetSchedulerParameters = lxcDomainSetSchedulerParameters, /* 0.5.0 */ + .domainSetSchedulerParametersFlags = lxcDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainInterfaceStats = lxcDomainInterfaceStats, /* 0.7.3 */ .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.3 */ .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.6.5 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.6.5 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .connectDomainEventRegister = lxcDomainEventRegister, /* 0.7.0 */ - .connectDomainEventDeregister = lxcDomainEventDeregister, /* 0.7.0 */ - .connectIsEncrypted = lxcIsEncrypted, /* 0.7.3 */ - .connectIsSecure = lxcIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = lxcConnectDomainEventRegister, /* 0.7.0 */ + .connectDomainEventDeregister = lxcConnectDomainEventDeregister, /* 0.7.0 */ + .connectIsEncrypted = lxcConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = lxcConnectIsSecure, /* 0.7.3 */ .domainIsActive = lxcDomainIsActive, /* 0.7.3 */ .domainIsPersistent = lxcDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = lxcDomainIsUpdated, /* 0.8.6 */ - .connectDomainEventRegisterAny = lxcDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = lxcDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = lxcConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = lxcConnectDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = lxcDomainOpenConsole, /* 0.8.6 */ - .connectIsAlive = lxcIsAlive, /* 0.9.8 */ + .connectIsAlive = lxcConnectIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ @@ -4473,14 +4473,14 @@ static virDriver lxcDriver = { .domainShutdown = lxcDomainShutdown, /* 1.0.1 */ .domainShutdownFlags = lxcDomainShutdownFlags, /* 1.0.1 */ .domainReboot = lxcDomainReboot, /* 1.0.1 */ - .domainLxcOpenNamespace = lxcDomainOpenNamespace, /* 1.0.2 */ + .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ }; static virStateDriver lxcStateDriver = { .name = LXC_DRIVER_NAME, - .stateInitialize = lxcStartup, - .stateCleanup = lxcShutdown, - .stateReload = lxcReload, + .stateInitialize = lxcStateInitialize, + .stateCleanup = lxcStateCleanup, + .stateReload = lxcStateReload, }; int lxcRegister(void) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1c0bd7e..53db5d5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -98,7 +98,7 @@ static void networkDriverUnlock(struct network_driver *driver) virMutexUnlock(&driver->lock); } -static int networkShutdown(void); +static int networkStateCleanup(void); static int networkStartNetwork(struct network_driver *driver, virNetworkObjPtr network); @@ -350,14 +350,14 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, #endif /** - * networkStartup: + * networkStateInitialize: * * Initialization function for the QEmu daemon */ static int -networkStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +networkStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { char *base = NULL; #ifdef HAVE_FIREWALLD @@ -472,18 +472,18 @@ error: networkDriverUnlock(driverState); VIR_FREE(base); - networkShutdown(); + networkStateCleanup(); return -1; } /** - * networkReload: + * networkStateReload: * * Function to restart the QEmu daemon, it will recheck the configuration * files and update its state and the networking */ static int -networkReload(void) { +networkStateReload(void) { if (!driverState) return 0; @@ -502,12 +502,12 @@ networkReload(void) { /** - * networkShutdown: + * networkStateCleanup: * * Shutdown the QEmu daemon, it will stop all active domains and networks */ static int -networkShutdown(void) { +networkStateCleanup(void) { if (!driverState) return -1; @@ -2778,9 +2778,9 @@ cleanup: return ret; } -static virDrvOpenStatus networkOpenNetwork(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus networkOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -2791,12 +2791,12 @@ static virDrvOpenStatus networkOpenNetwork(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int networkCloseNetwork(virConnectPtr conn) { +static int networkClose(virConnectPtr conn) { conn->networkPrivateData = NULL; return 0; } -static int networkNumNetworks(virConnectPtr conn) { +static int networkConnectNumOfNetworks(virConnectPtr conn) { int nactive = 0, i; struct network_driver *driver = conn->networkPrivateData; @@ -2812,7 +2812,7 @@ static int networkNumNetworks(virConnectPtr conn) { return nactive; } -static int networkListNetworks(virConnectPtr conn, char **const names, int nnames) { +static int networkConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { struct network_driver *driver = conn->networkPrivateData; int got = 0, i; @@ -2840,7 +2840,7 @@ static int networkListNetworks(virConnectPtr conn, char **const names, int nname return -1; } -static int networkNumDefinedNetworks(virConnectPtr conn) { +static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { int ninactive = 0, i; struct network_driver *driver = conn->networkPrivateData; @@ -2856,7 +2856,7 @@ static int networkNumDefinedNetworks(virConnectPtr conn) { return ninactive; } -static int networkListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { +static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { struct network_driver *driver = conn->networkPrivateData; int got = 0, i; @@ -2884,9 +2884,9 @@ static int networkListDefinedNetworks(virConnectPtr conn, char **const names, in } static int -networkListAllNetworks(virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags) +networkConnectListAllNetworks(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags) { struct network_driver *driver = conn->networkPrivateData; int ret = -1; @@ -3090,7 +3090,7 @@ networkValidate(struct network_driver *driver, return 0; } -static virNetworkPtr networkCreate(virConnectPtr conn, const char *xml) { +static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml) { struct network_driver *driver = conn->networkPrivateData; virNetworkDefPtr def; virNetworkObjPtr network = NULL; @@ -3129,7 +3129,7 @@ cleanup: return ret; } -static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { +static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml) { struct network_driver *driver = conn->networkPrivateData; virNetworkDefPtr def = NULL; bool freeDef = true; @@ -3372,7 +3372,7 @@ cleanup: return ret; } -static int networkStart(virNetworkPtr net) { +static int networkCreate(virNetworkPtr net) { struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3592,20 +3592,20 @@ cleanup: static virNetworkDriver networkDriver = { "Network", - .networkOpen = networkOpenNetwork, /* 0.2.0 */ - .networkClose = networkCloseNetwork, /* 0.2.0 */ - .connectNumOfNetworks = networkNumNetworks, /* 0.2.0 */ - .connectListNetworks = networkListNetworks, /* 0.2.0 */ - .connectNumOfDefinedNetworks = networkNumDefinedNetworks, /* 0.2.0 */ - .connectListDefinedNetworks = networkListDefinedNetworks, /* 0.2.0 */ - .connectListAllNetworks = networkListAllNetworks, /* 0.10.2 */ + .networkOpen = networkOpen, /* 0.2.0 */ + .networkClose = networkClose, /* 0.2.0 */ + .connectNumOfNetworks = networkConnectNumOfNetworks, /* 0.2.0 */ + .connectListNetworks = networkConnectListNetworks, /* 0.2.0 */ + .connectNumOfDefinedNetworks = networkConnectNumOfDefinedNetworks, /* 0.2.0 */ + .connectListDefinedNetworks = networkConnectListDefinedNetworks, /* 0.2.0 */ + .connectListAllNetworks = networkConnectListAllNetworks, /* 0.10.2 */ .networkLookupByUUID = networkLookupByUUID, /* 0.2.0 */ .networkLookupByName = networkLookupByName, /* 0.2.0 */ - .networkCreateXML = networkCreate, /* 0.2.0 */ - .networkDefineXML = networkDefine, /* 0.2.0 */ + .networkCreateXML = networkCreateXML, /* 0.2.0 */ + .networkDefineXML = networkDefineXML, /* 0.2.0 */ .networkUndefine = networkUndefine, /* 0.2.0 */ .networkUpdate = networkUpdate, /* 0.10.2 */ - .networkCreate = networkStart, /* 0.2.0 */ + .networkCreate = networkCreate, /* 0.2.0 */ .networkDestroy = networkDestroy, /* 0.2.0 */ .networkGetXMLDesc = networkGetXMLDesc, /* 0.2.0 */ .networkGetBridgeName = networkGetBridgeName, /* 0.2.0 */ @@ -3617,9 +3617,9 @@ static virNetworkDriver networkDriver = { static virStateDriver networkStateDriver = { .name = "Network", - .stateInitialize = networkStartup, - .stateCleanup = networkShutdown, - .stateReload = networkReload, + .stateInitialize = networkStateInitialize, + .stateCleanup = networkStateCleanup, + .stateReload = networkStateReload, }; int networkRegister(void) { diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 53c9712..4a430dc 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -590,9 +590,9 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static int halNodeDeviceDriverStartup(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int nodeDeviceStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; char **udi = NULL; @@ -691,7 +691,7 @@ static int halNodeDeviceDriverStartup(bool privileged ATTRIBUTE_UNUSED, } -static int halNodeDeviceDriverShutdown(void) +static int nodeDeviceStateCleanup(void) { if (driverState) { nodeDeviceLock(driverState); @@ -708,7 +708,7 @@ static int halNodeDeviceDriverShutdown(void) } -static int halNodeDeviceDriverReload(void) +static int nodeDeviceStateReload(void) { DBusError err; char **udi = NULL; @@ -740,7 +740,7 @@ static int halNodeDeviceDriverReload(void) } -static virDrvOpenStatus halNodeDrvOpen(virConnectPtr conn, +static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { @@ -754,7 +754,7 @@ static virDrvOpenStatus halNodeDrvOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int nodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED) { conn->nodeDevicePrivateData = NULL; return 0; @@ -763,8 +763,8 @@ static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virNodeDeviceDriver halNodeDeviceDriver = { .name = "halNodeDeviceDriver", - .nodeDeviceOpen = halNodeDrvOpen, /* 0.5.0 */ - .nodDeviceClose = halNodeDrvClose, /* 0.5.0 */ + .nodeDeviceOpen = nodeDeviceOpen, /* 0.5.0 */ + .nodDeviceClose = nodDeviceClose, /* 0.5.0 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */ .nodeListDevices = nodeListDevices, /* 0.5.0 */ .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ @@ -781,9 +781,9 @@ static virNodeDeviceDriver halNodeDeviceDriver = { static virStateDriver halStateDriver = { .name = "HAL", - .stateInitialize = halNodeDeviceDriverStartup, /* 0.5.0 */ - .stateCleanup = halNodeDeviceDriverShutdown, /* 0.5.0 */ - .stateReload = halNodeDeviceDriverReload, /* 0.5.0 */ + .stateInitialize = nodeDeviceStateInitialize, /* 0.5.0 */ + .stateCleanup = nodeDeviceStateCleanup, /* 0.5.0 */ + .stateReload = nodeDeviceStateReload, /* 0.5.0 */ }; int halNodeRegister(void) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b8e64c9..92292be 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1437,7 +1437,7 @@ out: } -static int udevNodeDeviceDriverShutdown(void) +static int nodeDeviceStateCleanup(void) { int ret = 0; @@ -1649,9 +1649,9 @@ out: return ret; } -static int udevNodeDeviceDriverStartup(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int nodeDeviceStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { udevPrivate *priv = NULL; struct udev *udev = NULL; @@ -1758,21 +1758,21 @@ out_unlock: out: if (ret == -1) { - udevNodeDeviceDriverShutdown(); + nodeDeviceStateCleanup(); } return ret; } -static int udevNodeDeviceDriverReload(void) +static int nodeDeviceStateReload(void) { return 0; } -static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1785,7 +1785,7 @@ static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int udevNodeDrvClose(virConnectPtr conn) +static int nodeDeviceClose(virConnectPtr conn) { conn->nodeDevicePrivateData = NULL; return 0; @@ -1793,8 +1793,8 @@ static int udevNodeDrvClose(virConnectPtr conn) static virNodeDeviceDriver udevNodeDeviceDriver = { .name = "udevNodeDeviceDriver", - .nodeDeviceOpen = udevNodeDrvOpen, /* 0.7.3 */ - .nodeDeviceClose = udevNodeDrvClose, /* 0.7.3 */ + .nodeDeviceOpen = nodeDeviceOpen, /* 0.7.3 */ + .nodeDeviceClose = nodeDeviceClose, /* 0.7.3 */ .nodeNumOfDevices = nodeNumOfDevices, /* 0.7.3 */ .nodeListDevices = nodeListDevices, /* 0.7.3 */ .connectListAllNodeDevices = nodeListAllNodeDevices, /* 0.10.2 */ @@ -1810,9 +1810,9 @@ static virNodeDeviceDriver udevNodeDeviceDriver = { static virStateDriver udevStateDriver = { .name = "udev", - .stateInitialize = udevNodeDeviceDriverStartup, /* 0.7.3 */ - .stateCleanup = udevNodeDeviceDriverShutdown, /* 0.7.3 */ - .stateReload = udevNodeDeviceDriverReload, /* 0.7.3 */ + .stateInitialize = nodeDeviceStateInitialize, /* 0.7.3 */ + .stateCleanup = nodeDeviceStateCleanup, /* 0.7.3 */ + .stateReload = nodeDeviceStateReload, /* 0.7.3 */ }; int udevNodeRegister(void) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2934fec..7892807 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -62,9 +62,9 @@ static virNWFilterDriverStatePtr driverState; -static int nwfilterDriverShutdown(void); +static int nwfilterStateCleanup(void); -static int nwfilterDriverReload(void); +static int nwfilterStateReload(void); static void nwfilterDriverLock(virNWFilterDriverStatePtr driver) { @@ -87,7 +87,7 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterDriverReload(); + nwfilterStateReload(); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -160,14 +160,14 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED) #endif /* HAVE_FIREWALLD */ /** - * virNWFilterStartup: + * nwfilterStateInitialize: * * Initialization function for the QEmu daemon */ static int -nwfilterDriverStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +nwfilterStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { char *base = NULL; DBusConnection *sysbus = NULL; @@ -244,7 +244,7 @@ out_of_memory: error: VIR_FREE(base); nwfilterDriverUnlock(driverState); - nwfilterDriverShutdown(); + nwfilterStateCleanup(); return -1; @@ -263,13 +263,13 @@ err_free_driverstate: } /** - * virNWFilterReload: + * nwfilterStateReload: * * Function to restart the nwfilter driver, it will recheck the configuration * files and update its state */ static int -nwfilterDriverReload(void) { +nwfilterStateReload(void) { virConnectPtr conn; if (!driverState) { @@ -328,12 +328,12 @@ virNWFilterDriverIsWatchingFirewallD(void) } /** - * virNWFilterShutdown: + * nwfilterStateCleanup: * * Shutdown the nwfilter driver, it will stop all active nwfilters */ static int -nwfilterDriverShutdown(void) { +nwfilterStateCleanup(void) { if (!driverState) return -1; @@ -437,16 +437,16 @@ nwfilterClose(virConnectPtr conn) { static int -nwfilterNumNWFilters(virConnectPtr conn) { +nwfilterConnectNumOfNWFilters(virConnectPtr conn) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; return driver->nwfilters.count; } static int -nwfilterListNWFilters(virConnectPtr conn, - char **const names, - int nnames) { +nwfilterConnectListNWFilters(virConnectPtr conn, + char **const names, + int nnames) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; int got = 0, i; @@ -474,9 +474,9 @@ nwfilterListNWFilters(virConnectPtr conn, static int -nwfilterListAllNWFilters(virConnectPtr conn, - virNWFilterPtr **filters, - unsigned int flags) { +nwfilterConnectListAllNWFilters(virConnectPtr conn, + virNWFilterPtr **filters, + unsigned int flags) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterPtr *tmp_filters = NULL; int nfilters = 0; @@ -529,8 +529,8 @@ nwfilterListAllNWFilters(virConnectPtr conn, } static virNWFilterPtr -nwfilterDefine(virConnectPtr conn, - const char *xml) +nwfilterDefineXML(virConnectPtr conn, + const char *xml) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterDefPtr def; @@ -661,12 +661,12 @@ static virNWFilterDriver nwfilterDriver = { .name = "nwfilter", .nwfilterOpen = nwfilterOpen, /* 0.8.0 */ .nwfilterClose = nwfilterClose, /* 0.8.0 */ - .connectNumOfNWFilters = nwfilterNumNWFilters, /* 0.8.0 */ - .connectListNWFilters = nwfilterListNWFilters, /* 0.8.0 */ - .connectListAllNWFilters = nwfilterListAllNWFilters, /* 0.10.2 */ + .connectNumOfNWFilters = nwfilterConnectNumOfNWFilters, /* 0.8.0 */ + .connectListNWFilters = nwfilterConnectListNWFilters, /* 0.8.0 */ + .connectListAllNWFilters = nwfilterConnectListAllNWFilters, /* 0.10.2 */ .nwfilterLookupByName = nwfilterLookupByName, /* 0.8.0 */ .nwfilterLookupByUUID = nwfilterLookupByUUID, /* 0.8.0 */ - .nwfilterDefineXML = nwfilterDefine, /* 0.8.0 */ + .nwfilterDefineXML = nwfilterDefineXML, /* 0.8.0 */ .nwfilterUndefine = nwfilterUndefine, /* 0.8.0 */ .nwfilterGetXMLDesc = nwfilterGetXMLDesc, /* 0.8.0 */ }; @@ -674,9 +674,9 @@ static virNWFilterDriver nwfilterDriver = { static virStateDriver stateDriver = { .name = "NWFilter", - .stateInitialize = nwfilterDriverStartup, - .stateCleanup = nwfilterDriverShutdown, - .stateReload = nwfilterDriverReload, + .stateInitialize = nwfilterStateInitialize, + .stateCleanup = nwfilterStateCleanup, + .stateReload = nwfilterStateReload, }; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 0e3d91d..f8bec62 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -68,7 +68,7 @@ #define OPENVZ_NB_MEM_PARAM 3 static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid); -static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); +static int openvzConnectGetMaxVcpus(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); static int openvzDomainSetVcpusInternal(virDomainObjPtr vm, unsigned int nvcpus); @@ -335,7 +335,7 @@ cleanup: return dom; } -static int openvzGetVersion(virConnectPtr conn, unsigned long *version) { +static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) { struct openvz_driver *driver = conn->privateData; openvzDriverLock(driver); *version = driver->version; @@ -343,7 +343,7 @@ static int openvzGetVersion(virConnectPtr conn, unsigned long *version) { return 0; } -static char *openvzGetOSType(virDomainPtr dom) +static char *openvzDomainGetOSType(virDomainPtr dom) { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -712,6 +712,18 @@ openvzDomainShutdown(virDomainPtr dom) return openvzDomainShutdownFlags(dom, 0); } +static int +openvzDomainDestroy(virDomainPtr dom) +{ + return openvzDomainShutdownFlags(dom, 0); +} + +static int +openvzDomainDestroyFlags(virDomainPtr dom, unsigned int flags) +{ + return openvzDomainShutdownFlags(dom, flags); +} + static int openvzDomainReboot(virDomainPtr dom, unsigned int flags) { @@ -1326,8 +1338,8 @@ cleanup: return ret; } -static int openvzGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type) +static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type) { if (type == NULL || STRCASEEQ(type, "openvz")) return 1028; /* OpenVZ has no limitation */ @@ -1347,7 +1359,7 @@ openvzDomainGetVcpusFlags(virDomainPtr dom ATTRIBUTE_UNUSED, return -1; } - return openvzGetMaxVCPUs(NULL, "openvz"); + return openvzConnectGetMaxVcpus(NULL, "openvz"); } static int openvzDomainGetMaxVcpus(virDomainPtr dom) @@ -1428,9 +1440,9 @@ openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) return openvzDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_AFFECT_LIVE); } -static virDrvOpenStatus openvzOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { struct openvz_driver *driver; @@ -1510,7 +1522,7 @@ cleanup: return VIR_DRV_OPEN_ERROR; }; -static int openvzClose(virConnectPtr conn) { +static int openvzConnectClose(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; openvzFreeDriver(driver); @@ -1519,27 +1531,27 @@ static int openvzClose(virConnectPtr conn) { return 0; } -static const char *openvzGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { +static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "OpenVZ"; } -static int openvzIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Encryption is not relevant / applicable to way we talk to openvz */ return 0; } -static int openvzIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* We run CLI tools directly so this is secure */ return 1; } static int -openvzIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +openvzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static char *openvzGetCapabilities(virConnectPtr conn) { +static char *openvzConnectGetCapabilities(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; char *ret; @@ -1550,8 +1562,8 @@ static char *openvzGetCapabilities(virConnectPtr conn) { return ret; } -static int openvzListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, - int *ids, int nids) { +static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, + int *ids, int nids) { int got = 0; int veid; int outfd = -1; @@ -1593,7 +1605,7 @@ cleanup: return rc; } -static int openvzNumDomains(virConnectPtr conn) { +static int openvzConnectNumOfDomains(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; int n; @@ -1604,8 +1616,8 @@ static int openvzNumDomains(virConnectPtr conn) { return n; } -static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names, int nnames) { +static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names, int nnames) { int got = 0; int veid, outfd = -1, ret; int rc = -1; @@ -1707,7 +1719,7 @@ Version: 2.2 return 0; } -static int openvzNumDefinedDomains(virConnectPtr conn) { +static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; int n; @@ -2146,9 +2158,9 @@ cleanup: } static int -openvzListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +openvzConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { struct openvz_driver *driver = conn->privateData; int ret = -1; @@ -2166,22 +2178,22 @@ openvzListAllDomains(virConnectPtr conn, static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", - .connectOpen = openvzOpen, /* 0.3.1 */ - .connectClose = openvzClose, /* 0.3.1 */ - .connectGetType = openvzGetType, /* 0.3.1 */ - .connectGetVersion = openvzGetVersion, /* 0.5.0 */ + .connectOpen = openvzConnectOpen, /* 0.3.1 */ + .connectClose = openvzConnectClose, /* 0.3.1 */ + .connectGetType = openvzConnectGetType, /* 0.3.1 */ + .connectGetVersion = openvzConnectGetVersion, /* 0.5.0 */ .connectGetHostname = virGetHostname, /* 0.9.12 */ - .connectGetMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ + .connectGetMaxVcpus = openvzConnectGetMaxVcpus, /* 0.4.6 */ .nodeGetInfo = nodeGetInfo, /* 0.3.2 */ .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.12 */ .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.12 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.9.12 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.9.12 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .connectGetCapabilities = openvzGetCapabilities, /* 0.4.6 */ - .connectListDomains = openvzListDomains, /* 0.3.1 */ - .connectNumOfDomains = openvzNumDomains, /* 0.3.1 */ - .connectListAllDomains = openvzListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = openvzConnectGetCapabilities, /* 0.4.6 */ + .connectListDomains = openvzConnectListDomains, /* 0.3.1 */ + .connectNumOfDomains = openvzConnectNumOfDomains, /* 0.3.1 */ + .connectListAllDomains = openvzConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = openvzDomainCreateXML, /* 0.3.3 */ .domainLookupByID = openvzDomainLookupByID, /* 0.3.1 */ .domainLookupByUUID = openvzDomainLookupByUUID, /* 0.3.1 */ @@ -2191,9 +2203,9 @@ static virDriver openvzDriver = { .domainShutdown = openvzDomainShutdown, /* 0.3.1 */ .domainShutdownFlags = openvzDomainShutdownFlags, /* 0.9.10 */ .domainReboot = openvzDomainReboot, /* 0.3.1 */ - .domainDestroy = openvzDomainShutdown, /* 0.3.1 */ - .domainDestroyFlags = openvzDomainShutdownFlags, /* 0.9.4 */ - .domainGetOSType = openvzGetOSType, /* 0.3.1 */ + .domainDestroy = openvzDomainDestroy, /* 0.3.1 */ + .domainDestroyFlags = openvzDomainDestroyFlags, /* 0.9.4 */ + .domainGetOSType = openvzDomainGetOSType, /* 0.3.1 */ .domainGetMemoryParameters = openvzDomainGetMemoryParameters, /* 0.9.12 */ .domainSetMemoryParameters = openvzDomainSetMemoryParameters, /* 0.9.12 */ .domainGetInfo = openvzDomainGetInfo, /* 0.3.1 */ @@ -2203,8 +2215,8 @@ static virDriver openvzDriver = { .domainGetVcpusFlags = openvzDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = openvzDomainGetMaxVcpus, /* 0.4.6 */ .domainGetXMLDesc = openvzDomainGetXMLDesc, /* 0.4.6 */ - .connectListDefinedDomains = openvzListDefinedDomains, /* 0.3.1 */ - .connectNumOfDefinedDomains = openvzNumDefinedDomains, /* 0.3.1 */ + .connectListDefinedDomains = openvzConnectListDefinedDomains, /* 0.3.1 */ + .connectNumOfDefinedDomains = openvzConnectNumOfDefinedDomains, /* 0.3.1 */ .domainCreate = openvzDomainCreate, /* 0.3.1 */ .domainCreateWithFlags = openvzDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = openvzDomainDefineXML, /* 0.3.3 */ @@ -2213,12 +2225,12 @@ static virDriver openvzDriver = { .domainGetAutostart = openvzDomainGetAutostart, /* 0.4.6 */ .domainSetAutostart = openvzDomainSetAutostart, /* 0.4.6 */ .domainInterfaceStats = openvzDomainInterfaceStats, /* 0.9.12 */ - .connectIsEncrypted = openvzIsEncrypted, /* 0.7.3 */ - .connectIsSecure = openvzIsSecure, /* 0.7.3 */ + .connectIsEncrypted = openvzConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = openvzConnectIsSecure, /* 0.7.3 */ .domainIsActive = openvzDomainIsActive, /* 0.7.3 */ .domainIsPersistent = openvzDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = openvzDomainIsUpdated, /* 0.8.6 */ - .connectIsAlive = openvzIsAlive, /* 0.9.8 */ + .connectIsAlive = openvzConnectIsAlive, /* 0.9.8 */ .domainUpdateDeviceFlags = openvzDomainUpdateDeviceFlags, /* 0.9.13 */ .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ }; diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 851881e..e126967 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -68,7 +68,7 @@ #define IS_CT(def) (STREQ_NULLABLE(def->os.type, "exe")) -static int parallelsClose(virConnectPtr conn); +static int parallelsConnectClose(virConnectPtr conn); static const char * parallelsGetDiskBusName(int bus) { switch (bus) { @@ -151,7 +151,7 @@ parallelsBuildCapabilities(void) } static char * -parallelsGetCapabilities(virConnectPtr conn) +parallelsConnectGetCapabilities(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; char *xml; @@ -947,9 +947,9 @@ parallelsOpenDefault(virConnectPtr conn) } static virDrvOpenStatus -parallelsOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +parallelsConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { int ret; @@ -980,7 +980,7 @@ parallelsOpen(virConnectPtr conn, } static int -parallelsClose(virConnectPtr conn) +parallelsConnectClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; @@ -998,7 +998,7 @@ parallelsClose(virConnectPtr conn) } static int -parallelsGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) +parallelsConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) { char *output, *sVer, *tmp; const char *searchStr = "prlsrvctl version "; @@ -1044,7 +1044,7 @@ cleanup: } static int -parallelsListDomains(virConnectPtr conn, int *ids, int maxids) +parallelsConnectListDomains(virConnectPtr conn, int *ids, int maxids) { parallelsConnPtr privconn = conn->privateData; int n; @@ -1057,7 +1057,7 @@ parallelsListDomains(virConnectPtr conn, int *ids, int maxids) } static int -parallelsNumOfDomains(virConnectPtr conn) +parallelsConnectNumOfDomains(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; int count; @@ -1070,7 +1070,7 @@ parallelsNumOfDomains(virConnectPtr conn) } static int -parallelsListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) +parallelsConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { parallelsConnPtr privconn = conn->privateData; int n; @@ -1085,7 +1085,7 @@ parallelsListDefinedDomains(virConnectPtr conn, char **const names, int maxnames } static int -parallelsNumOfDefinedDomains(virConnectPtr conn) +parallelsConnectNumOfDefinedDomains(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; int count; @@ -1098,9 +1098,9 @@ parallelsNumOfDefinedDomains(virConnectPtr conn) } static int -parallelsListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +parallelsConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { parallelsConnPtr privconn = conn->privateData; int ret = -1; @@ -1114,7 +1114,7 @@ parallelsListAllDomains(virConnectPtr conn, } static virDomainPtr -parallelsLookupDomainByID(virConnectPtr conn, int id) +parallelsDomainLookupByID(virConnectPtr conn, int id) { parallelsConnPtr privconn = conn->privateData; virDomainPtr ret = NULL; @@ -1140,7 +1140,7 @@ parallelsLookupDomainByID(virConnectPtr conn, int id) } static virDomainPtr -parallelsLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid) +parallelsDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { parallelsConnPtr privconn = conn->privateData; virDomainPtr ret = NULL; @@ -1169,7 +1169,7 @@ parallelsLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid) } static virDomainPtr -parallelsLookupDomainByName(virConnectPtr conn, const char *name) +parallelsDomainLookupByName(virConnectPtr conn, const char *name) { parallelsConnPtr privconn = conn->privateData; virDomainPtr ret = NULL; @@ -1196,7 +1196,7 @@ parallelsLookupDomainByName(virConnectPtr conn, const char *name) } static int -parallelsGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info) +parallelsDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { parallelsConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -1225,7 +1225,7 @@ parallelsGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info) } static char * -parallelsGetOSType(virDomainPtr domain) +parallelsDomainGetOSType(virDomainPtr domain) { parallelsConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -1404,7 +1404,7 @@ static int parallelsPause(virDomainObjPtr privdom) } static int -parallelsPauseDomain(virDomainPtr domain) +parallelsDomainSuspend(virDomainPtr domain) { return parallelsDomainChangeState(domain, VIR_DOMAIN_RUNNING, "running", @@ -1418,7 +1418,7 @@ static int parallelsResume(virDomainObjPtr privdom) } static int -parallelsResumeDomain(virDomainPtr domain) +parallelsDomainResume(virDomainPtr domain) { return parallelsDomainChangeState(domain, VIR_DOMAIN_PAUSED, "paused", @@ -1446,7 +1446,7 @@ static int parallelsKill(virDomainObjPtr privdom) } static int -parallelsDestroyDomain(virDomainPtr domain) +parallelsDomainDestroy(virDomainPtr domain) { return parallelsDomainChangeState(domain, VIR_DOMAIN_RUNNING, "running", @@ -1460,7 +1460,7 @@ static int parallelsStop(virDomainObjPtr privdom) } static int -parallelsShutdownDomain(virDomainPtr domain) +parallelsDomainShutdown(virDomainPtr domain) { return parallelsDomainChangeState(domain, VIR_DOMAIN_RUNNING, "running", @@ -1650,7 +1650,7 @@ static int parallelsAddHddByVolume(parallelsDomObjPtr pdom, if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (parallelsStorageVolumeDefRemove(pool, voldef)) + if (parallelsStorageVolDefRemove(pool, voldef)) goto cleanup; ret = 0; @@ -1669,7 +1669,7 @@ static int parallelsAddHdd(virConnectPtr conn, virStorageVolPtr vol = NULL; int ret = -1; - if (!(vol = parallelsStorageVolumeLookupByPathLocked(conn, disk->src))) { + if (!(vol = parallelsStorageVolLookupByPathLocked(conn, disk->src))) { virReportError(VIR_ERR_INVALID_ARG, _("Can't find volume with path '%s'"), disk->src); return -1; @@ -2229,7 +2229,7 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def) if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK) continue; - vol = parallelsStorageVolumeLookupByPathLocked(conn, def->disks[i]->src); + vol = parallelsStorageVolLookupByPathLocked(conn, def->disks[i]->src); if (!vol) { virReportError(VIR_ERR_INVALID_ARG, _("Can't find volume with path '%s'"), @@ -2390,30 +2390,30 @@ parallelsDomainDefineXML(virConnectPtr conn, const char *xml) static virDriver parallelsDriver = { .no = VIR_DRV_PARALLELS, .name = "Parallels", - .connectOpen = parallelsOpen, /* 0.10.0 */ - .connectClose = parallelsClose, /* 0.10.0 */ - .connectGetVersion = parallelsGetVersion, /* 0.10.0 */ + .connectOpen = parallelsConnectOpen, /* 0.10.0 */ + .connectClose = parallelsConnectClose, /* 0.10.0 */ + .connectGetVersion = parallelsConnectGetVersion, /* 0.10.0 */ .connectGetHostname = virGetHostname, /* 0.10.0 */ .nodeGetInfo = nodeGetInfo, /* 0.10.0 */ - .connectGetCapabilities = parallelsGetCapabilities, /* 0.10.0 */ - .connectListDomains = parallelsListDomains, /* 0.10.0 */ - .connectNumOfDomains = parallelsNumOfDomains, /* 0.10.0 */ - .connectListDefinedDomains = parallelsListDefinedDomains, /* 0.10.0 */ - .connectNumOfDefinedDomains = parallelsNumOfDefinedDomains, /* 0.10.0 */ - .connectListAllDomains = parallelsListAllDomains, /* 0.10.0 */ - .domainLookupByID = parallelsLookupDomainByID, /* 0.10.0 */ - .domainLookupByUUID = parallelsLookupDomainByUUID, /* 0.10.0 */ - .domainLookupByName = parallelsLookupDomainByName, /* 0.10.0 */ - .domainGetOSType = parallelsGetOSType, /* 0.10.0 */ - .domainGetInfo = parallelsGetDomainInfo, /* 0.10.0 */ + .connectGetCapabilities = parallelsConnectGetCapabilities, /* 0.10.0 */ + .connectListDomains = parallelsConnectListDomains, /* 0.10.0 */ + .connectNumOfDomains = parallelsConnectNumOfDomains, /* 0.10.0 */ + .connectListDefinedDomains = parallelsConnectListDefinedDomains, /* 0.10.0 */ + .connectNumOfDefinedDomains = parallelsConnectNumOfDefinedDomains, /* 0.10.0 */ + .connectListAllDomains = parallelsConnectListAllDomains, /* 0.10.0 */ + .domainLookupByID = parallelsDomainLookupByID, /* 0.10.0 */ + .domainLookupByUUID = parallelsDomainLookupByUUID, /* 0.10.0 */ + .domainLookupByName = parallelsDomainLookupByName, /* 0.10.0 */ + .domainGetOSType = parallelsDomainGetOSType, /* 0.10.0 */ + .domainGetInfo = parallelsDomainGetInfo, /* 0.10.0 */ .domainGetState = parallelsDomainGetState, /* 0.10.0 */ .domainGetXMLDesc = parallelsDomainGetXMLDesc, /* 0.10.0 */ .domainIsPersistent = parallelsDomainIsPersistent, /* 0.10.0 */ .domainGetAutostart = parallelsDomainGetAutostart, /* 0.10.0 */ - .domainSuspend = parallelsPauseDomain, /* 0.10.0 */ - .domainResume = parallelsResumeDomain, /* 0.10.0 */ - .domainDestroy = parallelsDestroyDomain, /* 0.10.0 */ - .domainShutdown = parallelsShutdownDomain, /* 0.10.0 */ + .domainSuspend = parallelsDomainSuspend, /* 0.10.0 */ + .domainResume = parallelsDomainResume, /* 0.10.0 */ + .domainDestroy = parallelsDomainDestroy, /* 0.10.0 */ + .domainShutdown = parallelsDomainShutdown, /* 0.10.0 */ .domainCreate = parallelsDomainCreate, /* 0.10.0 */ .domainDefineXML = parallelsDomainDefineXML, /* 0.10.0 */ }; diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 1f55b19..c61e280 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -334,7 +334,7 @@ cleanup: } static virDrvOpenStatus -parallelsOpenNetwork(virConnectPtr conn, +parallelsNetworkOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { @@ -351,7 +351,7 @@ parallelsOpenNetwork(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int parallelsCloseNetwork(virConnectPtr conn) +static int parallelsNetworkClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; parallelsDriverLock(privconn); @@ -360,7 +360,7 @@ static int parallelsCloseNetwork(virConnectPtr conn) return 0; } -static int parallelsNumNetworks(virConnectPtr conn) +static int parallelsConnectNumOfNetworks(virConnectPtr conn) { int nactive = 0, i; parallelsConnPtr privconn = conn->privateData; @@ -377,9 +377,9 @@ static int parallelsNumNetworks(virConnectPtr conn) return nactive; } -static int parallelsListNetworks(virConnectPtr conn, - char **const names, - int nnames) +static int parallelsConnectListNetworks(virConnectPtr conn, + char **const names, + int nnames) { parallelsConnPtr privconn = conn->privateData; int got = 0, i; @@ -408,7 +408,7 @@ static int parallelsListNetworks(virConnectPtr conn, return -1; } -static int parallelsNumDefinedNetworks(virConnectPtr conn) +static int parallelsConnectNumOfDefinedNetworks(virConnectPtr conn) { int ninactive = 0, i; parallelsConnPtr privconn = conn->privateData; @@ -425,9 +425,9 @@ static int parallelsNumDefinedNetworks(virConnectPtr conn) return ninactive; } -static int parallelsListDefinedNetworks(virConnectPtr conn, - char **const names, - int nnames) +static int parallelsConnectListDefinedNetworks(virConnectPtr conn, + char **const names, + int nnames) { parallelsConnPtr privconn = conn->privateData; int got = 0, i; @@ -455,9 +455,9 @@ static int parallelsListDefinedNetworks(virConnectPtr conn, return -1; } -static int parallelsListAllNetworks(virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags) +static int parallelsConnectListAllNetworks(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags) { parallelsConnPtr privconn = conn->privateData; int ret = -1; @@ -614,13 +614,13 @@ cleanup: } static virNetworkDriver parallelsNetworkDriver = { "Parallels", - .networkOpen = parallelsOpenNetwork, /* 1.0.1 */ - .networkClose = parallelsCloseNetwork, /* 1.0.1 */ - .connectNumOfNetworks = parallelsNumNetworks, /* 1.0.1 */ - .connectListNetworks = parallelsListNetworks, /* 1.0.1 */ - .connectNumOfDefinedNetworks = parallelsNumDefinedNetworks, /* 1.0.1 */ - .connectListDefinedNetworks = parallelsListDefinedNetworks, /* 1.0.1 */ - .connectListAllNetworks = parallelsListAllNetworks, /* 1.0.1 */ + .networkOpen = parallelsNetworkOpen, /* 1.0.1 */ + .networkClose = parallelsNetworkClose, /* 1.0.1 */ + .connectNumOfNetworks = parallelsConnectNumOfNetworks, /* 1.0.1 */ + .connectListNetworks = parallelsConnectListNetworks, /* 1.0.1 */ + .connectNumOfDefinedNetworks = parallelsConnectNumOfDefinedNetworks, /* 1.0.1 */ + .connectListDefinedNetworks = parallelsConnectListDefinedNetworks, /* 1.0.1 */ + .connectListAllNetworks = parallelsConnectListAllNetworks, /* 1.0.1 */ .networkLookupByUUID = parallelsNetworkLookupByUUID, /* 1.0.1 */ .networkLookupByName = parallelsNetworkLookupByName, /* 1.0.1 */ .networkGetXMLDesc = parallelsNetworkGetXMLDesc, /* 1.0.1 */ diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 6bd117a..cf2f790 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -45,10 +45,10 @@ _("pool '%s' not found"), pool_name); static virStorageVolDefPtr -parallelsStorageVolumeDefine(virStoragePoolObjPtr pool, const char *xmldesc, +parallelsStorageVolDefineXML(virStoragePoolObjPtr pool, const char *xmldesc, const char *xmlfile, bool is_new); static virStorageVolPtr -parallelsStorageVolumeLookupByPath(virConnectPtr conn, const char *path); +parallelsStorageVolLookupByPath(virConnectPtr conn, const char *path); static int parallelsStoragePoolGetAlloc(virStoragePoolDefPtr def); @@ -108,7 +108,7 @@ parallelsFindVolumes(virStoragePoolObjPtr pool) virReportOOMError(); goto cleanup; } - if (!parallelsStorageVolumeDefine(pool, NULL, path, false)) + if (!parallelsStorageVolDefineXML(pool, NULL, path, false)) goto cleanup; VIR_FREE(path); @@ -513,7 +513,7 @@ error: } static int -parallelsStorageNumPools(virConnectPtr conn) +parallelsConnectNumOfStoragePools(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; int numActive = 0; @@ -529,7 +529,7 @@ parallelsStorageNumPools(virConnectPtr conn) } static int -parallelsStorageListPools(virConnectPtr conn, char **const names, int nnames) +parallelsConnectListStoragePools(virConnectPtr conn, char **const names, int nnames) { parallelsConnPtr privconn = conn->privateData; int n = 0; @@ -559,7 +559,7 @@ no_memory: } static int -parallelsStorageNumDefinedPools(virConnectPtr conn) +parallelsConnectNumOfDefinedStoragePools(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; int numInactive = 0; @@ -578,8 +578,8 @@ parallelsStorageNumDefinedPools(virConnectPtr conn) } static int -parallelsStorageListDefinedPools(virConnectPtr conn, - char **const names, int nnames) +parallelsConnectListDefinedStoragePools(virConnectPtr conn, + char **const names, int nnames) { parallelsConnPtr privconn = conn->privateData; int n = 0; @@ -719,8 +719,8 @@ parallelsStoragePoolGetAlloc(virStoragePoolDefPtr def) } static virStoragePoolPtr -parallelsStoragePoolDefine(virConnectPtr conn, - const char *xml, unsigned int flags) +parallelsStoragePoolDefineXML(virConnectPtr conn, + const char *xml, unsigned int flags) { parallelsConnPtr privconn = conn->privateData; virStoragePoolDefPtr def; @@ -812,7 +812,7 @@ cleanup: } static int -parallelsStoragePoolStart(virStoragePoolPtr pool, unsigned int flags) +parallelsStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { parallelsConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; @@ -1028,7 +1028,7 @@ cleanup: } static int -parallelsStoragePoolNumVolumes(virStoragePoolPtr pool) +parallelsStoragePoolNumOfVolumes(virStoragePoolPtr pool) { parallelsConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; @@ -1104,7 +1104,7 @@ error: } static virStorageVolPtr -parallelsStorageVolumeLookupByName(virStoragePoolPtr pool, +parallelsStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { parallelsConnPtr privconn = pool->conn->privateData; @@ -1148,7 +1148,7 @@ cleanup: static virStorageVolPtr -parallelsStorageVolumeLookupByKey(virConnectPtr conn, const char *key) +parallelsStorageVolLookupByKey(virConnectPtr conn, const char *key) { parallelsConnPtr privconn = conn->privateData; size_t i; @@ -1182,7 +1182,7 @@ parallelsStorageVolumeLookupByKey(virConnectPtr conn, const char *key) } virStorageVolPtr -parallelsStorageVolumeLookupByPathLocked(virConnectPtr conn, const char *path) +parallelsStorageVolLookupByPathLocked(virConnectPtr conn, const char *path) { parallelsConnPtr privconn = conn->privateData; size_t i; @@ -1214,20 +1214,20 @@ parallelsStorageVolumeLookupByPathLocked(virConnectPtr conn, const char *path) } static virStorageVolPtr -parallelsStorageVolumeLookupByPath(virConnectPtr conn, const char *path) +parallelsStorageVolLookupByPath(virConnectPtr conn, const char *path) { parallelsConnPtr privconn = conn->privateData; virStorageVolPtr ret = NULL; parallelsDriverLock(privconn); - ret = parallelsStorageVolumeLookupByPathLocked(conn, path); + ret = parallelsStorageVolLookupByPathLocked(conn, path); parallelsDriverUnlock(privconn); return ret; } static virStorageVolDefPtr -parallelsStorageVolumeDefine(virStoragePoolObjPtr pool, +parallelsStorageVolDefineXML(virStoragePoolObjPtr pool, const char *xmldesc, const char *xmlfile, bool is_new) { @@ -1305,7 +1305,7 @@ cleanup: } static virStorageVolPtr -parallelsStorageVolumeCreateXML(virStoragePoolPtr pool, +parallelsStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc, unsigned int flags) { parallelsConnPtr privconn = pool->conn->privateData; @@ -1330,7 +1330,7 @@ parallelsStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; } - privvol = parallelsStorageVolumeDefine(privpool, xmldesc, NULL, true); + privvol = parallelsStorageVolDefineXML(privpool, xmldesc, NULL, true); if (!privvol) goto cleanup; @@ -1344,7 +1344,7 @@ cleanup: } static virStorageVolPtr -parallelsStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, +parallelsStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, virStorageVolPtr clonevol, unsigned int flags) @@ -1436,7 +1436,7 @@ cleanup: return ret; } -int parallelsStorageVolumeDefRemove(virStoragePoolObjPtr privpool, +int parallelsStorageVolDefRemove(virStoragePoolObjPtr privpool, virStorageVolDefPtr privvol) { int ret = -1; @@ -1484,7 +1484,7 @@ cleanup: } static int -parallelsStorageVolumeDelete(virStorageVolPtr vol, unsigned int flags) +parallelsStorageVolDelete(virStorageVolPtr vol, unsigned int flags) { parallelsConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -1518,7 +1518,7 @@ parallelsStorageVolumeDelete(virStorageVolPtr vol, unsigned int flags) } - if (parallelsStorageVolumeDefRemove(privpool, privvol)) + if (parallelsStorageVolDefRemove(privpool, privvol)) goto cleanup; ret = 0; @@ -1531,7 +1531,7 @@ cleanup: static int -parallelsStorageVolumeTypeForPool(int pooltype) +parallelsStorageVolTypeForPool(int pooltype) { switch (pooltype) { @@ -1545,7 +1545,7 @@ default: } static int -parallelsStorageVolumeGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) +parallelsStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) { parallelsConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -1576,7 +1576,7 @@ parallelsStorageVolumeGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) } memset(info, 0, sizeof(*info)); - info->type = parallelsStorageVolumeTypeForPool(privpool->def->type); + info->type = parallelsStorageVolTypeForPool(privpool->def->type); info->capacity = privvol->capacity; info->allocation = privvol->allocation; ret = 0; @@ -1588,7 +1588,7 @@ cleanup: } static char * -parallelsStorageVolumeGetXMLDesc(virStorageVolPtr vol, unsigned int flags) +parallelsStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { parallelsConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -1629,7 +1629,7 @@ cleanup: } static char * -parallelsStorageVolumeGetPath(virStorageVolPtr vol) +parallelsStorageVolGetPath(virStorageVolPtr vol) { parallelsConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -1674,34 +1674,34 @@ static virStorageDriver parallelsStorageDriver = { .storageOpen = parallelsStorageOpen, /* 0.10.0 */ .storageClose = parallelsStorageClose, /* 0.10.0 */ - .connectNumOfStoragePools = parallelsStorageNumPools, /* 0.10.0 */ - .connectListStoragePools = parallelsStorageListPools, /* 0.10.0 */ - .connectNumOfDefinedStoragePools = parallelsStorageNumDefinedPools, /* 0.10.0 */ - .connectListDefinedStoragePools = parallelsStorageListDefinedPools, /* 0.10.0 */ + .connectNumOfStoragePools = parallelsConnectNumOfStoragePools, /* 0.10.0 */ + .connectListStoragePools = parallelsConnectListStoragePools, /* 0.10.0 */ + .connectNumOfDefinedStoragePools = parallelsConnectNumOfDefinedStoragePools, /* 0.10.0 */ + .connectListDefinedStoragePools = parallelsConnectListDefinedStoragePools, /* 0.10.0 */ .storagePoolLookupByName = parallelsStoragePoolLookupByName, /* 0.10.0 */ .storagePoolLookupByUUID = parallelsStoragePoolLookupByUUID, /* 0.10.0 */ .storagePoolLookupByVolume = parallelsStoragePoolLookupByVolume, /* 0.10.0 */ - .storagePoolDefineXML = parallelsStoragePoolDefine, /* 0.10.0 */ + .storagePoolDefineXML = parallelsStoragePoolDefineXML, /* 0.10.0 */ .storagePoolUndefine = parallelsStoragePoolUndefine, /* 0.10.0 */ - .storagePoolCreate = parallelsStoragePoolStart, /* 0.10.0 */ + .storagePoolCreate = parallelsStoragePoolCreate, /* 0.10.0 */ .storagePoolDestroy = parallelsStoragePoolDestroy, /* 0.10.0 */ .storagePoolRefresh = parallelsStoragePoolRefresh, /* 0.10.0 */ .storagePoolGetInfo = parallelsStoragePoolGetInfo, /* 0.10.0 */ .storagePoolGetXMLDesc = parallelsStoragePoolGetXMLDesc, /* 0.10.0 */ .storagePoolGetAutostart = parallelsStoragePoolGetAutostart, /* 0.10.0 */ .storagePoolSetAutostart = parallelsStoragePoolSetAutostart, /* 0.10.0 */ - .storagePoolNumOfVolumes = parallelsStoragePoolNumVolumes, /* 0.10.0 */ + .storagePoolNumOfVolumes = parallelsStoragePoolNumOfVolumes, /* 0.10.0 */ .storagePoolListVolumes = parallelsStoragePoolListVolumes, /* 0.10.0 */ - .storageVolLookupByName = parallelsStorageVolumeLookupByName, /* 0.10.0 */ - .storageVolLookupByKey = parallelsStorageVolumeLookupByKey, /* 0.10.0 */ - .storageVolLookupByPath = parallelsStorageVolumeLookupByPath, /* 0.10.0 */ - .storageVolCreateXML = parallelsStorageVolumeCreateXML, /* 0.10.0 */ - .storageVolCreateXMLFrom = parallelsStorageVolumeCreateXMLFrom, /* 0.10.0 */ - .storageVolDelete = parallelsStorageVolumeDelete, /* 0.10.0 */ - .storageVolGetInfo = parallelsStorageVolumeGetInfo, /* 0.10.0 */ - .storageVolGetXMLDesc = parallelsStorageVolumeGetXMLDesc, /* 0.10.0 */ - .storageVolGetPath = parallelsStorageVolumeGetPath, /* 0.10.0 */ + .storageVolLookupByName = parallelsStorageVolLookupByName, /* 0.10.0 */ + .storageVolLookupByKey = parallelsStorageVolLookupByKey, /* 0.10.0 */ + .storageVolLookupByPath = parallelsStorageVolLookupByPath, /* 0.10.0 */ + .storageVolCreateXML = parallelsStorageVolCreateXML, /* 0.10.0 */ + .storageVolCreateXMLFrom = parallelsStorageVolCreateXMLFrom, /* 0.10.0 */ + .storageVolDelete = parallelsStorageVolDelete, /* 0.10.0 */ + .storageVolGetInfo = parallelsStorageVolGetInfo, /* 0.10.0 */ + .storageVolGetXMLDesc = parallelsStorageVolGetXMLDesc, /* 0.10.0 */ + .storageVolGetPath = parallelsStorageVolGetPath, /* 0.10.0 */ .storagePoolIsActive = parallelsStoragePoolIsActive, /* 0.10.0 */ .storagePoolIsPersistent = parallelsStoragePoolIsPersistent, /* 0.10.0 */ }; diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 603f2de..12403ea 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -70,9 +70,9 @@ int parallelsCmdRun(const char *binary, ...) char * parallelsAddFileExt(const char *path, const char *ext); void parallelsDriverLock(parallelsConnPtr driver); void parallelsDriverUnlock(parallelsConnPtr driver); -virStorageVolPtr parallelsStorageVolumeLookupByPathLocked(virConnectPtr conn, - const char *path); -int parallelsStorageVolumeDefRemove(virStoragePoolObjPtr privpool, - virStorageVolDefPtr privvol); +virStorageVolPtr parallelsStorageVolLookupByPathLocked(virConnectPtr conn, + const char *path); +int parallelsStorageVolDefRemove(virStoragePoolObjPtr privpool, + virStorageVolDefPtr privvol); #endif diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 722e56f..f5c66ba 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -344,7 +344,7 @@ no_memory: * * - All * */ static int -phypNumDomainsGeneric(virConnectPtr conn, unsigned int type) +phypConnectNumOfDomainsGeneric(virConnectPtr conn, unsigned int type) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -383,8 +383,8 @@ phypNumDomainsGeneric(virConnectPtr conn, unsigned int type) * 1 - all * */ static int -phypListDomainsGeneric(virConnectPtr conn, int *ids, int nids, - unsigned int type) +phypConnectListDomainsGeneric(virConnectPtr conn, int *ids, int nids, + unsigned int type) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -781,7 +781,7 @@ phypUUIDTable_Init(virConnectPtr conn) int ret = -1; bool table_created = false; - if ((nids_numdomains = phypNumDomainsGeneric(conn, 2)) < 0) + if ((nids_numdomains = phypConnectNumOfDomainsGeneric(conn, 2)) < 0) goto cleanup; if (VIR_ALLOC_N(ids, nids_numdomains) < 0) { @@ -790,7 +790,7 @@ phypUUIDTable_Init(virConnectPtr conn) } if ((nids_listdomains = - phypListDomainsGeneric(conn, ids, nids_numdomains, 1)) < 0) + phypConnectListDomainsGeneric(conn, ids, nids_numdomains, 1)) < 0) goto cleanup; /* exit early if there are no domains */ @@ -1099,8 +1099,8 @@ exit: } static virDrvOpenStatus -phypOpen(virConnectPtr conn, - virConnectAuthPtr auth, unsigned int flags) +phypConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth, unsigned int flags) { LIBSSH2_SESSION *session = NULL; ConnectionData *connection_data = NULL; @@ -1230,7 +1230,7 @@ failure: } static int -phypClose(virConnectPtr conn) +phypConnectClose(virConnectPtr conn) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -1252,7 +1252,7 @@ phypClose(virConnectPtr conn) static int -phypIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +phypConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Phyp uses an SSH tunnel, so is always encrypted */ return 1; @@ -1260,7 +1260,7 @@ phypIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) static int -phypIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +phypConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Phyp uses an SSH tunnel, so is always secure */ return 1; @@ -1268,7 +1268,7 @@ phypIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) static int -phypIsAlive(virConnectPtr conn) +phypConnectIsAlive(virConnectPtr conn) { ConnectionData *connection_data = conn->networkPrivateData; @@ -1284,7 +1284,7 @@ phypIsAlive(virConnectPtr conn) static int -phypIsUpdated(virDomainPtr conn ATTRIBUTE_UNUSED) +phypDomainIsUpdated(virDomainPtr conn ATTRIBUTE_UNUSED) { return 0; } @@ -1425,7 +1425,7 @@ phypDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) } static int -phypGetLparCPUMAX(virDomainPtr dom) +phypDomainGetMaxVcpus(virDomainPtr dom) { return phypDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)); @@ -1700,7 +1700,7 @@ phypGetVIOSFreeSCSIAdapter(virConnectPtr conn) static int -phypAttachDevice(virDomainPtr domain, const char *xml) +phypDomainAttachDevice(virDomainPtr domain, const char *xml) { int result = -1; virConnectPtr conn = domain->conn; @@ -1862,7 +1862,7 @@ cleanup: } static char * -phypVolumeGetKey(virConnectPtr conn, const char *name) +phypStorageVolGetKey(virConnectPtr conn, const char *name) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -1977,7 +1977,7 @@ phypBuildVolume(virConnectPtr conn, const char *lvname, const char *spname, goto cleanup; } - key = phypVolumeGetKey(conn, lvname); + key = phypStorageVolGetKey(conn, lvname); cleanup: VIR_FREE(ret); @@ -1986,12 +1986,12 @@ cleanup: } static virStorageVolPtr -phypVolumeLookupByName(virStoragePoolPtr pool, const char *volname) +phypStorageVolLookupByName(virStoragePoolPtr pool, const char *volname) { char *key; virStorageVolPtr vol; - key = phypVolumeGetKey(pool->conn, volname); + key = phypStorageVolGetKey(pool->conn, volname); if (key == NULL) return NULL; @@ -2059,7 +2059,7 @@ phypStorageVolCreateXML(virStoragePoolPtr pool, } /* checking if this name already exists on this system */ - if ((dup_vol = phypVolumeLookupByName(pool, voldef->name)) != NULL) { + if ((dup_vol = phypStorageVolLookupByName(pool, voldef->name)) != NULL) { VIR_ERROR(_("StoragePool name already exists.")); virObjectUnref(dup_vol); goto err; @@ -2102,7 +2102,7 @@ err: } static char * -phypVolumeGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) +phypStorageVolGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) { virConnectPtr conn = vol->conn; ConnectionData *connection_data = conn->networkPrivateData; @@ -2133,7 +2133,7 @@ phypVolumeGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) } static virStorageVolPtr -phypVolumeLookupByPath(virConnectPtr conn, const char *volname) +phypStorageVolLookupByPath(virConnectPtr conn, const char *volname) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -2162,7 +2162,7 @@ phypVolumeLookupByPath(virConnectPtr conn, const char *volname) if (exit_status < 0 || ret == NULL) goto cleanup; - key = phypVolumeGetKey(conn, volname); + key = phypStorageVolGetKey(conn, volname); if (key == NULL) goto cleanup; @@ -2229,7 +2229,7 @@ phypStoragePoolLookupByName(virConnectPtr conn, const char *name) } static char * -phypVolumeGetXMLDesc(virStorageVolPtr vol, unsigned int flags) +phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { virStorageVolDef voldef; virStoragePoolDef pool; @@ -2309,7 +2309,7 @@ cleanup: * * */ static char * -phypVolumeGetPath(virStorageVolPtr vol) +phypStorageVolGetPath(virStorageVolPtr vol) { virConnectPtr conn = vol->conn; ConnectionData *connection_data = conn->networkPrivateData; @@ -2340,7 +2340,7 @@ phypVolumeGetPath(virStorageVolPtr vol) if (exit_status < 0 || ret == NULL) goto cleanup; - pv = phypVolumeGetPhysicalVolumeByStoragePool(vol, ret); + pv = phypStorageVolGetPhysicalVolumeByStoragePool(vol, ret); if (!pv) goto cleanup; @@ -2452,7 +2452,7 @@ phypStoragePoolNumOfVolumes(virStoragePoolPtr pool) } static int -phypDestroyStoragePool(virStoragePoolPtr pool) +phypStoragePoolDestroy(virStoragePoolPtr pool) { int result = -1; virConnectPtr conn = pool->conn; @@ -2537,7 +2537,7 @@ cleanup: } static int -phypNumOfStoragePools(virConnectPtr conn) +phypConnectNumOfStoragePools(virConnectPtr conn) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -2563,7 +2563,7 @@ phypNumOfStoragePools(virConnectPtr conn) } static int -phypListStoragePools(virConnectPtr conn, char **const pools, int npools) +phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) { bool success = false; ConnectionData *connection_data = conn->networkPrivateData; @@ -2626,8 +2626,8 @@ cleanup: } static virStoragePoolPtr -phypGetStoragePoolLookUpByUUID(virConnectPtr conn, - const unsigned char *uuid) +phypStoragePoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) { virStoragePoolPtr sp = NULL; int npools = 0; @@ -2641,7 +2641,7 @@ phypGetStoragePoolLookUpByUUID(virConnectPtr conn, goto err; } - if ((npools = phypNumOfStoragePools(conn)) == -1) { + if ((npools = phypConnectNumOfStoragePools(conn)) == -1) { virReportOOMError(); goto err; } @@ -2651,7 +2651,7 @@ phypGetStoragePoolLookUpByUUID(virConnectPtr conn, goto err; } - if ((gotpools = phypListStoragePools(conn, pools, npools)) == -1) { + if ((gotpools = phypConnectListStoragePools(conn, pools, npools)) == -1) { virReportOOMError(); goto err; } @@ -2704,7 +2704,7 @@ phypStoragePoolCreateXML(virConnectPtr conn, } /* checking if ID or UUID already exists on this system */ - if ((dup_sp = phypGetStoragePoolLookUpByUUID(conn, def->uuid)) != NULL) { + if ((dup_sp = phypStoragePoolLookupByUUID(conn, def->uuid)) != NULL) { VIR_WARN("StoragePool uuid already exists."); virObjectUnref(dup_sp); goto err; @@ -2725,7 +2725,7 @@ err: } static char * -phypGetStoragePoolXMLDesc(virStoragePoolPtr pool, unsigned int flags) +phypStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { virCheckFlags(0, NULL); @@ -3031,7 +3031,7 @@ phypInterfaceIsActive(virInterfacePtr iface) } static int -phypListInterfaces(virConnectPtr conn, char **const names, int nnames) +phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -3089,7 +3089,7 @@ cleanup: } static int -phypNumOfInterfaces(virConnectPtr conn) +phypConnectNumOfInterfaces(virConnectPtr conn) { ConnectionData *connection_data = conn->networkPrivateData; phyp_driverPtr phyp_driver = conn->privateData; @@ -3183,25 +3183,25 @@ cleanup: } static int -phypNumDefinedDomains(virConnectPtr conn) +phypConnectNumOfDefinedDomains(virConnectPtr conn) { - return phypNumDomainsGeneric(conn, 1); + return phypConnectNumOfDomainsGeneric(conn, 1); } static int -phypNumDomains(virConnectPtr conn) +phypConnectNumOfDomains(virConnectPtr conn) { - return phypNumDomainsGeneric(conn, 0); + return phypConnectNumOfDomainsGeneric(conn, 0); } static int -phypListDomains(virConnectPtr conn, int *ids, int nids) +phypConnectListDomains(virConnectPtr conn, int *ids, int nids) { - return phypListDomainsGeneric(conn, ids, nids, 0); + return phypConnectListDomainsGeneric(conn, ids, nids, 0); } static int -phypListDefinedDomains(virConnectPtr conn, char **const names, int nnames) +phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { bool success = false; ConnectionData *connection_data = conn->networkPrivateData; @@ -3612,8 +3612,8 @@ cleanup: } static virDomainPtr -phypDomainCreateAndStart(virConnectPtr conn, - const char *xml, unsigned int flags) +phypDomainCreateXML(virConnectPtr conn, + const char *xml, unsigned int flags) { virCheckFlags(0, NULL); @@ -3702,7 +3702,7 @@ phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if ((ncpus = phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) return 0; - if (nvcpus > phypGetLparCPUMAX(dom)) { + if (nvcpus > phypDomainGetMaxVcpus(dom)) { VIR_ERROR(_("You are trying to set a number of CPUs bigger than " "the max possible.")); return 0; @@ -3737,15 +3737,34 @@ phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } static int -phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus) +phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE); } static virDrvOpenStatus -phypVIOSDriverOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +phypStorageOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + if (conn->driver->no != VIR_DRV_PHYP) + return VIR_DRV_OPEN_DECLINED; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int +phypStorageClose(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 0; +} + +static virDrvOpenStatus +phypInterfaceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -3756,7 +3775,7 @@ phypVIOSDriverOpen(virConnectPtr conn, } static int -phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) +phypInterfaceClose(virConnectPtr conn ATTRIBUTE_UNUSED) { return 0; } @@ -3764,12 +3783,12 @@ phypVIOSDriverClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDriver phypDriver = { .no = VIR_DRV_PHYP, .name = "PHYP", - .connectOpen = phypOpen, /* 0.7.0 */ - .connectClose = phypClose, /* 0.7.0 */ + .connectOpen = phypConnectOpen, /* 0.7.0 */ + .connectClose = phypConnectClose, /* 0.7.0 */ .connectGetCapabilities = phypConnectGetCapabilities, /* 0.7.3 */ - .connectListDomains = phypListDomains, /* 0.7.0 */ - .connectNumOfDomains = phypNumDomains, /* 0.7.0 */ - .domainCreateXML = phypDomainCreateAndStart, /* 0.7.3 */ + .connectListDomains = phypConnectListDomains, /* 0.7.0 */ + .connectNumOfDomains = phypConnectNumOfDomains, /* 0.7.0 */ + .domainCreateXML = phypDomainCreateXML, /* 0.7.3 */ .domainLookupByID = phypDomainLookupByID, /* 0.7.0 */ .domainLookupByName = phypDomainLookupByName, /* 0.7.0 */ .domainResume = phypDomainResume, /* 0.7.0 */ @@ -3779,48 +3798,48 @@ static virDriver phypDriver = { .domainDestroyFlags = phypDomainDestroyFlags, /* 0.9.4 */ .domainGetInfo = phypDomainGetInfo, /* 0.7.0 */ .domainGetState = phypDomainGetState, /* 0.9.2 */ - .domainSetVcpus = phypDomainSetCPU, /* 0.7.3 */ + .domainSetVcpus = phypDomainSetVcpus, /* 0.7.3 */ .domainSetVcpusFlags = phypDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = phypDomainGetVcpusFlags, /* 0.8.5 */ - .domainGetMaxVcpus = phypGetLparCPUMAX, /* 0.7.3 */ + .domainGetMaxVcpus = phypDomainGetMaxVcpus, /* 0.7.3 */ .domainGetXMLDesc = phypDomainGetXMLDesc, /* 0.7.0 */ - .connectListDefinedDomains = phypListDefinedDomains, /* 0.7.0 */ - .connectNumOfDefinedDomains = phypNumDefinedDomains, /* 0.7.0 */ - .domainAttachDevice = phypAttachDevice, /* 0.8.2 */ - .connectIsEncrypted = phypIsEncrypted, /* 0.7.3 */ - .connectIsSecure = phypIsSecure, /* 0.7.3 */ - .domainIsUpdated = phypIsUpdated, /* 0.8.6 */ - .connectIsAlive = phypIsAlive, /* 0.9.8 */ + .connectListDefinedDomains = phypConnectListDefinedDomains, /* 0.7.0 */ + .connectNumOfDefinedDomains = phypConnectNumOfDefinedDomains, /* 0.7.0 */ + .domainAttachDevice = phypDomainAttachDevice, /* 0.8.2 */ + .connectIsEncrypted = phypConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = phypConnectIsSecure, /* 0.7.3 */ + .domainIsUpdated = phypDomainIsUpdated, /* 0.8.6 */ + .connectIsAlive = phypConnectIsAlive, /* 0.9.8 */ }; static virStorageDriver phypStorageDriver = { .name = "PHYP", - .storageOpen = phypVIOSDriverOpen, /* 0.8.2 */ - .storageClose = phypVIOSDriverClose, /* 0.8.2 */ + .storageOpen = phypStorageOpen, /* 0.8.2 */ + .storageClose = phypStorageClose, /* 0.8.2 */ - .connectNumOfStoragePools = phypNumOfStoragePools, /* 0.8.2 */ - .connectListStoragePools = phypListStoragePools, /* 0.8.2 */ + .connectNumOfStoragePools = phypConnectNumOfStoragePools, /* 0.8.2 */ + .connectListStoragePools = phypConnectListStoragePools, /* 0.8.2 */ .storagePoolLookupByName = phypStoragePoolLookupByName, /* 0.8.2 */ - .storagePoolLookupByUUID = phypGetStoragePoolLookUpByUUID, /* 0.8.2 */ + .storagePoolLookupByUUID = phypStoragePoolLookupByUUID, /* 0.8.2 */ .storagePoolCreateXML = phypStoragePoolCreateXML, /* 0.8.2 */ - .storagePoolDestroy = phypDestroyStoragePool, /* 0.8.2 */ - .storagePoolGetXMLDesc = phypGetStoragePoolXMLDesc, /* 0.8.2 */ + .storagePoolDestroy = phypStoragePoolDestroy, /* 0.8.2 */ + .storagePoolGetXMLDesc = phypStoragePoolGetXMLDesc, /* 0.8.2 */ .storagePoolNumOfVolumes = phypStoragePoolNumOfVolumes, /* 0.8.2 */ .storagePoolListVolumes = phypStoragePoolListVolumes, /* 0.8.2 */ - .storageVolLookupByName = phypVolumeLookupByName, /* 0.8.2 */ - .storageVolLookupByPath = phypVolumeLookupByPath, /* 0.8.2 */ + .storageVolLookupByName = phypStorageVolLookupByName, /* 0.8.2 */ + .storageVolLookupByPath = phypStorageVolLookupByPath, /* 0.8.2 */ .storageVolCreateXML = phypStorageVolCreateXML, /* 0.8.2 */ - .storageVolGetXMLDesc = phypVolumeGetXMLDesc, /* 0.8.2 */ - .storageVolGetPath = phypVolumeGetPath, /* 0.8.2 */ + .storageVolGetXMLDesc = phypStorageVolGetXMLDesc, /* 0.8.2 */ + .storageVolGetPath = phypStorageVolGetPath, /* 0.8.2 */ }; static virInterfaceDriver phypInterfaceDriver = { .name = "PHYP", - .interfaceOpen = phypVIOSDriverOpen, /* 0.9.1 */ - .interfaceClose = phypVIOSDriverClose, /* 0.9.1 */ - .connectNumOfInterfaces = phypNumOfInterfaces, /* 0.9.1 */ - .connectListInterfaces = phypListInterfaces, /* 0.9.1 */ + .interfaceOpen = phypInterfaceOpen, /* 0.9.1 */ + .interfaceClose = phypInterfaceClose, /* 0.9.1 */ + .connectNumOfInterfaces = phypConnectNumOfInterfaces, /* 0.9.1 */ + .connectListInterfaces = phypConnectListInterfaces, /* 0.9.1 */ .interfaceLookupByName = phypInterfaceLookupByName, /* 0.9.1 */ .interfaceDefineXML = phypInterfaceDefineXML, /* 0.9.1 */ .interfaceDestroy = phypInterfaceDestroy, /* 0.9.1 */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0dc5e80..ba5600d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -135,7 +135,7 @@ static void processWatchdogEvent(void *data, void *opaque); -static int qemuShutdown(void); +static int qemuStateCleanup(void); static int qemuDomainObjStart(virConnectPtr conn, virQEMUDriverPtr driver, @@ -541,14 +541,14 @@ qemuDomainFindMaxID(virDomainObjPtr vm, /** - * qemuStartup: + * qemuStateInitialize: * * Initialization function for the QEmu daemon */ static int -qemuStartup(bool privileged, - virStateInhibitCallback callback, - void *opaque) +qemuStateInitialize(bool privileged, + virStateInhibitCallback callback, + void *opaque) { char *driverConf = NULL; virConnectPtr conn = NULL; @@ -821,7 +821,7 @@ error: VIR_FREE(driverConf); VIR_FREE(membase); VIR_FREE(mempath); - qemuShutdown(); + qemuStateCleanup(); return -1; } @@ -840,13 +840,13 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) } /** - * qemuReload: + * qemuStateReload: * * Function to restart the QEmu daemon, it will recheck the configuration * files and update its state and the networking */ static int -qemuReload(void) { +qemuStateReload(void) { virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; @@ -871,13 +871,13 @@ cleanup: /* - * qemuStop: + * qemuStateStop: * * Save any VMs in preparation for shutdown * */ static int -qemuStop(void) { +qemuStateStop(void) { int ret = -1; virConnectPtr conn; int numDomains = 0; @@ -932,12 +932,12 @@ qemuStop(void) { } /** - * qemuShutdown: + * qemuStateCleanup: * * Shutdown the QEmu daemon, it will stop all active domains and networks */ static int -qemuShutdown(void) { +qemuStateCleanup(void) { if (!qemu_driver) return -1; @@ -978,9 +978,9 @@ qemuShutdown(void) { } -static virDrvOpenStatus qemuOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virQEMUDriverConfigPtr cfg = NULL; virDrvOpenStatus ret = VIR_DRV_OPEN_ERROR; @@ -1049,7 +1049,7 @@ cleanup: return ret; } -static int qemuClose(virConnectPtr conn) +static int qemuConnectClose(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; @@ -1063,7 +1063,7 @@ static int qemuClose(virConnectPtr conn) /* Which features are supported by this driver? */ static int -qemuSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +qemuConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) { switch (feature) { case VIR_DRV_FEATURE_MIGRATION_V2: @@ -1080,24 +1080,24 @@ qemuSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) } } -static const char *qemuGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { +static const char *qemuConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "QEMU"; } -static int qemuIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -static int qemuIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -static int qemuIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } @@ -1135,7 +1135,7 @@ cleanup: static char * -qemuGetSysinfo(virConnectPtr conn, unsigned int flags) +qemuConnectGetSysinfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -1157,7 +1157,7 @@ qemuGetSysinfo(virConnectPtr conn, unsigned int flags) return virBufferContentAndReset(&buf); } -static int qemuGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) { +static int qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) { if (!type) return 16; @@ -1176,7 +1176,7 @@ static int qemuGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type } -static char *qemuGetCapabilities(virConnectPtr conn) { +static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; virCapsPtr caps = NULL; char *xml = NULL; @@ -1390,7 +1390,7 @@ cleanup: return ret; } -static int qemuGetVersion(virConnectPtr conn, unsigned long *version) { +static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *version) { virQEMUDriverPtr driver = conn->privateData; int ret = -1; unsigned int qemuVersion = 0; @@ -1412,7 +1412,7 @@ cleanup: return ret; } -static int qemuListDomains(virConnectPtr conn, int *ids, int nids) { +static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { virQEMUDriverPtr driver = conn->privateData; int n; @@ -1421,7 +1421,7 @@ static int qemuListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int qemuNumDomains(virConnectPtr conn) { +static int qemuConnectNumOfDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; int n; @@ -1453,8 +1453,9 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) } -static virDomainPtr qemuDomainCreate(virConnectPtr conn, const char *xml, - unsigned int flags) { +static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; @@ -5113,10 +5114,10 @@ cleanup: } -static char *qemuDomainXMLFromNative(virConnectPtr conn, - const char *format, - const char *config, - unsigned int flags) +static char *qemuConnectDomainXMLFromNative(virConnectPtr conn, + const char *format, + const char *config, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; @@ -5153,10 +5154,10 @@ cleanup: return xml; } -static char *qemuDomainXMLToNative(virConnectPtr conn, - const char *format, - const char *xmlData, - unsigned int flags) +static char *qemuConnectDomainXMLToNative(virConnectPtr conn, + const char *format, + const char *xmlData, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; @@ -5288,8 +5289,8 @@ cleanup: } -static int qemuListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { +static int qemuConnectListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) { virQEMUDriverPtr driver = conn->privateData; int n; @@ -5297,7 +5298,7 @@ static int qemuListDefinedDomains(virConnectPtr conn, return n; } -static int qemuNumDefinedDomains(virConnectPtr conn) { +static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; int n; @@ -5386,7 +5387,7 @@ cleanup: } static int -qemuDomainStartWithFlags(virDomainPtr dom, unsigned int flags) +qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; @@ -5425,12 +5426,12 @@ cleanup: } static int -qemuDomainStart(virDomainPtr dom) +qemuDomainCreate(virDomainPtr dom) { - return qemuDomainStartWithFlags(dom, 0); + return qemuDomainCreateWithFlags(dom, 0); } -static virDomainPtr qemuDomainDefine(virConnectPtr conn, const char *xml) { +static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml) { virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; virDomainDefPtr oldDef = NULL; @@ -6597,8 +6598,8 @@ cleanup: } -static char *qemuGetSchedulerType(virDomainPtr dom, - int *nparams) +static char *qemuDomainGetSchedulerType(virDomainPtr dom, + int *nparams) { virQEMUDriverPtr driver = dom->conn->privateData; char *ret = NULL; @@ -7707,10 +7708,10 @@ cleanup: } static int -qemuSetSchedulerParametersFlags(virDomainPtr dom, - virTypedParameterPtr params, - int nparams, - unsigned int flags) +qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; int i; @@ -7871,14 +7872,14 @@ cleanup: #undef SCHED_RANGE_CHECK static int -qemuSetSchedulerParameters(virDomainPtr dom, - virTypedParameterPtr params, - int nparams) +qemuDomainSetSchedulerParameters(virDomainPtr dom, + virTypedParameterPtr params, + int nparams) { - return qemuSetSchedulerParametersFlags(dom, - params, - nparams, - VIR_DOMAIN_AFFECT_CURRENT); + return qemuDomainSetSchedulerParametersFlags(dom, + params, + nparams, + VIR_DOMAIN_AFFECT_CURRENT); } static int @@ -7984,10 +7985,10 @@ cleanup: } static int -qemuGetSchedulerParametersFlags(virDomainPtr dom, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +qemuDomainGetSchedulerParametersFlags(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; @@ -8121,12 +8122,12 @@ cleanup: } static int -qemuGetSchedulerParameters(virDomainPtr dom, - virTypedParameterPtr params, - int *nparams) +qemuDomainGetSchedulerParameters(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams) { - return qemuGetSchedulerParametersFlags(dom, params, nparams, - VIR_DOMAIN_AFFECT_CURRENT); + return qemuDomainGetSchedulerParametersFlags(dom, params, nparams, + VIR_DOMAIN_AFFECT_CURRENT); } /** @@ -9139,10 +9140,10 @@ cleanup: static int -qemuDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +qemuConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { virQEMUDriverPtr driver = conn->privateData; int ret; @@ -9156,8 +9157,8 @@ qemuDomainEventRegister(virConnectPtr conn, static int -qemuDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +qemuConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { virQEMUDriverPtr driver = conn->privateData; int ret; @@ -9171,12 +9172,12 @@ qemuDomainEventDeregister(virConnectPtr conn, static int -qemuDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +qemuConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { virQEMUDriverPtr driver = conn->privateData; int ret; @@ -9192,8 +9193,8 @@ qemuDomainEventRegisterAny(virConnectPtr conn, static int -qemuDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +qemuConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { virQEMUDriverPtr driver = conn->privateData; int ret; @@ -9850,9 +9851,9 @@ out: } static int -qemuCPUCompare(virConnectPtr conn, - const char *xmlDesc, - unsigned int flags) +qemuConnectCompareCPU(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; int ret = VIR_CPU_COMPARE_ERROR; @@ -9878,10 +9879,10 @@ cleanup: static char * -qemuCPUBaseline(virConnectPtr conn ATTRIBUTE_UNUSED, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags) +qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags) { char *cpu; @@ -12446,8 +12447,8 @@ cleanup: return ret; } -static int qemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, - char **result, unsigned int flags) +static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, + char **result, unsigned int flags) { virQEMUDriverPtr driver = domain->conn->privateData; virDomainObjPtr vm = NULL; @@ -12497,9 +12498,9 @@ cleanup: } -static virDomainPtr qemuDomainAttach(virConnectPtr conn, - unsigned int pid_value, - unsigned int flags) +static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, + unsigned int pid_value, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; virDomainObjPtr vm = NULL; @@ -14475,9 +14476,9 @@ cleanup: } static int -qemuListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +qemuConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; int ret = -1; @@ -14490,10 +14491,10 @@ qemuListAllDomains(virConnectPtr conn, } static char * -qemuDomainAgentCommand(virDomainPtr domain, - const char *cmd, - int timeout, - unsigned int flags) +qemuDomainQemuAgentCommand(virDomainPtr domain, + const char *cmd, + int timeout, + unsigned int flags) { virQEMUDriverPtr driver = domain->conn->privateData; virDomainObjPtr vm; @@ -14626,20 +14627,20 @@ cleanup: static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, - .connectOpen = qemuOpen, /* 0.2.0 */ - .connectClose = qemuClose, /* 0.2.0 */ - .connectSupportsFeature = qemuSupportsFeature, /* 0.5.0 */ - .connectGetType = qemuGetType, /* 0.2.0 */ - .connectGetVersion = qemuGetVersion, /* 0.2.0 */ + .connectOpen = qemuConnectOpen, /* 0.2.0 */ + .connectClose = qemuConnectClose, /* 0.2.0 */ + .connectSupportsFeature = qemuConnectSupportsFeature, /* 0.5.0 */ + .connectGetType = qemuConnectGetType, /* 0.2.0 */ + .connectGetVersion = qemuConnectGetVersion, /* 0.2.0 */ .connectGetHostname = virGetHostname, /* 0.3.3 */ - .connectGetSysinfo = qemuGetSysinfo, /* 0.8.8 */ - .connectGetMaxVcpus = qemuGetMaxVCPUs, /* 0.2.1 */ + .connectGetSysinfo = qemuConnectGetSysinfo, /* 0.8.8 */ + .connectGetMaxVcpus = qemuConnectGetMaxVcpus, /* 0.2.1 */ .nodeGetInfo = nodeGetInfo, /* 0.2.0 */ - .connectGetCapabilities = qemuGetCapabilities, /* 0.2.1 */ - .connectListDomains = qemuListDomains, /* 0.2.0 */ - .connectNumOfDomains = qemuNumDomains, /* 0.2.0 */ - .connectListAllDomains = qemuListAllDomains, /* 0.9.13 */ - .domainCreateXML = qemuDomainCreate, /* 0.2.0 */ + .connectGetCapabilities = qemuConnectGetCapabilities, /* 0.2.1 */ + .connectListDomains = qemuConnectListDomains, /* 0.2.0 */ + .connectNumOfDomains = qemuConnectNumOfDomains, /* 0.2.0 */ + .connectListAllDomains = qemuConnectListAllDomains, /* 0.9.13 */ + .domainCreateXML = qemuDomainCreateXML, /* 0.2.0 */ .domainLookupByID = qemuDomainLookupByID, /* 0.2.0 */ .domainLookupByUUID = qemuDomainLookupByUUID, /* 0.2.0 */ .domainLookupByName = qemuDomainLookupByName, /* 0.2.0 */ @@ -14685,13 +14686,13 @@ static virDriver qemuDriver = { .domainGetSecurityLabelList = qemuDomainGetSecurityLabelList, /* 0.10.0 */ .nodeGetSecurityModel = qemuNodeGetSecurityModel, /* 0.6.1 */ .domainGetXMLDesc = qemuDomainGetXMLDesc, /* 0.2.0 */ - .connectDomainXMLFromNative = qemuDomainXMLFromNative, /* 0.6.4 */ - .connectDomainXMLToNative = qemuDomainXMLToNative, /* 0.6.4 */ - .connectListDefinedDomains = qemuListDefinedDomains, /* 0.2.0 */ - .connectNumOfDefinedDomains = qemuNumDefinedDomains, /* 0.2.0 */ - .domainCreate = qemuDomainStart, /* 0.2.0 */ - .domainCreateWithFlags = qemuDomainStartWithFlags, /* 0.8.2 */ - .domainDefineXML = qemuDomainDefine, /* 0.2.0 */ + .connectDomainXMLFromNative = qemuConnectDomainXMLFromNative, /* 0.6.4 */ + .connectDomainXMLToNative = qemuConnectDomainXMLToNative, /* 0.6.4 */ + .connectListDefinedDomains = qemuConnectListDefinedDomains, /* 0.2.0 */ + .connectNumOfDefinedDomains = qemuConnectNumOfDefinedDomains, /* 0.2.0 */ + .domainCreate = qemuDomainCreate, /* 0.2.0 */ + .domainCreateWithFlags = qemuDomainCreateWithFlags, /* 0.8.2 */ + .domainDefineXML = qemuDomainDefineXML, /* 0.2.0 */ .domainUndefine = qemuDomainUndefine, /* 0.2.0 */ .domainUndefineFlags = qemuDomainUndefineFlags, /* 0.9.4 */ .domainAttachDevice = qemuDomainAttachDevice, /* 0.4.1 */ @@ -14701,11 +14702,11 @@ static virDriver qemuDriver = { .domainUpdateDeviceFlags = qemuDomainUpdateDeviceFlags, /* 0.8.0 */ .domainGetAutostart = qemuDomainGetAutostart, /* 0.2.1 */ .domainSetAutostart = qemuDomainSetAutostart, /* 0.2.1 */ - .domainGetSchedulerType = qemuGetSchedulerType, /* 0.7.0 */ - .domainGetSchedulerParameters = qemuGetSchedulerParameters, /* 0.7.0 */ - .domainGetSchedulerParametersFlags = qemuGetSchedulerParametersFlags, /* 0.9.2 */ - .domainSetSchedulerParameters = qemuSetSchedulerParameters, /* 0.7.0 */ - .domainSetSchedulerParametersFlags = qemuSetSchedulerParametersFlags, /* 0.9.2 */ + .domainGetSchedulerType = qemuDomainGetSchedulerType, /* 0.7.0 */ + .domainGetSchedulerParameters = qemuDomainGetSchedulerParameters, /* 0.7.0 */ + .domainGetSchedulerParametersFlags = qemuDomainGetSchedulerParametersFlags, /* 0.9.2 */ + .domainSetSchedulerParameters = qemuDomainSetSchedulerParameters, /* 0.7.0 */ + .domainSetSchedulerParametersFlags = qemuDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainMigratePerform = qemuDomainMigratePerform, /* 0.5.0 */ .domainBlockResize = qemuDomainBlockResize, /* 0.9.8 */ .domainBlockStats = qemuDomainBlockStats, /* 0.4.1 */ @@ -14719,21 +14720,21 @@ static virDriver qemuDriver = { .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.4.4 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.4.4 */ - .connectDomainEventRegister = qemuDomainEventRegister, /* 0.5.0 */ - .connectDomainEventDeregister = qemuDomainEventDeregister, /* 0.5.0 */ + .connectDomainEventRegister = qemuConnectDomainEventRegister, /* 0.5.0 */ + .connectDomainEventDeregister = qemuConnectDomainEventDeregister, /* 0.5.0 */ .domainMigratePrepare2 = qemuDomainMigratePrepare2, /* 0.5.0 */ .domainMigrateFinish2 = qemuDomainMigrateFinish2, /* 0.5.0 */ .nodeDeviceDettach = qemuNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = qemuNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = qemuNodeDeviceReset, /* 0.6.1 */ .domainMigratePrepareTunnel = qemuDomainMigratePrepareTunnel, /* 0.7.2 */ - .connectIsEncrypted = qemuIsEncrypted, /* 0.7.3 */ - .connectIsSecure = qemuIsSecure, /* 0.7.3 */ + .connectIsEncrypted = qemuConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = qemuConnectIsSecure, /* 0.7.3 */ .domainIsActive = qemuDomainIsActive, /* 0.7.3 */ .domainIsPersistent = qemuDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = qemuDomainIsUpdated, /* 0.8.6 */ - .connectCompareCPU = qemuCPUCompare, /* 0.7.5 */ - .connectBaselineCPU = qemuCPUBaseline, /* 0.7.7 */ + .connectCompareCPU = qemuConnectCompareCPU, /* 0.7.5 */ + .connectBaselineCPU = qemuConnectBaselineCPU, /* 0.7.7 */ .domainGetJobInfo = qemuDomainGetJobInfo, /* 0.7.7 */ .domainGetJobStats = qemuDomainGetJobStats, /* 1.0.3 */ .domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */ @@ -14742,8 +14743,8 @@ static virDriver qemuDriver = { .domainMigrateSetCompressionCache = qemuDomainMigrateSetCompressionCache, /* 1.0.3 */ .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, /* 0.9.0 */ .domainMigrateGetMaxSpeed = qemuDomainMigrateGetMaxSpeed, /* 0.9.5 */ - .connectDomainEventRegisterAny = qemuDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = qemuDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = qemuConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = qemuConnectDomainEventDeregisterAny, /* 0.8.0 */ .domainManagedSave = qemuDomainManagedSave, /* 0.8.0 */ .domainHasManagedSaveImage = qemuDomainHasManagedSaveImage, /* 0.8.0 */ .domainManagedSaveRemove = qemuDomainManagedSaveRemove, /* 0.8.0 */ @@ -14763,9 +14764,9 @@ static virDriver qemuDriver = { .domainSnapshotHasMetadata = qemuDomainSnapshotHasMetadata, /* 0.9.13 */ .domainRevertToSnapshot = qemuDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */ - .domainQemuMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ - .domainQemuAttach = qemuDomainAttach, /* 0.9.4 */ - .domainQemuAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ + .domainQemuMonitorCommand = qemuDomainQemuMonitorCommand, /* 0.8.3 */ + .domainQemuAttach = qemuDomainQemuAttach, /* 0.9.4 */ + .domainQemuAgentCommand = qemuDomainQemuAgentCommand, /* 0.10.0 */ .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */ @@ -14782,7 +14783,7 @@ static virDriver qemuDriver = { .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ .domainBlockRebase = qemuDomainBlockRebase, /* 0.9.10 */ .domainBlockCommit = qemuDomainBlockCommit, /* 1.0.0 */ - .connectIsAlive = qemuIsAlive, /* 0.9.8 */ + .connectIsAlive = qemuConnectIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .domainSetBlockIoTune = qemuDomainSetBlockIoTune, /* 0.9.8 */ .domainGetBlockIoTune = qemuDomainGetBlockIoTune, /* 0.9.8 */ @@ -14806,10 +14807,10 @@ static virDriver qemuDriver = { static virStateDriver qemuStateDriver = { .name = "QEMU", - .stateInitialize = qemuStartup, - .stateCleanup = qemuShutdown, - .stateReload = qemuReload, - .stateStop = qemuStop, + .stateInitialize = qemuStateInitialize, + .stateCleanup = qemuStateCleanup, + .stateReload = qemuStateReload, + .stateStop = qemuStateStop, }; int qemuRegister(void) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132637e..ee7a2a4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -158,9 +158,9 @@ static char *get_transport_from_scheme(char *scheme); #ifdef WITH_LIBVIRTD static int -remoteStartup(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { /* Mark that we're inside the daemon so we can avoid * re-entering ourselves @@ -936,9 +936,9 @@ remoteOpenSecondaryDriver(virConnectPtr conn, } static virDrvOpenStatus -remoteOpen(virConnectPtr conn, - virConnectAuthPtr auth, - unsigned int flags) +remoteConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth, + unsigned int flags) { struct private_data *priv; int ret, rflags = 0; @@ -1058,7 +1058,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv) } static int -remoteClose(virConnectPtr conn) +remoteConnectClose(virConnectPtr conn) { int ret = 0; struct private_data *priv = conn->privateData; @@ -5049,7 +5049,7 @@ done: /*----------------------------------------------------------------------*/ static int -remoteQemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, +remoteDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, char **result, unsigned int flags) { int rv = -1; @@ -5472,7 +5472,7 @@ done: static int -remoteSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) +remoteConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) { struct private_data *priv = conn->privateData; int ret = -1; @@ -5504,7 +5504,7 @@ cleanup: static int -remoteIsAlive(virConnectPtr conn) +remoteConnectIsAlive(virConnectPtr conn) { struct private_data *priv = conn->privateData; bool ret; @@ -6120,8 +6120,8 @@ unsigned long remoteVersion(void) static virDriver remote_driver = { .no = VIR_DRV_REMOTE, .name = "remote", - .connectOpen = remoteOpen, /* 0.3.0 */ - .connectClose = remoteClose, /* 0.3.0 */ + .connectOpen = remoteConnectOpen, /* 0.3.0 */ + .connectClose = remoteConnectClose, /* 0.3.0 */ .connectSupportsFeature = remoteConnectSupportsFeature, /* 0.3.0 */ .connectGetType = remoteConnectGetType, /* 0.3.0 */ .connectGetVersion = remoteConnectGetVersion, /* 0.3.0 */ @@ -6264,9 +6264,9 @@ static virDriver remote_driver = { .domainSnapshotIsCurrent = remoteDomainSnapshotIsCurrent, /* 0.9.13 */ .domainSnapshotHasMetadata = remoteDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = remoteDomainSnapshotDelete, /* 0.8.0 */ - .domainQemuMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */ - .domainQemuAttach = qemuDomainAttach, /* 0.9.4 */ - .domainQemuAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ + .domainQemuMonitorCommand = remoteDomainQemuMonitorCommand, /* 0.8.3 */ + .domainQemuAttach = remoteDomainQemuAttach, /* 0.9.4 */ + .domainQemuAgentCommand = remoteDomainQemuAgentCommand, /* 0.10.0 */ .domainOpenConsole = remoteDomainOpenConsole, /* 0.8.6 */ .domainOpenChannel = remoteDomainOpenChannel, /* 1.0.2 */ .domainOpenGraphics = remoteDomainOpenGraphics, /* 0.9.7 */ @@ -6285,8 +6285,8 @@ static virDriver remote_driver = { .domainBlockPull = remoteDomainBlockPull, /* 0.9.4 */ .domainBlockRebase = remoteDomainBlockRebase, /* 0.9.10 */ .domainBlockCommit = remoteDomainBlockCommit, /* 0.10.2 */ - .connectSetKeepAlive = remoteSetKeepAlive, /* 0.9.8 */ - .connectIsAlive = remoteIsAlive, /* 0.9.8 */ + .connectSetKeepAlive = remoteConnectSetKeepAlive, /* 0.9.8 */ + .connectIsAlive = remoteConnectIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = remoteNodeSuspendForDuration, /* 0.9.8 */ .domainSetBlockIoTune = remoteDomainSetBlockIoTune, /* 0.9.8 */ .domainGetBlockIoTune = remoteDomainGetBlockIoTune, /* 0.9.8 */ @@ -6449,7 +6449,7 @@ static virNWFilterDriver nwfilter_driver = { #ifdef WITH_LIBVIRTD static virStateDriver state_driver = { .name = "Remote", - .stateInitialize = remoteStartup, + .stateInitialize = remoteStateInitialize, }; #endif diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index d364e1c..f10464f 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1426,7 +1426,15 @@ elsif ($mode eq "client") { # print function print "\n"; print "static $single_ret_type\n"; - print "$structprefix$call->{ProcName}("; + if ($structprefix eq "remote") { + print "$structprefix$call->{ProcName}("; + } else { + my $proc = $call->{ProcName}; + my $extra = $structprefix; + $extra =~ s/^(\w)/uc $1/e; + $proc =~ s/^(Domain)(.*)/$1 . $extra . $2/e; + print "remote$proc("; + } print join(", ", @args_list); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 327051d..646c8ff 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -553,7 +553,7 @@ secretClose(virConnectPtr conn) { } static int -secretNumOfSecrets(virConnectPtr conn) +secretConnectNumOfSecrets(virConnectPtr conn) { virSecretDriverStatePtr driver = conn->secretPrivateData; int i; @@ -570,7 +570,7 @@ secretNumOfSecrets(virConnectPtr conn) } static int -secretListSecrets(virConnectPtr conn, char **uuids, int maxuuids) +secretConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) { virSecretDriverStatePtr driver = conn->secretPrivateData; int i; @@ -629,9 +629,9 @@ secretUsageIDForDef(virSecretDefPtr def) #define MATCH(FLAG) (flags & (FLAG)) static int -secretListAllSecrets(virConnectPtr conn, - virSecretPtr **secrets, - unsigned int flags) { +secretConnectListAllSecrets(virConnectPtr conn, + virSecretPtr **secrets, + unsigned int flags) { virSecretDriverStatePtr driver = conn->secretPrivateData; virSecretPtr *tmp_secrets = NULL; int nsecrets = 0; @@ -1058,7 +1058,7 @@ cleanup: } static int -secretDriverCleanup(void) +secretStateCleanup(void) { if (driverState == NULL) return -1; @@ -1081,9 +1081,9 @@ secretDriverCleanup(void) } static int -secretDriverStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +secretStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { char *base = NULL; @@ -1120,12 +1120,12 @@ secretDriverStartup(bool privileged, error: VIR_FREE(base); secretDriverUnlock(driverState); - secretDriverCleanup(); + secretStateCleanup(); return -1; } static int -secretDriverReload(void) +secretStateReload(void) { virSecretEntryPtr new_secrets = NULL; @@ -1159,9 +1159,9 @@ static virSecretDriver secretDriver = { .name = "secret", .secretOpen = secretOpen, /* 0.7.1 */ .secretClose = secretClose, /* 0.7.1 */ - .connectNumOfSecrets = secretNumOfSecrets, /* 0.7.1 */ - .connectListSecrets = secretListSecrets, /* 0.7.1 */ - .connectListAllSecrets = secretListAllSecrets, /* 0.10.2 */ + .connectNumOfSecrets = secretConnectNumOfSecrets, /* 0.7.1 */ + .connectListSecrets = secretConnectListSecrets, /* 0.7.1 */ + .connectListAllSecrets = secretConnectListAllSecrets, /* 0.10.2 */ .secretLookupByUUID = secretLookupByUUID, /* 0.7.1 */ .secretLookupByUsage = secretLookupByUsage, /* 0.7.1 */ .secretDefineXML = secretDefineXML, /* 0.7.1 */ @@ -1173,9 +1173,9 @@ static virSecretDriver secretDriver = { static virStateDriver stateDriver = { .name = "Secret", - .stateInitialize = secretDriverStartup, - .stateCleanup = secretDriverCleanup, - .stateReload = secretDriverReload, + .stateInitialize = secretStateInitialize, + .stateCleanup = secretStateCleanup, + .stateReload = secretStateReload, }; int diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9965b69..f190eb7 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -53,7 +53,7 @@ static virStorageDriverStatePtr driverState; -static int storageDriverShutdown(void); +static int storageStateCleanup(void); static void storageDriverLock(virStorageDriverStatePtr driver) { @@ -128,9 +128,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { * Initialization function for the QEmu daemon */ static int -storageDriverStartup(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +storageStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { char *base = NULL; @@ -179,18 +179,18 @@ out_of_memory: error: VIR_FREE(base); storageDriverUnlock(driverState); - storageDriverShutdown(); + storageStateCleanup(); return -1; } /** - * virStorageReload: + * storageStateReload: * * Function to restart the storage driver, it will recheck the configuration * files and update its state */ static int -storageDriverReload(void) { +storageStateReload(void) { if (!driverState) return -1; @@ -206,12 +206,12 @@ storageDriverReload(void) { /** - * virStorageShutdown: + * storageStateCleanup * * Shutdown the storage driver, it will stop all active storage pools */ static int -storageDriverShutdown(void) { +storageStateCleanup(void) { if (!driverState) return -1; @@ -309,7 +309,7 @@ storageClose(virConnectPtr conn) { } static int -storageNumPools(virConnectPtr conn) { +storageConnectNumOfStoragePools(virConnectPtr conn) { virStorageDriverStatePtr driver = conn->storagePrivateData; unsigned int i, nactive = 0; @@ -326,9 +326,9 @@ storageNumPools(virConnectPtr conn) { } static int -storageListPools(virConnectPtr conn, - char **const names, - int nnames) { +storageConnectListStoragePools(virConnectPtr conn, + char **const names, + int nnames) { virStorageDriverStatePtr driver = conn->storagePrivateData; int got = 0, i; @@ -357,7 +357,7 @@ storageListPools(virConnectPtr conn, } static int -storageNumDefinedPools(virConnectPtr conn) { +storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { virStorageDriverStatePtr driver = conn->storagePrivateData; unsigned int i, nactive = 0; @@ -374,9 +374,9 @@ storageNumDefinedPools(virConnectPtr conn) { } static int -storageListDefinedPools(virConnectPtr conn, - char **const names, - int nnames) { +storageConnectListDefinedStoragePools(virConnectPtr conn, + char **const names, + int nnames) { virStorageDriverStatePtr driver = conn->storagePrivateData; int got = 0, i; @@ -408,10 +408,10 @@ storageListDefinedPools(virConnectPtr conn, /* This method is required to be re-entrant / thread safe, so uses no driver lock */ static char * -storageFindPoolSources(virConnectPtr conn, - const char *type, - const char *srcSpec, - unsigned int flags) +storageConnectFindStoragePoolSources(virConnectPtr conn, + const char *type, + const char *srcSpec, + unsigned int flags) { int backend_type; virStorageBackendPtr backend; @@ -486,9 +486,9 @@ cleanup: static virStoragePoolPtr -storagePoolCreate(virConnectPtr conn, - const char *xml, - unsigned int flags) +storagePoolCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { virStorageDriverStatePtr driver = conn->storagePrivateData; virStoragePoolDefPtr def; @@ -544,9 +544,9 @@ cleanup: } static virStoragePoolPtr -storagePoolDefine(virConnectPtr conn, - const char *xml, - unsigned int flags) +storagePoolDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { virStorageDriverStatePtr driver = conn->storagePrivateData; virStoragePoolDefPtr def; @@ -643,8 +643,8 @@ cleanup: } static int -storagePoolStart(virStoragePoolPtr obj, - unsigned int flags) +storagePoolCreate(virStoragePoolPtr obj, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; @@ -1062,7 +1062,7 @@ cleanup: static int -storagePoolNumVolumes(virStoragePoolPtr obj) { +storagePoolNumOfVolumes(virStoragePoolPtr obj) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -1207,8 +1207,8 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, } static virStorageVolPtr -storageVolumeLookupByName(virStoragePoolPtr obj, - const char *name) { +storageVolLookupByName(virStoragePoolPtr obj, + const char *name) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageVolDefPtr vol; @@ -1250,8 +1250,8 @@ cleanup: static virStorageVolPtr -storageVolumeLookupByKey(virConnectPtr conn, - const char *key) { +storageVolLookupByKey(virConnectPtr conn, + const char *key) { virStorageDriverStatePtr driver = conn->storagePrivateData; unsigned int i; virStorageVolPtr ret = NULL; @@ -1282,8 +1282,8 @@ storageVolumeLookupByKey(virConnectPtr conn, } static virStorageVolPtr -storageVolumeLookupByPath(virConnectPtr conn, - const char *path) { +storageVolLookupByPath(virConnectPtr conn, + const char *path) { virStorageDriverStatePtr driver = conn->storagePrivateData; unsigned int i; virStorageVolPtr ret = NULL; @@ -1336,12 +1336,12 @@ storageVolumeLookupByPath(virConnectPtr conn, return ret; } -static int storageVolumeDelete(virStorageVolPtr obj, unsigned int flags); +static int storageVolDelete(virStorageVolPtr obj, unsigned int flags); static virStorageVolPtr -storageVolumeCreateXML(virStoragePoolPtr obj, - const char *xmldesc, - unsigned int flags) +storageVolCreateXML(virStoragePoolPtr obj, + const char *xmldesc, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; @@ -1440,7 +1440,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (buildret < 0) { virStoragePoolObjUnlock(pool); - storageVolumeDelete(volobj, 0); + storageVolDelete(volobj, 0); pool = NULL; goto cleanup; } @@ -1462,10 +1462,10 @@ cleanup: } static virStorageVolPtr -storageVolumeCreateXMLFrom(virStoragePoolPtr obj, - const char *xmldesc, - virStorageVolPtr vobj, - unsigned int flags) +storageVolCreateXMLFrom(virStoragePoolPtr obj, + const char *xmldesc, + virStorageVolPtr vobj, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool, origpool = NULL; @@ -1605,7 +1605,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if (buildret < 0) { virStoragePoolObjUnlock(pool); - storageVolumeDelete(volobj, 0); + storageVolDelete(volobj, 0); pool = NULL; goto cleanup; } @@ -1627,11 +1627,11 @@ cleanup: static int -storageVolumeDownload(virStorageVolPtr obj, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, - unsigned int flags) +storageVolDownload(virStorageVolPtr obj, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool = NULL; @@ -1690,11 +1690,11 @@ out: static int -storageVolumeUpload(virStorageVolPtr obj, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, - unsigned int flags) +storageVolUpload(virStorageVolPtr obj, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool = NULL; @@ -1754,9 +1754,9 @@ out: } static int -storageVolumeResize(virStorageVolPtr obj, - unsigned long long capacity, - unsigned int flags) +storageVolResize(virStorageVolPtr obj, + unsigned long long capacity, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageBackendPtr backend; @@ -1858,9 +1858,9 @@ out: * appear as if it were zero-filled. */ static int -storageVolumeZeroSparseFile(virStorageVolDefPtr vol, - off_t size, - int fd) +storageVolZeroSparseFile(virStorageVolDefPtr vol, + off_t size, + int fd) { int ret = -1; @@ -1947,8 +1947,8 @@ out: static int -storageVolumeWipeInternal(virStorageVolDefPtr def, - unsigned int algorithm) +storageVolWipeInternal(virStorageVolDefPtr def, + unsigned int algorithm) { int ret = -1, fd = -1; struct stat st; @@ -2017,7 +2017,7 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, goto out; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { - ret = storageVolumeZeroSparseFile(def, st.st_size, fd); + ret = storageVolZeroSparseFile(def, st.st_size, fd); } else { if (VIR_ALLOC_N(writebuf, st.st_blksize) != 0) { @@ -2044,9 +2044,9 @@ out: static int -storageVolumeWipePattern(virStorageVolPtr obj, - unsigned int algorithm, - unsigned int flags) +storageVolWipePattern(virStorageVolPtr obj, + unsigned int algorithm, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool = NULL; @@ -2095,7 +2095,7 @@ storageVolumeWipePattern(virStorageVolPtr obj, goto out; } - if (storageVolumeWipeInternal(vol, algorithm) == -1) { + if (storageVolWipeInternal(vol, algorithm) == -1) { goto out; } @@ -2111,15 +2111,15 @@ out: } static int -storageVolumeWipe(virStorageVolPtr obj, - unsigned int flags) +storageVolWipe(virStorageVolPtr obj, + unsigned int flags) { - return storageVolumeWipePattern(obj, VIR_STORAGE_VOL_WIPE_ALG_ZERO, flags); + return storageVolWipePattern(obj, VIR_STORAGE_VOL_WIPE_ALG_ZERO, flags); } static int -storageVolumeDelete(virStorageVolPtr obj, - unsigned int flags) { +storageVolDelete(virStorageVolPtr obj, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -2201,8 +2201,8 @@ cleanup: } static int -storageVolumeGetInfo(virStorageVolPtr obj, - virStorageVolInfoPtr info) { +storageVolGetInfo(virStorageVolPtr obj, + virStorageVolInfoPtr info) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -2255,8 +2255,8 @@ cleanup: } static char * -storageVolumeGetXMLDesc(virStorageVolPtr obj, - unsigned int flags) +storageVolGetXMLDesc(virStorageVolPtr obj, + unsigned int flags) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; @@ -2309,7 +2309,7 @@ cleanup: } static char * -storageVolumeGetPath(virStorageVolPtr obj) { +storageVolGetPath(virStorageVolPtr obj) { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageVolDefPtr vol; @@ -2351,9 +2351,9 @@ cleanup: } static int -storageListAllPools(virConnectPtr conn, - virStoragePoolPtr **pools, - unsigned int flags) +storageConnectListAllStoragePools(virConnectPtr conn, + virStoragePoolPtr **pools, + unsigned int flags) { virStorageDriverStatePtr driver = conn->storagePrivateData; int ret = -1; @@ -2371,20 +2371,20 @@ static virStorageDriver storageDriver = { .name = "storage", .storageOpen = storageOpen, /* 0.4.0 */ .storageClose = storageClose, /* 0.4.0 */ - .connectNumOfStoragePools = storageNumPools, /* 0.4.0 */ - .connectListStoragePools = storageListPools, /* 0.4.0 */ - .connectNumOfDefinedStoragePools = storageNumDefinedPools, /* 0.4.0 */ - .connectListDefinedStoragePools = storageListDefinedPools, /* 0.4.0 */ - .connectListAllStoragePools = storageListAllPools, /* 0.10.2 */ - .connectFindStoragePoolSources = storageFindPoolSources, /* 0.4.0 */ + .connectNumOfStoragePools = storageConnectNumOfStoragePools, /* 0.4.0 */ + .connectListStoragePools = storageConnectListStoragePools, /* 0.4.0 */ + .connectNumOfDefinedStoragePools = storageConnectNumOfDefinedStoragePools, /* 0.4.0 */ + .connectListDefinedStoragePools = storageConnectListDefinedStoragePools, /* 0.4.0 */ + .connectListAllStoragePools = storageConnectListAllStoragePools, /* 0.10.2 */ + .connectFindStoragePoolSources = storageConnectFindStoragePoolSources, /* 0.4.0 */ .storagePoolLookupByName = storagePoolLookupByName, /* 0.4.0 */ .storagePoolLookupByUUID = storagePoolLookupByUUID, /* 0.4.0 */ .storagePoolLookupByVolume = storagePoolLookupByVolume, /* 0.4.0 */ - .storagePoolCreateXML = storagePoolCreate, /* 0.4.0 */ - .storagePoolDefineXML = storagePoolDefine, /* 0.4.0 */ + .storagePoolCreateXML = storagePoolCreateXML, /* 0.4.0 */ + .storagePoolDefineXML = storagePoolDefineXML, /* 0.4.0 */ .storagePoolBuild = storagePoolBuild, /* 0.4.0 */ .storagePoolUndefine = storagePoolUndefine, /* 0.4.0 */ - .storagePoolCreate = storagePoolStart, /* 0.4.0 */ + .storagePoolCreate = storagePoolCreate, /* 0.4.0 */ .storagePoolDestroy = storagePoolDestroy, /* 0.4.0 */ .storagePoolDelete = storagePoolDelete, /* 0.4.0 */ .storagePoolRefresh = storagePoolRefresh, /* 0.4.0 */ @@ -2392,24 +2392,24 @@ static virStorageDriver storageDriver = { .storagePoolGetXMLDesc = storagePoolGetXMLDesc, /* 0.4.0 */ .storagePoolGetAutostart = storagePoolGetAutostart, /* 0.4.0 */ .storagePoolSetAutostart = storagePoolSetAutostart, /* 0.4.0 */ - .storagePoolNumOfVolumes = storagePoolNumVolumes, /* 0.4.0 */ + .storagePoolNumOfVolumes = storagePoolNumOfVolumes, /* 0.4.0 */ .storagePoolListVolumes = storagePoolListVolumes, /* 0.4.0 */ .storagePoolListAllVolumes = storagePoolListAllVolumes, /* 0.10.2 */ - .storageVolLookupByName = storageVolumeLookupByName, /* 0.4.0 */ - .storageVolLookupByKey = storageVolumeLookupByKey, /* 0.4.0 */ - .storageVolLookupByPath = storageVolumeLookupByPath, /* 0.4.0 */ - .storageVolCreateXML = storageVolumeCreateXML, /* 0.4.0 */ - .storageVolCreateXMLFrom = storageVolumeCreateXMLFrom, /* 0.6.4 */ - .storageVolDownload = storageVolumeDownload, /* 0.9.0 */ - .storageVolUpload = storageVolumeUpload, /* 0.9.0 */ - .storageVolDelete = storageVolumeDelete, /* 0.4.0 */ - .storageVolWipe = storageVolumeWipe, /* 0.8.0 */ - .storageVolWipePattern = storageVolumeWipePattern, /* 0.9.10 */ - .storageVolGetInfo = storageVolumeGetInfo, /* 0.4.0 */ - .storageVolGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ - .storageVolGetPath = storageVolumeGetPath, /* 0.4.0 */ - .storageVolResize = storageVolumeResize, /* 0.9.10 */ + .storageVolLookupByName = storageVolLookupByName, /* 0.4.0 */ + .storageVolLookupByKey = storageVolLookupByKey, /* 0.4.0 */ + .storageVolLookupByPath = storageVolLookupByPath, /* 0.4.0 */ + .storageVolCreateXML = storageVolCreateXML, /* 0.4.0 */ + .storageVolCreateXMLFrom = storageVolCreateXMLFrom, /* 0.6.4 */ + .storageVolDownload = storageVolDownload, /* 0.9.0 */ + .storageVolUpload = storageVolUpload, /* 0.9.0 */ + .storageVolDelete = storageVolDelete, /* 0.4.0 */ + .storageVolWipe = storageVolWipe, /* 0.8.0 */ + .storageVolWipePattern = storageVolWipePattern, /* 0.9.10 */ + .storageVolGetInfo = storageVolGetInfo, /* 0.4.0 */ + .storageVolGetXMLDesc = storageVolGetXMLDesc, /* 0.4.0 */ + .storageVolGetPath = storageVolGetPath, /* 0.4.0 */ + .storageVolResize = storageVolResize, /* 0.9.10 */ .storagePoolIsActive = storagePoolIsActive, /* 0.7.3 */ .storagePoolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ @@ -2418,9 +2418,9 @@ static virStorageDriver storageDriver = { static virStateDriver stateDriver = { .name = "Storage", - .stateInitialize = storageDriverStartup, - .stateCleanup = storageDriverShutdown, - .stateReload = storageDriverReload, + .stateInitialize = storageStateInitialize, + .stateCleanup = storageStateCleanup, + .stateReload = storageStateReload, }; int storageRegister(void) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 0b1950d..d964fb2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -117,7 +117,7 @@ static const virNodeInfo defaultNodeInfo = { }; -static int testClose(virConnectPtr conn); +static int testConnectClose(virConnectPtr conn); static void testDomainEventQueue(testConnPtr driver, virDomainEventPtr event); @@ -1142,9 +1142,9 @@ static int testOpenFromFile(virConnectPtr conn, } -static virDrvOpenStatus testOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus testConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { int ret; testConnPtr privconn; @@ -1185,7 +1185,7 @@ static virDrvOpenStatus testOpen(virConnectPtr conn, privconn->domainEventState = virDomainEventStateNew(); if (!privconn->domainEventState) { testDriverUnlock(privconn); - testClose(conn); + testConnectClose(conn); return VIR_DRV_OPEN_ERROR; } @@ -1194,7 +1194,7 @@ static virDrvOpenStatus testOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testClose(virConnectPtr conn) +static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; testDriverLock(privconn); @@ -1216,30 +1216,30 @@ static int testClose(virConnectPtr conn) return 0; } -static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned long *hvVer) +static int testConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned long *hvVer) { *hvVer = 2; return 0; } -static int testIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static int testIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { return 0; } -static int testIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED) +static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type ATTRIBUTE_UNUSED) { return 32; } @@ -1254,7 +1254,7 @@ static int testNodeGetInfo(virConnectPtr conn, return 0; } -static char *testGetCapabilities(virConnectPtr conn) +static char *testConnectGetCapabilities(virConnectPtr conn) { testConnPtr privconn = conn->privateData; char *xml; @@ -1265,7 +1265,7 @@ static char *testGetCapabilities(virConnectPtr conn) return xml; } -static int testNumOfDomains(virConnectPtr conn) +static int testConnectNumOfDomains(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int count; @@ -1374,7 +1374,7 @@ cleanup: } -static virDomainPtr testLookupDomainByID(virConnectPtr conn, +static virDomainPtr testDomainLookupByID(virConnectPtr conn, int id) { testConnPtr privconn = conn->privateData; @@ -1400,7 +1400,7 @@ cleanup: return ret; } -static virDomainPtr testLookupDomainByUUID(virConnectPtr conn, +static virDomainPtr testDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { testConnPtr privconn = conn->privateData; @@ -1426,7 +1426,7 @@ cleanup: return ret; } -static virDomainPtr testLookupDomainByName(virConnectPtr conn, +static virDomainPtr testDomainLookupByName(virConnectPtr conn, const char *name) { testConnPtr privconn = conn->privateData; @@ -1452,9 +1452,9 @@ cleanup: return ret; } -static int testListDomains(virConnectPtr conn, - int *ids, - int maxids) +static int testConnectListDomains(virConnectPtr conn, + int *ids, + int maxids) { testConnPtr privconn = conn->privateData; int n; @@ -1466,7 +1466,7 @@ static int testListDomains(virConnectPtr conn, return n; } -static int testDestroyDomain(virDomainPtr domain) +static int testDomainDestroy(virDomainPtr domain) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -1503,7 +1503,7 @@ cleanup: return ret; } -static int testResumeDomain(virDomainPtr domain) +static int testDomainResume(virDomainPtr domain) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -1544,7 +1544,7 @@ cleanup: return ret; } -static int testPauseDomain(virDomainPtr domain) +static int testDomainSuspend(virDomainPtr domain) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -1587,7 +1587,7 @@ cleanup: return ret; } -static int testShutdownDomainFlags(virDomainPtr domain, +static int testDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { testConnPtr privconn = domain->conn->privateData; @@ -1633,13 +1633,13 @@ cleanup: return ret; } -static int testShutdownDomain(virDomainPtr domain) +static int testDomainShutdown(virDomainPtr domain) { - return testShutdownDomainFlags(domain, 0); + return testDomainShutdownFlags(domain, 0); } /* Similar behaviour as shutdown */ -static int testRebootDomain(virDomainPtr domain, +static int testDomainReboot(virDomainPtr domain, unsigned int action ATTRIBUTE_UNUSED) { testConnPtr privconn = domain->conn->privateData; @@ -1709,7 +1709,7 @@ cleanup: return ret; } -static int testGetDomainInfo(virDomainPtr domain, +static int testDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { testConnPtr privconn = domain->conn->privateData; @@ -2059,14 +2059,14 @@ cleanup: return ret; } -static char *testGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { +static char *testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { char *ret = strdup("linux"); if (!ret) virReportOOMError(); return ret; } -static unsigned long long testGetMaxMemory(virDomainPtr domain) { +static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; unsigned long long ret = 0; @@ -2089,8 +2089,8 @@ cleanup: return ret; } -static int testSetMaxMemory(virDomainPtr domain, - unsigned long memory) +static int testDomainSetMaxMemory(virDomainPtr domain, + unsigned long memory) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -2116,8 +2116,8 @@ cleanup: return ret; } -static int testSetMemory(virDomainPtr domain, - unsigned long memory) +static int testDomainSetMemory(virDomainPtr domain, + unsigned long memory) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -2215,7 +2215,7 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, _("invalid flag combination: (0x%x)"), flags); return -1; } - if (!nrCpus || (maxvcpus = testGetMaxVCPUs(domain->conn, NULL)) < nrCpus) { + if (!nrCpus || (maxvcpus = testConnectGetMaxVcpus(domain->conn, NULL)) < nrCpus) { virReportError(VIR_ERR_INVALID_ARG, _("argument out of range: %d"), nrCpus); return -1; @@ -2286,7 +2286,7 @@ cleanup: } static int -testSetVcpus(virDomainPtr domain, unsigned int nrCpus) +testDomainSetVcpus(virDomainPtr domain, unsigned int nrCpus) { return testDomainSetVcpusFlags(domain, nrCpus, VIR_DOMAIN_AFFECT_LIVE); } @@ -2467,7 +2467,7 @@ cleanup: return ret; } -static int testNumOfDefinedDomains(virConnectPtr conn) { +static int testConnectNumOfDefinedDomains(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int count; @@ -2478,9 +2478,9 @@ static int testNumOfDefinedDomains(virConnectPtr conn) { return count; } -static int testListDefinedDomains(virConnectPtr conn, - char **const names, - int maxnames) { +static int testConnectListDefinedDomains(virConnectPtr conn, + char **const names, + int maxnames) { testConnPtr privconn = conn->privateData; int n; @@ -2728,10 +2728,10 @@ static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, } static int -testDomainGetSchedulerParamsFlags(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +testDomainGetSchedulerParametersFlags(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -2765,18 +2765,18 @@ cleanup: } static int -testDomainGetSchedulerParams(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams) +testDomainGetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams) { - return testDomainGetSchedulerParamsFlags(domain, params, nparams, 0); + return testDomainGetSchedulerParametersFlags(domain, params, nparams, 0); } static int -testDomainSetSchedulerParamsFlags(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags) +testDomainSetSchedulerParametersFlags(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; @@ -2815,11 +2815,11 @@ cleanup: } static int -testDomainSetSchedulerParams(virDomainPtr domain, - virTypedParameterPtr params, - int nparams) +testDomainSetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams) { - return testDomainSetSchedulerParamsFlags(domain, params, nparams, 0); + return testDomainSetSchedulerParametersFlags(domain, params, nparams, 0); } static int testDomainBlockStats(virDomainPtr domain, @@ -2927,7 +2927,7 @@ error: return ret; } -static virDrvOpenStatus testOpenNetwork(virConnectPtr conn, +static virDrvOpenStatus testNetworkOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { @@ -2940,14 +2940,14 @@ static virDrvOpenStatus testOpenNetwork(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testCloseNetwork(virConnectPtr conn) { +static int testNetworkClose(virConnectPtr conn) { conn->networkPrivateData = NULL; return 0; } -static virNetworkPtr testLookupNetworkByUUID(virConnectPtr conn, - const unsigned char *uuid) +static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) { testConnPtr privconn = conn->privateData; virNetworkObjPtr net; @@ -2970,7 +2970,7 @@ cleanup: return ret; } -static virNetworkPtr testLookupNetworkByName(virConnectPtr conn, +static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, const char *name) { testConnPtr privconn = conn->privateData; @@ -2995,7 +2995,7 @@ cleanup: } -static int testNumNetworks(virConnectPtr conn) { +static int testConnectNumOfNetworks(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int numActive = 0, i; @@ -3011,7 +3011,7 @@ static int testNumNetworks(virConnectPtr conn) { return numActive; } -static int testListNetworks(virConnectPtr conn, char **const names, int nnames) { +static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -3038,7 +3038,7 @@ no_memory: return -1; } -static int testNumDefinedNetworks(virConnectPtr conn) { +static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int numInactive = 0, i; @@ -3054,7 +3054,7 @@ static int testNumDefinedNetworks(virConnectPtr conn) { return numInactive; } -static int testListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { +static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -3082,7 +3082,7 @@ no_memory: } static int -testNetworkListAllNetworks(virConnectPtr conn, +testConnectListAllNetworks(virConnectPtr conn, virNetworkPtr **nets, unsigned int flags) { @@ -3141,7 +3141,7 @@ cleanup: } -static virNetworkPtr testNetworkCreate(virConnectPtr conn, const char *xml) { +static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) { testConnPtr privconn = conn->privateData; virNetworkDefPtr def; virNetworkObjPtr net = NULL; @@ -3167,7 +3167,7 @@ cleanup: } static -virNetworkPtr testNetworkDefine(virConnectPtr conn, const char *xml) +virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml) { testConnPtr privconn = conn->privateData; virNetworkDefPtr def; @@ -3273,7 +3273,7 @@ cleanup: return ret; } -static int testNetworkStart(virNetworkPtr network) { +static int testNetworkCreate(virNetworkPtr network) { testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -3447,7 +3447,7 @@ cleanup: * Physical host interface routines */ -static virDrvOpenStatus testOpenInterface(virConnectPtr conn, +static virDrvOpenStatus testInterfaceOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { @@ -3460,14 +3460,14 @@ static virDrvOpenStatus testOpenInterface(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testCloseInterface(virConnectPtr conn) +static int testInterfaceClose(virConnectPtr conn) { conn->interfacePrivateData = NULL; return 0; } -static int testNumOfInterfaces(virConnectPtr conn) +static int testConnectNumOfInterfaces(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int i, count = 0; @@ -3484,7 +3484,7 @@ static int testNumOfInterfaces(virConnectPtr conn) return count; } -static int testListInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -3513,7 +3513,7 @@ no_memory: return -1; } -static int testNumOfDefinedInterfaces(virConnectPtr conn) +static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int i, count = 0; @@ -3530,7 +3530,7 @@ static int testNumOfDefinedInterfaces(virConnectPtr conn) return count; } -static int testListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) +static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -3559,7 +3559,7 @@ no_memory: return -1; } -static virInterfacePtr testLookupInterfaceByName(virConnectPtr conn, +static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, const char *name) { testConnPtr privconn = conn->privateData; @@ -3583,7 +3583,7 @@ cleanup: return ret; } -static virInterfacePtr testLookupInterfaceByMACString(virConnectPtr conn, +static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, const char *mac) { testConnPtr privconn = conn->privateData; @@ -3964,7 +3964,7 @@ testStoragePoolLookupByVolume(virStorageVolPtr vol) { } static int -testStorageNumPools(virConnectPtr conn) { +testConnectNumOfStoragePools(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int numActive = 0, i; @@ -3978,9 +3978,9 @@ testStorageNumPools(virConnectPtr conn) { } static int -testStorageListPools(virConnectPtr conn, - char **const names, - int nnames) { +testConnectListStoragePools(virConnectPtr conn, + char **const names, + int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -4008,7 +4008,7 @@ no_memory: } static int -testStorageNumDefinedPools(virConnectPtr conn) { +testConnectNumOfDefinedStoragePools(virConnectPtr conn) { testConnPtr privconn = conn->privateData; int numInactive = 0, i; @@ -4025,9 +4025,9 @@ testStorageNumDefinedPools(virConnectPtr conn) { } static int -testStorageListDefinedPools(virConnectPtr conn, - char **const names, - int nnames) { +testConnectListDefinedStoragePools(virConnectPtr conn, + char **const names, + int nnames) { testConnPtr privconn = conn->privateData; int n = 0, i; @@ -4055,9 +4055,9 @@ no_memory: } static int -testStorageListAllPools(virConnectPtr conn, - virStoragePoolPtr **pools, - unsigned int flags) +testConnectListAllStoragePools(virConnectPtr conn, + virStoragePoolPtr **pools, + unsigned int flags) { testConnPtr privconn = conn->privateData; int ret = -1; @@ -4116,8 +4116,8 @@ cleanup: static int -testStoragePoolStart(virStoragePoolPtr pool, - unsigned int flags) +testStoragePoolCreate(virStoragePoolPtr pool, + unsigned int flags) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; @@ -4151,10 +4151,10 @@ cleanup: } static char * -testStorageFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type, - const char *srcSpec, - unsigned int flags) +testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type, + const char *srcSpec, + unsigned int flags) { virStoragePoolSourcePtr source = NULL; int pool_type; @@ -4207,9 +4207,9 @@ cleanup: static virStoragePoolPtr -testStoragePoolCreate(virConnectPtr conn, - const char *xml, - unsigned int flags) +testStoragePoolCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { testConnPtr privconn = conn->privateData; virStoragePoolDefPtr def; @@ -4254,9 +4254,9 @@ cleanup: } static virStoragePoolPtr -testStoragePoolDefine(virConnectPtr conn, - const char *xml, - unsigned int flags) +testStoragePoolDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags) { testConnPtr privconn = conn->privateData; virStoragePoolDefPtr def; @@ -4591,7 +4591,7 @@ cleanup: static int -testStoragePoolNumVolumes(virStoragePoolPtr pool) { +testStoragePoolNumOfVolumes(virStoragePoolPtr pool) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -4737,8 +4737,8 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, } static virStorageVolPtr -testStorageVolumeLookupByName(virStoragePoolPtr pool, - const char *name ATTRIBUTE_UNUSED) { +testStorageVolLookupByName(virStoragePoolPtr pool, + const char *name ATTRIBUTE_UNUSED) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -4781,8 +4781,8 @@ cleanup: static virStorageVolPtr -testStorageVolumeLookupByKey(virConnectPtr conn, - const char *key) { +testStorageVolLookupByKey(virConnectPtr conn, + const char *key) { testConnPtr privconn = conn->privateData; unsigned int i; virStorageVolPtr ret = NULL; @@ -4816,8 +4816,8 @@ testStorageVolumeLookupByKey(virConnectPtr conn, } static virStorageVolPtr -testStorageVolumeLookupByPath(virConnectPtr conn, - const char *path) { +testStorageVolLookupByPath(virConnectPtr conn, + const char *path) { testConnPtr privconn = conn->privateData; unsigned int i; virStorageVolPtr ret = NULL; @@ -4851,9 +4851,9 @@ testStorageVolumeLookupByPath(virConnectPtr conn, } static virStorageVolPtr -testStorageVolumeCreateXML(virStoragePoolPtr pool, - const char *xmldesc, - unsigned int flags) +testStorageVolCreateXML(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; @@ -4935,10 +4935,10 @@ cleanup: } static virStorageVolPtr -testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, - const char *xmldesc, - virStorageVolPtr clonevol, - unsigned int flags) +testStorageVolCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr clonevol, + unsigned int flags) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; @@ -5030,8 +5030,8 @@ cleanup: } static int -testStorageVolumeDelete(virStorageVolPtr vol, - unsigned int flags) +testStorageVolDelete(virStorageVolPtr vol, + unsigned int flags) { testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -5113,8 +5113,8 @@ static int testStorageVolumeTypeForPool(int pooltype) { } static int -testStorageVolumeGetInfo(virStorageVolPtr vol, - virStorageVolInfoPtr info) { +testStorageVolGetInfo(virStorageVolPtr vol, + virStorageVolInfoPtr info) { testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -5158,8 +5158,8 @@ cleanup: } static char * -testStorageVolumeGetXMLDesc(virStorageVolPtr vol, - unsigned int flags) +testStorageVolGetXMLDesc(virStorageVolPtr vol, + unsigned int flags) { testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; @@ -5202,7 +5202,7 @@ cleanup: } static char * -testStorageVolumeGetPath(virStorageVolPtr vol) { +testStorageVolGetPath(virStorageVolPtr vol) { testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -5604,10 +5604,10 @@ out: /* Domain event implementations */ static int -testDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +testConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { testConnPtr driver = conn->privateData; int ret; @@ -5623,8 +5623,8 @@ testDomainEventRegister(virConnectPtr conn, static int -testDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +testConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { testConnPtr driver = conn->privateData; int ret; @@ -5640,12 +5640,12 @@ testDomainEventDeregister(virConnectPtr conn, static int -testDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +testConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { testConnPtr driver = conn->privateData; int ret; @@ -5662,8 +5662,8 @@ testDomainEventRegisterAny(virConnectPtr conn, } static int -testDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +testConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { testConnPtr driver = conn->privateData; int ret; @@ -5722,9 +5722,9 @@ static int testNWFilterClose(virConnectPtr conn) { return 0; } -static int testListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +static int testConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { testConnPtr privconn = conn->privateData; int ret; @@ -5793,46 +5793,46 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, static virDriver testDriver = { .no = VIR_DRV_TEST, .name = "Test", - .connectOpen = testOpen, /* 0.1.1 */ - .connectClose = testClose, /* 0.1.1 */ - .connectGetVersion = testGetVersion, /* 0.1.1 */ + .connectOpen = testConnectOpen, /* 0.1.1 */ + .connectClose = testConnectClose, /* 0.1.1 */ + .connectGetVersion = testConnectGetVersion, /* 0.1.1 */ .connectGetHostname = virGetHostname, /* 0.6.3 */ - .connectGetMaxVcpus = testGetMaxVCPUs, /* 0.3.2 */ + .connectGetMaxVcpus = testConnectGetMaxVcpus, /* 0.3.2 */ .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ - .connectGetCapabilities = testGetCapabilities, /* 0.2.1 */ - .connectListDomains = testListDomains, /* 0.1.1 */ - .connectNumOfDomains = testNumOfDomains, /* 0.1.1 */ - .connectListAllDomains = testListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = testConnectGetCapabilities, /* 0.2.1 */ + .connectListDomains = testConnectListDomains, /* 0.1.1 */ + .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ + .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ - .domainLookupByID = testLookupDomainByID, /* 0.1.1 */ - .domainLookupByUUID = testLookupDomainByUUID, /* 0.1.1 */ - .domainLookupByName = testLookupDomainByName, /* 0.1.1 */ - .domainSuspend = testPauseDomain, /* 0.1.1 */ - .domainResume = testResumeDomain, /* 0.1.1 */ - .domainShutdown = testShutdownDomain, /* 0.1.1 */ - .domainShutdownFlags = testShutdownDomainFlags, /* 0.9.10 */ - .domainReboot = testRebootDomain, /* 0.1.1 */ - .domainDestroy = testDestroyDomain, /* 0.1.1 */ - .domainGetOSType = testGetOSType, /* 0.1.9 */ - .domainGetMaxMemory = testGetMaxMemory, /* 0.1.4 */ - .domainSetMaxMemory = testSetMaxMemory, /* 0.1.1 */ - .domainSetMemory = testSetMemory, /* 0.1.4 */ - .domainGetInfo = testGetDomainInfo, /* 0.1.1 */ + .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ + .domainLookupByUUID = testDomainLookupByUUID, /* 0.1.1 */ + .domainLookupByName = testDomainLookupByName, /* 0.1.1 */ + .domainSuspend = testDomainSuspend, /* 0.1.1 */ + .domainResume = testDomainResume, /* 0.1.1 */ + .domainShutdown = testDomainShutdown, /* 0.1.1 */ + .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ + .domainReboot = testDomainReboot, /* 0.1.1 */ + .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ + .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ + .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ + .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ + .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ .domainGetState = testDomainGetState, /* 0.9.2 */ .domainSave = testDomainSave, /* 0.3.2 */ .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */ .domainRestore = testDomainRestore, /* 0.3.2 */ .domainRestoreFlags = testDomainRestoreFlags, /* 0.9.4 */ .domainCoreDump = testDomainCoreDump, /* 0.3.2 */ - .domainSetVcpus = testSetVcpus, /* 0.1.4 */ + .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */ .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = testDomainGetVcpusFlags, /* 0.8.5 */ .domainPinVcpu = testDomainPinVcpu, /* 0.7.3 */ .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ - .connectListDefinedDomains = testListDefinedDomains, /* 0.1.11 */ - .connectNumOfDefinedDomains = testNumOfDefinedDomains, /* 0.1.11 */ + .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ + .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ .domainCreate = testDomainCreate, /* 0.1.11 */ .domainCreateWithFlags = testDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = testDomainDefineXML, /* 0.1.11 */ @@ -5841,43 +5841,43 @@ static virDriver testDriver = { .domainGetAutostart = testDomainGetAutostart, /* 0.3.2 */ .domainSetAutostart = testDomainSetAutostart, /* 0.3.2 */ .domainGetSchedulerType = testDomainGetSchedulerType, /* 0.3.2 */ - .domainGetSchedulerParameters = testDomainGetSchedulerParams, /* 0.3.2 */ - .domainGetSchedulerParametersFlags = testDomainGetSchedulerParamsFlags, /* 0.9.2 */ - .domainSetSchedulerParameters = testDomainSetSchedulerParams, /* 0.3.2 */ - .domainSetSchedulerParametersFlags = testDomainSetSchedulerParamsFlags, /* 0.9.2 */ + .domainGetSchedulerParameters = testDomainGetSchedulerParameters, /* 0.3.2 */ + .domainGetSchedulerParametersFlags = testDomainGetSchedulerParametersFlags, /* 0.9.2 */ + .domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */ + .domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ - .connectDomainEventRegister = testDomainEventRegister, /* 0.6.0 */ - .connectDomainEventDeregister = testDomainEventDeregister, /* 0.6.0 */ - .connectIsEncrypted = testIsEncrypted, /* 0.7.3 */ - .connectIsSecure = testIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */ + .connectDomainEventDeregister = testConnectDomainEventDeregister, /* 0.6.0 */ + .connectIsEncrypted = testConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = testConnectIsSecure, /* 0.7.3 */ .domainIsActive = testDomainIsActive, /* 0.7.3 */ .domainIsPersistent = testDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = testDomainIsUpdated, /* 0.8.6 */ - .connectDomainEventRegisterAny = testDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ - .connectIsAlive = testIsAlive, /* 0.9.8 */ + .connectDomainEventRegisterAny = testConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = testConnectDomainEventDeregisterAny, /* 0.8.0 */ + .connectIsAlive = testConnectIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ }; static virNetworkDriver testNetworkDriver = { "Test", - .networkOpen = testOpenNetwork, /* 0.3.2 */ - .networkClose = testCloseNetwork, /* 0.3.2 */ - .connectNumOfNetworks = testNumNetworks, /* 0.3.2 */ - .connectListNetworks = testListNetworks, /* 0.3.2 */ - .connectNumOfDefinedNetworks = testNumDefinedNetworks, /* 0.3.2 */ - .connectListDefinedNetworks = testListDefinedNetworks, /* 0.3.2 */ - .connectListAllNetworks = testNetworkListAllNetworks, /* 0.10.2 */ - .networkLookupByUUID = testLookupNetworkByUUID, /* 0.3.2 */ - .networkLookupByName = testLookupNetworkByName, /* 0.3.2 */ - .networkCreateXML = testNetworkCreate, /* 0.3.2 */ - .networkDefineXML = testNetworkDefine, /* 0.3.2 */ + .networkOpen = testNetworkOpen, /* 0.3.2 */ + .networkClose = testNetworkClose, /* 0.3.2 */ + .connectNumOfNetworks = testConnectNumOfNetworks, /* 0.3.2 */ + .connectListNetworks = testConnectListNetworks, /* 0.3.2 */ + .connectNumOfDefinedNetworks = testConnectNumOfDefinedNetworks, /* 0.3.2 */ + .connectListDefinedNetworks = testConnectListDefinedNetworks, /* 0.3.2 */ + .connectListAllNetworks = testConnectListAllNetworks, /* 0.10.2 */ + .networkLookupByUUID = testNetworkLookupByUUID, /* 0.3.2 */ + .networkLookupByName = testNetworkLookupByName, /* 0.3.2 */ + .networkCreateXML = testNetworkCreateXML, /* 0.3.2 */ + .networkDefineXML = testNetworkDefineXML, /* 0.3.2 */ .networkUndefine = testNetworkUndefine, /* 0.3.2 */ .networkUpdate = testNetworkUpdate, /* 0.10.2 */ - .networkCreate = testNetworkStart, /* 0.3.2 */ + .networkCreate = testNetworkCreate, /* 0.3.2 */ .networkDestroy = testNetworkDestroy, /* 0.3.2 */ .networkGetXMLDesc = testNetworkGetXMLDesc, /* 0.3.2 */ .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ @@ -5889,14 +5889,14 @@ static virNetworkDriver testNetworkDriver = { static virInterfaceDriver testInterfaceDriver = { "Test", /* name */ - .interfaceOpen = testOpenInterface, /* 0.7.0 */ - .interfaceClose = testCloseInterface, /* 0.7.0 */ - .connectNumOfInterfaces = testNumOfInterfaces, /* 0.7.0 */ - .connectListInterfaces = testListInterfaces, /* 0.7.0 */ - .connectNumOfDefinedInterfaces = testNumOfDefinedInterfaces, /* 0.7.0 */ - .connectListDefinedInterfaces = testListDefinedInterfaces, /* 0.7.0 */ - .interfaceLookupByName = testLookupInterfaceByName, /* 0.7.0 */ - .interfaceLookupByMACString = testLookupInterfaceByMACString, /* 0.7.0 */ + .interfaceOpen = testInterfaceOpen, /* 0.7.0 */ + .interfaceClose = testInterfaceClose, /* 0.7.0 */ + .connectNumOfInterfaces = testConnectNumOfInterfaces, /* 0.7.0 */ + .connectListInterfaces = testConnectListInterfaces, /* 0.7.0 */ + .connectNumOfDefinedInterfaces = testConnectNumOfDefinedInterfaces, /* 0.7.0 */ + .connectListDefinedInterfaces = testConnectListDefinedInterfaces, /* 0.7.0 */ + .interfaceLookupByName = testInterfaceLookupByName, /* 0.7.0 */ + .interfaceLookupByMACString = testInterfaceLookupByMACString, /* 0.7.0 */ .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ .interfaceDefineXML = testInterfaceDefineXML, /* 0.7.0 */ .interfaceUndefine = testInterfaceUndefine, /* 0.7.0 */ @@ -5914,20 +5914,20 @@ static virStorageDriver testStorageDriver = { .storageOpen = testStorageOpen, /* 0.4.1 */ .storageClose = testStorageClose, /* 0.4.1 */ - .connectNumOfStoragePools = testStorageNumPools, /* 0.5.0 */ - .connectListStoragePools = testStorageListPools, /* 0.5.0 */ - .connectNumOfDefinedStoragePools = testStorageNumDefinedPools, /* 0.5.0 */ - .connectListDefinedStoragePools = testStorageListDefinedPools, /* 0.5.0 */ - .connectListAllStoragePools = testStorageListAllPools, /* 0.10.2 */ - .connectFindStoragePoolSources = testStorageFindPoolSources, /* 0.5.0 */ + .connectNumOfStoragePools = testConnectNumOfStoragePools, /* 0.5.0 */ + .connectListStoragePools = testConnectListStoragePools, /* 0.5.0 */ + .connectNumOfDefinedStoragePools = testConnectNumOfDefinedStoragePools, /* 0.5.0 */ + .connectListDefinedStoragePools = testConnectListDefinedStoragePools, /* 0.5.0 */ + .connectListAllStoragePools = testConnectListAllStoragePools, /* 0.10.2 */ + .connectFindStoragePoolSources = testConnectFindStoragePoolSources, /* 0.5.0 */ .storagePoolLookupByName = testStoragePoolLookupByName, /* 0.5.0 */ .storagePoolLookupByUUID = testStoragePoolLookupByUUID, /* 0.5.0 */ .storagePoolLookupByVolume = testStoragePoolLookupByVolume, /* 0.5.0 */ - .storagePoolCreateXML = testStoragePoolCreate, /* 0.5.0 */ - .storagePoolDefineXML = testStoragePoolDefine, /* 0.5.0 */ + .storagePoolCreateXML = testStoragePoolCreateXML, /* 0.5.0 */ + .storagePoolDefineXML = testStoragePoolDefineXML, /* 0.5.0 */ .storagePoolBuild = testStoragePoolBuild, /* 0.5.0 */ .storagePoolUndefine = testStoragePoolUndefine, /* 0.5.0 */ - .storagePoolCreate = testStoragePoolStart, /* 0.5.0 */ + .storagePoolCreate = testStoragePoolCreate, /* 0.5.0 */ .storagePoolDestroy = testStoragePoolDestroy, /* 0.5.0 */ .storagePoolDelete = testStoragePoolDelete, /* 0.5.0 */ .storagePoolRefresh = testStoragePoolRefresh, /* 0.5.0 */ @@ -5935,19 +5935,19 @@ static virStorageDriver testStorageDriver = { .storagePoolGetXMLDesc = testStoragePoolGetXMLDesc, /* 0.5.0 */ .storagePoolGetAutostart = testStoragePoolGetAutostart, /* 0.5.0 */ .storagePoolSetAutostart = testStoragePoolSetAutostart, /* 0.5.0 */ - .storagePoolNumOfVolumes = testStoragePoolNumVolumes, /* 0.5.0 */ + .storagePoolNumOfVolumes = testStoragePoolNumOfVolumes, /* 0.5.0 */ .storagePoolListVolumes = testStoragePoolListVolumes, /* 0.5.0 */ .storagePoolListAllVolumes = testStoragePoolListAllVolumes, /* 0.10.2 */ - .storageVolLookupByName = testStorageVolumeLookupByName, /* 0.5.0 */ - .storageVolLookupByKey = testStorageVolumeLookupByKey, /* 0.5.0 */ - .storageVolLookupByPath = testStorageVolumeLookupByPath, /* 0.5.0 */ - .storageVolCreateXML = testStorageVolumeCreateXML, /* 0.5.0 */ - .storageVolCreateXMLFrom = testStorageVolumeCreateXMLFrom, /* 0.6.4 */ - .storageVolDelete = testStorageVolumeDelete, /* 0.5.0 */ - .storageVolGetInfo = testStorageVolumeGetInfo, /* 0.5.0 */ - .storageVolGetXMLDesc = testStorageVolumeGetXMLDesc, /* 0.5.0 */ - .storageVolGetPath = testStorageVolumeGetPath, /* 0.5.0 */ + .storageVolLookupByName = testStorageVolLookupByName, /* 0.5.0 */ + .storageVolLookupByKey = testStorageVolLookupByKey, /* 0.5.0 */ + .storageVolLookupByPath = testStorageVolLookupByPath, /* 0.5.0 */ + .storageVolCreateXML = testStorageVolCreateXML, /* 0.5.0 */ + .storageVolCreateXMLFrom = testStorageVolCreateXMLFrom, /* 0.6.4 */ + .storageVolDelete = testStorageVolDelete, /* 0.5.0 */ + .storageVolGetInfo = testStorageVolGetInfo, /* 0.5.0 */ + .storageVolGetXMLDesc = testStorageVolGetXMLDesc, /* 0.5.0 */ + .storageVolGetPath = testStorageVolGetPath, /* 0.5.0 */ .storagePoolIsActive = testStoragePoolIsActive, /* 0.7.3 */ .storagePoolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ }; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index e30f067..9b0aba6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -89,7 +89,7 @@ static int umlProcessAutoDestroyRemove(struct uml_driver *driver, virDomainObjPtr vm); -static int umlShutdown(void); +static int umlStateCleanup(void); static void *umlDomainObjPrivateAlloc(void) { @@ -446,9 +446,9 @@ virDomainDefParserConfig umlDriverDomainDefParserConfig = { * Initialization function for the Uml daemon */ static int -umlStartup(bool privileged, - virStateInhibitCallback callback, - void *opaque) +umlStateInitialize(bool privileged, + virStateInhibitCallback callback, + void *opaque) { char *base = NULL; char *userdir = NULL; @@ -586,7 +586,7 @@ error: VIR_FREE(userdir); VIR_FREE(base); umlDriverUnlock(uml_driver); - umlShutdown(); + umlStateCleanup(); return -1; } @@ -606,13 +606,13 @@ static void umlNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) /** - * umlReload: + * umlStateReload: * * Function to restart the Uml daemon, it will recheck the configuration * files and update its state and the networking */ static int -umlReload(void) { +umlStateReload(void) { if (!uml_driver) return 0; @@ -645,12 +645,12 @@ umlShutdownOneVM(virDomainObjPtr dom, void *opaque) } /** - * umlShutdown: + * umlStateCleanup: * * Shutdown the Uml daemon, it will stop all active domains and networks */ static int -umlShutdown(void) { +umlStateCleanup(void) { if (!uml_driver) return -1; @@ -1186,9 +1186,9 @@ static void umlShutdownVMDaemon(struct uml_driver *driver, } -static virDrvOpenStatus umlOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus umlConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1241,7 +1241,7 @@ static virDrvOpenStatus umlOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int umlClose(virConnectPtr conn) { +static int umlConnectClose(virConnectPtr conn) { struct uml_driver *driver = conn->privateData; umlDriverLock(driver); @@ -1253,32 +1253,32 @@ static int umlClose(virConnectPtr conn) { return 0; } -static const char *umlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { +static const char *umlConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "UML"; } -static int umlIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int umlConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -static int umlIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int umlConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -static int umlIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int umlConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static char *umlGetCapabilities(virConnectPtr conn) { +static char *umlConnectGetCapabilities(virConnectPtr conn) { struct uml_driver *driver = (struct uml_driver *)conn->privateData; char *xml; @@ -1469,7 +1469,7 @@ cleanup: return ret; } -static int umlGetVersion(virConnectPtr conn, unsigned long *version) { +static int umlConnectGetVersion(virConnectPtr conn, unsigned long *version) { struct uml_driver *driver = conn->privateData; struct utsname ut; int ret = -1; @@ -1494,7 +1494,7 @@ cleanup: return ret; } -static int umlListDomains(virConnectPtr conn, int *ids, int nids) { +static int umlConnectListDomains(virConnectPtr conn, int *ids, int nids) { struct uml_driver *driver = conn->privateData; int n; @@ -1504,7 +1504,7 @@ static int umlListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int umlNumDomains(virConnectPtr conn) { +static int umlConnectNumOfDomains(virConnectPtr conn) { struct uml_driver *driver = conn->privateData; int n; @@ -1514,8 +1514,8 @@ static int umlNumDomains(virConnectPtr conn) { return n; } -static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, - unsigned int flags) { +static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml, + unsigned int flags) { struct uml_driver *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm = NULL; @@ -1876,8 +1876,8 @@ cleanup: } -static int umlListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { +static int umlConnectListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) { struct uml_driver *driver = conn->privateData; int n; @@ -1888,7 +1888,7 @@ static int umlListDefinedDomains(virConnectPtr conn, return n; } -static int umlNumDefinedDomains(virConnectPtr conn) { +static int umlConnectNumOfDefinedDomains(virConnectPtr conn) { struct uml_driver *driver = conn->privateData; int n; @@ -1900,7 +1900,7 @@ static int umlNumDefinedDomains(virConnectPtr conn) { } -static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { +static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virDomainEventPtr event = NULL; @@ -1934,11 +1934,11 @@ cleanup: return ret; } -static int umlDomainStart(virDomainPtr dom) { - return umlDomainStartWithFlags(dom, 0); +static int umlDomainCreate(virDomainPtr dom) { + return umlDomainCreateWithFlags(dom, 0); } -static virDomainPtr umlDomainDefine(virConnectPtr conn, const char *xml) { +static virDomainPtr umlDomainDefineXML(virConnectPtr conn, const char *xml) { struct uml_driver *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm = NULL; @@ -2492,10 +2492,10 @@ cleanup: static int -umlDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) +umlConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { struct uml_driver *driver = conn->privateData; int ret; @@ -2510,8 +2510,8 @@ umlDomainEventRegister(virConnectPtr conn, } static int -umlDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +umlConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { struct uml_driver *driver = conn->privateData; int ret; @@ -2526,12 +2526,12 @@ umlDomainEventDeregister(virConnectPtr conn, } static int -umlDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) +umlConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { struct uml_driver *driver = conn->privateData; int ret; @@ -2549,8 +2549,8 @@ umlDomainEventRegisterAny(virConnectPtr conn, static int -umlDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +umlConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { struct uml_driver *driver = conn->privateData; int ret; @@ -2572,9 +2572,9 @@ static void umlDomainEventQueue(struct uml_driver *driver, virDomainEventStateQueue(driver->domainEventState, event); } -static int umlListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +static int umlConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { struct uml_driver *driver = conn->privateData; int ret = -1; @@ -2593,17 +2593,17 @@ static int umlListAllDomains(virConnectPtr conn, static virDriver umlDriver = { .no = VIR_DRV_UML, .name = "UML", - .connectOpen = umlOpen, /* 0.5.0 */ - .connectClose = umlClose, /* 0.5.0 */ - .connectGetType = umlGetType, /* 0.5.0 */ - .connectGetVersion = umlGetVersion, /* 0.5.0 */ + .connectOpen = umlConnectOpen, /* 0.5.0 */ + .connectClose = umlConnectClose, /* 0.5.0 */ + .connectGetType = umlConnectGetType, /* 0.5.0 */ + .connectGetVersion = umlConnectGetVersion, /* 0.5.0 */ .connectGetHostname = virGetHostname, /* 0.5.0 */ .nodeGetInfo = nodeGetInfo, /* 0.5.0 */ - .connectGetCapabilities = umlGetCapabilities, /* 0.5.0 */ - .connectListDomains = umlListDomains, /* 0.5.0 */ - .connectNumOfDomains = umlNumDomains, /* 0.5.0 */ - .connectListAllDomains = umlListAllDomains, /* 0.9.13 */ - .domainCreateXML = umlDomainCreate, /* 0.5.0 */ + .connectGetCapabilities = umlConnectGetCapabilities, /* 0.5.0 */ + .connectListDomains = umlConnectListDomains, /* 0.5.0 */ + .connectNumOfDomains = umlConnectNumOfDomains, /* 0.5.0 */ + .connectListAllDomains = umlConnectListAllDomains, /* 0.9.13 */ + .domainCreateXML = umlDomainCreateXML, /* 0.5.0 */ .domainLookupByID = umlDomainLookupByID, /* 0.5.0 */ .domainLookupByUUID = umlDomainLookupByUUID, /* 0.5.0 */ .domainLookupByName = umlDomainLookupByName, /* 0.5.0 */ @@ -2618,11 +2618,11 @@ static virDriver umlDriver = { .domainGetInfo = umlDomainGetInfo, /* 0.5.0 */ .domainGetState = umlDomainGetState, /* 0.9.2 */ .domainGetXMLDesc = umlDomainGetXMLDesc, /* 0.5.0 */ - .connectListDefinedDomains = umlListDefinedDomains, /* 0.5.0 */ - .connectNumOfDefinedDomains = umlNumDefinedDomains, /* 0.5.0 */ - .domainCreate = umlDomainStart, /* 0.5.0 */ - .domainCreateWithFlags = umlDomainStartWithFlags, /* 0.8.2 */ - .domainDefineXML = umlDomainDefine, /* 0.5.0 */ + .connectListDefinedDomains = umlConnectListDefinedDomains, /* 0.5.0 */ + .connectNumOfDefinedDomains = umlConnectNumOfDefinedDomains, /* 0.5.0 */ + .domainCreate = umlDomainCreate, /* 0.5.0 */ + .domainCreateWithFlags = umlDomainCreateWithFlags, /* 0.8.2 */ + .domainDefineXML = umlDomainDefineXML, /* 0.5.0 */ .domainUndefine = umlDomainUndefine, /* 0.5.0 */ .domainUndefineFlags = umlDomainUndefineFlags, /* 0.9.4 */ .domainAttachDevice = umlDomainAttachDevice, /* 0.8.4 */ @@ -2637,17 +2637,17 @@ static virDriver umlDriver = { .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.5.0 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.5.0 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ - .connectDomainEventRegister = umlDomainEventRegister, /* 0.9.4 */ - .connectDomainEventDeregister = umlDomainEventDeregister, /* 0.9.4 */ - .connectIsEncrypted = umlIsEncrypted, /* 0.7.3 */ - .connectIsSecure = umlIsSecure, /* 0.7.3 */ + .connectDomainEventRegister = umlConnectDomainEventRegister, /* 0.9.4 */ + .connectDomainEventDeregister = umlConnectDomainEventDeregister, /* 0.9.4 */ + .connectIsEncrypted = umlConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = umlConnectIsSecure, /* 0.7.3 */ .domainIsActive = umlDomainIsActive, /* 0.7.3 */ .domainIsPersistent = umlDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = umlDomainIsUpdated, /* 0.8.6 */ - .connectDomainEventRegisterAny = umlDomainEventRegisterAny, /* 0.9.4 */ - .connectDomainEventDeregisterAny = umlDomainEventDeregisterAny, /* 0.9.4 */ + .connectDomainEventRegisterAny = umlConnectDomainEventRegisterAny, /* 0.9.4 */ + .connectDomainEventDeregisterAny = umlConnectDomainEventDeregisterAny, /* 0.9.4 */ .domainOpenConsole = umlDomainOpenConsole, /* 0.8.6 */ - .connectIsAlive = umlIsAlive, /* 0.9.8 */ + .connectIsAlive = umlConnectIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ @@ -2655,9 +2655,9 @@ static virDriver umlDriver = { static virStateDriver umlStateDriver = { .name = "UML", - .stateInitialize = umlStartup, - .stateCleanup = umlShutdown, - .stateReload = umlReload, + .stateInitialize = umlStateInitialize, + .stateCleanup = umlStateCleanup, + .stateReload = umlStateReload, }; int umlRegister(void) { diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index c2e17e4..dc1e8c3 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -141,9 +141,9 @@ int vboxRegister(void) { return 0; } -static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { uid_t uid = getuid(); @@ -184,5 +184,5 @@ static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn, static virDriver vboxDriverDummy = { VIR_DRV_VBOX, "VBOX", - .connectOpen = vboxOpenDummy, + .connectOpen = vboxConnectOpen, }; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8ef16ba..315ba9c 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -991,9 +991,9 @@ static void vboxUninitialize(vboxGlobalData *data) { } -static virDrvOpenStatus vboxOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { vboxGlobalData *data = NULL; uid_t uid = getuid(); @@ -1068,7 +1068,7 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int vboxClose(virConnectPtr conn) { +static int vboxConnectClose(virConnectPtr conn) { vboxGlobalData *data = conn->privateData; VIR_DEBUG("%s: in vboxClose",conn->driver->name); @@ -1078,7 +1078,7 @@ static int vboxClose(virConnectPtr conn) { return 0; } -static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { +static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) { vboxGlobalData *data = conn->privateData; VIR_DEBUG("%s: in vboxGetVersion",conn->driver->name); @@ -1089,22 +1089,22 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { return 0; } -static int vboxIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { /* Driver is using local, non-network based transport */ return 1; } -static int vboxIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* No encryption is needed, or used on the local transport*/ return 0; } -static int vboxIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { +static int vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { VBOX_OBJECT_CHECK(conn, int, -1); PRUint32 maxCPUCount = 0; @@ -1126,7 +1126,7 @@ static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED } -static char *vboxGetCapabilities(virConnectPtr conn) { +static char *vboxConnectGetCapabilities(virConnectPtr conn) { VBOX_OBJECT_CHECK(conn, char *, NULL); vboxDriverLock(data); @@ -1136,7 +1136,7 @@ static char *vboxGetCapabilities(virConnectPtr conn) { return ret; } -static int vboxListDomains(virConnectPtr conn, int *ids, int nids) { +static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) { VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; @@ -1173,7 +1173,7 @@ cleanup: return ret; } -static int vboxNumOfDomains(virConnectPtr conn) { +static int vboxConnectNumOfDomains(virConnectPtr conn) { VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; @@ -3447,7 +3447,7 @@ cleanup: return ret; } -static int vboxListDefinedDomains(virConnectPtr conn, char ** const names, int maxnames) { +static int vboxConnectListDefinedDomains(virConnectPtr conn, char ** const names, int maxnames) { VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; char *machineName = NULL; @@ -3499,7 +3499,7 @@ cleanup: return ret; } -static int vboxNumOfDefinedDomains(virConnectPtr conn) { +static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) { VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state = MachineState_Null; @@ -7248,10 +7248,10 @@ static void vboxReadCallback(int watch ATTRIBUTE_UNUSED, } } -static int vboxDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) { +static int vboxConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) { VBOX_OBJECT_CHECK(conn, int, -1); int vboxRet = -1; nsresult rc; @@ -7311,8 +7311,8 @@ static int vboxDomainEventRegister(virConnectPtr conn, } } -static int vboxDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) { +static int vboxConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { VBOX_OBJECT_CHECK(conn, int, -1); int cnt; @@ -7338,12 +7338,12 @@ static int vboxDomainEventDeregister(virConnectPtr conn, return ret; } -static int vboxDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) { +static int vboxConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) { VBOX_OBJECT_CHECK(conn, int, -1); int vboxRet = -1; nsresult rc; @@ -7405,8 +7405,8 @@ static int vboxDomainEventRegisterAny(virConnectPtr conn, } } -static int vboxDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) { +static int vboxConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { VBOX_OBJECT_CHECK(conn, int, -1); int cnt; @@ -7467,7 +7467,7 @@ static int vboxNetworkClose(virConnectPtr conn) { return 0; } -static int vboxNumOfNetworks(virConnectPtr conn) { +static int vboxConnectNumOfNetworks(virConnectPtr conn) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; int i = 0; @@ -7500,7 +7500,7 @@ static int vboxNumOfNetworks(virConnectPtr conn) { return ret; } -static int vboxListNetworks(virConnectPtr conn, char **const names, int nnames) { +static int vboxConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; int i = 0; @@ -7549,7 +7549,7 @@ static int vboxListNetworks(virConnectPtr conn, char **const names, int nnames) return ret; } -static int vboxNumOfDefinedNetworks(virConnectPtr conn) { +static int vboxConnectNumOfDefinedNetworks(virConnectPtr conn) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; int i = 0; @@ -7582,7 +7582,7 @@ static int vboxNumOfDefinedNetworks(virConnectPtr conn) { return ret; } -static int vboxListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { +static int vboxConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; int i = 0; @@ -8282,7 +8282,7 @@ static int vboxStorageClose(virConnectPtr conn) { return 0; } -static int vboxStorageNumOfPools(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) { /** Currently only one pool supported, the default one * given by ISystemProperties::defaultHardDiskFolder() @@ -8291,8 +8291,8 @@ static int vboxStorageNumOfPools(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } -static int vboxStorageListPools(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names, int nnames) { +static int vboxConnectListStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, + char **const names, int nnames) { int numActive = 0; if (nnames == 1) { @@ -8508,7 +8508,7 @@ static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char VBOX_UTF16_TO_UTF8(hddNameUtf16, &hddNameUtf8); if (hddNameUtf8) { - if (vboxStorageNumOfPools(conn) == 1) { + if (vboxConnectNumOfStoragePools(conn) == 1) { ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key, NULL, NULL); VIR_DEBUG("Storage Volume Pool: %s", "default-pool"); @@ -8581,7 +8581,7 @@ static virStorageVolPtr vboxStorageVolLookupByPath(virConnectPtr conn, const cha /* TODO: currently only one default pool and thus * the check below, change it when pools are supported */ - if (vboxStorageNumOfPools(conn) == 1) + if (vboxConnectNumOfStoragePools(conn) == 1) ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key, NULL, NULL); @@ -9239,9 +9239,9 @@ endjob: #define MATCH(FLAG) (flags & (FLAG)) static int -vboxListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +vboxConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; @@ -9405,16 +9405,16 @@ no_memory: virDriver NAME(Driver) = { .no = VIR_DRV_VBOX, .name = "VBOX", - .connectOpen = vboxOpen, /* 0.6.3 */ - .connectClose = vboxClose, /* 0.6.3 */ - .connectGetVersion = vboxGetVersion, /* 0.6.3 */ + .connectOpen = vboxConnectOpen, /* 0.6.3 */ + .connectClose = vboxConnectClose, /* 0.6.3 */ + .connectGetVersion = vboxConnectGetVersion, /* 0.6.3 */ .connectGetHostname = virGetHostname, /* 0.6.3 */ - .connectGetMaxVcpus = vboxGetMaxVcpus, /* 0.6.3 */ + .connectGetMaxVcpus = vboxConnectGetMaxVcpus, /* 0.6.3 */ .nodeGetInfo = nodeGetInfo, /* 0.6.3 */ - .connectGetCapabilities = vboxGetCapabilities, /* 0.6.3 */ - .connectListDomains = vboxListDomains, /* 0.6.3 */ - .connectNumOfDomains = vboxNumOfDomains, /* 0.6.3 */ - .connectListAllDomains = vboxListAllDomains, /* 0.9.13 */ + .connectGetCapabilities = vboxConnectGetCapabilities, /* 0.6.3 */ + .connectListDomains = vboxConnectListDomains, /* 0.6.3 */ + .connectNumOfDomains = vboxConnectNumOfDomains, /* 0.6.3 */ + .connectListAllDomains = vboxConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = vboxDomainCreateXML, /* 0.6.3 */ .domainLookupByID = vboxDomainLookupByID, /* 0.6.3 */ .domainLookupByUUID = vboxDomainLookupByUUID, /* 0.6.3 */ @@ -9436,8 +9436,8 @@ virDriver NAME(Driver) = { .domainGetVcpusFlags = vboxDomainGetVcpusFlags, /* 0.8.5 */ .domainGetMaxVcpus = vboxDomainGetMaxVcpus, /* 0.7.1 */ .domainGetXMLDesc = vboxDomainGetXMLDesc, /* 0.6.3 */ - .connectListDefinedDomains = vboxListDefinedDomains, /* 0.6.3 */ - .connectNumOfDefinedDomains = vboxNumOfDefinedDomains, /* 0.6.3 */ + .connectListDefinedDomains = vboxConnectListDefinedDomains, /* 0.6.3 */ + .connectNumOfDefinedDomains = vboxConnectNumOfDefinedDomains, /* 0.6.3 */ .domainCreate = vboxDomainCreate, /* 0.6.3 */ .domainCreateWithFlags = vboxDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = vboxDomainDefineXML, /* 0.6.3 */ @@ -9454,17 +9454,17 @@ virDriver NAME(Driver) = { .domainScreenshot = vboxDomainScreenshot, /* 0.9.2 */ #endif #if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 - .connectDomainEventRegister = vboxDomainEventRegister, /* 0.7.0 */ - .connectDomainEventDeregister = vboxDomainEventDeregister, /* 0.7.0 */ + .connectDomainEventRegister = vboxConnectDomainEventRegister, /* 0.7.0 */ + .connectDomainEventDeregister = vboxConnectDomainEventDeregister, /* 0.7.0 */ #endif - .connectIsEncrypted = vboxIsEncrypted, /* 0.7.3 */ - .connectIsSecure = vboxIsSecure, /* 0.7.3 */ + .connectIsEncrypted = vboxConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = vboxConnectIsSecure, /* 0.7.3 */ .domainIsActive = vboxDomainIsActive, /* 0.7.3 */ .domainIsPersistent = vboxDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = vboxDomainIsUpdated, /* 0.8.6 */ #if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 - .connectDomainEventRegisterAny = vboxDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = vboxDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = vboxConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = vboxConnectDomainEventDeregisterAny, /* 0.8.0 */ #endif .domainSnapshotCreateXML = vboxDomainSnapshotCreateXML, /* 0.8.0 */ .domainSnapshotGetXMLDesc = vboxDomainSnapshotGetXMLDesc, /* 0.8.0 */ @@ -9478,17 +9478,17 @@ virDriver NAME(Driver) = { .domainSnapshotHasMetadata = vboxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainRevertToSnapshot = vboxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = vboxDomainSnapshotDelete, /* 0.8.0 */ - .connectIsAlive = vboxIsAlive, /* 0.9.8 */ + .connectIsAlive = vboxConnectIsAlive, /* 0.9.8 */ }; virNetworkDriver NAME(NetworkDriver) = { "VBOX", .networkOpen = vboxNetworkOpen, /* 0.6.4 */ .networkClose = vboxNetworkClose, /* 0.6.4 */ - .connectNumOfNetworks = vboxNumOfNetworks, /* 0.6.4 */ - .connectListNetworks = vboxListNetworks, /* 0.6.4 */ - .connectNumOfDefinedNetworks = vboxNumOfDefinedNetworks, /* 0.6.4 */ - .connectListDefinedNetworks = vboxListDefinedNetworks, /* 0.6.4 */ + .connectNumOfNetworks = vboxConnectNumOfNetworks, /* 0.6.4 */ + .connectListNetworks = vboxConnectListNetworks, /* 0.6.4 */ + .connectNumOfDefinedNetworks = vboxConnectNumOfDefinedNetworks, /* 0.6.4 */ + .connectListDefinedNetworks = vboxConnectListDefinedNetworks, /* 0.6.4 */ .networkLookupByUUID = vboxNetworkLookupByUUID, /* 0.6.4 */ .networkLookupByName = vboxNetworkLookupByName, /* 0.6.4 */ .networkCreateXML = vboxNetworkCreateXML, /* 0.6.4 */ @@ -9503,8 +9503,8 @@ virStorageDriver NAME(StorageDriver) = { .name = "VBOX", .storageOpen = vboxStorageOpen, /* 0.7.1 */ .storageClose = vboxStorageClose, /* 0.7.1 */ - .connectNumOfStoragePools = vboxStorageNumOfPools, /* 0.7.1 */ - .connectListStoragePools = vboxStorageListPools, /* 0.7.1 */ + .connectNumOfStoragePools = vboxConnectNumOfStoragePools, /* 0.7.1 */ + .connectListStoragePools = vboxConnectListStoragePools, /* 0.7.1 */ .storagePoolLookupByName = vboxStoragePoolLookupByName, /* 0.7.1 */ .storagePoolNumOfVolumes = vboxStoragePoolNumOfVolumes, /* 0.7.1 */ .storagePoolListVolumes = vboxStoragePoolListVolumes, /* 0.7.1 */ diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index e42c8e5..00852be 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -82,9 +82,9 @@ vmwareDomainXMLConfigInit(void) } static virDrvOpenStatus -vmwareOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +vmwareConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { struct vmware_driver *driver; char * vmrun = NULL; @@ -162,7 +162,7 @@ vmwareOpen(virConnectPtr conn, }; static int -vmwareClose(virConnectPtr conn) +vmwareConnectClose(virConnectPtr conn) { struct vmware_driver *driver = conn->privateData; @@ -174,13 +174,13 @@ vmwareClose(virConnectPtr conn) } static const char * -vmwareGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +vmwareConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "VMware"; } static int -vmwareGetVersion(virConnectPtr conn, unsigned long *version) +vmwareConnectGetVersion(virConnectPtr conn, unsigned long *version) { struct vmware_driver *driver = conn->privateData; @@ -431,6 +431,19 @@ vmwareDomainShutdown(virDomainPtr dom) } static int +vmwareDomainDestroy(virDomainPtr dom) +{ + return vmwareDomainShutdownFlags(dom, 0); +} + +static int +vmwareDomainDestroyFlags(virDomainPtr dom, + unsigned int flags) +{ + return vmwareDomainShutdownFlags(dom, flags); +} + +static int vmwareDomainSuspend(virDomainPtr dom) { struct vmware_driver *driver = dom->conn->privateData; @@ -773,7 +786,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id) } static char * -vmwareGetOSType(virDomainPtr dom) +vmwareDomainGetOSType(virDomainPtr dom) { struct vmware_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -924,9 +937,9 @@ vmwareDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } static char * -vmwareDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, - const char *nativeConfig, - unsigned int flags) +vmwareConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, + const char *nativeConfig, + unsigned int flags) { struct vmware_driver *driver = conn->privateData; virVMXContext ctx; @@ -969,7 +982,7 @@ vmwareDomainObjListUpdateAll(virDomainObjListPtr doms, struct vmware_driver *dri } static int -vmwareNumDefinedDomains(virConnectPtr conn) +vmwareConnectNumOfDefinedDomains(virConnectPtr conn) { struct vmware_driver *driver = conn->privateData; int n; @@ -983,7 +996,7 @@ vmwareNumDefinedDomains(virConnectPtr conn) } static int -vmwareNumDomains(virConnectPtr conn) +vmwareConnectNumOfDomains(virConnectPtr conn) { struct vmware_driver *driver = conn->privateData; int n; @@ -998,7 +1011,7 @@ vmwareNumDomains(virConnectPtr conn) static int -vmwareListDomains(virConnectPtr conn, int *ids, int nids) +vmwareConnectListDomains(virConnectPtr conn, int *ids, int nids) { struct vmware_driver *driver = conn->privateData; int n; @@ -1012,8 +1025,8 @@ vmwareListDomains(virConnectPtr conn, int *ids, int nids) } static int -vmwareListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) +vmwareConnectListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) { struct vmware_driver *driver = conn->privateData; int n; @@ -1093,15 +1106,15 @@ vmwareDomainGetState(virDomainPtr dom, } static int -vmwareIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +vmwareConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; } static int -vmwareListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) +vmwareConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) { struct vmware_driver *driver = conn->privateData; int ret = -1; @@ -1120,13 +1133,13 @@ vmwareListAllDomains(virConnectPtr conn, static virDriver vmwareDriver = { .no = VIR_DRV_VMWARE, .name = "VMWARE", - .connectOpen = vmwareOpen, /* 0.8.7 */ - .connectClose = vmwareClose, /* 0.8.7 */ - .connectGetType = vmwareGetType, /* 0.8.7 */ - .connectGetVersion = vmwareGetVersion, /* 0.8.7 */ - .connectListDomains = vmwareListDomains, /* 0.8.7 */ - .connectNumOfDomains = vmwareNumDomains, /* 0.8.7 */ - .connectListAllDomains = vmwareListAllDomains, /* 0.9.13 */ + .connectOpen = vmwareConnectOpen, /* 0.8.7 */ + .connectClose = vmwareConnectClose, /* 0.8.7 */ + .connectGetType = vmwareConnectGetType, /* 0.8.7 */ + .connectGetVersion = vmwareConnectGetVersion, /* 0.8.7 */ + .connectListDomains = vmwareConnectListDomains, /* 0.8.7 */ + .connectNumOfDomains = vmwareConnectNumOfDomains, /* 0.8.7 */ + .connectListAllDomains = vmwareConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = vmwareDomainCreateXML, /* 0.8.7 */ .domainLookupByID = vmwareDomainLookupByID, /* 0.8.7 */ .domainLookupByUUID = vmwareDomainLookupByUUID, /* 0.8.7 */ @@ -1136,15 +1149,15 @@ static virDriver vmwareDriver = { .domainShutdown = vmwareDomainShutdown, /* 0.8.7 */ .domainShutdownFlags = vmwareDomainShutdownFlags, /* 0.9.10 */ .domainReboot = vmwareDomainReboot, /* 0.8.7 */ - .domainDestroy = vmwareDomainShutdown, /* 0.8.7 */ - .domainDestroyFlags = vmwareDomainShutdownFlags, /* 0.9.4 */ - .domainGetOSType = vmwareGetOSType, /* 0.8.7 */ + .domainDestroy = vmwareDomainDestroy, /* 0.8.7 */ + .domainDestroyFlags = vmwareDomainDestroyFlags, /* 0.9.4 */ + .domainGetOSType = vmwareDomainGetOSType, /* 0.8.7 */ .domainGetInfo = vmwareDomainGetInfo, /* 0.8.7 */ .domainGetState = vmwareDomainGetState, /* 0.9.2 */ .domainGetXMLDesc = vmwareDomainGetXMLDesc, /* 0.8.7 */ - .connectDomainXMLFromNative = vmwareDomainXMLFromNative, /* 0.9.11 */ - .connectListDefinedDomains = vmwareListDefinedDomains, /* 0.8.7 */ - .connectNumOfDefinedDomains = vmwareNumDefinedDomains, /* 0.8.7 */ + .connectDomainXMLFromNative = vmwareConnectDomainXMLFromNative, /* 0.9.11 */ + .connectListDefinedDomains = vmwareConnectListDefinedDomains, /* 0.8.7 */ + .connectNumOfDefinedDomains = vmwareConnectNumOfDefinedDomains, /* 0.8.7 */ .domainCreate = vmwareDomainCreate, /* 0.8.7 */ .domainCreateWithFlags = vmwareDomainCreateWithFlags, /* 0.8.7 */ .domainDefineXML = vmwareDomainDefineXML, /* 0.8.7 */ @@ -1152,7 +1165,7 @@ static virDriver vmwareDriver = { .domainUndefineFlags = vmwareDomainUndefineFlags, /* 0.9.4 */ .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ - .connectIsAlive = vmwareIsAlive, /* 0.9.8 */ + .connectIsAlive = vmwareConnectIsAlive, /* 0.9.8 */ }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 04f4206..a6990cf 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -203,9 +203,9 @@ done: #ifdef WITH_LIBVIRTD static int -xenInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +xenUnifiedStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { inside_daemon = true; return 0; @@ -213,7 +213,7 @@ xenInitialize(bool privileged ATTRIBUTE_UNUSED, static virStateDriver state_driver = { .name = "Xen", - .stateInitialize = xenInitialize, + .stateInitialize = xenUnifiedStateInitialize, }; #endif @@ -296,7 +296,7 @@ xenDomainXMLConfInit(void) static virDrvOpenStatus -xenUnifiedOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) +xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) { int i, ret = VIR_DRV_OPEN_DECLINED; xenUnifiedPrivatePtr priv; @@ -474,7 +474,7 @@ clean: xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) (conn)->privateData static int -xenUnifiedClose(virConnectPtr conn) +xenUnifiedConnectClose(virConnectPtr conn) { GET_PRIVATE(conn); int i; @@ -506,7 +506,7 @@ unsigned long xenUnifiedVersion(void) static const char * -xenUnifiedType(virConnectPtr conn) +xenUnifiedConnectGetType(virConnectPtr conn) { GET_PRIVATE(conn); int i; @@ -520,7 +520,7 @@ xenUnifiedType(virConnectPtr conn) /* Which features are supported by this driver? */ static int -xenUnifiedSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +xenUnifiedConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) { switch (feature) { case VIR_DRV_FEATURE_MIGRATION_V1: @@ -532,7 +532,7 @@ xenUnifiedSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) } static int -xenUnifiedGetVersion(virConnectPtr conn, unsigned long *hvVer) +xenUnifiedConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) { GET_PRIVATE(conn); int i; @@ -547,13 +547,13 @@ xenUnifiedGetVersion(virConnectPtr conn, unsigned long *hvVer) } static int -xenUnifiedIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +xenUnifiedConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { return 0; } static int -xenUnifiedIsSecure(virConnectPtr conn) +xenUnifiedConnectIsSecure(virConnectPtr conn) { GET_PRIVATE(conn); int ret = 1; @@ -567,14 +567,14 @@ xenUnifiedIsSecure(virConnectPtr conn) } static int -xenUnifiedIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +xenUnifiedConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) { /* XenD reconnects for each request */ return 1; } int -xenUnifiedGetMaxVcpus(virConnectPtr conn, const char *type) +xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char *type) { GET_PRIVATE(conn); @@ -602,7 +602,7 @@ xenUnifiedNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) } static char * -xenUnifiedGetCapabilities(virConnectPtr conn) +xenUnifiedConnectGetCapabilities(virConnectPtr conn) { xenUnifiedPrivatePtr priv = conn->privateData; char *xml; @@ -616,7 +616,7 @@ xenUnifiedGetCapabilities(virConnectPtr conn) } static int -xenUnifiedListDomains(virConnectPtr conn, int *ids, int maxids) +xenUnifiedConnectListDomains(virConnectPtr conn, int *ids, int maxids) { GET_PRIVATE(conn); int ret; @@ -643,7 +643,7 @@ xenUnifiedListDomains(virConnectPtr conn, int *ids, int maxids) } static int -xenUnifiedNumOfDomains(virConnectPtr conn) +xenUnifiedConnectNumOfDomains(virConnectPtr conn) { GET_PRIVATE(conn); int ret; @@ -1392,10 +1392,10 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) static char * -xenUnifiedDomainXMLFromNative(virConnectPtr conn, - const char *format, - const char *config, - unsigned int flags) +xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn, + const char *format, + const char *config, + unsigned int flags) { virDomainDefPtr def = NULL; char *ret = NULL; @@ -1444,10 +1444,10 @@ cleanup: #define MAX_CONFIG_SIZE (1024 * 65) static char * -xenUnifiedDomainXMLToNative(virConnectPtr conn, - const char *format, - const char *xmlData, - unsigned int flags) +xenUnifiedConnectDomainXMLToNative(virConnectPtr conn, + const char *format, + const char *xmlData, + unsigned int flags) { virDomainDefPtr def = NULL; char *ret = NULL; @@ -1590,8 +1590,8 @@ failure: } static int -xenUnifiedListDefinedDomains(virConnectPtr conn, char **const names, - int maxnames) +xenUnifiedConnectListDefinedDomains(virConnectPtr conn, char **const names, + int maxnames) { GET_PRIVATE(conn); int i; @@ -1607,7 +1607,7 @@ xenUnifiedListDefinedDomains(virConnectPtr conn, char **const names, } static int -xenUnifiedNumOfDefinedDomains(virConnectPtr conn) +xenUnifiedConnectNumOfDefinedDomains(virConnectPtr conn) { GET_PRIVATE(conn); int i; @@ -1988,10 +1988,10 @@ xenUnifiedNodeGetFreeMemory(virConnectPtr conn) static int -xenUnifiedDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freefunc) +xenUnifiedConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freefunc) { GET_PRIVATE(conn); @@ -2013,8 +2013,8 @@ xenUnifiedDomainEventRegister(virConnectPtr conn, static int -xenUnifiedDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) +xenUnifiedConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) { int ret; GET_PRIVATE(conn); @@ -2036,12 +2036,12 @@ xenUnifiedDomainEventDeregister(virConnectPtr conn, static int -xenUnifiedDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freefunc) +xenUnifiedConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freefunc) { GET_PRIVATE(conn); @@ -2064,8 +2064,8 @@ xenUnifiedDomainEventRegisterAny(virConnectPtr conn, } static int -xenUnifiedDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) +xenUnifiedConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) { int ret; GET_PRIVATE(conn); @@ -2168,7 +2168,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev) xenUnifiedPrivatePtr priv = conn->privateData; /* Get active domains */ - numdomains = xenUnifiedNumOfDomains(conn); + numdomains = xenUnifiedConnectNumOfDomains(conn); if (numdomains < 0) { return ret; } @@ -2177,7 +2177,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev) virReportOOMError(); goto out; } - if ((numdomains = xenUnifiedListDomains(conn, &ids[0], numdomains)) < 0) { + if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) { goto out; } } @@ -2330,17 +2330,17 @@ cleanup: static virDriver xenUnifiedDriver = { .no = VIR_DRV_XEN_UNIFIED, .name = "Xen", - .connectOpen = xenUnifiedOpen, /* 0.0.3 */ - .connectClose = xenUnifiedClose, /* 0.0.3 */ - .connectSupportsFeature = xenUnifiedSupportsFeature, /* 0.3.2 */ - .connectGetType = xenUnifiedType, /* 0.0.3 */ - .connectGetVersion = xenUnifiedGetVersion, /* 0.0.3 */ + .connectOpen = xenUnifiedConnectOpen, /* 0.0.3 */ + .connectClose = xenUnifiedConnectClose, /* 0.0.3 */ + .connectSupportsFeature = xenUnifiedConnectSupportsFeature, /* 0.3.2 */ + .connectGetType = xenUnifiedConnectGetType, /* 0.0.3 */ + .connectGetVersion = xenUnifiedConnectGetVersion, /* 0.0.3 */ .connectGetHostname = virGetHostname, /* 0.7.3 */ - .connectGetMaxVcpus = xenUnifiedGetMaxVcpus, /* 0.2.1 */ + .connectGetMaxVcpus = xenUnifiedConnectGetMaxVcpus, /* 0.2.1 */ .nodeGetInfo = xenUnifiedNodeGetInfo, /* 0.1.0 */ - .connectGetCapabilities = xenUnifiedGetCapabilities, /* 0.2.1 */ - .connectListDomains = xenUnifiedListDomains, /* 0.0.3 */ - .connectNumOfDomains = xenUnifiedNumOfDomains, /* 0.0.3 */ + .connectGetCapabilities = xenUnifiedConnectGetCapabilities, /* 0.2.1 */ + .connectListDomains = xenUnifiedConnectListDomains, /* 0.0.3 */ + .connectNumOfDomains = xenUnifiedConnectNumOfDomains, /* 0.0.3 */ .domainCreateXML = xenUnifiedDomainCreateXML, /* 0.0.3 */ .domainLookupByID = xenUnifiedDomainLookupByID, /* 0.0.3 */ .domainLookupByUUID = xenUnifiedDomainLookupByUUID, /* 0.0.5 */ @@ -2373,10 +2373,10 @@ static virDriver xenUnifiedDriver = { .domainGetVcpus = xenUnifiedDomainGetVcpus, /* 0.1.4 */ .domainGetMaxVcpus = xenUnifiedDomainGetMaxVcpus, /* 0.2.1 */ .domainGetXMLDesc = xenUnifiedDomainGetXMLDesc, /* 0.0.3 */ - .connectDomainXMLFromNative = xenUnifiedDomainXMLFromNative, /* 0.6.4 */ - .connectDomainXMLToNative = xenUnifiedDomainXMLToNative, /* 0.6.4 */ - .connectListDefinedDomains = xenUnifiedListDefinedDomains, /* 0.1.1 */ - .connectNumOfDefinedDomains = xenUnifiedNumOfDefinedDomains, /* 0.1.5 */ + .connectDomainXMLFromNative = xenUnifiedConnectDomainXMLFromNative, /* 0.6.4 */ + .connectDomainXMLToNative = xenUnifiedConnectDomainXMLToNative, /* 0.6.4 */ + .connectListDefinedDomains = xenUnifiedConnectListDefinedDomains, /* 0.1.1 */ + .connectNumOfDefinedDomains = xenUnifiedConnectNumOfDefinedDomains, /* 0.1.5 */ .domainCreate = xenUnifiedDomainCreate, /* 0.1.1 */ .domainCreateWithFlags = xenUnifiedDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = xenUnifiedDomainDefineXML, /* 0.1.1 */ @@ -2402,20 +2402,20 @@ static virDriver xenUnifiedDriver = { .domainBlockPeek = xenUnifiedDomainBlockPeek, /* 0.4.4 */ .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory, /* 0.3.3 */ .nodeGetFreeMemory = xenUnifiedNodeGetFreeMemory, /* 0.3.3 */ - .connectDomainEventRegister = xenUnifiedDomainEventRegister, /* 0.5.0 */ - .connectDomainEventDeregister = xenUnifiedDomainEventDeregister, /* 0.5.0 */ + .connectDomainEventRegister = xenUnifiedConnectDomainEventRegister, /* 0.5.0 */ + .connectDomainEventDeregister = xenUnifiedConnectDomainEventDeregister, /* 0.5.0 */ .nodeDeviceDettach = xenUnifiedNodeDeviceDettach, /* 0.6.1 */ .nodeDeviceReAttach = xenUnifiedNodeDeviceReAttach, /* 0.6.1 */ .nodeDeviceReset = xenUnifiedNodeDeviceReset, /* 0.6.1 */ - .connectIsEncrypted = xenUnifiedIsEncrypted, /* 0.7.3 */ - .connectIsSecure = xenUnifiedIsSecure, /* 0.7.3 */ + .connectIsEncrypted = xenUnifiedConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = xenUnifiedConnectIsSecure, /* 0.7.3 */ .domainIsActive = xenUnifiedDomainIsActive, /* 0.7.3 */ .domainIsPersistent = xenUnifiedDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = xenUnifiedDomainIsUpdated, /* 0.8.6 */ - .connectDomainEventRegisterAny = xenUnifiedDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, /* 0.8.0 */ + .connectDomainEventRegisterAny = xenUnifiedConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = xenUnifiedConnectDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = xenUnifiedDomainOpenConsole, /* 0.8.6 */ - .connectIsAlive = xenUnifiedIsAlive, /* 0.9.8 */ + .connectIsAlive = xenUnifiedConnectIsAlive, /* 0.9.8 */ .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = nodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 6fe9539..c39e9be 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -238,7 +238,7 @@ int xenUnifiedRemoveDomainInfo(xenUnifiedDomainInfoListPtr info, void xenUnifiedDomainEventDispatch (xenUnifiedPrivatePtr priv, virDomainEventPtr event); unsigned long xenUnifiedVersion(void); -int xenUnifiedGetMaxVcpus(virConnectPtr conn, const char *type); +int xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char *type); void xenUnifiedLock(xenUnifiedPrivatePtr priv); void xenUnifiedUnlock(xenUnifiedPrivatePtr priv); diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index b3a537a..8ac7cb0 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -707,7 +707,7 @@ xenXMDomainSetVcpusFlags(virDomainPtr domain, goto cleanup; /* Hypervisor maximum. */ - if ((max = xenUnifiedGetMaxVcpus(domain->conn, NULL)) < 0) { + if ((max = xenUnifiedConnectGetMaxVcpus(domain->conn, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not determine max vcpus for the domain")); goto cleanup; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index fb81184..1135c4e 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -102,14 +102,14 @@ getCapsObject(void) } /* - * XenapiOpen + * xenapiConnectOpen * * Authenticates and creates a session with the server * Return VIR_DRV_OPEN_SUCCESS on success, else VIR_DRV_OPEN_ERROR */ static virDrvOpenStatus -xenapiOpen(virConnectPtr conn, virConnectAuthPtr auth, - unsigned int flags) +xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, + unsigned int flags) { char *username = NULL; char *password = NULL; @@ -237,13 +237,13 @@ xenapiOpen(virConnectPtr conn, virConnectAuthPtr auth, } /* - * xenapiClose: + * xenapiConnectClose: * * Returns 0 on successful session logout * */ static int -xenapiClose(virConnectPtr conn) +xenapiConnectClose(virConnectPtr conn) { struct _xenapiPrivate *priv = conn->privateData; @@ -265,12 +265,12 @@ xenapiClose(virConnectPtr conn) /* * - * xenapiSupportsFeature + * xenapiConnectSupportsFeature * * Returns 0 */ static int -xenapiSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +xenapiConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) { switch (feature) { case VIR_DRV_FEATURE_MIGRATION_V2: @@ -281,26 +281,26 @@ xenapiSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) } /* - * xenapiType: + * xenapiConnectGetType: * * * Returns name of the driver */ static const char * -xenapiType(virConnectPtr conn ATTRIBUTE_UNUSED) +xenapiConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "XenAPI"; } /* - * xenapiGetVersion: + * xenapiConnectGetVersion: * * Gets the version of XenAPI * */ static int -xenapiGetVersion(virConnectPtr conn, unsigned long *hvVer) +xenapiConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) { xen_host host; xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; @@ -346,13 +346,13 @@ xenapiGetVersion(virConnectPtr conn, unsigned long *hvVer) /* - * xenapiGetHostname: + * xenapiConnectGetHostname: * * * Returns the hostname on success, or NULL on failure */ static char * -xenapiGetHostname(virConnectPtr conn) +xenapiConnectGetHostname(virConnectPtr conn) { char *result = NULL; xen_host host; @@ -369,13 +369,13 @@ xenapiGetHostname(virConnectPtr conn) /* - * xenapiGetMaxVcpus: + * xenapiConnectGetMaxVcpus: * * * Returns a hardcoded value for Maximum VCPUS */ static int -xenapiGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED) +xenapiConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED) { /* this is hardcoded for simplicity and set to a resonable value compared to the actual value */ @@ -435,13 +435,13 @@ xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) } /* - * xenapiGetCapabilities: + * xenapiConnectGetCapabilities: * * * Returns capabilities as an XML string */ static char * -xenapiGetCapabilities(virConnectPtr conn) +xenapiConnectGetCapabilities(virConnectPtr conn) { virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps; @@ -458,13 +458,13 @@ xenapiGetCapabilities(virConnectPtr conn) /* - * xenapiListDomains + * xenapiConnectListDomains * * Collects the list of active domains, and store their ID in @maxids * Returns the number of domain found or -1 in case of error */ static int -xenapiListDomains(virConnectPtr conn, int *ids, int maxids) +xenapiConnectListDomains(virConnectPtr conn, int *ids, int maxids) { /* vm.list */ xen_host host; @@ -495,13 +495,13 @@ xenapiListDomains(virConnectPtr conn, int *ids, int maxids) } /* - * xenapiNumOfDomains + * xenapiConnectNumOfDomains * * * Returns the number of domains found or -1 in case of error */ static int -xenapiNumOfDomains(virConnectPtr conn) +xenapiConnectNumOfDomains(virConnectPtr conn) { /* #(vm.list) */ xen_vm_set *result = NULL; @@ -1324,7 +1324,7 @@ xenapiDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (state == XEN_VM_POWER_STATE_RUNNING) { xen_vm_get_vcpus_max(session, &maxvcpu, vm); } else { - maxvcpu = xenapiGetMaxVcpus(dom->conn, NULL); + maxvcpu = xenapiConnectGetMaxVcpus(dom->conn, NULL); } xen_vm_set_free(vms); return (int)maxvcpu; @@ -1549,14 +1549,14 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } /* - * xenapiListDefinedDomains + * xenapiConnectListDefinedDomains * * list the defined but inactive domains, stores the pointers to the names in @names * Returns number of names provided in the array or -1 in case of error */ static int -xenapiListDefinedDomains(virConnectPtr conn, char **const names, - int maxnames) +xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names, + int maxnames) { int i,j=0,doms; xen_vm_set *result; @@ -1596,13 +1596,13 @@ xenapiListDefinedDomains(virConnectPtr conn, char **const names, } /* - * xenapiNumOfDefinedDomains + * xenapiConnectNumOfDefinedDomains * * Provides the number of defined but inactive domains * Returns number of domains found on success or -1 in case of error */ static int -xenapiNumOfDefinedDomains(virConnectPtr conn) +xenapiConnectNumOfDefinedDomains(virConnectPtr conn) { xen_vm_set *result; xen_vm_record *record; @@ -1920,7 +1920,7 @@ xenapiNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, } static int -xenapiIsAlive(virConnectPtr conn) +xenapiConnectIsAlive(virConnectPtr conn) { struct _xenapiPrivate *priv = conn->privateData; @@ -1934,17 +1934,17 @@ xenapiIsAlive(virConnectPtr conn) static virDriver xenapiDriver = { .no = VIR_DRV_XENAPI, .name = "XenAPI", - .connectOpen = xenapiOpen, /* 0.8.0 */ - .connectClose = xenapiClose, /* 0.8.0 */ - .connectSupportsFeature = xenapiSupportsFeature, /* 0.8.0 */ - .connectGetType = xenapiType, /* 0.8.0 */ - .connectGetVersion = xenapiGetVersion, /* 0.8.0 */ - .connectGetHostname = xenapiGetHostname, /* 0.8.0 */ - .connectGetMaxVcpus = xenapiGetMaxVcpus, /* 0.8.0 */ + .connectOpen = xenapiConnectOpen, /* 0.8.0 */ + .connectClose = xenapiConnectClose, /* 0.8.0 */ + .connectSupportsFeature = xenapiConnectSupportsFeature, /* 0.8.0 */ + .connectGetType = xenapiConnectGetType, /* 0.8.0 */ + .connectGetVersion = xenapiConnectGetVersion, /* 0.8.0 */ + .connectGetHostname = xenapiConnectGetHostname, /* 0.8.0 */ + .connectGetMaxVcpus = xenapiConnectGetMaxVcpus, /* 0.8.0 */ .nodeGetInfo = xenapiNodeGetInfo, /* 0.8.0 */ - .connectGetCapabilities = xenapiGetCapabilities, /* 0.8.0 */ - .connectListDomains = xenapiListDomains, /* 0.8.0 */ - .connectNumOfDomains = xenapiNumOfDomains, /* 0.8.0 */ + .connectGetCapabilities = xenapiConnectGetCapabilities, /* 0.8.0 */ + .connectListDomains = xenapiConnectListDomains, /* 0.8.0 */ + .connectNumOfDomains = xenapiConnectNumOfDomains, /* 0.8.0 */ .domainCreateXML = xenapiDomainCreateXML, /* 0.8.0 */ .domainLookupByID = xenapiDomainLookupByID, /* 0.8.0 */ .domainLookupByUUID = xenapiDomainLookupByUUID, /* 0.8.0 */ @@ -1968,8 +1968,8 @@ static virDriver xenapiDriver = { .domainGetVcpus = xenapiDomainGetVcpus, /* 0.8.0 */ .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, /* 0.8.0 */ .domainGetXMLDesc = xenapiDomainGetXMLDesc, /* 0.8.0 */ - .connectListDefinedDomains = xenapiListDefinedDomains, /* 0.8.0 */ - .connectNumOfDefinedDomains = xenapiNumOfDefinedDomains, /* 0.8.0 */ + .connectListDefinedDomains = xenapiConnectListDefinedDomains, /* 0.8.0 */ + .connectNumOfDefinedDomains = xenapiConnectNumOfDefinedDomains, /* 0.8.0 */ .domainCreate = xenapiDomainCreate, /* 0.8.0 */ .domainCreateWithFlags = xenapiDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = xenapiDomainDefineXML, /* 0.8.0 */ @@ -1981,7 +1981,7 @@ static virDriver xenapiDriver = { .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, /* 0.8.0 */ .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ - .connectIsAlive = xenapiIsAlive, /* 0.9.8 */ + .connectIsAlive = xenapiConnectIsAlive, /* 0.9.8 */ }; /** -- 1.8.1.4

On Tue, Apr 23, 2013 at 03:08:23PM -0600, Eric Blake wrote: We could probably just list all source files, since the script will just skip over their content unless it finds something named 'vir*Driver'. The downside would be making the script slower to run due to redundant I/O. Probably worth it on balance though. I'll do a followup. Heh, you can tell I always tested by running 'make check-driverimpls' :-) I thought about this quite alot. In the end I decided not to touch this. I know we prefer this style, but we have been absolutely awful at doing it consistently. IMHO if we want to keep this is a rule, then we need todo something serious to enforce it at make check time. Relying on our reviewers is just not proving reliable enough. I'm wondering about perhaps running 'indent | diff' during make check to validate whether any code gets re-formatted by changes. This would of course require us to do a big one-time reformat to get into an initial consistent state. I've also not been able to figure out how to make indent respect our preferred style for function parameters. ie all params on one line, but if line wrapping is needed, then put each param on a separate line, aligned with (. Yeah, this is slightly awful, but I didn't want to mix in semantic changes. Basically all methods are doing non-graceful shutdown in OpenVZ. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|