Also remove manually added function names from log messages, the logging macros already record them and the logging framework outputs them. Cleanup the msg_gen_function list in cfg.mk. Also don't restrict one of the grep lines in the libvirt_unmarked_diagnostics rule to match exactly one space between function name and opening parenthesis. Update POTFILES.in accordingly. --- cfg.mk | 15 +-- daemon/libvirtd.c | 223 +++++++++---------- daemon/libvirtd.h | 2 - daemon/remote.c | 78 ++++---- ...-Step-7-of-8-Implement-the-driver-methods.patch | 4 +- po/POTFILES.in | 7 - src/conf/secret_conf.c | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 12 +- src/node_device/node_device_driver.c | 8 +- src/node_device/node_device_linux_sysfs.c | 12 +- src/node_device/node_device_udev.c | 4 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/phyp/phyp_driver.c | 28 ++-- src/qemu/qemu_conf.c | 24 +- src/qemu/qemu_driver.c | 48 ++-- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_text.c | 22 +- src/secret/secret_driver.c | 4 +- src/security/security_apparmor.c | 2 +- src/storage/storage_backend_mpath.c | 2 - src/storage/storage_backend_scsi.c | 38 ++-- src/uml/uml_conf.c | 3 - src/uml/uml_driver.c | 23 +- src/util/bridge.c | 16 +- src/util/logging.c | 8 +- src/util/pci.c | 8 +- src/util/uuid.c | 4 +- src/xen/proxy_internal.c | 6 +- tools/console.c | 12 +- 32 files changed, 292 insertions(+), 333 deletions(-) diff --git a/cfg.mk b/cfg.mk index 74fe5ed..619a8e2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -168,28 +168,16 @@ sc_prohibit_gethostby: # |grep -vE '^(qsort|if|close|assert|fputc|free|N_|vir.*GetName|.*Unlock|virNodeListDevices|virHashRemoveEntry|freeaddrinfo|.*[fF]ree|xdrmem_create|xmlXPathFreeObject|virUUIDFormat|openvzSetProgramSentinal|polkit_action_unref)$' msg_gen_function = -msg_gen_function += DEBUG0 -msg_gen_function += DISABLE_fprintf -msg_gen_function += ERROR -msg_gen_function += ERROR0 -msg_gen_function += REMOTE_DEBUG msg_gen_function += ReportError -msg_gen_function += VIR_FREE -msg_gen_function += VIR_INFO -msg_gen_function += VIR_USE_CPU msg_gen_function += errorf msg_gen_function += lxcError -msg_gen_function += networkLog msg_gen_function += networkReportError msg_gen_function += oneError msg_gen_function += openvzError -msg_gen_function += openvzLog msg_gen_function += qemudDispatchClientFailure -msg_gen_function += qemudLog msg_gen_function += qemudReportError msg_gen_function += regerror msg_gen_function += remoteDispatchFormatError -msg_gen_function += umlLog msg_gen_function += umlReportError msg_gen_function += virConfError msg_gen_function += virDomainReportError @@ -197,7 +185,6 @@ msg_gen_function += virSecurityReportError msg_gen_function += virHashError msg_gen_function += virLibConnError msg_gen_function += virLibDomainError -msg_gen_function += virLog msg_gen_function += virNetworkReportError msg_gen_function += virNodeDeviceReportError msg_gen_function += virProxyError @@ -236,7 +223,7 @@ func_re := ($(func_or)) # "%s", _("no storage vol w..." sc_libvirt_unmarked_diagnostics: @grep -nE \ - '\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT)) \ + '\<$(func_re) *\([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT)) \ | grep -v '_''(' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 208ffca..68fe95a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -272,7 +272,7 @@ remoteCheckCertFile(const char *type, const char *file) struct stat sb; if (stat(file, &sb) < 0) { char ebuf[1024]; - VIR_ERROR(_("Cannot access %s '%s': %s"), + VIR_ERROR("Cannot access %s '%s': %s", type, file, virStrerror(errno, ebuf, sizeof ebuf)); return -1; } @@ -289,7 +289,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - VIR_ERROR(_("gnutls_certificate_allocate_credentials: %s"), + VIR_ERROR("gnutls_certificate_allocate_credentials failed: %s", gnutls_strerror (err)); return -1; } @@ -298,11 +298,11 @@ remoteInitializeGnuTLS (void) if (remoteCheckCertFile("CA certificate", ca_file) < 0) return -1; - qemudDebug ("loading CA cert from %s", ca_file); + VIR_DEBUG("loading CA cert from %s", ca_file); err = gnutls_certificate_set_x509_trust_file (x509_cred, ca_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - VIR_ERROR(_("gnutls_certificate_set_x509_trust_file: %s"), + VIR_ERROR("gnutls_certificate_set_x509_trust_file failed: %s", gnutls_strerror (err)); return -1; } @@ -316,7 +316,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_set_x509_crl_file (x509_cred, crl_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - VIR_ERROR(_("gnutls_certificate_set_x509_crl_file: %s"), + VIR_ERROR("gnutls_certificate_set_x509_crl_file failed: %s", gnutls_strerror (err)); return -1; } @@ -327,13 +327,13 @@ remoteInitializeGnuTLS (void) return -1; if (remoteCheckCertFile("server key", key_file) < 0) return -1; - DEBUG("loading cert and key from %s and %s", cert_file, key_file); + DEBUG("loading cert and key from '%s' and '%s'", cert_file, key_file); err = gnutls_certificate_set_x509_key_file (x509_cred, cert_file, key_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - VIR_ERROR(_("gnutls_certificate_set_x509_key_file: %s"), + VIR_ERROR("gnutls_certificate_set_x509_key_file failed: %s", gnutls_strerror (err)); return -1; } @@ -346,12 +346,12 @@ remoteInitializeGnuTLS (void) */ err = gnutls_dh_params_init (&dh_params); if (err < 0) { - VIR_ERROR(_("gnutls_dh_params_init: %s"), gnutls_strerror (err)); + VIR_ERROR("gnutls_dh_params_init failed: %s", gnutls_strerror (err)); return -1; } err = gnutls_dh_params_generate2 (dh_params, DH_BITS); if (err < 0) { - VIR_ERROR(_("gnutls_dh_params_generate2: %s"), gnutls_strerror (err)); + VIR_ERROR("gnutls_dh_params_generate2 failed: %s", gnutls_strerror (err)); return -1; } @@ -372,7 +372,7 @@ qemudDispatchSignalEvent(int watch ATTRIBUTE_UNUSED, if (saferead(server->sigread, &siginfo, sizeof(siginfo)) != sizeof(siginfo)) { char ebuf[1024]; - VIR_ERROR(_("Failed to read from signal pipe: %s"), + VIR_ERROR("Failed to read from signal pipe: %s", virStrerror(errno, ebuf, sizeof ebuf)); virMutexUnlock(&server->lock); return; @@ -380,23 +380,23 @@ qemudDispatchSignalEvent(int watch ATTRIBUTE_UNUSED, switch (siginfo.si_signo) { case SIGHUP: - VIR_INFO0(_("Reloading configuration on SIGHUP")); + VIR_INFO0("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL); if (virStateReload() < 0) - VIR_WARN0(_("Error while reloading drivers")); + VIR_WARN0("Error while reloading drivers"); break; case SIGINT: case SIGQUIT: case SIGTERM: - VIR_WARN(_("Shutting down on signal %d"), siginfo.si_signo); + VIR_WARN("Shutting down on signal %d", siginfo.si_signo); server->quitEventThread = 1; break; default: - VIR_INFO(_("Received unexpected signal %d"), siginfo.si_signo); + VIR_INFO("Received unexpected signal %d", siginfo.si_signo); break; } @@ -502,27 +502,27 @@ static int qemudWritePidFile(const char *pidFile) { return 0; if ((fd = open(pidFile, O_WRONLY|O_CREAT|O_EXCL, 0644)) < 0) { - VIR_ERROR(_("Failed to open pid file '%s' : %s"), + VIR_ERROR("Failed to open pid file '%s' : %s", pidFile, virStrerror(errno, ebuf, sizeof ebuf)); return -1; } if (!(fh = fdopen(fd, "w"))) { - VIR_ERROR(_("Failed to fdopen pid file '%s' : %s"), + VIR_ERROR("Failed to fdopen pid file '%s' : %s", pidFile, virStrerror(errno, ebuf, sizeof ebuf)); close(fd); return -1; } if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) { - VIR_ERROR(_("Failed to write to pid file '%s' : %s"), + VIR_ERROR("Failed to write to pid file '%s' : %s", pidFile, virStrerror(errno, ebuf, sizeof ebuf)); fclose(fh); return -1; } if (fclose(fh) == EOF) { - VIR_ERROR(_("Failed to close pid file '%s' : %s"), + VIR_ERROR("Failed to close pid file '%s' : %s", pidFile, virStrerror(errno, ebuf, sizeof ebuf)); return -1; } @@ -539,7 +539,7 @@ static int qemudListenUnix(struct qemud_server *server, char ebuf[1024]; if (VIR_ALLOC(sock) < 0) { - VIR_ERROR("%s", _("Failed to allocate memory for struct qemud_socket")); + VIR_ERROR0("Failed to allocate memory for struct qemud_socket"); return -1; } @@ -549,7 +549,7 @@ static int qemudListenUnix(struct qemud_server *server, sock->auth = auth; if ((sock->fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - VIR_ERROR(_("Failed to create socket: %s"), + VIR_ERROR("Failed to create socket: %s", virStrerror(errno, ebuf, sizeof ebuf)); goto cleanup; } @@ -561,7 +561,7 @@ static int qemudListenUnix(struct qemud_server *server, memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; if (virStrcpyStatic(addr.sun_path, path) == NULL) { - VIR_ERROR(_("Path %s too long for unix socket"), path); + VIR_ERROR("Path %s too long for unix socket", path); goto cleanup; } if (addr.sun_path[0] == '@') @@ -570,23 +570,23 @@ static int qemudListenUnix(struct qemud_server *server, oldgrp = getgid(); oldmask = umask(readonly ? ~unix_sock_ro_mask : ~unix_sock_rw_mask); if (server->privileged && setgid(unix_sock_gid)) { - VIR_ERROR(_("Failed to set group ID to %d"), unix_sock_gid); + VIR_ERROR("Failed to set group ID to %d", unix_sock_gid); goto cleanup; } if (bind(sock->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - VIR_ERROR(_("Failed to bind socket to '%s': %s"), + VIR_ERROR("Failed to bind socket to '%s': %s", path, virStrerror(errno, ebuf, sizeof ebuf)); goto cleanup; } umask(oldmask); if (server->privileged && setgid(oldgrp)) { - VIR_ERROR(_("Failed to restore group ID to %d"), oldgrp); + VIR_ERROR("Failed to restore group ID to %d", oldgrp); goto cleanup; } if (listen(sock->fd, 30) < 0) { - VIR_ERROR(_("Failed to listen for connections on '%s': %s"), + VIR_ERROR("Failed to listen for connections on '%s': %s", path, virStrerror(errno, ebuf, sizeof ebuf)); goto cleanup; } @@ -616,7 +616,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c int e = getaddrinfo (node, service, &hints, &ai); if (e != 0) { - VIR_ERROR(_("getaddrinfo: %s"), gai_strerror (e)); + VIR_ERROR("getaddrinfo failed: %s", gai_strerror (e)); return -1; } @@ -626,7 +626,8 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c fds[*nfds_r] = socket (runp->ai_family, runp->ai_socktype, runp->ai_protocol); if (fds[*nfds_r] == -1) { - VIR_ERROR(_("socket: %s"), virStrerror (errno, ebuf, sizeof ebuf)); + VIR_ERROR("socket failed: %s", + virStrerror (errno, ebuf, sizeof ebuf)); return -1; } @@ -650,7 +651,8 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c if (bind (fds[*nfds_r], runp->ai_addr, runp->ai_addrlen) == -1) { if (errno != EADDRINUSE) { - VIR_ERROR(_("bind: %s"), virStrerror (errno, ebuf, sizeof ebuf)); + VIR_ERROR("bind failed: %s", + virStrerror (errno, ebuf, sizeof ebuf)); return -1; } close (fds[*nfds_r]); @@ -695,7 +697,7 @@ remoteListenTCP (struct qemud_server *server, socklen_t salen = sizeof(s); if (VIR_ALLOC(sock) < 0) { - VIR_ERROR(_("remoteListenTCP: calloc: %s"), + VIR_ERROR("calloc failed: %s", virStrerror (errno, ebuf, sizeof ebuf)); goto cleanup; } @@ -726,7 +728,7 @@ remoteListenTCP (struct qemud_server *server, goto cleanup; if (listen (sock->fd, 30) < 0) { - VIR_ERROR(_("remoteListenTCP: listen: %s"), + VIR_ERROR("listen failed: %s", virStrerror (errno, ebuf, sizeof ebuf)); goto cleanup; } @@ -755,7 +757,7 @@ static int qemudInitPaths(struct qemud_server *server, /* Change the group ownership of /var/run/libvirt to unix_sock_gid */ if (server->privileged) { if (chown(unix_sock_dir, -1, unix_sock_gid) < 0) - VIR_ERROR(_("Failed to change group ownership of %s"), + VIR_ERROR("Failed to change group ownership of %s", unix_sock_dir); } } else { @@ -817,8 +819,7 @@ static int qemudInitPaths(struct qemud_server *server, snprintf_error: if (ret) - VIR_ERROR("%s", - _("Resulting path too long for buffer in qemudInitPaths()")); + VIR_ERROR0("Resulting path too long for buffer in qemudInitPaths()"); cleanup: VIR_FREE(dir_prefix); @@ -836,7 +837,7 @@ static struct qemud_server *qemudInitialize(void) { struct qemud_server *server; if (VIR_ALLOC(server) < 0) { - VIR_ERROR0(_("Failed to allocate struct qemud_server")); + VIR_ERROR0("Failed to allocate struct qemud_server"); return NULL; } @@ -844,19 +845,19 @@ static struct qemud_server *qemudInitialize(void) { server->sigread = server->sigwrite = -1; if (virMutexInit(&server->lock) < 0) { - VIR_ERROR("%s", _("cannot initialize mutex")); + VIR_ERROR0("cannot initialize mutex"); VIR_FREE(server); return NULL; } if (virCondInit(&server->job) < 0) { - VIR_ERROR("%s", _("cannot initialize condition variable")); + VIR_ERROR0("cannot initialize condition variable"); virMutexDestroy(&server->lock); VIR_FREE(server); return NULL; } if (virEventInit() < 0) { - VIR_ERROR0(_("Failed to initialize event system")); + VIR_ERROR0("Failed to initialize event system"); virMutexDestroy(&server->lock); if (virCondDestroy(&server->job) < 0) {} @@ -953,7 +954,7 @@ static int qemudNetworkInit(struct qemud_server *server) { auth_tcp == REMOTE_AUTH_SASL || auth_tls == REMOTE_AUTH_SASL) { if ((err = sasl_server_init(NULL, "libvirt")) != SASL_OK) { - VIR_ERROR(_("Failed to initialize SASL authentication %s"), + VIR_ERROR("Failed to initialize SASL authentication %s", sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -971,7 +972,7 @@ static int qemudNetworkInit(struct qemud_server *server) { dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { - VIR_ERROR(_("Failed to connect to system bus for PolicyKit auth: %s"), + VIR_ERROR("Failed to connect to system bus for PolicyKit auth: %s", derr.message); dbus_error_free(&derr); goto cleanup; @@ -1058,7 +1059,7 @@ static int qemudNetworkEnable(struct qemud_server *server) { VIR_EVENT_HANDLE_HANGUP, qemudDispatchServerEvent, server, NULL)) < 0) { - VIR_ERROR0(_("Failed to add server event callback")); + VIR_ERROR0("Failed to add server event callback"); return -1; } @@ -1094,8 +1095,7 @@ remoteInitializeTLSSession (void) return session; failed: - VIR_ERROR(_("remoteInitializeTLSSession: %s"), - gnutls_strerror (err)); + VIR_ERROR("gnutls error occured: %s", gnutls_strerror (err)); return NULL; } @@ -1110,7 +1110,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) err = gnutls_x509_crt_get_dn (cert, name, &namesize); if (err != 0) { - VIR_ERROR(_("remoteCheckDN: gnutls_x509_cert_get_dn: %s"), + VIR_ERROR("gnutls_x509_cert_get_dn failed: %s", gnutls_strerror (err)); return 0; } @@ -1127,7 +1127,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) } /* Print the client's DN. */ - DEBUG(_("remoteCheckDN: failed: client DN is %s"), name); + VIR_DEBUG("remoteCheckDN failed, client DN is %s", name); return 0; // Not found. } @@ -1142,40 +1142,35 @@ remoteCheckCertificate (gnutls_session_t session) time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0){ - VIR_ERROR(_("remoteCheckCertificate: verify failed: %s"), - gnutls_strerror (ret)); + VIR_ERROR("verify failed: %s", gnutls_strerror (ret)); return -1; } if (status != 0) { if (status & GNUTLS_CERT_INVALID) - VIR_ERROR0(_("remoteCheckCertificate: " - "the client certificate is not trusted.")); + VIR_ERROR0("the client certificate is not trusted."); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - VIR_ERROR0(_("remoteCheckCertificate: the client " - "certificate has unknown issuer.")); + VIR_ERROR0("the client certificate has unknown issuer."); if (status & GNUTLS_CERT_REVOKED) - VIR_ERROR0(_("remoteCheckCertificate: " - "the client certificate has been revoked.")); + VIR_ERROR0("the client certificate has been revoked."); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - VIR_ERROR0(_("remoteCheckCertificate: the client certificate" - " uses an insecure algorithm.")); + VIR_ERROR0("the client certificate uses an insecure algorithm."); #endif return -1; } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { - VIR_ERROR0(_("remoteCheckCertificate: certificate is not X.509")); + VIR_ERROR0("certificate is not X.509"); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - VIR_ERROR0(_("remoteCheckCertificate: no peers")); + VIR_ERROR0("no peers"); return -1; } @@ -1185,7 +1180,7 @@ remoteCheckCertificate (gnutls_session_t session) gnutls_x509_crt_t cert; if (gnutls_x509_crt_init (&cert) < 0) { - VIR_ERROR0(_("remoteCheckCertificate: gnutls_x509_crt_init failed")); + VIR_ERROR0("gnutls_x509_crt_init failed"); return -1; } @@ -1195,15 +1190,13 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - VIR_ERROR0(_("remoteCheckCertificate: " - "the client certificate has expired")); + VIR_ERROR0("the client certificate has expired"); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - VIR_ERROR0(_("remoteCheckCertificate: the client " - "certificate is not yet activated")); + VIR_ERROR0("the client certificate is not yet activated"); gnutls_x509_crt_deinit (cert); return -1; } @@ -1211,7 +1204,12 @@ remoteCheckCertificate (gnutls_session_t session) if (i == 0) { if (!remoteCheckDN (cert)) { /* This is the most common error: make it informative. */ - VIR_ERROR0(_("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); + VIR_ERROR0("client's Distinguished Name is not on the list of " + "allowed clients (tls_allowed_dn_list). Use " + "'openssl x509 -in clientcert.pem -text' to view " + "the Distinguished Name field in the client " + "certificate, or run this daemon with --verbose " + "option."); gnutls_x509_crt_deinit (cert); return -1; } @@ -1229,16 +1227,14 @@ remoteCheckAccess (struct qemud_client *client) /* Verify client certificate. */ if (remoteCheckCertificate (client->tlssession) == -1) { - VIR_ERROR0(_("remoteCheckCertificate: " - "failed to verify client's certificate")); + VIR_ERROR0("failed to verify client's certificate"); if (!tls_no_verify_certificate) return -1; - else VIR_INFO0(_("remoteCheckCertificate: tls_no_verify_certificate " - "is set so the bad certificate is ignored")); + else VIR_INFO0("tls_no_verify_certificate " + "is set so the bad certificate is ignored"); } if (client->tx) { - VIR_INFO("%s", - _("client had unexpected data pending tx after access check")); + VIR_INFO0("client had unexpected data pending tx after access check"); return -1; } @@ -1266,7 +1262,7 @@ int qemudGetSocketIdentity(int fd, uid_t *uid, pid_t *pid) { if (getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to verify client credentials: %s"), + VIR_ERROR("Failed to verify client credentials: %s", virStrerror(errno, ebuf, sizeof ebuf)); return -1; } @@ -1294,19 +1290,19 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket char ebuf[1024]; if (errno == EAGAIN) return 0; - VIR_ERROR(_("Failed to accept connection: %s"), + VIR_ERROR("Failed to accept connection: %s", virStrerror(errno, ebuf, sizeof ebuf)); return -1; } if (server->nclients >= max_clients) { - VIR_ERROR(_("Too many active clients (%d), dropping connection"), max_clients); + VIR_ERROR("Too many active clients (%d), dropping connection", max_clients); close(fd); return -1; } if (VIR_REALLOC_N(server->clients, server->nclients+1) < 0) { - VIR_ERROR0(_("Out of memory allocating clients")); + VIR_ERROR0("Out of memory allocating clients"); close(fd); return -1; } @@ -1347,7 +1343,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket if (VIR_ALLOC(client) < 0) goto cleanup; if (virMutexInit(&client->lock) < 0) { - VIR_ERROR("%s", _("cannot initialize mutex")); + VIR_ERROR0("cannot initialize mutex"); VIR_FREE(client); goto cleanup; } @@ -1384,7 +1380,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket /* Client is running as root, so disable auth */ if (uid == 0) { - VIR_INFO(_("Turn off polkit auth for privileged client %d"), pid); + VIR_INFO("Turn off polkit auth for privileged client %d", pid); client->auth = REMOTE_AUTH_NONE; } } @@ -1423,8 +1419,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket if (qemudRegisterClientEvent (server, client) < 0) goto cleanup; } else { - VIR_ERROR(_("TLS handshake failed: %s"), - gnutls_strerror (ret)); + VIR_ERROR("TLS handshake failed: %s", gnutls_strerror(ret)); goto cleanup; } } @@ -1608,13 +1603,13 @@ static ssize_t qemudClientReadBuf(struct qemud_client *client, ssize_t ret; if (len < 0) { - VIR_ERROR(_("unexpected negative length request %lld"), + VIR_ERROR("unexpected negative length request %lld", (long long int) len); qemudDispatchClientFailure(client); return -1; } - /*qemudDebug ("qemudClientRead: len = %d", len);*/ + /*VIR_DEBUG("qemudClientRead: len = %d", len);*/ if (!client->tlssession) { char ebuf[1024]; @@ -1624,7 +1619,7 @@ static ssize_t qemudClientReadBuf(struct qemud_client *client, return 0; if (ret <= 0) { if (ret != 0) - VIR_ERROR(_("read: %s"), + VIR_ERROR("read: %s", virStrerror (errno, ebuf, sizeof ebuf)); qemudDispatchClientFailure(client); return -1; @@ -1637,7 +1632,7 @@ static ssize_t qemudClientReadBuf(struct qemud_client *client, return 0; if (ret <= 0) { if (ret != 0) - VIR_ERROR(_("gnutls_record_recv: %s"), + VIR_ERROR("gnutls_record_recv: %s", gnutls_strerror (ret)); qemudDispatchClientFailure(client); return -1; @@ -1699,7 +1694,7 @@ static ssize_t qemudClientReadSASL(struct qemud_client *client) { ret = sasl_decode(client->saslconn, encoded, encodedLen, &client->saslDecoded, &client->saslDecodedLength); if (ret != SASL_OK) { - VIR_ERROR(_("failed to decode SASL data %s"), + VIR_ERROR("failed to decode SASL data %s", sasl_errstring(ret, NULL, NULL)); qemudDispatchClientFailure(client); return -1; @@ -1748,7 +1743,7 @@ static ssize_t qemudClientRead(struct qemud_client *client) { */ static void qemudDispatchClientRead(struct qemud_server *server, struct qemud_client *client) { - /*qemudDebug ("qemudDispatchClientRead: mode = %d", client->mode);*/ + /*VIR_DEBUG("qemudDispatchClientRead: mode = %d", client->mode);*/ readmore: if (qemudClientRead(client) < 0) @@ -1858,7 +1853,7 @@ static ssize_t qemudClientWriteBuf(struct qemud_client *client, ssize_t ret; if (len < 0) { - VIR_ERROR(_("unexpected negative length request %lld"), + VIR_ERROR("unexpected negative length request %lld", (long long int) len); qemudDispatchClientFailure(client); return -1; @@ -1869,7 +1864,7 @@ static ssize_t qemudClientWriteBuf(struct qemud_client *client, if ((ret = write(client->fd, data, len)) == -1) { if (errno == EAGAIN || errno == EINTR) return 0; - VIR_ERROR(_("write: %s"), virStrerror (errno, ebuf, sizeof ebuf)); + VIR_ERROR("write: %s", virStrerror (errno, ebuf, sizeof ebuf)); qemudDispatchClientFailure(client); return -1; } @@ -1880,7 +1875,7 @@ static ssize_t qemudClientWriteBuf(struct qemud_client *client, ret == GNUTLS_E_AGAIN) return 0; - VIR_ERROR(_("gnutls_record_send: %s"), gnutls_strerror (ret)); + VIR_ERROR("gnutls_record_send: %s", gnutls_strerror (ret)); qemudDispatchClientFailure(client); return -1; } @@ -1929,7 +1924,7 @@ static int qemudClientWriteSASL(struct qemud_client *client) { &client->saslEncodedLength); if (ret != SASL_OK) { - VIR_ERROR(_("failed to encode SASL data %s"), + VIR_ERROR("failed to encode SASL data %s", sasl_errstring(ret, NULL, NULL)); qemudDispatchClientFailure(client); return -1; @@ -2057,8 +2052,7 @@ qemudDispatchClientHandshake(struct qemud_client *client) { qemudUpdateClientEvent (client); } else { /* Fatal error in handshake */ - VIR_ERROR(_("TLS handshake failed: %s"), - gnutls_strerror (ret)); + VIR_ERROR("TLS handshake failed: %s", gnutls_strerror(ret)); qemudDispatchClientFailure(client); } } @@ -2205,7 +2199,7 @@ static int qemudOneLoop(void) { if (errors) { char ebuf[1024]; sig_errors -= errors; - VIR_ERROR(_("Signal handler reported %d errors: last error: %s"), + VIR_ERROR("Signal handler reported %d errors: last error: %s", errors, virStrerror (sig_lasterrno, ebuf, sizeof ebuf)); return -1; } @@ -2264,7 +2258,7 @@ static void *qemudRunLoop(void *opaque) { (timerid = virEventAddTimeoutImpl(-1, qemudInactiveTimer, server, NULL)) < 0) { - VIR_ERROR0(_("Failed to register shutdown timeout")); + VIR_ERROR0("Failed to register shutdown timeout"); return NULL; } @@ -2273,7 +2267,7 @@ static void *qemudRunLoop(void *opaque) { server->nworkers = max_workers; if (VIR_ALLOC_N(server->workers, server->nworkers) < 0) { - VIR_ERROR0(_("Failed to allocate workers")); + VIR_ERROR0("Failed to allocate workers"); return NULL; } @@ -2457,13 +2451,13 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, switch (p->type) { case VIR_CONF_STRING: if (VIR_ALLOC_N(list, 2) < 0) { - VIR_ERROR(_("failed to allocate memory for %s config list"), key); + VIR_ERROR("failed to allocate memory for %s config list", key); return -1; } list[0] = strdup (p->str); list[1] = NULL; if (list[0] == NULL) { - VIR_ERROR(_("failed to allocate memory for %s config list value"), + VIR_ERROR("failed to allocate memory for %s config list value", key); VIR_FREE(list); return -1; @@ -2476,13 +2470,12 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, for (pp = p->list; pp; pp = pp->next) len++; if (VIR_ALLOC_N(list, 1+len) < 0) { - VIR_ERROR(_("failed to allocate memory for %s config list"), key); + VIR_ERROR("failed to allocate memory for %s config list", key); return -1; } for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { if (pp->type != VIR_CONF_STRING) { - VIR_ERROR(_("remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n"), + VIR_ERROR("%s: %s: must be a string or list of strings\n", filename, key); VIR_FREE(list); return -1; @@ -2493,7 +2486,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, for (j = 0 ; j < i ; j++) VIR_FREE(list[j]); VIR_FREE(list); - VIR_ERROR(_("failed to allocate memory for %s config list value"), + VIR_ERROR("failed to allocate memory for %s config list value", key); return -1; } @@ -2504,8 +2497,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, } default: - VIR_ERROR(_("remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n"), + VIR_ERROR("%s: %s: must be a string or list of strings\n", filename, key); return -1; } @@ -2520,8 +2512,7 @@ checkType (virConfValuePtr p, const char *filename, const char *key, virConfType required_type) { if (p->type != required_type) { - VIR_ERROR(_("remoteReadConfigFile: %s: %s: invalid type:" - " got %s; expected %s\n"), filename, key, + VIR_ERROR("%s: %s: invalid type: got %s; expected %s\n", filename, key, virConfTypeName (p->type), virConfTypeName (required_type)); return -1; @@ -2542,8 +2533,7 @@ checkType (virConfValuePtr p, const char *filename, (var_name) = strdup (p->str); \ if ((var_name) == NULL) { \ char ebuf[1024]; \ - VIR_ERROR(_("remoteReadConfigFile: %s"), \ - virStrerror(errno, ebuf, sizeof ebuf)); \ + VIR_ERROR("%s", virStrerror(errno, ebuf, sizeof ebuf)); \ goto free_and_fail; \ } \ } \ @@ -2585,8 +2575,7 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons *auth = REMOTE_AUTH_POLKIT; #endif } else { - VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s"), - filename, key, p->str); + VIR_ERROR("%s: %s: unsupported auth %s", filename, key, p->str); return -1; } @@ -2749,7 +2738,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { if (!server->privileged) { - VIR_WARN0(_("Cannot set group when not running as root")); + VIR_WARN0("Cannot set group when not running as root"); } else { int ret; struct group grpdata, *grp; @@ -2759,7 +2748,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) maxbuf = 1024; if (VIR_ALLOC_N(buf, maxbuf) < 0) { - VIR_ERROR("%s", _("Failed to allocate memory for buffer")); + VIR_ERROR0("Failed to allocate memory for buffer"); goto free_and_fail; } @@ -2768,13 +2757,13 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) &grp)) == ERANGE) { maxbuf *= 2; if (maxbuf > 65536 || VIR_REALLOC_N(buf, maxbuf) < 0) { - VIR_ERROR("%s", _("Failed to reallocate enough memory for buffer")); + VIR_ERROR0("Failed to reallocate enough memory for buffer"); goto free_and_fail; } } if (ret != 0 || !grp) { - VIR_ERROR(_("Failed to lookup group '%s'"), unix_sock_group); + VIR_ERROR("Failed to lookup group '%s'", unix_sock_group); goto free_and_fail; } unix_sock_gid = grp->gr_gid; @@ -2786,7 +2775,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_ro_perms); if (unix_sock_ro_perms) { if (virStrToLong_i (unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { - VIR_ERROR(_("Failed to parse mode '%s'"), unix_sock_ro_perms); + VIR_ERROR("Failed to parse mode '%s'", unix_sock_ro_perms); goto free_and_fail; } VIR_FREE(unix_sock_ro_perms); @@ -2795,7 +2784,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_rw_perms); if (unix_sock_rw_perms) { if (virStrToLong_i (unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { - VIR_ERROR(_("Failed to parse mode '%s'"), unix_sock_rw_perms); + VIR_ERROR("Failed to parse mode '%s'", unix_sock_rw_perms); goto free_and_fail; } VIR_FREE(unix_sock_rw_perms); @@ -2870,13 +2859,13 @@ qemudSetupPrivs (void) if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET, SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { - VIR_ERROR0(_("additional privileges are required")); + VIR_ERROR0("additional privileges are required"); return -1; } if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { - VIR_ERROR0(_("failed to set reduced privileges")); + VIR_ERROR0("failed to set reduced privileges"); return -1; } @@ -2909,7 +2898,7 @@ daemonSetupSignals(struct qemud_server *server) virSetCloseExec(sigpipe[0]) < 0 || virSetCloseExec(sigpipe[1]) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create pipe: %s"), + VIR_ERROR("Failed to create pipe: %s", virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -2931,7 +2920,7 @@ daemonSetupSignals(struct qemud_server *server) VIR_EVENT_HANDLE_READABLE, qemudDispatchSignalEvent, server, NULL) < 0) { - VIR_ERROR0(_("Failed to register callback for signal pipe")); + VIR_ERROR0("Failed to register callback for signal pipe"); goto error; } @@ -3087,7 +3076,7 @@ int main(int argc, char **argv) { if (godaemon) { char ebuf[1024]; if ((statuswrite = daemonForkIntoBackground()) < 0) { - VIR_ERROR(_("Failed to fork as daemon: %s"), + VIR_ERROR("Failed to fork as daemon: %s", virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -3114,7 +3103,7 @@ int main(int argc, char **argv) { if (mkdir (rundir, 0755)) { if (errno != EEXIST) { char ebuf[1024]; - VIR_ERROR(_("unable to create rundir %s: %s"), rundir, + VIR_ERROR("unable to create rundir %s: %s", rundir, virStrerror(errno, ebuf, sizeof(ebuf))); ret = VIR_DAEMON_ERR_RUNDIR; goto error; diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index d292681..40cba8c 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -109,8 +109,6 @@ # endif # endif -# define qemudDebug DEBUG - /* Whether we're passing reads & writes through a sasl SSF */ enum qemud_sasl_ssf { QEMUD_SASL_SSF_NONE = 0, diff --git a/daemon/remote.c b/daemon/remote.c index 780d536..868113c 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3223,7 +3223,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, REMOTE_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { - VIR_ERROR0(_("client tried invalid SASL init request")); + VIR_ERROR0("client tried invalid SASL init request"); goto authfail; } @@ -3265,7 +3265,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, VIR_FREE(localAddr); VIR_FREE(remoteAddr); if (err != SASL_OK) { - VIR_ERROR(_("sasl context setup failed %d (%s)"), + VIR_ERROR("sasl context setup failed %d (%s)", err, sasl_errstring(err, NULL, NULL)); client->saslconn = NULL; goto authfail; @@ -3278,7 +3278,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, cipher = gnutls_cipher_get(client->tlssession); if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { - VIR_ERROR0(_("cannot get TLS cipher size")); + VIR_ERROR0("cannot get TLS cipher size"); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -3287,7 +3287,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, err = sasl_setprop(client->saslconn, SASL_SSF_EXTERNAL, &ssf); if (err != SASL_OK) { - VIR_ERROR(_("cannot set SASL external SSF %d (%s)"), + VIR_ERROR("cannot set SASL external SSF %d (%s)", err, sasl_errstring(err, NULL, NULL)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3315,7 +3315,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, err = sasl_setprop(client->saslconn, SASL_SEC_PROPS, &secprops); if (err != SASL_OK) { - VIR_ERROR(_("cannot set SASL security props %d (%s)"), + VIR_ERROR("cannot set SASL security props %d (%s)", err, sasl_errstring(err, NULL, NULL)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3331,7 +3331,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, NULL, NULL); if (err != SASL_OK) { - VIR_ERROR(_("cannot list SASL mechanisms %d (%s)"), + VIR_ERROR("cannot list SASL mechanisms %d (%s)", err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3340,7 +3340,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server, REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { - VIR_ERROR0(_("cannot allocate mechlist")); + VIR_ERROR0("cannot allocate mechlist"); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -3371,7 +3371,7 @@ remoteSASLCheckSSF (struct qemud_client *client, err = sasl_getprop(client->saslconn, SASL_SSF, &val); if (err != SASL_OK) { - VIR_ERROR(_("cannot query SASL ssf on connection %d (%s)"), + VIR_ERROR("cannot query SASL ssf on connection %d (%s)", err, sasl_errstring(err, NULL, NULL)); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); @@ -3381,7 +3381,7 @@ remoteSASLCheckSSF (struct qemud_client *client, ssf = *(const int *)val; REMOTE_DEBUG("negotiated an SSF of %d", ssf); if (ssf < 56) { /* 56 is good for Kerberos */ - VIR_ERROR(_("negotiated SSF %d was not strong enough"), ssf); + VIR_ERROR("negotiated SSF %d was not strong enough", ssf); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3410,7 +3410,7 @@ remoteSASLCheckAccess (struct qemud_server *server, err = sasl_getprop(client->saslconn, SASL_USERNAME, &val); if (err != SASL_OK) { - VIR_ERROR(_("cannot query SASL username on connection %d (%s)"), + VIR_ERROR("cannot query SASL username on connection %d (%s)", err, sasl_errstring(err, NULL, NULL)); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); @@ -3418,7 +3418,7 @@ remoteSASLCheckAccess (struct qemud_server *server, return -1; } if (val == NULL) { - VIR_ERROR0(_("no client username was found")); + VIR_ERROR0("no client username was found"); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3428,7 +3428,7 @@ remoteSASLCheckAccess (struct qemud_server *server, client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { - VIR_ERROR0(_("out of memory copying username")); + VIR_ERROR0("out of memory copying username"); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3447,7 +3447,7 @@ remoteSASLCheckAccess (struct qemud_server *server, } /* Denied */ - VIR_ERROR(_("SASL client %s not allowed in whitelist"), client->saslUsername); + VIR_ERROR("SASL client %s not allowed in whitelist", client->saslUsername); remoteDispatchAuthError(rerr); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3478,7 +3478,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, REMOTE_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - VIR_ERROR0(_("client tried invalid SASL start request")); + VIR_ERROR0("client tried invalid SASL start request"); goto authfail; } @@ -3493,14 +3493,14 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - VIR_ERROR(_("sasl start failed %d (%s)"), + VIR_ERROR("sasl start failed %d (%s)", err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - VIR_ERROR(_("sasl start reply data too long %d"), serveroutlen); + VIR_ERROR("sasl start reply data too long %d", serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; goto authfail; @@ -3566,7 +3566,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, REMOTE_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - VIR_ERROR0(_("client tried invalid SASL start request")); + VIR_ERROR0("client tried invalid SASL start request"); goto authfail; } @@ -3580,7 +3580,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - VIR_ERROR(_("sasl step failed %d (%s)"), + VIR_ERROR("sasl step failed %d (%s)", err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3588,7 +3588,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - VIR_ERROR(_("sasl step reply data too long %d"), + VIR_ERROR("sasl step reply data too long %d", serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -3645,7 +3645,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - VIR_ERROR0(_("client tried unsupported SASL init request")); + VIR_ERROR0("client tried unsupported SASL init request"); remoteDispatchAuthError(rerr); return -1; } @@ -3659,7 +3659,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - VIR_ERROR0(_("client tried unsupported SASL start request")); + VIR_ERROR0("client tried unsupported SASL start request"); remoteDispatchAuthError(rerr); return -1; } @@ -3673,7 +3673,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - VIR_ERROR0(_("client tried unsupported SASL step request")); + VIR_ERROR0("client tried unsupported SASL step request"); remoteDispatchAuthError(rerr); return -1; } @@ -3715,33 +3715,33 @@ remoteDispatchAuthPolkit (struct qemud_server *server, REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - VIR_ERROR0(_("client tried invalid PolicyKit init request")); + VIR_ERROR0("client tried invalid PolicyKit init request"); goto authfail; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - VIR_ERROR0(_("cannot get peer socket identity")); + VIR_ERROR0("cannot get peer socket identity"); goto authfail; } - VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid); + VIR_INFO("Checking PID %d running as %d", callerPid, callerUid); rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid); if (rv < 0 || rv >= sizeof pidbuf) { - VIR_ERROR(_("Caller PID was too large %d"), callerPid); + VIR_ERROR("Caller PID was too large %d", callerPid); goto authfail; } if (virRun(pkcheck, &status) < 0) { - VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH); + VIR_ERROR("Cannot invoke %s", PKCHECK_PATH); goto authfail; } if (status != 0) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d"), + VIR_ERROR("Policy kit denied action %s from pid %d, uid %d, result: %d", action, callerPid, callerUid, status); goto authfail; } - VIR_INFO(_("Policy allowed action %s from pid %d, uid %d"), + VIR_INFO("Policy allowed action %s from pid %d, uid %d", action, callerPid, callerUid); ret->complete = 1; client->auth = REMOTE_AUTH_NONE; @@ -3784,27 +3784,27 @@ remoteDispatchAuthPolkit (struct qemud_server *server, REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - VIR_ERROR0(_("client tried invalid PolicyKit init request")); + VIR_ERROR0("client tried invalid PolicyKit init request"); goto authfail; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - VIR_ERROR0(_("cannot get peer socket identity")); + VIR_ERROR0("cannot get peer socket identity"); goto authfail; } - VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid); + VIR_INFO("Checking PID %d running as %d", callerPid, callerUid); dbus_error_init(&err); if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus, callerPid, &err))) { - VIR_ERROR(_("Failed to lookup policy kit caller: %s"), err.message); + VIR_ERROR("Failed to lookup policy kit caller: %s", err.message); dbus_error_free(&err); goto authfail; } if (!(pkaction = polkit_action_new())) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit action %s"), + VIR_ERROR("Failed to create polkit action %s", virStrerror(errno, ebuf, sizeof ebuf)); polkit_caller_unref(pkcaller); goto authfail; @@ -3814,7 +3814,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, if (!(pkcontext = polkit_context_new()) || !polkit_context_init(pkcontext, &pkerr)) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit context %s"), + VIR_ERROR("Failed to create polkit context %s", (pkerr ? polkit_error_get_error_message(pkerr) : virStrerror(errno, ebuf, sizeof ebuf))); if (pkerr) @@ -3832,7 +3832,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, 0, &pkerr); if (pkerr && polkit_error_is_set(pkerr)) { - VIR_ERROR(_("Policy kit failed to check authorization %d %s"), + VIR_ERROR("Policy kit failed to check authorization %d %s", polkit_error_get_error_code(pkerr), polkit_error_get_error_message(pkerr)); goto authfail; @@ -3846,12 +3846,12 @@ remoteDispatchAuthPolkit (struct qemud_server *server, polkit_caller_unref(pkcaller); polkit_action_unref(pkaction); if (pkresult != POLKIT_RESULT_YES) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s"), + VIR_ERROR("Policy kit denied action %s from pid %d, uid %d, result: %s", action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); goto authfail; } - VIR_INFO(_("Policy allowed action %s from pid %d, uid %d, result %s"), + VIR_INFO("Policy allowed action %s from pid %d, uid %d, result %s", action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); ret->complete = 1; @@ -3877,7 +3877,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) { - VIR_ERROR0(_("client tried unsupported PolicyKit init request")); + VIR_ERROR0("client tried unsupported PolicyKit init request"); remoteDispatchAuthError(rerr); return -1; } diff --git a/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch b/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch index 807ed78..ff1124f 100644 --- a/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch +++ b/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch @@ -146,7 +146,7 @@ index b84729f..4f73baf 100644 + goto cleanup; + } + -+ VIR_DEBUG(_("Vport operation path is '%s'"), operation_path); ++ VIR_DEBUG("Vport operation path is '%s'", operation_path); + + fd = open(operation_path, O_WRONLY); + @@ -959,7 +959,7 @@ index 0000000..1deb6d2 + char buf[64]; + struct stat st; + -+ VIR_DEBUG(_("Checking if host%d is an FC HBA"), d->scsi_host.host); ++ VIR_DEBUG("Checking if host%d is an FC HBA", d->scsi_host.host); + + if (virAsprintf(&sysfs_path, "%s/host%d", + LINUX_SYSFS_FC_HOST_PREFIX, diff --git a/po/POTFILES.in b/po/POTFILES.in index 417bfa1..6c93e2a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ daemon/dispatch.c -daemon/libvirtd.c daemon/remote.c daemon/stream.c src/conf/cpu_conf.c @@ -25,8 +24,6 @@ src/lxc/lxc_controller.c src/lxc/lxc_driver.c src/network/bridge_driver.c src/node_device/node_device_driver.c -src/node_device/node_device_linux_sysfs.c -src/node_device/node_device_udev.c src/nodeinfo.c src/nwfilter/nwfilter_driver.c src/nwfilter/nwfilter_ebiptables_driver.c @@ -61,19 +58,16 @@ src/test/test_driver.c src/uml/uml_conf.c src/uml/uml_driver.c src/util/authhelper.c -src/util/bridge.c src/util/conf.c src/util/hooks.c src/util/hostusb.c src/util/json.c -src/util/logging.c src/util/macvtap.c src/util/pci.c src/util/processinfo.c src/util/stats_linux.c src/util/storage_file.c src/util/util.c -src/util/uuid.c src/util/virterror.c src/util/xml.c src/vbox/vbox_driver.c @@ -87,5 +81,4 @@ src/xen/xm_internal.c src/xen/xs_internal.c src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c -tools/console.c tools/virsh.c diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index bbdad89..b3657be 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -53,7 +53,7 @@ virSecretDefFree(virSecretDefPtr def) break; default: - VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type); + VIR_ERROR("unexpected secret usage type %d", def->usage_type); break; } VIR_FREE(def); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 706c796..018f4d5 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -716,7 +716,7 @@ static int lxcContainerDropCapabilities(void) * be unmasked - they can never escape the bounding set. */ #else - VIR_WARN0(_("libcap-ng support not compiled in, unable to clear capabilities")); + VIR_WARN0("libcap-ng support not compiled in, unable to clear capabilities"); #endif return 0; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c120b8e..1732780 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -259,7 +259,7 @@ static int lxcControllerClearCapabilities(void) return -1; } #else - VIR_WARN0(_("libcap-ng support not compiled in, unable to clear capabilities")); + VIR_WARN0("libcap-ng support not compiled in, unable to clear capabilities"); #endif return 0; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 01330ec..fb9e010 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1684,7 +1684,7 @@ lxcAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaqu int ret = lxcVmStart(data->conn, data->driver, vm); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s"), + VIR_ERROR("Failed to autostart VM '%s': %s", vm->def->name, err ? err->message : ""); } else { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 83ab00e..4eeaeed 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -806,7 +806,7 @@ networkReloadIptablesRules(struct network_driver *driver) { unsigned int i; - VIR_INFO0(_("Reloading iptables rules")); + VIR_INFO0("Reloading iptables rules"); for (i = 0 ; i < driver->networks.count ; i++) { virNetworkObjLock(driver->networks.objs[i]); @@ -970,14 +970,14 @@ static int networkStartNetworkDaemon(struct network_driver *driver, err_delbr1: if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; - VIR_WARN(_("Failed to bring down bridge '%s' : %s"), + VIR_WARN("Failed to bring down bridge '%s' : %s", network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } err_delbr: if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { char ebuf[1024]; - VIR_WARN(_("Failed to delete bridge '%s' : %s"), + VIR_WARN("Failed to delete bridge '%s' : %s", network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } @@ -991,7 +991,7 @@ static int networkShutdownNetworkDaemon(struct network_driver *driver, int err; char *stateFile; - VIR_INFO(_("Shutting down network '%s'"), network->def->name); + VIR_INFO("Shutting down network '%s'", network->def->name); if (!virNetworkObjIsActive(network)) return 0; @@ -1010,12 +1010,12 @@ static int networkShutdownNetworkDaemon(struct network_driver *driver, char ebuf[1024]; if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { - VIR_WARN(_("Failed to bring down bridge '%s' : %s"), + VIR_WARN("Failed to bring down bridge '%s' : %s", network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { - VIR_WARN(_("Failed to delete bridge '%s' : %s"), + VIR_WARN("Failed to delete bridge '%s' : %s", network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b0ea986..c0fdce6 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -51,14 +51,14 @@ static int update_caps(virNodeDeviceObjPtr dev) if (read_wwn(cap->data.scsi_host.host, "port_name", &cap->data.scsi_host.wwpn) == -1) { - VIR_ERROR(_("Failed to refresh WWPN for host%d"), + VIR_ERROR("Failed to refresh WWPN for host%d", cap->data.scsi_host.host); } if (read_wwn(cap->data.scsi_host.host, "node_name", &cap->data.scsi_host.wwnn) == -1) { - VIR_ERROR(_("Failed to refresh WWNN for host%d"), + VIR_ERROR("Failed to refresh WWNN for host%d", cap->data.scsi_host.host); } } @@ -432,7 +432,7 @@ nodeDeviceVportCreateDelete(const int parent_host, goto cleanup; } - VIR_DEBUG(_("Vport operation path is '%s'"), operation_path); + VIR_DEBUG("Vport operation path is '%s'", operation_path); if (virAsprintf(&vport_name, "%s:%s", @@ -455,7 +455,7 @@ nodeDeviceVportCreateDelete(const int parent_host, cleanup: VIR_FREE(vport_name); VIR_FREE(operation_path); - VIR_DEBUG("%s", _("Vport operation complete")); + VIR_DEBUG0("Vport operation complete"); return retval; } diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index c4d1d01..9ed0daa 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -53,10 +53,10 @@ static int open_wwn_file(const char *prefix, /* fd will be closed by caller */ if ((*fd = open(wwn_path, O_RDONLY)) != -1) { - VIR_DEBUG(_("Opened WWN path '%s' for reading"), + VIR_DEBUG("Opened WWN path '%s' for reading", wwn_path); } else { - VIR_ERROR(_("Failed to open WWN path '%s' for reading"), + VIR_ERROR("Failed to open WWN path '%s' for reading", wwn_path); } @@ -79,7 +79,7 @@ int read_wwn_linux(int host, const char *file, char **wwn) memset(buf, 0, sizeof(buf)); if (saferead(fd, buf, sizeof(buf)) < 0) { retval = -1; - VIR_DEBUG(_("Failed to read WWN for host%d '%s'"), + VIR_DEBUG("Failed to read WWN for host%d '%s'", host, file); goto out; } @@ -117,7 +117,7 @@ int check_fc_host_linux(union _virNodeDevCapData *d) int retval = 0; struct stat st; - VIR_DEBUG(_("Checking if host%d is an FC HBA"), d->scsi_host.host); + VIR_DEBUG("Checking if host%d is an FC HBA", d->scsi_host.host); if (virAsprintf(&sysfs_path, "%s/host%d", LINUX_SYSFS_FC_HOST_PREFIX, @@ -137,7 +137,7 @@ int check_fc_host_linux(union _virNodeDevCapData *d) if (read_wwn(d->scsi_host.host, "port_name", &d->scsi_host.wwpn) == -1) { - VIR_ERROR(_("Failed to read WWPN for host%d"), + VIR_ERROR("Failed to read WWPN for host%d", d->scsi_host.host); retval = -1; goto out; @@ -146,7 +146,7 @@ int check_fc_host_linux(union _virNodeDevCapData *d) if (read_wwn(d->scsi_host.host, "node_name", &d->scsi_host.wwnn) == -1) { - VIR_ERROR(_("Failed to read WWNN for host%d"), + VIR_ERROR("Failed to read WWNN for host%d", d->scsi_host.host); retval = -1; } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e3114fa..47f53f7 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -112,7 +112,7 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, udev_value = udev_device_get_property_value(udev_device, property_key); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have property '%s'"), + VIR_INFO("udev reports device '%s' does not have property '%s'", udev_device_get_sysname(udev_device), property_key); ret = PROPERTY_MISSING; goto out; @@ -201,7 +201,7 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, udev_value = udev_device_get_sysattr_value(udev_device, attr_name); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have sysfs attr '%s'"), + VIR_INFO("udev reports device '%s' does not have sysfs attr '%s'", udev_device_get_sysname(udev_device), attr_name); ret = PROPERTY_MISSING; goto out; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 6d66543..cffe027 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -204,7 +204,7 @@ _printDataType(virConnectPtr conn, case DATATYPE_IPMASK: if (snprintf(buf, bufsize, "%d", item->u.u8) >= bufsize) { - virNWFilterReportError(conn, VIR_ERR_INVALID_NWFILTER, + virNWFilterReportError(conn, VIR_ERR_INVALID_NWFILTER, "%s", _("Buffer too small for uint8 type")); return 1; } diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 0e1d35f..365fb08 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1234,30 +1234,30 @@ phypDomainDumpXML(virDomainPtr dom, int flags) dom->conn); if (lpar_name == NULL) { - VIR_ERROR("%s", "Unable to determine domain's name."); + VIR_ERROR0("Unable to determine domain's name."); goto err; } if (phypGetLparUUID(def.uuid, dom->id, dom->conn) == -1) { - VIR_ERROR("%s", "Unable to generate random uuid."); + VIR_ERROR0("Unable to generate random uuid."); goto err; } if ((def.maxmem = phypGetLparMem(dom->conn, managed_system, dom->id, 0)) == 0) { - VIR_ERROR("%s", "Unable to determine domain's max memory."); + VIR_ERROR0("Unable to determine domain's max memory."); goto err; } if ((def.memory = phypGetLparMem(dom->conn, managed_system, dom->id, 1)) == 0) { - VIR_ERROR("%s", "Unable to determine domain's memory."); + VIR_ERROR0("Unable to determine domain's memory."); goto err; } if ((def.vcpus = phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) { - VIR_ERROR("%s", "Unable to determine domain's CPU."); + VIR_ERROR0("Unable to determine domain's CPU."); goto err; } @@ -1521,9 +1521,8 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus) goto err; if (nvcpus > phypGetLparCPUMAX(dom)) { - VIR_ERROR("%s", - "You are trying to set a number of CPUs bigger than " - "the max possible.."); + VIR_ERROR0("You are trying to set a number of CPUs bigger than " + "the max possible.."); goto err; } @@ -1548,9 +1547,8 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus) ret = phypExec(session, cmd, &exit_status, dom->conn); if (exit_status < 0) { - VIR_ERROR("%s", - "Possibly you don't have IBM Tools installed in your LPAR." - "Contact your support to enable this feature."); + VIR_ERROR0("Possibly you don't have IBM Tools installed in your LPAR." + "Contact your support to enable this feature."); goto err; } @@ -1681,12 +1679,12 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) ret = phypExec(session, cmd, &exit_status, conn); if (exit_status < 0) { - VIR_ERROR("%s\"%s\"", "Unable to create LPAR. Reason: ", ret); + VIR_ERROR("Unable to create LPAR. Reason: %s", ret); goto err; } if (phypUUIDTable_AddLpar(conn, def->uuid, def->id) == -1) { - VIR_ERROR("%s", "Unable to add LPAR to the table"); + VIR_ERROR0("Unable to add LPAR to the table"); goto err; } @@ -1828,13 +1826,13 @@ phypUUIDTable_WriteFile(virConnectPtr conn) if (safewrite(fd, &uuid_table->lpars[i]->id, sizeof(uuid_table->lpars[i]->id)) != sizeof(uuid_table->lpars[i]->id)) { - VIR_ERROR("%s", "Unable to write information to local file."); + VIR_ERROR0("Unable to write information to local file."); goto err; } if (safewrite(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN) != VIR_UUID_BUFLEN) { - VIR_ERROR("%s", "Unable to write information to local file."); + VIR_ERROR0("Unable to write information to local file."); goto err; } } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 55397cd..087bb72 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -254,7 +254,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { int ctl; if (pp->type != VIR_CONF_STRING) { - VIR_ERROR("%s", _("cgroup_controllers must be a list of strings")); + VIR_ERROR0("cgroup_controllers must be a list of strings"); virConfFree(conf); return -1; } @@ -292,7 +292,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, } for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { if (pp->type != VIR_CONF_STRING) { - VIR_ERROR("%s", _("cgroup_device_acl must be a list of strings")); + VIR_ERROR0("cgroup_device_acl must be a list of strings"); virConfFree(conf); return -1; } @@ -515,7 +515,7 @@ rewait: if (errno == EINTR) goto rewait; - VIR_ERROR(_("Unexpected exit status from qemu %d pid %lu"), + VIR_ERROR("Unexpected exit status from qemu %d pid %lu", WEXITSTATUS(status), (unsigned long)child); ret = -1; } @@ -523,7 +523,7 @@ rewait: * as there's really no need to throw an error if we did * actually read a valid version number above */ if (WEXITSTATUS(status) != 0) { - VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"), + VIR_WARN("Unexpected exit status '%d', qemu probably failed", WEXITSTATUS(status)); } @@ -718,7 +718,7 @@ qemudProbeCPUModels(const char *qemu, if (STREQ(arch, "i686") || STREQ(arch, "x86_64")) parse = qemudParseX86Models; else { - VIR_DEBUG(_("don't know how to parse %s CPU models"), arch); + VIR_DEBUG("don't know how to parse %s CPU models", arch); return 0; } @@ -750,7 +750,7 @@ rewait: if (errno == EINTR) goto rewait; - VIR_ERROR(_("Unexpected exit status from qemu %d pid %lu"), + VIR_ERROR("Unexpected exit status from qemu %d pid %lu", WEXITSTATUS(status), (unsigned long)child); ret = -1; } @@ -758,7 +758,7 @@ rewait: * as there's really no need to throw an error if we did * actually read a valid version number above */ if (WEXITSTATUS(status) != 0) { - VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"), + VIR_WARN("Unexpected exit status '%d', qemu probably failed", WEXITSTATUS(status)); } @@ -838,7 +838,7 @@ qemudCapsInitGuest(virCapsPtr caps, binary_mtime = st.st_mtime; } else { char ebuf[1024]; - VIR_WARN(_("Failed to stat %s, most peculiar : %s"), + VIR_WARN("Failed to stat %s, most peculiar : %s", binary, virStrerror(errno, ebuf, sizeof(ebuf))); binary_mtime = 0; } @@ -922,7 +922,7 @@ qemudCapsInitGuest(virCapsPtr caps, binary_mtime = st.st_mtime; } else { char ebuf[1024]; - VIR_WARN(_("Failed to stat %s, most peculiar : %s"), + VIR_WARN("Failed to stat %s, most peculiar : %s", binary, virStrerror(errno, ebuf, sizeof(ebuf))); binary_mtime = 0; } @@ -1385,7 +1385,7 @@ rewait: if (errno == EINTR) goto rewait; - VIR_ERROR(_("Unexpected exit status from qemu %d pid %lu"), + VIR_ERROR("Unexpected exit status from qemu %d pid %lu", WEXITSTATUS(status), (unsigned long)child); ret = -1; } @@ -1393,7 +1393,7 @@ rewait: * as there's really no need to throw an error if we did * actually read a valid version number above */ if (WEXITSTATUS(status) != 0) { - VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"), + VIR_WARN("Unexpected exit status '%d', qemu probably failed", WEXITSTATUS(status)); } @@ -6085,7 +6085,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { - VIR_WARN(_("unknown QEMU argument '%s' during conversion"), arg); + VIR_WARN("unknown QEMU argument '%s' during conversion", arg); #if 0 qemuReportError(VIR_ERR_INTERNAL_ERROR, _("unknown argument '%s'"), arg); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index eea49bb..2ff33e0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -632,7 +632,7 @@ qemuAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaq ret = qemudStartVMDaemon(data->conn, data->driver, vm, NULL, -1); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s"), + VIR_ERROR("Failed to autostart VM '%s': %s", vm->def->name, err ? err->message : ""); } else { @@ -689,12 +689,12 @@ qemudRemoveDomainStatus(struct qemud_driver *driver, } if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) - VIR_WARN(_("Failed to remove domain XML for %s: %s"), + VIR_WARN("Failed to remove domain XML for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FREE(file); if (virFileDeletePid(driver->stateDir, vm->def->name) != 0) - VIR_WARN(_("Failed to remove PID file for %s: %s"), + VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); @@ -1178,7 +1178,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) priv->monConfig, priv->monJSON, &monitorCallbacks)) == NULL) { - VIR_ERROR(_("Failed to connect monitor for %s"), vm->def->name); + VIR_ERROR("Failed to connect monitor for %s", vm->def->name); return -1; } @@ -1279,7 +1279,7 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) ret = virSecurityDriverStartup(&security_drv, qemud_drv->securityDriverName); if (ret == -1) { - VIR_ERROR0(_("Failed to start security driver")); + VIR_ERROR0("Failed to start security driver"); return -1; } @@ -1287,7 +1287,7 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) * the DAC driver on its own */ if (ret == -2) { qemud_drv->securityDriver = &qemuDACSecurityDriver; - VIR_INFO0(_("No security driver available")); + VIR_INFO0("No security driver available"); } else { qemud_drv->securityPrimaryDriver = security_drv; qemud_drv->securitySecondaryDriver = &qemuDACSecurityDriver; @@ -1357,7 +1357,7 @@ qemudStartup(int privileged) { return -1; if (virMutexInit(&qemu_driver->lock) < 0) { - VIR_ERROR("%s", _("cannot initialize mutex")); + VIR_ERROR0("cannot initialize mutex"); VIR_FREE(qemu_driver); return -1; } @@ -1432,19 +1432,19 @@ qemudStartup(int privileged) { if (virFileMakePath(qemu_driver->stateDir) != 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create state dir '%s': %s"), + VIR_ERROR("Failed to create state dir '%s': %s", qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->libDir) != 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create lib dir '%s': %s"), + VIR_ERROR("Failed to create lib dir '%s': %s", qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->cacheDir) != 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create cache dir '%s': %s"), + VIR_ERROR("Failed to create cache dir '%s': %s", qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -1932,7 +1932,7 @@ qemudWaitForMonitor(struct qemud_driver* driver, "console", 30); if (close(logfd) < 0) { char ebuf[4096]; - VIR_WARN(_("Unable to close logfile: %s"), + VIR_WARN("Unable to close logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); } @@ -2750,7 +2750,7 @@ qemudReattachManagedDevice(pciDevice *dev) } if (pciReAttachDevice(dev) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s"), + VIR_ERROR("Failed to re-attach PCI device: %s", err ? err->message : ""); virResetError(err); } @@ -2769,7 +2769,7 @@ qemuDomainReAttachHostDevices(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(def))) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to allocate pciDeviceList: %s"), + VIR_ERROR("Failed to allocate pciDeviceList: %s", err ? err->message : ""); virResetError(err); return; @@ -2787,7 +2787,7 @@ qemuDomainReAttachHostDevices(struct qemud_driver *driver, pciDevice *dev = pciDeviceListGet(pcidevs, i); if (pciResetDevice(dev, driver->activePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to reset PCI device: %s"), + VIR_ERROR("Failed to reset PCI device: %s", err ? err->message : ""); virResetError(err); } @@ -3215,29 +3215,29 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = progenv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s"), + VIR_WARN("Unable to write envv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s"), + VIR_WARN("Unable to write envv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } if (safewrite(logfile, "\n", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); if ((pos = lseek(logfile, 0, SEEK_END)) < 0) - VIR_WARN(_("Unable to seek to end of logfile: %s"), + VIR_WARN("Unable to seek to end of logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); for (i = 0 ; i < ntapfds ; i++) @@ -7048,14 +7048,14 @@ cleanup: try_remove: if (vlan < 0) { - VIR_WARN0(_("Unable to remove network backend")); + VIR_WARN0("Unable to remove network backend"); } else { char *hostnet_name; if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) goto no_memory; qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) - VIR_WARN(_("Failed to remove network backend for vlan %d, net %s"), + VIR_WARN("Failed to remove network backend for vlan %d, net %s", vlan, hostnet_name); qemuDomainObjExitMonitorWithDriver(driver, vm); VIR_FREE(hostnet_name); @@ -7066,7 +7066,7 @@ try_tapfd_close: if (tapfd_name) { qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); + VIR_WARN("Failed to close tapfd with '%s'", tapfd_name); qemuDomainObjExitMonitorWithDriver(driver, vm); } @@ -10000,7 +10000,7 @@ endjob: * overwrite the previous error, though, so we just throw something * to the logs and hope for the best */ - VIR_ERROR(_("Failed to resume guest %s after failure"), + VIR_ERROR("Failed to resume guest %s after failure", vm->def->name); } qemuDomainObjExitMonitorWithDriver(driver, vm); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 64779ac..ac73f0c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -544,7 +544,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { } quit = 1; } else if (events) { - VIR_ERROR(_("unhandled fd event %d for monitor fd %d"), + VIR_ERROR("unhandled fd event %d for monitor fd %d", events, mon->fd); failed = 1; } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a199de7..e171483 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1399,42 +1399,42 @@ qemuMonitorTextParsePciAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED, s += strlen("domain "); if (virStrToLong_ui(s, &e, 10, &addr->domain) == -1) { - VIR_WARN(_("Unable to parse domain number '%s'"), s); + VIR_WARN("Unable to parse domain number '%s'", s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); + VIR_WARN("Expected ', ' parsing pci_add reply '%s'", s); return -1; } s = e + 2; } if (!STRPREFIX(s, "bus ")) { - VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'"), s); + VIR_WARN("Expected 'bus ' parsing pci_add reply '%s'", s); return -1; } s += strlen("bus "); if (virStrToLong_ui(s, &e, 10, &addr->bus) == -1) { - VIR_WARN(_("Unable to parse bus number '%s'"), s); + VIR_WARN("Unable to parse bus number '%s'", s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); + VIR_WARN("Expected ', ' parsing pci_add reply '%s'", s); return -1; } s = e + 2; if (!STRPREFIX(s, "slot ")) { - VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'"), s); + VIR_WARN("Expected 'slot ' parsing pci_add reply '%s'", s); return -1; } s += strlen("slot "); if (virStrToLong_ui(s, &e, 10, &addr->slot) == -1) { - VIR_WARN(_("Unable to parse slot number '%s'"), s); + VIR_WARN("Unable to parse slot number '%s'", s); return -1; } @@ -1913,25 +1913,25 @@ qemudParseDriveAddReply(const char *reply, s += strlen("bus "); if (virStrToLong_ui(s, &e, 10, &addr->bus) == -1) { - VIR_WARN(_("Unable to parse bus '%s'"), s); + VIR_WARN("Unable to parse bus '%s'", s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing drive_add reply '%s'"), s); + VIR_WARN("Expected ', ' parsing drive_add reply '%s'", s); return -1; } s = e + 2; } if (!STRPREFIX(s, "unit ")) { - VIR_WARN(_("Expected 'unit ' parsing drive_add reply '%s'"), s); + VIR_WARN("Expected 'unit ' parsing drive_add reply '%s'", s); return -1; } s += strlen("bus "); if (virStrToLong_ui(s, &e, 10, &addr->unit) == -1) { - VIR_WARN(_("Unable to parse unit number '%s'"), s); + VIR_WARN("Unable to parse unit number '%s'", s); return -1; } diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 22852a1..41d2cb8 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -498,7 +498,7 @@ loadSecrets(virSecretDriverStatePtr driver, if (secret == NULL) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Error reading secret: %s"), + VIR_ERROR("Error reading secret: %s", err != NULL ? err->message: ""); virResetError(err); continue; @@ -1023,7 +1023,7 @@ secretDriverStartup(int privileged) return 0; out_of_memory: - VIR_ERROR0(_("Out of memory initializing secrets")); + VIR_ERROR0("Out of memory initializing secrets"); error: VIR_FREE(base); secretDriverUnlock(driverState); diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index db04d5c..8e1c794 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -483,7 +483,7 @@ AppArmorSetSecurityProcessLabel(virSecurityDriverPtr drv, virDomainObjPtr vm) } if (aa_change_profile(profile_name) < 0) { - virSecurityReportError(VIR_ERR_INTERNAL_ERROR, + virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error calling aa_change_profile()")); goto clean; } diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 8318969..9c6e5ed 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -318,8 +318,6 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, { int retval = 0; - VIR_ERROR(_("in %s"), __func__); - pool->def->allocation = pool->def->capacity = pool->def->available = 0; virFileWaitForDevices(); diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 0260818..cd01f93 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -92,7 +92,7 @@ getDeviceType(uint32_t host, goto out; } - VIR_DEBUG(_("Device type is %d"), *type); + VIR_DEBUG("Device type is %d", *type); out: VIR_FREE(type_path); @@ -221,7 +221,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, goto free_vol; } - VIR_DEBUG(_("Trying to create volume for '%s'"), devpath); + VIR_DEBUG("Trying to create volume for '%s'", devpath); /* Now figure out the stable path * @@ -239,7 +239,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, !(STREQ(pool->def->target.path, "/dev") || STREQ(pool->def->target.path, "/dev/"))) { - VIR_DEBUG(_("No stable path found for '%s' in '%s'"), + VIR_DEBUG("No stable path found for '%s' in '%s'", devpath, pool->def->target.path); retval = -1; @@ -301,7 +301,7 @@ getNewStyleBlockDevice(const char *lun_path, goto out; } - VIR_DEBUG(_("Looking for block device in '%s'"), block_path); + VIR_DEBUG("Looking for block device in '%s'", block_path); block_dir = opendir(block_path); if (block_dir == NULL) { @@ -327,7 +327,7 @@ getNewStyleBlockDevice(const char *lun_path, goto out; } - VIR_DEBUG(_("Block device is '%s'"), *block_device); + VIR_DEBUG("Block device is '%s'", *block_device); break; } @@ -366,7 +366,7 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, goto out; } - VIR_DEBUG(_("Block device is '%s'"), *block_device); + VIR_DEBUG("Block device is '%s'", *block_device); } out: @@ -436,7 +436,7 @@ processLU(virStoragePoolObjPtr pool, int device_type; char *block_device = NULL; - VIR_DEBUG(_("Processing LU %u:%u:%u:%u"), + VIR_DEBUG("Processing LU %u:%u:%u:%u", host, bus, target, lun); if (getDeviceType(host, bus, target, lun, &device_type) < 0) { @@ -457,7 +457,7 @@ processLU(virStoragePoolObjPtr pool, goto out; } - VIR_DEBUG(_("%u:%u:%u:%u is a Direct-Access LUN"), + VIR_DEBUG("%u:%u:%u:%u is a Direct-Access LUN", host, bus, target, lun); if (getBlockDevice(host, bus, target, lun, &block_device) < 0) { @@ -467,13 +467,13 @@ processLU(virStoragePoolObjPtr pool, if (virStorageBackendSCSINewLun(pool, host, bus, target, lun, block_device) < 0) { - VIR_DEBUG(_("Failed to create new storage volume for %u:%u:%u:%u"), + VIR_DEBUG("Failed to create new storage volume for %u:%u:%u:%u", host, bus, target, lun); retval = -1; goto out; } - VIR_DEBUG(_("Created new storage volume for %u:%u:%u:%u successfully"), + VIR_DEBUG("Created new storage volume for %u:%u:%u:%u successfully", host, bus, target, lun); VIR_FREE(type_path); @@ -494,7 +494,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, struct dirent *lun_dirent = NULL; char devicepattern[64]; - VIR_DEBUG(_("Discovering LUs on host %u"), scanhost); + VIR_DEBUG("Discovering LUs on host %u", scanhost); virFileWaitForDevices(); @@ -520,7 +520,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, continue; } - VIR_DEBUG(_("Found LU '%s'"), lun_dirent->d_name); + VIR_DEBUG("Found LU '%s'", lun_dirent->d_name); processLU(pool, scanhost, bus, target, lun); } @@ -541,7 +541,7 @@ virStorageBackendSCSIGetHostNumber(const char *sysfs_path, DIR *sysdir = NULL; struct dirent *dirent = NULL; - VIR_DEBUG(_("Finding host number from '%s'"), sysfs_path); + VIR_DEBUG("Finding host number from '%s'", sysfs_path); virFileWaitForDevices(); @@ -558,7 +558,7 @@ virStorageBackendSCSIGetHostNumber(const char *sysfs_path, if (STREQLEN(dirent->d_name, "target", strlen("target"))) { if (sscanf(dirent->d_name, "target%u:", host) != 1) { - VIR_DEBUG(_("Failed to parse target '%s'"), dirent->d_name); + VIR_DEBUG("Failed to parse target '%s'", dirent->d_name); retval = -1; break; } @@ -578,7 +578,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) int retval = 0; char *path; - VIR_DEBUG(_("Triggering rescan of host %d"), host); + VIR_DEBUG("Triggering rescan of host %d", host); if (virAsprintf(&path, "/sys/class/scsi_host/host%u/scan", host) < 0) { virReportOOMError(); @@ -586,7 +586,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) goto out; } - VIR_DEBUG(_("Scan trigger path is '%s'"), path); + VIR_DEBUG("Scan trigger path is '%s'", path); fd = open(path, O_WRONLY); @@ -612,7 +612,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) free_path: VIR_FREE(path); out: - VIR_DEBUG(_("Rescan of host %d complete"), host); + VIR_DEBUG("Rescan of host %d complete", host); return retval; } @@ -627,13 +627,13 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, pool->def->allocation = pool->def->capacity = pool->def->available = 0; if (sscanf(pool->def->source.adapter, "host%u", &host) != 1) { - VIR_DEBUG(_("Failed to get host number from '%s'"), + VIR_DEBUG("Failed to get host number from '%s'", pool->def->source.adapter); retval = -1; goto out; } - VIR_DEBUG(_("Scanning host%u"), host); + VIR_DEBUG("Scanning host%u", host); if (virStorageBackendSCSITriggerRescan(host) < 0) { retval = -1; diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 876e16b..17f4e2e 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -49,9 +49,6 @@ #define VIR_FROM_THIS VIR_FROM_UML -#define umlLog(level, msg, ...) \ - virLogMessage(__FILE__, level, 0, msg, __VA_ARGS__) - virCapsPtr umlCapsInit(void) { struct utsname utsname; virCapsPtr caps; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 443d82e..58ffe68 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -121,7 +121,7 @@ static int umlSetCloseExec(int fd) { goto error; return 0; error: - VIR_ERROR0(_("Failed to set close-on-exec file descriptor flag")); + VIR_ERROR0("Failed to set close-on-exec file descriptor flag"); return -1; } @@ -159,7 +159,7 @@ umlAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaqu virResetLastError(); if (umlStartVMDaemon(data->conn, data->driver, vm) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s"), + VIR_ERROR("Failed to autostart VM '%s': %s", vm->def->name, err->message); } } @@ -412,13 +412,13 @@ umlStartup(int privileged) { uml_driver->caps->privateDataFreeFunc = umlDomainObjPrivateFree; if ((uml_driver->inotifyFD = inotify_init()) < 0) { - VIR_ERROR0(_("cannot initialize inotify")); + VIR_ERROR0("cannot initialize inotify"); goto error; } if (virFileMakePath(uml_driver->monitorDir) != 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create monitor directory %s: %s"), + VIR_ERROR("Failed to create monitor directory %s: %s", uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -450,7 +450,7 @@ umlStartup(int privileged) { return 0; out_of_memory: - VIR_ERROR0(_("umlStartup: out of memory")); + VIR_ERROR0("umlStartup: out of memory"); error: VIR_FREE(userdir); @@ -887,25 +887,25 @@ static int umlStartVMDaemon(virConnectPtr conn, tmp = progenv; while (*tmp) { if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s"), + VIR_WARN("Unable to write envv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfd, " ", 1) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s"), + VIR_WARN("Unable to write envv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfd, " ", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } if (safewrite(logfd, "\n", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s"), + VIR_WARN("Unable to write argv to logfile: %s", virStrerror(errno, ebuf, sizeof ebuf)); priv->monitor = -1; @@ -953,8 +953,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, priv->monitor = -1; if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) { - VIR_WARN(_("Got unexpected pid %d != %d"), - ret, vm->pid); + VIR_WARN("Got unexpected pid %d != %d", ret, vm->pid); } vm->pid = -1; diff --git a/src/util/bridge.c b/src/util/bridge.c index b236f80..310ac20 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -394,14 +394,14 @@ brProbeVnetHdr(int tapfd) struct ifreq dummy; if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) { - VIR_INFO0(_("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() not implemented")); + VIR_INFO0("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() not implemented"); return 0; } if (!(features & IFF_VNET_HDR)) { - VIR_INFO0(_("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR")); + VIR_INFO0("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR"); return 0; } @@ -409,17 +409,17 @@ brProbeVnetHdr(int tapfd) * If TUNGETIFF is not implemented then errno == EBADFD. */ if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) { - VIR_INFO0(_("Not enabling IFF_VNET_HDR; " - "TUNGETIFF ioctl() not implemented")); + VIR_INFO0("Not enabling IFF_VNET_HDR; " + "TUNGETIFF ioctl() not implemented"); return 0; } - VIR_INFO0(_("Enabling IFF_VNET_HDR")); + VIR_INFO0("Enabling IFF_VNET_HDR"); return 1; # else (void) tapfd; - VIR_INFO0(_("Not enabling IFF_VNET_HDR; disabled at build time")); + VIR_INFO0("Not enabling IFF_VNET_HDR; disabled at build time"); return 0; # endif } diff --git a/src/util/logging.c b/src/util/logging.c index 6bc2ccf..248c47e 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -330,7 +330,7 @@ error: */ int virLogSetDefaultPriority(int priority) { if ((priority < VIR_LOG_DEBUG) || (priority > VIR_LOG_ERROR)) { - VIR_WARN0(_("Ignoring invalid log level setting.")); + VIR_WARN0("Ignoring invalid log level setting."); return(-1); } if (!virLogInitialized) @@ -781,7 +781,7 @@ int virLogParseOutputs(const char *outputs) { ret = count; cleanup: if (ret == -1) - VIR_WARN0(_("Ignoring invalid log output setting.")); + VIR_WARN0("Ignoring invalid log output setting."); return(ret); } @@ -837,7 +837,7 @@ int virLogParseFilters(const char *filters) { ret = count; cleanup: if (ret == -1) - VIR_WARN0(_("Ignoring invalid log filter setting.")); + VIR_WARN0("Ignoring invalid log filter setting."); return(ret); } @@ -959,7 +959,7 @@ int virLogParseDefaultPriority(const char *priority) { else if (STREQ(priority, "4") || STREQ(priority, "error")) ret = virLogSetDefaultPriority(VIR_LOG_ERROR); else - VIR_WARN0(_("Ignoring invalid log level setting")); + VIR_WARN0("Ignoring invalid log level setting"); return ret; } diff --git a/src/util/pci.c b/src/util/pci.c index 81193b7..e8f985c 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -173,7 +173,7 @@ pciOpenConfig(pciDevice *dev) fd = open(dev->path, O_RDWR); if (fd < 0) { char ebuf[1024]; - VIR_WARN(_("Failed to open config space file '%s': %s"), + VIR_WARN("Failed to open config space file '%s': %s", dev->path, virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } @@ -193,7 +193,7 @@ pciRead(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen) if (lseek(dev->fd, pos, SEEK_SET) != pos || saferead(dev->fd, buf, buflen) != buflen) { char ebuf[1024]; - VIR_WARN(_("Failed to read from '%s' : %s"), dev->path, + VIR_WARN("Failed to read from '%s' : %s", dev->path, virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } @@ -233,7 +233,7 @@ pciWrite(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen) if (lseek(dev->fd, pos, SEEK_SET) != pos || safewrite(dev->fd, buf, buflen) != buflen) { char ebuf[1024]; - VIR_WARN(_("Failed to write to '%s' : %s"), dev->path, + VIR_WARN("Failed to write to '%s' : %s", dev->path, virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } @@ -730,7 +730,7 @@ recheck: if (virRun(backprobe, NULL) < 0 && virRun(stubprobe, NULL) < 0) { char ebuf[1024]; - VIR_WARN(_("failed to load pci-stub or pciback drivers: %s"), + VIR_WARN("failed to load pci-stub or pciback drivers: %s", virStrerror(errno, ebuf, sizeof ebuf)); return 0; } diff --git a/src/util/uuid.c b/src/util/uuid.c index 459273a..1cfdd07 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -101,8 +101,8 @@ virUUIDGenerate(unsigned char *uuid) if ((err = virUUIDGenerateRandomBytes(uuid, VIR_UUID_BUFLEN))) { char ebuf[1024]; - VIR_WARN(_("Falling back to pseudorandom UUID," - " failed to generate random bytes: %s"), + VIR_WARN("Falling back to pseudorandom UUID, " + "failed to generate random bytes: %s", virStrerror(err, ebuf, sizeof ebuf)); err = virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); } diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index 26eec13..c3cade8 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -240,7 +240,7 @@ virProxyCloseSocket(xenUnifiedPrivatePtr priv) { ret = close(priv->proxy); if (ret != 0) - VIR_WARN(_("Failed to close socket %d"), priv->proxy); + VIR_WARN("Failed to close socket %d", priv->proxy); else VIR_DEBUG("Closed socket %d", priv->proxy); priv->proxy = -1; @@ -297,7 +297,7 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { ret = safewrite(fd, data, len); if (ret < 0) { - VIR_WARN(_("Failed to write to socket %d"), fd); + VIR_WARN("Failed to write to socket %d", fd); return(-1); } VIR_DEBUG("wrote %d bytes to socket %d", @@ -452,7 +452,7 @@ retry: goto error; } if (res->serial != serial) { - VIR_WARN(_("got asynchronous packet number %d"), res->serial); + VIR_WARN("got asynchronous packet number %d", res->serial); goto retry; } diff --git a/tools/console.c b/tools/console.c index 4201ba4..3a29a12 100644 --- a/tools/console.c +++ b/tools/console.c @@ -73,7 +73,7 @@ int vshRunConsole(const char *tty) { /* We do not want this to become the controlling TTY */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { - VIR_ERROR(_("unable to open tty %s: %s"), + VIR_ERROR("unable to open tty %s: %s", tty, strerror(errno)); return -1; } @@ -84,7 +84,7 @@ int vshRunConsole(const char *tty) { also ensure Ctrl-C, etc is blocked, and misc other bits */ if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) { - VIR_ERROR(_("unable to get tty attributes: %s"), + VIR_ERROR("unable to get tty attributes: %s", strerror(errno)); goto closetty; } @@ -93,7 +93,7 @@ int vshRunConsole(const char *tty) { cfmakeraw(&rawattr); if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { - VIR_ERROR(_("unable to set tty attributes: %s"), + VIR_ERROR("unable to set tty attributes: %s", strerror(errno)); goto closetty; } @@ -128,7 +128,7 @@ int vshRunConsole(const char *tty) { if (errno == EINTR || errno == EAGAIN) continue; - VIR_ERROR(_("failure waiting for I/O: %s"), strerror(errno)); + VIR_ERROR("failure waiting for I/O: %s", strerror(errno)); goto cleanup; } @@ -142,7 +142,7 @@ int vshRunConsole(const char *tty) { int got, sent = 0, destfd; if ((got = read(fds[i].fd, buf, sizeof(buf))) < 0) { - VIR_ERROR(_("failure reading input: %s"), + VIR_ERROR("failure reading input: %s", strerror(errno)); goto cleanup; } @@ -164,7 +164,7 @@ int vshRunConsole(const char *tty) { int done; if ((done = safewrite(destfd, buf + sent, got - sent)) <= 0) { - VIR_ERROR(_("failure writing output: %s"), + VIR_ERROR("failure writing output: %s", strerror(errno)); goto cleanup; } -- 1.6.3.3

--- cfg.mk | 2 + po/POTFILES.in | 6 + src/esx/esx_driver.c | 211 +++++++++++++++++---------------- src/esx/esx_util.c | 58 +++++----- src/esx/esx_vi.c | 274 +++++++++++++++++++++--------------------- src/esx/esx_vi_methods.c | 8 +- src/esx/esx_vi_types.c | 70 ++++++----- src/esx/esx_vmx.c | 300 +++++++++++++++++++++++----------------------- 8 files changed, 481 insertions(+), 448 deletions(-) diff --git a/cfg.mk b/cfg.mk index 619a8e2..8073f34 100644 --- a/cfg.mk +++ b/cfg.mk @@ -169,6 +169,8 @@ sc_prohibit_gethostby: msg_gen_function = msg_gen_function += ReportError +msg_gen_function += ESX_ERROR +msg_gen_function += ESX_VI_ERROR msg_gen_function += errorf msg_gen_function += lxcError msg_gen_function += networkReportError diff --git a/po/POTFILES.in b/po/POTFILES.in index 6c93e2a..a952910 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,6 +17,12 @@ src/cpu/cpu_generic.c src/cpu/cpu_map.c src/cpu/cpu_x86.c src/datatypes.c +src/esx/esx_driver.c +src/esx/esx_util.c +src/esx/esx_vi.c +src/esx/esx_vi_methods.c +src/esx/esx_vi_types.c +src/esx/esx_vmx.c src/interface/netcf_driver.c src/libvirt.c src/lxc/lxc_container.c diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e55c948..a5b87df 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -84,8 +84,8 @@ esxSupportsLongMode(esxPrivate *priv) } if (hostSystem == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the HostSystem object"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); goto failure; } @@ -108,9 +108,9 @@ esxSupportsLongMode(esxPrivate *priv) "%*c%*c%c%*c:"_SKIP12":"_SKIP12":%*c%*c%*c%c", &edxLongModeBit, &edxFirstBit) != 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "HostSystem property 'hardware.cpuFeature[].edx' " - "with value '%s' doesn't have expected format " - "'----:----:----:----:----:----:----:----'", + _("HostSystem property 'hardware.cpuFeature[].edx' " + "with value '%s' doesn't have expected format " + "'----:----:----:----:----:----:----:----'"), hostCpuIdInfo->edx); goto failure; } @@ -124,10 +124,10 @@ esxSupportsLongMode(esxPrivate *priv) priv->supportsLongMode = esxVI_Boolean_False; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Bit 29 (Long Mode) of HostSystem property " - "'hardware.cpuFeature[].edx' with value '%s' " - "has unexpected value '%c', expecting '0' " - "or '1'", hostCpuIdInfo->edx, edxLongModeBit); + _("Bit 29 (Long Mode) of HostSystem property " + "'hardware.cpuFeature[].edx' with value '%s' " + "has unexpected value '%c', expecting '0' " + "or '1'"), hostCpuIdInfo->edx, edxLongModeBit); goto failure; } @@ -358,7 +358,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) username = virRequestUsername(auth, "root", conn->uri->server); if (username == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "Username request failed"); + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); goto failure; } } @@ -370,7 +370,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) password = virRequestPassword(auth, username, conn->uri->server); if (password == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "Password request failed"); + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto failure; } @@ -383,14 +383,14 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && priv->host->productVersion != esxVI_ProductVersion_ESX40) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s is neither an ESX 3.5 host nor an ESX 4.0 host", + _("%s is neither an ESX 3.5 host nor an ESX 4.0 host"), conn->uri->server); goto failure; } } else { /* GSX */ if (priv->host->productVersion != esxVI_ProductVersion_GSX20) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s isn't a GSX 2.0 host", conn->uri->server); + _("%s isn't a GSX 2.0 host"), conn->uri->server); goto failure; } } @@ -457,16 +457,17 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) if (virStrcpyStatic(vCenterIpAddress, dynamicProperty->val->string) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "vCenter IP address %s too big for " - "destination", dynamicProperty->val->string); + _("vCenter IP address %s too big for " + "destination"), + dynamicProperty->val->string); goto failure; } } else if (STRNEQ(vCenterIpAddress, dynamicProperty->val->string)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "This host is managed by a vCenter with IP " - "address %s, but a mismachting vCenter '%s' " - "(%s) has been specified", + _("This host is managed by a vCenter with IP " + "address %s, but a mismachting vCenter '%s' " + "(%s) has been specified"), dynamicProperty->val->string, vCenter, vCenterIpAddress); goto failure; @@ -477,8 +478,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } if (STREQ(vCenter, "*")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "This host is not managed by a vCenter"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("This host is not managed by a vCenter")); goto failure; } @@ -495,14 +496,14 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) username = virRequestUsername(auth, "administrator", vCenter); if (username == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "Username request failed"); + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); goto failure; } password = virRequestPassword(auth, username, vCenter); if (password == NULL) { - ESX_ERROR(VIR_ERR_AUTH_FAILED, "Password request failed"); + ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto failure; } @@ -514,8 +515,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX40) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s is neither a vCenter 2.5 server nor a vCenter " - "4.0 server", conn->uri->server); + _("%s is neither a vCenter 2.5 server nor a vCenter " + "4.0 server"), conn->uri->server); goto failure; } } @@ -613,8 +614,8 @@ esxSupportsVMotion(esxPrivate *priv) } if (hostSystem == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the HostSystem object"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); goto failure; } @@ -688,7 +689,7 @@ esxGetVersion(virConnectPtr conn, unsigned long *version) if (virParseVersionString(priv->host->service->about->version, version) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse version number from '%s'", + _("Could not parse version number from '%s'"), priv->host->service->about->version); return -1; @@ -725,8 +726,8 @@ esxGetHostname(virConnectPtr conn) } if (hostSystem == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the HostSystem object"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); goto failure; } @@ -754,8 +755,8 @@ esxGetHostname(virConnectPtr conn) } if (hostName == NULL || strlen(hostName) < 1) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing or empty 'hostName' property"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing or empty 'hostName' property")); goto failure; } @@ -824,8 +825,8 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) } if (hostSystem == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the HostSystem object"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); goto failure; } @@ -906,7 +907,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) sizeof(nodeinfo->model) - 1, sizeof(nodeinfo->model)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "CPU Model %s too long for destination", + _("CPU Model %s too long for destination"), dynamicProperty->val->string); goto failure; } @@ -1003,7 +1004,7 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) &ids[count]) < 0 || ids[count] <= 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Failed to parse positive integer from '%s'", + _("Failed to parse positive integer from '%s'"), virtualMachine->obj->value); goto failure; } @@ -1110,7 +1111,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) } if (domain == NULL) { - ESX_ERROR(VIR_ERR_NO_DOMAIN, "No domain with ID %d", id); + ESX_ERROR(VIR_ERR_NO_DOMAIN, _("No domain with ID %d"), id); } cleanup: @@ -1208,7 +1209,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) } if (virtualMachine == NULL) { - ESX_ERROR(VIR_ERR_NO_DOMAIN, "No domain with name '%s'", name); + ESX_ERROR(VIR_ERR_NO_DOMAIN, _("No domain with name '%s'"), name); goto failure; } @@ -1274,7 +1275,8 @@ esxDomainSuspend(virDomainPtr domain) } if (powerState != esxVI_VirtualMachinePowerState_PoweredOn) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not powered on"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered on")); goto failure; } @@ -1285,7 +1287,7 @@ esxDomainSuspend(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not suspend domain"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not suspend domain")); goto failure; } @@ -1329,7 +1331,7 @@ esxDomainResume(virDomainPtr domain) } if (powerState != esxVI_VirtualMachinePowerState_Suspended) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not suspended"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not suspended")); goto failure; } @@ -1340,7 +1342,7 @@ esxDomainResume(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not resume domain"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not resume domain")); goto failure; } @@ -1382,7 +1384,8 @@ esxDomainShutdown(virDomainPtr domain) } if (powerState != esxVI_VirtualMachinePowerState_PoweredOn) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not powered on"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered on")); goto failure; } @@ -1427,7 +1430,8 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED) } if (powerState != esxVI_VirtualMachinePowerState_PoweredOn) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not powered on"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered on")); goto failure; } @@ -1481,7 +1485,8 @@ esxDomainDestroy(virDomainPtr domain) } if (powerState != esxVI_VirtualMachinePowerState_PoweredOn) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not powered on"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered on")); goto failure; } @@ -1492,7 +1497,7 @@ esxDomainDestroy(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not destroy domain"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not destroy domain")); goto failure; } @@ -1556,7 +1561,8 @@ esxDomainGetMaxMemory(virDomainPtr domain) } if (dynamicProperty->val->int32 < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Got invalid memory size %d", + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Got invalid memory size %d"), dynamicProperty->val->int32); } else { memoryMB = dynamicProperty->val->int32; @@ -1616,7 +1622,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) if (taskInfoState != esxVI_TaskInfoState_Success) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not set max-memory to %lu kilobytes", memory); + _("Could not set max-memory to %lu kilobytes"), memory); goto failure; } @@ -1670,7 +1676,7 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) if (taskInfoState != esxVI_TaskInfoState_Success) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not set memory to %lu kilobytes", memory); + _("Could not set memory to %lu kilobytes"), memory); goto failure; } @@ -1962,8 +1968,8 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) esxVI_TaskInfoState taskInfoState; if (nvcpus < 1) { - ESX_ERROR(VIR_ERR_INVALID_ARG, - "Requested number of virtual CPUs must at least be 1"); + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Requested number of virtual CPUs must at least be 1")); goto failure; } @@ -1979,8 +1985,8 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) if (nvcpus > maxVcpus) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Requested number of virtual CPUs is greater than max " - "allowable number of virtual CPUs for the domain: %d > %d", + _("Requested number of virtual CPUs is greater than max " + "allowable number of virtual CPUs for the domain: %d > %d"), nvcpus, maxVcpus); goto failure; } @@ -2004,7 +2010,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) if (taskInfoState != esxVI_TaskInfoState_Success) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not set number of virtual CPUs to %d", nvcpus); + _("Could not set number of virtual CPUs to %d"), nvcpus); goto failure; } @@ -2048,8 +2054,8 @@ esxDomainGetMaxVcpus(virDomainPtr domain) } if (hostSystem == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the HostSystem object"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); goto failure; } @@ -2193,7 +2199,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, if (STRNEQ(nativeFormat, "vmware-vmx")) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Unsupported config format '%s'", nativeFormat); + _("Unsupported config format '%s'"), nativeFormat); return NULL; } @@ -2222,7 +2228,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, if (STRNEQ(nativeFormat, "vmware-vmx")) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Unsupported config format '%s'", nativeFormat); + _("Unsupported config format '%s'"), nativeFormat); return NULL; } @@ -2373,7 +2379,8 @@ esxDomainCreate(virDomainPtr domain) } if (powerState != esxVI_VirtualMachinePowerState_PoweredOff) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, "Domain is not powered off"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered off")); goto failure; } @@ -2384,7 +2391,7 @@ esxDomainCreate(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not start domain"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not start domain")); goto failure; } @@ -2446,9 +2453,9 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) if (virtualMachine != NULL) { /* FIXME */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Domain already exists, editing existing domains is not " - "supported yet"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain already exists, editing existing domains is not " + "supported yet")); goto failure; } @@ -2467,9 +2474,9 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) * datastore isn't perfect but should work in the majority of cases. */ if (def->ndisks < 1) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Domain XML doesn't contain any disks, cannot deduce " - "datastore and path for VMX file"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain XML doesn't contain any disks, cannot deduce " + "datastore and path for VMX file")); goto failure; } @@ -2482,16 +2489,16 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } if (disk == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Domain XML doesn't contain any file-based harddisks, " - "cannot deduce datastore and path for VMX file"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain XML doesn't contain any file-based harddisks, " + "cannot deduce datastore and path for VMX file")); goto failure; } if (disk->src == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "First file-based harddisk has no source, cannot deduce " - "datastore and path for VMX file"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("First file-based harddisk has no source, cannot deduce " + "datastore and path for VMX file")); goto failure; } @@ -2502,8 +2509,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) if (! virFileHasSuffix(fileName, ".vmdk")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting source '%s' of first file-based harddisk to be a " - "VMDK image", disk->src); + _("Expecting source '%s' of first file-based harddisk to " + "be a VMDK image"), disk->src); goto failure; } @@ -2572,7 +2579,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not define domain"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not define domain")); goto failure; } @@ -2641,8 +2648,8 @@ esxDomainUndefine(virDomainPtr domain) if (powerState != esxVI_VirtualMachinePowerState_Suspended && powerState != esxVI_VirtualMachinePowerState_PoweredOff) { - ESX_ERROR(VIR_ERR_OPERATION_INVALID, - "Domain is not suspended or powered off"); + ESX_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not suspended or powered off")); goto failure; } @@ -2725,8 +2732,8 @@ esxDomainGetSchedulerParameters(virDomainPtr domain, int i = 0; if (*nparams < 3) { - ESX_ERROR(VIR_ERR_INVALID_ARG, - "Parameter array must have space for 3 items"); + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Parameter array must have space for 3 items")); goto failure; } @@ -2810,7 +2817,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Shares level has unknown value %d", + _("Shares level has unknown value %d"), (int)sharesInfo->level); goto failure; } @@ -2874,8 +2881,8 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, if (params[i].value.l < 0) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Could not set reservation to %lld MHz, expecting " - "positive value", params[i].value.l); + _("Could not set reservation to %lld MHz, expecting " + "positive value"), params[i].value.l); goto failure; } @@ -2888,8 +2895,8 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, if (params[i].value.l < -1) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Could not set limit to %lld MHz, expecting " - "positive value or -1 (unlimited)", + _("Could not set limit to %lld MHz, expecting " + "positive value or -1 (unlimited)"), params[i].value.l); goto failure; } @@ -2928,14 +2935,14 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, default: ESX_ERROR(VIR_ERR_INVALID_ARG, - "Could not set shares to %d, expecting positive " - "value or -1 (low), -2 (normal) or -3 (high)", + _("Could not set shares to %d, expecting positive " + "value or -1 (low), -2 (normal) or -3 (high)"), params[i].value.i); goto failure; } } } else { - ESX_ERROR(VIR_ERR_INVALID_ARG, "Unknown field '%s'", + ESX_ERROR(VIR_ERR_INVALID_ARG, _("Unknown field '%s'"), params[i].field); goto failure; } @@ -2949,8 +2956,8 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not change scheduler parameters"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not change scheduler parameters")); goto failure; } @@ -3028,14 +3035,14 @@ esxDomainMigratePerform(virDomainPtr domain, esxVI_TaskInfoState taskInfoState; if (priv->vCenter == NULL) { - ESX_ERROR(VIR_ERR_INVALID_ARG, - "Migration not possible without a vCenter"); + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Migration not possible without a vCenter")); goto failure; } if (dname != NULL) { - ESX_ERROR(VIR_ERR_INVALID_ARG, - "Renaming domains on migration not supported"); + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Renaming domains on migration not supported")); goto failure; } @@ -3086,12 +3093,12 @@ esxDomainMigratePerform(virDomainPtr domain, */ if (eventList->fullFormattedMessage != NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not migrate domain, validation reported a " - "problem: %s", eventList->fullFormattedMessage); + _("Could not migrate domain, validation reported a " + "problem: %s"), eventList->fullFormattedMessage); } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not migrate domain, validation reported a " - "problem"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not migrate domain, validation reported a " + "problem")); } goto failure; @@ -3109,9 +3116,9 @@ esxDomainMigratePerform(virDomainPtr domain, } if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not migrate domain, migration task finished with " - "an error"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not migrate domain, migration task finished with " + "an error")); goto failure; } @@ -3201,8 +3208,8 @@ esxNodeGetFreeMemory(virConnectPtr conn) } if (resourcePoolResourceUsage == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve memory usage of resource pool"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve memory usage of resource pool")); goto failure; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 801b4b0..e8fd261 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -101,8 +101,8 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, if (STRNEQ(*transport, "http") && STRNEQ(*transport, "https")) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Query parameter 'transport' has unexpected value " - "'%s' (should be http|https)", *transport); + _("Query parameter 'transport' has unexpected value " + "'%s' (should be http|https)"), *transport); goto failure; } } else if (STRCASEEQ(queryParam->name, "vcenter")) { @@ -124,8 +124,8 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 || (*noVerify != 0 && *noVerify != 1)) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Query parameter 'no_verify' has unexpected value " - "'%s' (should be 0 or 1)", queryParam->value); + _("Query parameter 'no_verify' has unexpected value " + "'%s' (should be 0 or 1)"), queryParam->value); goto failure; } } else if (STRCASEEQ(queryParam->name, "auto_answer")) { @@ -136,8 +136,8 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, if (virStrToLong_i(queryParam->value, NULL, 10, autoAnswer) < 0 || (*autoAnswer != 0 && *autoAnswer != 1)) { ESX_ERROR(VIR_ERR_INVALID_ARG, - "Query parameter 'auto_answer' has unexpected value " - "'%s' (should be 0 or 1)", queryParam->value); + _("Query parameter 'auto_answer' has unexpected " + "value '%s' (should be 0 or 1)"), queryParam->value); goto failure; } } else { @@ -213,7 +213,7 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, if (datastoreName == NULL || *datastoreName != NULL || directoryName == NULL || *directoryName != NULL || fileName == NULL || *fileName != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -234,8 +234,8 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, if (sscanf(datastoreRelatedPath, "[%a[^]%]] %a[^\n]", datastoreName, &directoryAndFileName) != 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Datastore related path '%s' doesn't have expected format " - "'[<datastore>] <path>'", datastoreRelatedPath); + _("Datastore related path '%s' doesn't have expected format " + "'[<datastore>] <path>'"), datastoreRelatedPath); goto failure; } @@ -250,7 +250,7 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, if (*separator == '\0') { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Datastore related path '%s' doesn't reference a file", + _("Datastore related path '%s' doesn't reference a file"), datastoreRelatedPath); goto failure; } @@ -302,14 +302,14 @@ esxUtil_ResolveHostname(const char *hostname, if (errcode != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "IP address lookup for host '%s' failed: %s", hostname, + _("IP address lookup for host '%s' failed: %s"), hostname, gai_strerror(errcode)); return -1; } if (result == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "No IP address for host '%s' found: %s", hostname, + _("No IP address for host '%s' found: %s"), hostname, gai_strerror(errcode)); return -1; } @@ -319,7 +319,7 @@ esxUtil_ResolveHostname(const char *hostname, if (errcode != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Formating IP address for host '%s' failed: %s", hostname, + _("Formating IP address for host '%s' failed: %s"), hostname, gai_strerror(errcode)); freeaddrinfo(result); return -1; @@ -347,13 +347,13 @@ esxUtil_GetConfigString(virConfPtr conf, const char *name, char **string, } ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } if (value->type != VIR_CONF_STRING) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must be a string", name); + _("Config entry '%s' must be a string"), name); return -1; } @@ -363,7 +363,7 @@ esxUtil_GetConfigString(virConfPtr conf, const char *name, char **string, } ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } @@ -392,14 +392,14 @@ esxUtil_GetConfigUUID(virConfPtr conf, const char *name, unsigned char *uuid, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } if (value->type != VIR_CONF_STRING) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must be a string", name); + _("Config entry '%s' must be a string"), name); return -1; } @@ -408,14 +408,14 @@ esxUtil_GetConfigUUID(virConfPtr conf, const char *name, unsigned char *uuid, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } if (virUUIDParse(value->str, uuid) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse UUID from string '%s'", value->str); + _("Could not parse UUID from string '%s'"), value->str); return -1; } @@ -438,7 +438,7 @@ esxUtil_GetConfigLong(virConfPtr conf, const char *name, long long *number, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } @@ -449,7 +449,7 @@ esxUtil_GetConfigLong(virConfPtr conf, const char *name, long long *number, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } @@ -458,13 +458,13 @@ esxUtil_GetConfigLong(virConfPtr conf, const char *name, long long *number, *number = -1; } else if (virStrToLong_ll(value->str, NULL, 10, number) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must represent an integer value", + _("Config entry '%s' must represent an integer value"), name); return -1; } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must be a string", name); + _("Config entry '%s' must be a string"), name); return -1; } @@ -487,7 +487,7 @@ esxUtil_GetConfigBoolean(virConfPtr conf, const char *name, int *boolean_, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } @@ -498,7 +498,7 @@ esxUtil_GetConfigBoolean(virConfPtr conf, const char *name, int *boolean_, return 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing essential config entry '%s'", name); + _("Missing essential config entry '%s'"), name); return -1; } } @@ -509,13 +509,13 @@ esxUtil_GetConfigBoolean(virConfPtr conf, const char *name, int *boolean_, *boolean_ = 0; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must represent a boolean value " - "(true|false)", name); + _("Config entry '%s' must represent a boolean value " + "(true|false)"), name); return -1; } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Config entry '%s' must be a string", name); + _("Config entry '%s' must be a string"), name); return -1; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c1fd4b4..5ed1391 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -252,7 +252,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d) : %s", + _("curl_easy_perform() returned an error: %s (%d) : %s"), curl_easy_strerror(errorCode), errorCode, ctx->curl_error); return -1; } @@ -262,16 +262,16 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " - "error: %s (%d) : %s", curl_easy_strerror(errorCode), + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " + "error: %s (%d) : %s"), curl_easy_strerror(errorCode), errorCode, ctx->curl_error); return -1; } if (responseCode < 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a " - "negative response code"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a " + "negative response code")); return -1; } @@ -282,17 +282,18 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " - "an error: %s (%d) : %s", curl_easy_strerror(errorCode), + _("curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " + "an error: %s (%d) : %s"), + curl_easy_strerror(errorCode), errorCode, ctx->curl_error); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "The server redirects from '%s' to '%s'", url, + _("The server redirects from '%s' to '%s'"), url, redirectUrl); } #else ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "The server redirects from '%s'", url); + _("The server redirects from '%s'"), url); #endif return -1; @@ -314,7 +315,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || password == NULL || ctx->url != NULL || ctx->service != NULL || ctx->curl_handle != NULL || ctx->curl_headers != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -326,7 +327,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->curl_handle = curl_easy_init(); if (ctx->curl_handle == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not initialize CURL"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not initialize CURL")); goto failure; } @@ -345,7 +347,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, "Expect: nothing"); if (ctx->curl_headers == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not build CURL header list"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not build CURL header list")); goto failure; } @@ -369,7 +372,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, #endif if (virMutexInit(&ctx->curl_lock) < 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not initialize CURL mutex"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not initialize CURL mutex")); goto failure; } @@ -393,8 +397,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->apiVersion = esxVI_APIVersion_40; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VI API major/minor version '2.5' or '4.0' " - "but found '%s'", ctx->service->about->apiVersion); + _("Expecting VI API major/minor version '2.5' or '4.0' " + "but found '%s'"), ctx->service->about->apiVersion); goto failure; } @@ -403,8 +407,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productVersion = esxVI_ProductVersion_GSX20; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting GSX major/minor version '2.0' but " - "found '%s'", ctx->service->about->version); + _("Expecting GSX major/minor version '2.0' but " + "found '%s'"), ctx->service->about->version); goto failure; } } else if (STREQ(ctx->service->about->productLineId, "esx") || @@ -415,8 +419,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productVersion = esxVI_ProductVersion_ESX40; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting ESX major/minor version '3.5' or " - "'4.0' but found '%s'", + _("Expecting ESX major/minor version '3.5' or " + "'4.0' but found '%s'"), ctx->service->about->version); goto failure; } @@ -427,21 +431,21 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productVersion = esxVI_ProductVersion_VPX40; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VPX major/minor version '2.5' or '4.0' " - "but found '%s'", ctx->service->about->version); + _("Expecting VPX major/minor version '2.5' or '4.0' " + "but found '%s'"), ctx->service->about->version); goto failure; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting product 'gsx' or 'esx' or 'embeddedEsx' " - "or 'vpx' but found '%s'", + _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " + "or 'vpx' but found '%s'"), ctx->service->about->productLineId); goto failure; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VI API type 'HostAgent' or 'VirtualCenter' " - "but found '%s'", ctx->service->about->apiType); + _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " + "but found '%s'"), ctx->service->about->apiType); goto failure; } @@ -466,9 +470,9 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, } if (datacenterList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve the 'datacenter' object from the VI " - "host/center"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the 'datacenter' object from the " + "VI host/center")); goto failure; } @@ -494,9 +498,9 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, } if (ctx->vmFolder == NULL || ctx->hostFolder == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "The 'datacenter' object is missing the " - "'vmFolder'/'hostFolder' property"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("The 'datacenter' object is missing the " + "'vmFolder'/'hostFolder' property")); goto failure; } @@ -519,7 +523,7 @@ esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content) int responseCode = 0; if (content == NULL || *content != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -538,7 +542,7 @@ esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content) goto failure; } else if (responseCode != 200) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for download from '%s'", + _("HTTP response code %d for download from '%s'"), responseCode, url); goto failure; } @@ -565,7 +569,7 @@ esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, int responseCode = 0; if (content == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -584,7 +588,7 @@ esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, return -1; } else if (responseCode != 200 && responseCode != 201) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for upload to '%s'", + _("HTTP response code %d for upload to '%s'"), responseCode, url); return -1; } @@ -605,7 +609,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, xmlNodePtr responseNode = NULL; if (request == NULL || response == NULL || *response != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -642,14 +646,14 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->document == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Response for call to '%s' could not be parsed", + _("Response for call to '%s' could not be parsed"), methodName); goto failure; } if (xmlDocGetRootElement((*response)->document) == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Response for call to '%s' is an empty XML document", + _("Response for call to '%s' is an empty XML document"), methodName); goto failure; } @@ -657,8 +661,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, xpathContext = xmlXPathNewContext((*response)->document); if (xpathContext == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not create XPath context"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not create XPath context")); goto failure; } @@ -673,23 +677,23 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->node == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for call to '%s'. " - "Fault is unknown, XPath evaluation failed", + _("HTTP response code %d for call to '%s'. " + "Fault is unknown, XPath evaluation failed"), (*response)->responseCode, methodName); goto failure; } if (esxVI_Fault_Deserialize((*response)->node, &fault) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for call to '%s'. " - "Fault is unknown, deserialization failed", + _("HTTP response code %d for call to '%s'. " + "Fault is unknown, deserialization failed"), (*response)->responseCode, methodName); goto failure; } ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for call to '%s'. " - "Fault: %s - %s", (*response)->responseCode, + _("HTTP response code %d for call to '%s'. " + "Fault: %s - %s"), (*response)->responseCode, methodName, fault->faultcode, fault->faultstring); /* FIXME: Dump raw response until detail part gets deserialized */ @@ -710,8 +714,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if (responseNode == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "XPath evaluation of response for call to '%s' " - "failed", methodName); + _("XPath evaluation of response for call to '%s' " + "failed"), methodName); goto failure; } @@ -722,13 +726,13 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_RequiredItem: if ((*response)->node == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Call to '%s' returned an empty result, " - "expecting a non-empty result", methodName); + _("Call to '%s' returned an empty result, " + "expecting a non-empty result"), methodName); goto failure; } else if ((*response)->node->next != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Call to '%s' returned a list, expecting " - "exactly one item", methodName); + _("Call to '%s' returned a list, expecting " + "exactly one item"), methodName); goto failure; } @@ -737,8 +741,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_RequiredList: if ((*response)->node == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Call to '%s' returned an empty result, " - "expecting a non-empty result", methodName); + _("Call to '%s' returned an empty result, " + "expecting a non-empty result"), methodName); goto failure; } @@ -748,8 +752,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->node != NULL && (*response)->node->next != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Call to '%s' returned a list, expecting " - "exactly one item", methodName); + _("Call to '%s' returned a list, expecting " + "exactly one item"), methodName); goto failure; } @@ -762,22 +766,22 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_None: if ((*response)->node != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Call to '%s' returned something, expecting " - "an empty result", methodName); + _("Call to '%s' returned something, expecting " + "an empty result"), methodName); goto failure; } break; default: - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Invalid argument (occurrence)"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid argument (occurrence)")); goto failure; } } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d for call to '%s'", + _("HTTP response code %d for call to '%s'"), (*response)->responseCode, methodName); goto failure; } @@ -830,7 +834,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, int i; if (anyType == NULL || value == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -838,7 +842,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, if (anyType->type != enumeration->type) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting type '%s' but found '%s'", + _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(enumeration->type), esxVI_Type_ToString(anyType->type)); return -1; @@ -852,7 +856,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, } ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unknown value '%s' for %s", anyType->value, + _("Unknown value '%s' for %s"), anyType->value, esxVI_Type_ToString(enumeration->type)); return -1; @@ -866,7 +870,7 @@ esxVI_Enumeration_Serialize(const esxVI_Enumeration *enumeration, const char *name = NULL; if (element == NULL || output == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -882,7 +886,7 @@ esxVI_Enumeration_Serialize(const esxVI_Enumeration *enumeration, } if (name == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -905,7 +909,7 @@ esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, char *name = NULL; if (value == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -922,7 +926,7 @@ esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, } } - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Unknown value '%s' for %s", + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%s' for %s"), name, esxVI_Type_ToString(enumeration->type)); cleanup: @@ -948,7 +952,7 @@ esxVI_List_Append(esxVI_List **list, esxVI_List *item) esxVI_List *next = NULL; if (list == NULL || item == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -977,7 +981,7 @@ esxVI_List_DeepCopy(esxVI_List **destList, esxVI_List *srcList, esxVI_List *src = NULL; if (destList == NULL || *destList != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -1011,7 +1015,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, if (list == NULL || *list != NULL || castFromAnyTypeFunc == NULL || freeFunc == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1021,7 +1025,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, if (! STRPREFIX(anyType->other, "ArrayOf")) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting type to begin with 'ArrayOf' but found '%s'", + _("Expecting type to begin with 'ArrayOf' but found '%s'"), anyType->other); return -1; } @@ -1030,7 +1034,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, childNode = childNode->next) { if (childNode->type != XML_ELEMENT_NODE) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Wrong XML element type %d", childNode->type); + _("Wrong XML element type %d"), childNode->type); goto failure; } @@ -1067,7 +1071,7 @@ esxVI_List_Serialize(esxVI_List *list, const char *element, esxVI_List *item = NULL; if (element == NULL || output == NULL || serializeFunc == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1093,7 +1097,7 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, if (list == NULL || *list != NULL || deserializeFunc == NULL || freeFunc == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1104,7 +1108,7 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, for (; node != NULL; node = node->next) { if (node->type != XML_ELEMENT_NODE) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Wrong XML element type %d", node->type); + _("Wrong XML element type %d"), node->type); goto failure; } @@ -1139,7 +1143,7 @@ int esxVI_Alloc(void **ptrptr, size_t size) { if (ptrptr == NULL || *ptrptr != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1163,7 +1167,7 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, const char *currentSelectSetName = NULL; if (fullTraversalSpecList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1214,7 +1218,7 @@ int esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) { if (fullTraversalSpecList == NULL || *fullTraversalSpecList != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1332,7 +1336,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) #endif if (ctx->session == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid call"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); return -1; } @@ -1383,9 +1387,9 @@ esxVI_EnsureSession(esxVI_Context *ctx) goto failure; } } else if (STRNEQ(ctx->session->key, currentSession->key)) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Key of the current session differs from the key at " - "last login"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Key of the current session differs from the key at " + "last login")); goto failure; } @@ -1419,7 +1423,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, esxVI_PropertyFilterSpec *propertyFilterSpec = NULL; if (ctx->fullTraversalSpecList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid call"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); return -1; } @@ -1495,8 +1499,8 @@ esxVI_GetManagedEntityStatus(esxVI_ObjectContent *objectContent, } ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing '%s' property while looking for ManagedEntityStatus", - propertyName); + _("Missing '%s' property while looking for " + "ManagedEntityStatus"), propertyName); return -1; } @@ -1517,8 +1521,8 @@ esxVI_GetVirtualMachinePowerState(esxVI_ObjectContent *virtualMachine, } } - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing 'runtime.powerState' property"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing 'runtime.powerState' property")); return -1; } @@ -1533,7 +1537,7 @@ esxVI_GetVirtualMachineQuestionInfo esxVI_DynamicProperty *dynamicProperty; if (questionInfo == NULL || *questionInfo != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1618,8 +1622,8 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, esxVI_ManagedEntityStatus configStatus = esxVI_ManagedEntityStatus_Undefined; if (STRNEQ(virtualMachine->obj->type, "VirtualMachine")) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "ObjectContent does not reference a virtual machine"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("ObjectContent does not reference a virtual machine")); return -1; } @@ -1627,7 +1631,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, if (esxUtil_ParseVirtualMachineIDString (virtualMachine->obj->value, id) < 0 || *id <= 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse positive integer from '%s'", + _("Could not parse positive integer from '%s'"), virtualMachine->obj->value); goto failure; } @@ -1635,7 +1639,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, if (name != NULL) { if (*name != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); goto failure; } @@ -1660,8 +1664,8 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, } if (*name == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not get name of virtual machine"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not get name of virtual machine")); goto failure; } } @@ -1688,14 +1692,14 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, } if (uuid_string == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not get UUID of virtual machine"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not get UUID of virtual machine")); goto failure; } if (virUUIDParse(uuid_string, uuid) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse UUID from string '%s'", + _("Could not parse UUID from string '%s'"), uuid_string); goto failure; } @@ -1731,7 +1735,7 @@ esxVI_LookupResourcePoolByHostSystem esxVI_ObjectContent *computeResource = NULL; if (resourcePool == NULL || *resourcePool != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1750,8 +1754,8 @@ esxVI_LookupResourcePoolByHostSystem } if (managedObjectReference == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve compute resource of host system"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource of host system")); goto failure; } @@ -1764,8 +1768,8 @@ esxVI_LookupResourcePoolByHostSystem } if (computeResource == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve compute resource of host system"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource of host system")); goto failure; } @@ -1784,8 +1788,8 @@ esxVI_LookupResourcePoolByHostSystem } if ((*resourcePool) == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not retrieve resource pool of compute resource"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve resource pool of compute resource")); goto failure; } @@ -1813,7 +1817,7 @@ esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, esxVI_ManagedObjectReference *managedObjectReference = NULL; if (hostSystem == NULL || *hostSystem != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1852,7 +1856,7 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; if (virtualMachine == NULL || *virtualMachine != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1868,7 +1872,8 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, return 0; } else { ESX_VI_ERROR(VIR_ERR_NO_DOMAIN, - "Could not find domain with UUID '%s'", uuid_string); + _("Could not find domain with UUID '%s'"), + uuid_string); goto failure; } } @@ -1906,7 +1911,7 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, char *name_candidate = NULL; if (virtualMachine == NULL || *virtualMachine != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1945,7 +1950,7 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, return 0; } else { ESX_VI_ERROR(VIR_ERR_NO_DOMAIN, - "Could not find domain with name '%s'", name); + _("Could not find domain with name '%s'"), name); goto failure; } } @@ -1998,8 +2003,8 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask } if (pendingTaskInfoList != NULL) { - ESX_VI_ERROR(VIR_ERR_OPERATION_INVALID, - "Other tasks are pending for this domain"); + ESX_VI_ERROR(VIR_ERR_OPERATION_INVALID, "%s", + _("Other tasks are pending for this domain")); goto failure; } @@ -2034,7 +2039,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, int numInaccessibleDatastores = 0; if (datastore == NULL || *datastore != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2059,7 +2064,8 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, if (occurrence == esxVI_Occurrence_OptionalItem) { goto cleanup; } else { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "No datastores available"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No datastores available")); goto failure; } } @@ -2083,9 +2089,9 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, } if (accessible == esxVI_Boolean_Undefined) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Got incomplete response while querying for the " - "datastore 'summary.accessible' property"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Got incomplete response while querying for the " + "datastore 'summary.accessible' property")); goto failure; } @@ -2129,8 +2135,8 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, if (! STRPREFIX(dynamicProperty->val->string, "/vmfs/volumes/")) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Datastore URL '%s' has unexpected prefix, " - "expecting '/vmfs/volumes/' prefix", + _("Datastore URL '%s' has unexpected prefix, " + "expecting '/vmfs/volumes/' prefix"), dynamicProperty->val->string); goto failure; } @@ -2153,11 +2159,11 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, if (occurrence != esxVI_Occurrence_OptionalItem) { if (numInaccessibleDatastores > 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not find datastore '%s', maybe it's " - "inaccessible", name); + _("Could not find datastore '%s', maybe it's " + "inaccessible"), name); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not find datastore '%s'", name); + _("Could not find datastore '%s'"), name); } goto failure; @@ -2187,7 +2193,7 @@ int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_DynamicProperty *dynamicProperty = NULL; if (taskInfo == NULL || *taskInfo != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2239,7 +2245,7 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine esxVI_TaskInfo *taskInfo = NULL; if (pendingTaskInfoList == NULL || *pendingTaskInfoList != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2377,15 +2383,15 @@ esxVI_HandleVirtualMachineQuestion if (autoAnswer == esxVI_Boolean_True) { if (possibleAnswers == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Pending question blocks virtual machine execution, " - "question is '%s', no possible answers", + _("Pending question blocks virtual machine execution, " + "question is '%s', no possible answers"), questionInfo->text); goto failure; } else if (answerChoice == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Pending question blocks virtual machine execution, " - "question is '%s', possible answers are %s, but no " - "default answer is specified", questionInfo->text, + _("Pending question blocks virtual machine execution, " + "question is '%s', possible answers are %s, but no " + "default answer is specified"), questionInfo->text, possibleAnswers); goto failure; } @@ -2402,13 +2408,13 @@ esxVI_HandleVirtualMachineQuestion } else { if (possibleAnswers != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Pending question blocks virtual machine execution, " - "question is '%s', possible answers are %s", + _("Pending question blocks virtual machine execution, " + "question is '%s', possible answers are %s"), questionInfo->text, possibleAnswers); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Pending question blocks virtual machine execution, " - "question is '%s', no possible answers", + _("Pending question blocks virtual machine execution, " + "question is '%s', no possible answers"), questionInfo->text); } diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index f1234ae..87b7910 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -109,7 +109,7 @@ #define ESX_VI__METHOD__CHECK_SERVICE() \ if (ctx->service == NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid call"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); \ return -1; \ } @@ -117,7 +117,7 @@ #define ESX_VI__METHOD__PARAMETER__CHECK_OUTPUT(_name) \ if (_name == NULL || *_name != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); \ return -1; \ } @@ -198,7 +198,7 @@ esxVI_RetrieveServiceContent(esxVI_Context *ctx, esxVI_Response *response = NULL; if (serviceContent == NULL || *serviceContent != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -276,7 +276,7 @@ ESX_VI__METHOD(SessionIsActive, ESX_VI__METHOD__CHECK_SERVICE() if (active == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } }, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 3a30712..500f8f1 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -123,7 +123,8 @@ esxVI_##_type##_DeepCopy(esxVI_##_type **dest, esxVI_##_type *src) \ { \ if (dest == NULL || *dest != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ @@ -213,7 +214,8 @@ esxVI_##_type **ptrptr) \ { \ if (anyType == NULL || ptrptr == NULL || *ptrptr != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ @@ -236,7 +238,8 @@ const char *element, virBufferPtr output) \ { \ if (element == NULL || output == NULL ) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ @@ -274,7 +277,8 @@ xmlNodePtr childNode = NULL; \ \ if (ptrptr == NULL || *ptrptr != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ @@ -318,7 +322,8 @@ long long value; \ \ if (number == NULL || *number != NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return -1; \ } \ \ @@ -565,7 +570,8 @@ esxVI_##__type##_DynamicCast(void *item) \ { \ if (item == NULL) { \ - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("Invalid argument")); \ return NULL; \ } \ \ @@ -709,7 +715,7 @@ esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) { if (anyType->type != type) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting type '%s' but found '%s'", + _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(type), anyType->type != esxVI_Type_Other ? esxVI_Type_ToString(anyType->type) @@ -724,7 +730,7 @@ int esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) { if (dest == NULL || *dest != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -740,7 +746,8 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) (*dest)->node = xmlCopyNode(src->node, 1); if ((*dest)->node == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not copy an XML node"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not copy an XML node")); goto failure; } @@ -790,7 +797,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) long long int number; if (anyType == NULL || *anyType != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -801,7 +808,8 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) (*anyType)->node = xmlCopyNode(node, 1); if ((*anyType)->node == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Could not copy an XML node"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not copy an XML node")); goto failure; } @@ -811,8 +819,8 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); if ((*anyType)->other == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "AnyType is missing 'type' property"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("AnyType is missing 'type' property")); goto failure; } @@ -820,7 +828,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) if ((*anyType)->type == esxVI_Type_Undefined) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unknown value '%s' for AnyType 'type' property", + _("Unknown value '%s' for AnyType 'type' property"), (*anyType)->other); goto failure; } @@ -837,19 +845,19 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) } } -#define _DESERIALIZE_NUMBER(_type, _xsdType, _name, _min, _max) \ +#define _DESERIALIZE_NUMBER(_type, _xsdType, _name, _min, _max) \ do { \ if (virStrToLong_ll((*anyType)->value, NULL, 10, &number) < 0) { \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ - "Unknown value '%s' for "_xsdType, \ - (*anyType)->value); \ + _("Unknown value '%s' for %s"), \ + (*anyType)->value, _xsdType); \ goto failure; \ } \ \ if (number < (_min) || number > (_max)) { \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ - "Value '%s' is out of "_xsdType" range", \ - (*anyType)->value); \ + _("Value '%s' is out of %s range"), \ + (*anyType)->value, _xsdType); \ goto failure; \ } \ \ @@ -864,7 +872,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) (*anyType)->boolean = esxVI_Boolean_False; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unknown value '%s' for xsd:boolean", + _("Unknown value '%s' for xsd:boolean"), (*anyType)->value); goto failure; } @@ -995,7 +1003,7 @@ int esxVI_String_DeepCopyValue(char **dest, const char *src) { if (dest == NULL || *dest != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1029,7 +1037,7 @@ esxVI_String_SerializeValue(const char *value, const char *element, virBufferPtr output) { if (element == NULL || output == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1059,7 +1067,7 @@ int esxVI_String_DeserializeValue(xmlNodePtr node, char **value) { if (value == NULL || *value != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1184,7 +1192,7 @@ int esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime) { if (dateTime == NULL || *dateTime != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1196,9 +1204,9 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime) (char *)xmlNodeListGetString(node->doc, node->children, 1); if ((*dateTime)->value == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "XML node doesn't contain text, expecting an " - "xsd:dateTime value"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("XML node doesn't contain text, expecting an " + "xsd:dateTime value")); goto failure; } @@ -1281,7 +1289,7 @@ esxVI_ManagedObjectReference_Serialize const char *element, virBufferPtr output) { if (element == NULL || output == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1311,7 +1319,7 @@ esxVI_ManagedObjectReference_Deserialize (xmlNodePtr node, esxVI_ManagedObjectReference **managedObjectReference) { if (managedObjectReference == NULL || *managedObjectReference != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1323,8 +1331,8 @@ esxVI_ManagedObjectReference_Deserialize (char *)xmlGetNoNsProp(node, BAD_CAST "type"); if ((*managedObjectReference)->type == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "ManagedObjectReference is missing 'type' property"); + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("ManagedObjectReference is missing 'type' property")); goto failure; } diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c6a92bf..e4512b3 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -438,9 +438,9 @@ esxVMX_SCSIDiskNameToControllerAndID(const char *name, int *controller, int *id) int idx; if (! STRPREFIX(name, "sd")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'sd'"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML attribute 'dev' of entry " + "'devices/disk/target' to start with 'sd'")); return -1; } @@ -448,14 +448,14 @@ esxVMX_SCSIDiskNameToControllerAndID(const char *name, int *controller, int *id) if (idx < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse valid disk index from '%s'", name); + _("Could not parse valid disk index from '%s'"), name); return -1; } /* Each of the 4 SCSI controllers offers 15 IDs for devices */ if (idx >= (4 * 15)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "SCSI disk index (parsed from '%s') is too large", name); + _("SCSI disk index (parsed from '%s') is too large"), name); return -1; } @@ -478,9 +478,9 @@ esxVMX_IDEDiskNameToControllerAndID(const char *name, int *controller, int *id) int idx; if (! STRPREFIX(name, "hd")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'hd'"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML attribute 'dev' of entry " + "'devices/disk/target' to start with 'hd'")); return -1; } @@ -488,14 +488,14 @@ esxVMX_IDEDiskNameToControllerAndID(const char *name, int *controller, int *id) if (idx < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse valid disk index from '%s'", name); + _("Could not parse valid disk index from '%s'"), name); return -1; } /* Each of the 2 IDE controllers offers 2 IDs for devices */ if (idx >= (2 * 2)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "IDE disk index (parsed from '%s') is too large", name); + _("IDE disk index (parsed from '%s') is too large"), name); return -1; } @@ -513,9 +513,9 @@ esxVMX_FloppyDiskNameToController(const char *name, int *controller) int idx; if (! STRPREFIX(name, "fd")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'fd'"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML attribute 'dev' of entry " + "'devices/disk/target' to start with 'fd'")); return -1; } @@ -523,13 +523,13 @@ esxVMX_FloppyDiskNameToController(const char *name, int *controller) if (idx < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Could not parse valid disk index from '%s'", name); + _("Could not parse valid disk index from '%s'"), name); return -1; } if (idx >= 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Floppy disk index (parsed from '%s') is too large", name); + _("Floppy disk index (parsed from '%s') is too large"), name); return -1; } @@ -559,8 +559,8 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, char *virtualDev[4], STRCASENEQ(disk->driverName, "buslogic") && STRCASENEQ(disk->driverName, "lsilogic")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML entry 'devices/disk/target' to be " - "'buslogic' or 'lsilogic' but found '%s'", + _("Expecting domain XML entry 'devices/disk/target' to " + "be 'buslogic' or 'lsilogic' but found '%s'"), disk->driverName); return -1; } @@ -576,8 +576,8 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, char *virtualDev[4], virtualDev[controller] = disk->driverName; } else if (STRCASENEQ(virtualDev[controller], disk->driverName)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Inconsistent driver usage ('%s' is not '%s') on SCSI " - "controller index %d", virtualDev[controller], + _("Inconsistent driver usage ('%s' is not '%s') on SCSI " + "controller index %d"), virtualDev[controller], disk->driverName, controller); return -1; } @@ -602,8 +602,8 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, if (sscanf(absolutePath, "/vmfs/volumes/%a[^/]/%a[^\n]", &preliminaryDatastoreName, &directoryAndFileName) != 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Absolute path '%s' doesn't have expected format " - "'/vmfs/volumes/<datastore>/<path>'", absolutePath); + _("Absolute path '%s' doesn't have expected format " + "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); goto failure; } @@ -697,8 +697,8 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, } else if (strchr(fileName, '/') != NULL) { /* Found relative path, this is not supported */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Found relative path '%s' in VMX file, this is not " - "supported", fileName); + _("Found relative path '%s' in VMX file, this is not " + "supported"), fileName); return NULL; } else { /* Found single file name referencing a file inside a datastore */ @@ -758,8 +758,8 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, if (config_version != 8) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'config.version' to be 8 but found " - "%lld", config_version); + _("Expecting VMX entry 'config.version' to be 8 but found " + "%lld"), config_version); goto failure; } @@ -773,8 +773,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, case esxVI_APIVersion_25: if (virtualHW_version != 4) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'virtualHW.version' to be 4 for " - "VI API version 2.5 but found %lld", virtualHW_version); + _("Expecting VMX entry 'virtualHW.version' to be 4 for " + "VI API version 2.5 but found %lld"), + virtualHW_version); goto failure; } @@ -783,8 +784,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, case esxVI_APIVersion_40: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'virtualHW.version' to be 4 or 7 for " - "VI API version 4.0 but found %lld", virtualHW_version); + _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " + "for VI API version 4.0 but found %lld"), + virtualHW_version); goto failure; } @@ -793,16 +795,16 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, case esxVI_APIVersion_Unknown: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "but found %lld", virtualHW_version); + _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " + "but found %lld"), virtualHW_version); goto failure; } break; default: - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VI API version 2.5 or 4.0"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting VI API version 2.5 or 4.0")); goto failure; } @@ -824,8 +826,8 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, if (memsize <= 0 || memsize % 4 != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'memsize' to be an unsigned " - "integer (multiple of 4) but found %lld", memsize); + _("Expecting VMX entry 'memsize' to be an unsigned " + "integer (multiple of 4) but found %lld"), memsize); goto failure; } @@ -853,8 +855,8 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, if (numvcpus <= 0 || (numvcpus % 2 != 0 && numvcpus != 1)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'numvcpus' to be an unsigned " - "integer (1 or a multiple of 2) but found %lld", numvcpus); + _("Expecting VMX entry 'numvcpus' to be an unsigned " + "integer (1 or a multiple of 2) but found %lld"), numvcpus); goto failure; } @@ -885,16 +887,16 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, if (number < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'sched.cpu.affinity' to be " - "a comma separated list of unsigned integers but " - "found '%s'", sched_cpu_affinity); + _("Expecting VMX entry 'sched.cpu.affinity' to be " + "a comma separated list of unsigned integers but " + "found '%s'"), sched_cpu_affinity); goto failure; } if (number >= VIR_DOMAIN_CPUMASK_LEN) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "VMX entry 'sched.cpu.affinity' contains a %d, this " - "value is too large", number); + _("VMX entry 'sched.cpu.affinity' contains a %d, " + "this value is too large"), number); goto failure; } @@ -913,9 +915,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, break; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'sched.cpu.affinity' to be " - "a comma separated list of unsigned integers but " - "found '%s'", sched_cpu_affinity); + _("Expecting VMX entry 'sched.cpu.affinity' to be " + "a comma separated list of unsigned integers but " + "found '%s'"), sched_cpu_affinity); goto failure; } @@ -924,9 +926,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, if (count < numvcpus) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'sched.cpu.affinity' to contain " - "at least as many values as 'numvcpus' (%lld) but " - "found only %d value(s)", numvcpus, count); + _("Expecting VMX entry 'sched.cpu.affinity' to contain " + "at least as many values as 'numvcpus' (%lld) but " + "found only %d value(s)"), numvcpus, count); goto failure; } } @@ -1175,7 +1177,7 @@ esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def) long long port = 0; if (def == NULL || *def != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1240,13 +1242,13 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, int *present, char virtualDev_name[32]; if (virtualDev == NULL || *virtualDev != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } if (controller < 0 || controller > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "SCSI controller index %d out of [0..3] range", + _("SCSI controller index %d out of [0..3] range"), controller); return -1; } @@ -1271,8 +1273,8 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, int *present, STRCASENEQ(*virtualDev, "buslogic") && STRCASENEQ(*virtualDev, "lsilogic")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " - "but found '%s'", virtualDev_name, *virtualDev); + _("Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " + "but found '%s'"), virtualDev_name, *virtualDev); goto failure; } @@ -1352,7 +1354,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, int writeThrough = 0; if (def == NULL || *def != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1370,14 +1372,14 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, if (bus == VIR_DOMAIN_DISK_BUS_SCSI) { if (controller < 0 || controller > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "SCSI controller index %d out of [0..3] range", + _("SCSI controller index %d out of [0..3] range"), controller); goto failure; } if (id < 0 || id > 15 || id == 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "SCSI ID %d out of [0..6,8..15] range", id); + _("SCSI ID %d out of [0..6,8..15] range"), id); goto failure; } @@ -1405,14 +1407,14 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, } else if (bus == VIR_DOMAIN_DISK_BUS_IDE) { if (controller < 0 || controller > 1) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "IDE controller index %d out of [0..1] range", + _("IDE controller index %d out of [0..1] range"), controller); goto failure; } if (id < 0 || id > 1) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "IDE ID %d out of [0..1] range", id); + _("IDE ID %d out of [0..1] range"), id); goto failure; } @@ -1428,7 +1430,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported bus type '%s' for device type '%s'", + _("Unsupported bus type '%s' for device type '%s'"), virDomainDiskBusTypeToString(bus), virDomainDiskDeviceTypeToString(device)); goto failure; @@ -1437,7 +1439,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, if (bus == VIR_DOMAIN_DISK_BUS_FDC) { if (controller < 0 || controller > 1) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Floppy controller index %d out of [0..1] range", + _("Floppy controller index %d out of [0..1] range"), controller); goto failure; } @@ -1454,14 +1456,14 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported bus type '%s' for device type '%s'", + _("Unsupported bus type '%s' for device type '%s'"), virDomainDiskBusTypeToString(bus), virDomainDiskDeviceTypeToString(device)); goto failure; } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported device type '%s'", + _("Unsupported device type '%s'"), virDomainDiskDeviceTypeToString(device)); goto failure; } @@ -1532,14 +1534,14 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, if (bus == VIR_DOMAIN_DISK_BUS_SCSI && STRCASENEQ(deviceType, "scsi-hardDisk")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'scsi-hardDisk' " - "but found '%s'", deviceType_name, deviceType); + _("Expecting VMX entry '%s' to be 'scsi-hardDisk' " + "but found '%s'"), deviceType_name, deviceType); goto failure; } else if (bus == VIR_DOMAIN_DISK_BUS_IDE && STRCASENEQ(deviceType, "ata-hardDisk")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'ata-hardDisk' " - "but found '%s'", deviceType_name, deviceType); + _("Expecting VMX entry '%s' to be 'ata-hardDisk' " + "but found '%s'"), deviceType_name, deviceType); goto failure; } } @@ -1574,8 +1576,8 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, goto ignore; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Invalid or not yet handled value '%s' for VMX entry " - "'%s'", fileName, fileName_name); + _("Invalid or not yet handled value '%s' for VMX entry " + "'%s'"), fileName, fileName_name); goto failure; } } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) { @@ -1583,8 +1585,8 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, if (deviceType != NULL) { if (STRCASENEQ(deviceType, "cdrom-image")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'cdrom-image' " - "but found '%s'", deviceType_name, deviceType); + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); goto failure; } } @@ -1611,8 +1613,8 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, fileName = NULL; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Invalid or not yet handled value '%s' for VMX entry " - "'%s'", fileName, fileName_name); + _("Invalid or not yet handled value '%s' for VMX entry " + "'%s'"), fileName, fileName_name); goto failure; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { @@ -1620,8 +1622,8 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, if (fileType != NULL) { if (STRCASENEQ(fileType, "file")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'file' but " - "found '%s'", fileType_name, fileType); + _("Expecting VMX entry '%s' to be 'file' but " + "found '%s'"), fileType_name, fileType); goto failure; } } @@ -1640,12 +1642,12 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus, fileName = NULL; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Invalid or not yet handled value '%s' for VMX entry " - "'%s'", fileName, fileName_name); + _("Invalid or not yet handled value '%s' for VMX entry " + "'%s'"), fileName, fileName_name); goto failure; } } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Unsupported device type '%s'", + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Unsupported device type '%s'"), virDomainDiskDeviceTypeToString(device)); goto failure; } @@ -1704,13 +1706,13 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) char *networkName = NULL; if (def == NULL || *def != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } if (controller < 0 || controller > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Ethernet controller index %d out of [0..3] range", + _("Ethernet controller index %d out of [0..3] range"), controller); return -1; } @@ -1767,8 +1769,8 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) if (generatedAddress != NULL) { if (virParseMacAddr(generatedAddress, (*def)->mac) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be MAC address but " - "found '%s'", generatedAddress_name, + _("Expecting VMX entry '%s' to be MAC address but " + "found '%s'"), generatedAddress_name, generatedAddress); goto failure; } @@ -1777,15 +1779,15 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) if (address != NULL) { if (virParseMacAddr(address, (*def)->mac) < 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be MAC address but " - "found '%s'", address_name, address); + _("Expecting VMX entry '%s' to be MAC address but " + "found '%s'"), address_name, address); goto failure; } } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'generated' or 'static' or " - "'vpx' but found '%s'", addressType_name, addressType); + _("Expecting VMX entry '%s' to be 'generated' or 'static' or " + "'vpx' but found '%s'"), addressType_name, addressType); goto failure; } @@ -1800,8 +1802,8 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) STRCASENEQ(virtualDev, "vmxnet3") && STRCASENEQ(virtualDev, "e1000")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, + _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " + "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, virtualDev); goto failure; } @@ -1831,13 +1833,13 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) } else if (STRCASEEQ(connectionType, "hostonly")) { /* FIXME */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "No yet handled value '%s' for VMX entry '%s'", + _("No yet handled value '%s' for VMX entry '%s'"), connectionType, connectionType_name); goto failure; } else if (STRCASEEQ(connectionType, "nat")) { /* FIXME */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "No yet handled value '%s' for VMX entry '%s'", + _("No yet handled value '%s' for VMX entry '%s'"), connectionType, connectionType_name); goto failure; } else if (STRCASEEQ(connectionType, "custom")) { @@ -1851,7 +1853,7 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) vnet = NULL; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Invalid value '%s' for VMX entry '%s'", connectionType, + _("Invalid value '%s' for VMX entry '%s'"), connectionType, connectionType_name); goto failure; } @@ -1899,13 +1901,13 @@ esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, char *fileName = NULL; if (def == NULL || *def != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } if (port < 0 || port > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Serial port index %d out of [0..3] range", port); + _("Serial port index %d out of [0..3] range"), port); return -1; } @@ -1978,8 +1980,8 @@ esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, fileName = NULL; } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'device', 'file' or 'pipe' " - "but found '%s'", fileType_name, fileType); + _("Expecting VMX entry '%s' to be 'device', 'file' or 'pipe' " + "but found '%s'"), fileType_name, fileType); goto failure; } @@ -2022,13 +2024,13 @@ esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, char *fileName = NULL; if (def == NULL || *def != NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } if (port < 0 || port > 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Parallel port index %d out of [0..2] range", port); + _("Parallel port index %d out of [0..2] range"), port); return -1; } @@ -2091,8 +2093,8 @@ esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry '%s' to be 'device' or 'file' but " - "found '%s'", fileType_name, fileType); + _("Expecting VMX entry '%s' to be 'device' or 'file' but " + "found '%s'"), fileType_name, fileType); goto failure; } @@ -2157,8 +2159,8 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) } else { /* Found relative path, this is not supported */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Found relative path '%s' in domain XML, this is not " - "supported", src); + _("Found relative path '%s' in domain XML, this is not " + "supported"), src); goto failure; } @@ -2192,7 +2194,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, if (def->virtType != VIR_DOMAIN_VIRT_VMWARE) { /* FIXME: maybe add VIR_DOMAIN_VIRT_ESX ? */ ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting virt type to be '%s' but found '%s'", + _("Expecting virt type to be '%s' but found '%s'"), virDomainVirtTypeToString(VIR_DOMAIN_VIRT_VMWARE), virDomainVirtTypeToString(def->virtType)); return NULL; @@ -2212,8 +2214,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, break; default: - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting VI API version 2.5 or 4.0"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting VI API version 2.5 or 4.0")); goto failure; } @@ -2224,8 +2226,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, virBufferAddLit(&buffer, "guestOS = \"other-64\"\n"); } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'arch' of entry 'os/type' " - "to be 'i686' or 'x86_64' but found '%s'", def->os.arch); + _("Expecting domain XML attribute 'arch' of entry 'os/type' " + "to be 'i686' or 'x86_64' but found '%s'"), def->os.arch); goto failure; } @@ -2248,8 +2250,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, /* def:maxmem -> vmx:memsize */ if (def->maxmem <= 0 || def->maxmem % 4096 != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML entry 'memory' to be an unsigned " - "integer (multiple of 4096) but found %lld", + _("Expecting domain XML entry 'memory' to be an unsigned " + "integer (multiple of 4096) but found %lld"), (unsigned long long)def->maxmem); goto failure; } @@ -2262,8 +2264,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, if (def->memory < def->maxmem) { if (def->memory <= 0 || def->memory % 1024 != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML entry 'currentMemory' to be an " - "unsigned integer (multiple of 1024) but found %lld", + _("Expecting domain XML entry 'currentMemory' to be an " + "unsigned integer (multiple of 1024) but found %lld"), (unsigned long long)def->memory); goto failure; } @@ -2276,8 +2278,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, /* def:vcpus -> vmx:numvcpus */ if (def->vcpus <= 0 || (def->vcpus % 2 != 0 && def->vcpus != 1)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML entry 'vcpu' to be an unsigned " - "integer (1 or a multiple of 2) but found %d", + _("Expecting domain XML entry 'vcpu' to be an unsigned " + "integer (1 or a multiple of 2) but found %d"), (int)def->vcpus); goto failure; } @@ -2298,8 +2300,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, if (sched_cpu_affinity_length < def->vcpus) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'cpuset' of entry " - "'vcpu' to contains at least %d CPU(s)", + _("Expecting domain XML attribute 'cpuset' of entry " + "'vcpu' to contains at least %d CPU(s)"), (int)def->vcpus); goto failure; } @@ -2331,7 +2333,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported graphics type '%s'", + _("Unsupported graphics type '%s'"), virDomainGraphicsTypeToString(def->graphics[i]->type)); goto failure; } @@ -2381,7 +2383,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported disk device type '%s'", + _("Unsupported disk device type '%s'"), virDomainDiskDeviceTypeToString(def->disks[i]->device)); goto failure; } @@ -2440,7 +2442,7 @@ int esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) { if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2490,7 +2492,7 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, char *fileName = NULL; if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2514,14 +2516,14 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported bus type '%s' for harddisk", + _("Unsupported bus type '%s' for harddisk"), virDomainDiskBusTypeToString(def->bus)); return -1; } if (def->type != VIR_DOMAIN_DISK_TYPE_FILE) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s harddisk '%s' has unsupported type '%s', expecting '%s'", + _("%s harddisk '%s' has unsupported type '%s', expecting '%s'"), busName, def->dst, virDomainDiskTypeToString(def->type), virDomainDiskTypeToString(VIR_DOMAIN_DISK_TYPE_FILE)); return -1; @@ -2535,8 +2537,8 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, if (def->src != NULL) { if (! virFileHasSuffix(def->src, ".vmdk")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Image file for %s harddisk '%s' has unsupported suffix, " - "expecting '.vmdk'", busName, def->dst); + _("Image file for %s harddisk '%s' has unsupported suffix, " + "expecting '.vmdk'"), busName, def->dst); return -1; } @@ -2558,7 +2560,7 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, entryPrefix, controller, id); } else if (def->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s harddisk '%s' has unsupported cache mode '%s'", + _("%s harddisk '%s' has unsupported cache mode '%s'"), busName, def->dst, virDomainDiskCacheTypeToString(def->cachemode)); return -1; @@ -2580,7 +2582,7 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, char *fileName = NULL; if (def->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2601,7 +2603,8 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, return -1; } } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Unsupported bus type '%s' for cdrom", + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Unsupported bus type '%s' for cdrom"), virDomainDiskBusTypeToString(def->bus)); return -1; } @@ -2616,8 +2619,8 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, if (def->src != NULL) { if (! virFileHasSuffix(def->src, ".iso")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Image file for %s cdrom '%s' has unsupported " - "suffix, expecting '.iso'", busName, def->dst); + _("Image file for %s cdrom '%s' has unsupported " + "suffix, expecting '.iso'"), busName, def->dst); return -1; } @@ -2642,8 +2645,8 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "%s cdrom '%s' has unsupported type '%s', expecting '%s' " - "or '%s'", busName, def->dst, + _("%s cdrom '%s' has unsupported type '%s', expecting '%s' " + "or '%s'"), busName, def->dst, virDomainDiskTypeToString(def->type), virDomainDiskTypeToString(VIR_DOMAIN_DISK_TYPE_FILE), virDomainDiskTypeToString(VIR_DOMAIN_DISK_TYPE_BLOCK)); @@ -2663,7 +2666,7 @@ esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, char *fileName = NULL; if (def->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -2680,8 +2683,8 @@ esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, if (def->src != NULL) { if (! virFileHasSuffix(def->src, ".flp")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Image file for floppy '%s' has unsupported suffix, " - "expecting '.flp'", def->dst); + _("Image file for floppy '%s' has unsupported " + "suffix, expecting '.flp'"), def->dst); return -1; } @@ -2706,8 +2709,8 @@ esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, } } else { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Floppy '%s' has unsupported type '%s', expecting '%s' " - "or '%s'", def->dst, + _("Floppy '%s' has unsupported type '%s', expecting '%s' " + "or '%s'"), def->dst, virDomainDiskTypeToString(def->type), virDomainDiskTypeToString(VIR_DOMAIN_DISK_TYPE_FILE), virDomainDiskTypeToString(VIR_DOMAIN_DISK_TYPE_BLOCK)); @@ -2728,7 +2731,7 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, if (controller < 0 || controller > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Ethernet controller index %d out of [0..3] range", + _("Ethernet controller index %d out of [0..3] range"), controller); return -1; } @@ -2742,9 +2745,9 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' but " - "found '%s'", def->model); + _("Expecting domain XML entry 'devices/interfase/model' " + "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' " + "but found '%s'"), def->model); return -1; } @@ -2771,7 +2774,7 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, break; default: - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Unsupported net type '%s'", + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Unsupported net type '%s'"), virDomainNetTypeToString(def->type)); return -1; } @@ -2821,14 +2824,15 @@ esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, if (def->target.port < 0 || def->target.port > 3) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Serial port index %d out of [0..3] range", def->target.port); + _("Serial port index %d out of [0..3] range"), + def->target.port); return -1; } if (def->data.file.path == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'path' of entry " - "'devices/serial/source' to be present"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML attribute 'path' of entry " + "'devices/serial/source' to be present")); return -1; } @@ -2874,7 +2878,7 @@ esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported character device type '%s'", + _("Unsupported character device type '%s'"), virDomainChrTypeToString(def->type)); return -1; } @@ -2897,15 +2901,15 @@ esxVMX_FormatParallel(esxVI_Context *ctx, virDomainChrDefPtr def, if (def->target.port < 0 || def->target.port > 2) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Parallel port index %d out of [0..2] range", + _("Parallel port index %d out of [0..2] range"), def->target.port); return -1; } if (def->data.file.path == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Expecting domain XML attribute 'path' of entry " - "'devices/parallel/source' to be present"); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expecting domain XML attribute 'path' of entry " + "'devices/parallel/source' to be present")); return -1; } @@ -2939,7 +2943,7 @@ esxVMX_FormatParallel(esxVI_Context *ctx, virDomainChrDefPtr def, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsupported character device type '%s'", + _("Unsupported character device type '%s'"), virDomainChrTypeToString(def->type)); return -1; } -- 1.6.3.3

--- daemon/libvirtd.c | 8 ++++---- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_linux_sysfs.c | 4 ++-- src/node_device/node_device_udev.c | 16 ++++++++-------- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/qemu/qemu_conf.c | 2 +- src/remote/remote_driver.c | 2 +- src/storage/storage_backend_disk.c | 6 +++--- src/storage/storage_driver.c | 2 +- src/xen/proxy_internal.c | 14 +++++++------- src/xen/xen_hypervisor.c | 20 ++++++++++---------- src/xen/xs_internal.c | 2 +- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 68fe95a..fd3f509 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2302,7 +2302,7 @@ static void *qemudRunLoop(void *opaque) { virMutexUnlock(&server->lock); if (qemudOneLoop() < 0) { virMutexLock(&server->lock); - DEBUG0("Loop iteration error, exiting\n"); + DEBUG0("Loop iteration error, exiting"); break; } virMutexLock(&server->lock); @@ -2475,7 +2475,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, } for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { if (pp->type != VIR_CONF_STRING) { - VIR_ERROR("%s: %s: must be a string or list of strings\n", + VIR_ERROR("%s: %s: must be a string or list of strings", filename, key); VIR_FREE(list); return -1; @@ -2497,7 +2497,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, } default: - VIR_ERROR("%s: %s: must be a string or list of strings\n", + VIR_ERROR("%s: %s: must be a string or list of strings", filename, key); return -1; } @@ -2512,7 +2512,7 @@ checkType (virConfValuePtr p, const char *filename, const char *key, virConfType required_type) { if (p->type != required_type) { - VIR_ERROR("%s: %s: invalid type: got %s; expected %s\n", filename, key, + VIR_ERROR("%s: %s: invalid type: got %s; expected %s", filename, key, virConfTypeName (p->type), virConfTypeName (required_type)); return -1; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index fb9e010..b9b3784 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -634,7 +634,7 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) { if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) { lxcError(VIR_ERR_INTERNAL_ERROR, - _("Unable to get cgroup for %s\n"), vm->def->name); + _("Unable to get cgroup for %s"), vm->def->name); goto cleanup; } diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 9ed0daa..6c64e59 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -302,7 +302,7 @@ int get_physical_function_linux(const char *sysfs_path, char *device_link = NULL; VIR_DEBUG("Attempting to get SR IOV physical function for device " - "with sysfs path '%s'\n", sysfs_path); + "with sysfs path '%s'", sysfs_path); if (virBuildPath(&device_link, sysfs_path, "physfn") == -1) { virReportOOMError(); @@ -327,7 +327,7 @@ int get_virtual_functions_linux(const char *sysfs_path, char *device_link = NULL; VIR_DEBUG("Attempting to get SR IOV virtual functions for device" - "with sysfs path '%s'\n", sysfs_path); + "with sysfs path '%s'", sysfs_path); dir = opendir(sysfs_path); if (dir == NULL) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 47f53f7..ecd09bd 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -131,7 +131,7 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, } VIR_DEBUG("Found property key '%s' value '%s' " - "for device with sysname '%s'\n", + "for device with sysname '%s'", property_key, *property_value, udev_device_get_sysname(udev_device)); @@ -220,7 +220,7 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, } VIR_DEBUG("Found sysfs attribute '%s' value '%s' " - "for device with sysname '%s'\n", + "for device with sysname '%s'", attr_name, *attr_value, udev_device_get_sysname(udev_device)); @@ -330,7 +330,7 @@ static int udevGenerateDeviceName(struct udev_device *device, if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); VIR_ERROR("Buffer error when generating device name for device " - "with sysname '%s'\n", udev_device_get_sysname(device)); + "with sysname '%s'", udev_device_get_sysname(device)); ret = -1; } @@ -642,7 +642,7 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, if (!STRPREFIX(filename, "host")) { VIR_ERROR("SCSI host found, but its udev name '%s' does " - "not begin with 'host'\n", filename); + "not begin with 'host'", filename); goto out; } @@ -949,7 +949,7 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) int ret = -1; VIR_INFO("Could not find definitive storage type for device " - "with sysfs path '%s', trying to guess it\n", + "with sysfs path '%s', trying to guess it", def->sysfs_path); if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { @@ -962,10 +962,10 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) if (ret != 0) { VIR_INFO("Could not determine storage type for device " - "with sysfs path '%s'\n", def->sysfs_path); + "with sysfs path '%s'", def->sysfs_path); } else { VIR_DEBUG("Found storage type '%s' for device " - "with sysfs path '%s'\n", + "with sysfs path '%s'", def->caps->data.storage.drive_type, def->sysfs_path); } @@ -1131,7 +1131,7 @@ static int udevGetDeviceType(struct udev_device *device, } VIR_INFO("Could not determine device type for device " - "with sysfs path '%s'\n", + "with sysfs path '%s'", udev_device_get_sysname(device)); ret = -1; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index cdfb92e..fdf1c10 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2237,7 +2237,7 @@ ebiptablesExecCLI(virConnectPtr conn, *status >>= 8; - VIR_DEBUG("rc = %d, status = %d\n",rc, *status); + VIR_DEBUG("rc = %d, status = %d",rc, *status); unlink(filename); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 6a88dff..e1a0986 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -318,7 +318,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn, (*insts)[(*nEntries)++] = inst; } else if (inc) { - VIR_DEBUG("Instantiating filter %s\n", inc->filterref); + VIR_DEBUG("Instantiating filter %s", inc->filterref); obj = virNWFilterPoolObjFindByName(&driver->pools, inc->filterref); if (obj) { @@ -523,7 +523,7 @@ _virNWFilterInstantiateFilter(virConnectPtr conn, return 1; } - VIR_DEBUG("filter name: %s\n", net->filter); + VIR_DEBUG("filter name: %s", net->filter); obj = virNWFilterPoolObjFindByName(&driver->pools, net->filter); if (!obj) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 087bb72..b679b35 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -140,7 +140,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, #define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ qemuReportError(VIR_ERR_INTERNAL_ERROR, \ - "remoteReadConfigFile: %s: %s: expected type " #typ "\n", \ + "remoteReadConfigFile: %s: %s: expected type " #typ, \ filename, (name)); \ virConfFree(conf); \ return -1; \ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ede00e8..215b5d9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1286,7 +1286,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, } if (len != 1 || buf[0] != '\1') { error (conn, VIR_ERR_RPC, - _("server verification (of our certificate or IP address) failed\n")); + _("server verification (of our certificate or IP address) failed")); return NULL; } diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 5717cfd..836d1ca 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -455,7 +455,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, unsigned long long cylinderSize = dev->geometry.heads * dev->geometry.sectors * SECTOR_SIZE; - DEBUG("find free area: allocation %llu, cyl size %llu\n", allocation, cylinderSize); + DEBUG("find free area: allocation %llu, cyl size %llu", allocation, cylinderSize); int partType = virStorageBackendDiskPartTypeToCreate(pool); /* how many extra bytes we have since we allocate @@ -508,7 +508,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, return -1; } - DEBUG("aligned alloc %llu\n", alignedAllocation); + DEBUG("aligned alloc %llu", alignedAllocation); *start = dev->freeExtents[smallestExtent].start; if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { @@ -524,7 +524,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, /* counting in byte, we want the last byte of the current sector */ *end -= 1; - DEBUG("final aligned start %llu, end %llu\n", *start, *end); + DEBUG("final aligned start %llu, end %llu", *start, *end); return 0; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 857a233..d476822 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1557,7 +1557,7 @@ storageVolumeZeroSparseFile(virStorageVolDefPtr vol, if (ret == -1) { virReportSystemError(errno, _("Failed to truncate volume with " - "path '%s' to %ju bytes\n"), + "path '%s' to %ju bytes"), vol->target.path, (intmax_t)size); } diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index c3cade8..36058bc 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -217,7 +217,7 @@ retry: return (-1); } - DEBUG("connected to unix socket %s via %d\n", path, fd); + DEBUG("connected to unix socket %s via %d", path, fd); return (fd); } @@ -395,14 +395,14 @@ retry: } if (ret != sizeof(virProxyPacket)) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, - _("Communication error with proxy: got %d bytes of %d\n"), + _("Communication error with proxy: got %d bytes of %d"), ret, (int) sizeof(virProxyPacket)); goto error; } res = request; if (res->len != sizeof(virProxyPacket)) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, - _("Communication error with proxy: expected %d bytes got %d\n"), + _("Communication error with proxy: expected %d bytes got %d"), (int) sizeof(virProxyPacket), res->len); goto error; } @@ -418,7 +418,7 @@ retry: } if (ret != sizeof(virProxyPacket)) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, - _("Communication error with proxy: got %d bytes of %d\n"), + _("Communication error with proxy: got %d bytes of %d"), ret, (int) sizeof(virProxyPacket)); goto error; } @@ -426,7 +426,7 @@ retry: if ((res->len < sizeof(virProxyPacket)) || (res->len > sizeof(virProxyFullPacket))) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, - _("Communication error with proxy: got %d bytes packet\n"), + _("Communication error with proxy: got %d bytes packet"), res->len); goto error; } @@ -436,7 +436,7 @@ retry: res->len - ret); if (ret != (int) (res->len - sizeof(virProxyPacket))) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, - _("Communication error with proxy: got %d bytes of %d\n"), + _("Communication error with proxy: got %d bytes of %d"), ret, (int) sizeof(virProxyPacket)); goto error; } @@ -448,7 +448,7 @@ retry: if ((res->version != PROXY_PROTO_VERSION) || (res->len < sizeof(virProxyPacket))) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s", - _("Communication error with proxy: malformed packet\n")); + _("Communication error with proxy: malformed packet")); goto error; } if (res->serial != serial) { diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 552fbf5..4a8769f 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2009,7 +2009,7 @@ xenHypervisorInit(void) ret = ioctl(fd, cmd, (unsigned long) &hc); if ((ret != -1) && (ret != 0)) { - DEBUG("Using new hypervisor call: %X\n", ret); + DEBUG("Using new hypervisor call: %X", ret); hv_version = ret; xen_ioctl_hypercall_cmd = cmd; goto detect_v2; @@ -2025,7 +2025,7 @@ xenHypervisorInit(void) cmd = _IOC(_IOC_NONE, 'P', 0, sizeof(v0_hypercall_t)); ret = ioctl(fd, cmd, (unsigned long) &v0_hc); if ((ret != -1) && (ret != 0)) { - DEBUG("Using old hypervisor call: %X\n", ret); + DEBUG("Using old hypervisor call: %X", ret); hv_version = ret; xen_ioctl_hypercall_cmd = cmd; hypervisor_version = 0; @@ -2062,13 +2062,13 @@ xenHypervisorInit(void) /* RHEL 5.0 */ dom_interface_version = 3; /* XEN_DOMCTL_INTERFACE_VERSION */ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ - DEBUG0("Using hypervisor call v2, sys ver2 dom ver3\n"); + DEBUG0("Using hypervisor call v2, sys ver2 dom ver3"); goto done; } /* Fedora 7 */ dom_interface_version = 4; /* XEN_DOMCTL_INTERFACE_VERSION */ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ - DEBUG0("Using hypervisor call v2, sys ver2 dom ver4\n"); + DEBUG0("Using hypervisor call v2, sys ver2 dom ver4"); goto done; } } @@ -2078,7 +2078,7 @@ xenHypervisorInit(void) /* xen-3.1 */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ - DEBUG0("Using hypervisor call v2, sys ver3 dom ver5\n"); + DEBUG0("Using hypervisor call v2, sys ver3 dom ver5"); goto done; } } @@ -2088,7 +2088,7 @@ xenHypervisorInit(void) /* Fedora 8 */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ - DEBUG0("Using hypervisor call v2, sys ver4 dom ver5\n"); + DEBUG0("Using hypervisor call v2, sys ver4 dom ver5"); goto done; } } @@ -2098,7 +2098,7 @@ xenHypervisorInit(void) /* Xen 3.2, Fedora 9 */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ - DEBUG0("Using hypervisor call v2, sys ver6 dom ver5\n"); + DEBUG0("Using hypervisor call v2, sys ver6 dom ver5"); goto done; } } @@ -2107,14 +2107,14 @@ xenHypervisorInit(void) sys_interface_version = 7; /* XEN_SYSCTL_INTERFACE_VERSION */ if (virXen_getdomaininfo(fd, 0, &info) == 1) { dom_interface_version = 6; /* XEN_DOMCTL_INTERFACE_VERSION */ - DEBUG0("Using hypervisor call v2, sys ver7 dom ver6\n"); + DEBUG0("Using hypervisor call v2, sys ver7 dom ver6"); goto done; } hypervisor_version = 1; sys_interface_version = -1; if (virXen_getdomaininfo(fd, 0, &info) == 1) { - DEBUG0("Using hypervisor call v1\n"); + DEBUG0("Using hypervisor call v1"); goto done; } @@ -2122,7 +2122,7 @@ xenHypervisorInit(void) * we failed to make the getdomaininfolist hypercall */ - DEBUG0("Failed to find any Xen hypervisor method\n"); + DEBUG0("Failed to find any Xen hypervisor method"); hypervisor_version = -1; virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", (unsigned long)IOCTL_PRIVCMD_HYPERCALL); diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 613f97a..466169d 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -342,7 +342,7 @@ xenStoreOpen(virConnectPtr conn, xenStoreWatchEvent, conn, NULL)) < 0) - DEBUG0("Failed to add event handle, disabling events\n"); + DEBUG0("Failed to add event handle, disabling events"); #endif //PROXY return 0; -- 1.6.3.3

--- src/vbox/vbox_driver.c | 12 ++-- src/vbox/vbox_tmpl.c | 177 +++++++++++++++++++++++------------------------ 2 files changed, 93 insertions(+), 96 deletions(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 632cb76..36e7315 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -58,8 +58,8 @@ static virDriver vboxDriverDummy; #define VIR_FROM_THIS VIR_FROM_VBOX -#define vboxError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_VBOX, code, __FILE__, \ +#define vboxError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_VBOX, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) int vboxRegister(void) { @@ -136,27 +136,27 @@ static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", _("no VirtualBox driver path specified (try vbox:///session)")); return VIR_DRV_OPEN_ERROR; } if (uid != 0) { if (STRNEQ (conn->uri->path, "/session")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, + vboxError(VIR_ERR_INTERNAL_ERROR, _("unknown driver path '%s' specified (try vbox:///session)"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } } else { /* root */ if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, + vboxError(VIR_ERR_INTERNAL_ERROR, _("unknown driver path '%s' specified (try vbox:///system)"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } } - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to initialize VirtualBox driver API")); return VIR_DRV_OPEN_ERROR; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8450266..1310c1a 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -124,8 +124,8 @@ typedef IMediumAttachment IHardDiskAttachment; #endif /* VBOX_API_VERSION >= 3001 */ -#define vboxError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_VBOX, code, __FILE__, \ +#define vboxError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_VBOX, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define DEBUGPRUnichar(msg, strUtf16) \ @@ -664,7 +664,7 @@ no_memory: return NULL; } -static int vboxInitialize(virConnectPtr conn, vboxGlobalData *data) { +static int vboxInitialize(vboxGlobalData *data) { /* Get the API table for out version, g_pVBoxFuncs is for the oldest version of the API that we support so we cannot use that. */ @@ -691,7 +691,7 @@ static int vboxInitialize(virConnectPtr conn, vboxGlobalData *data) { data->pFuncs->pfnGetEventQueue(&data->vboxQueue); if (data->vboxQueue == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "nsIEventQueue object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "nsIEventQueue object is null"); goto cleanup; } @@ -699,12 +699,12 @@ static int vboxInitialize(virConnectPtr conn, vboxGlobalData *data) { #endif /* !(VBOX_XPCOMC_VERSION == 0x00010000U) */ if (data->vboxObj == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "IVirtualBox object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "IVirtualBox object is null"); goto cleanup; } if (data->vboxSession == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "ISession object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "ISession object is null"); goto cleanup; } @@ -714,7 +714,7 @@ cleanup: return -1; } -static int vboxExtractVersion(virConnectPtr conn, vboxGlobalData *data) { +static int vboxExtractVersion(vboxGlobalData *data) { int ret = -1; PRUnichar *versionUtf16 = NULL; nsresult rc; @@ -736,7 +736,7 @@ static int vboxExtractVersion(virConnectPtr conn, vboxGlobalData *data) { } if (ret != 0) - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s", "Cound not extract VirtualBox version"); return ret; @@ -781,21 +781,21 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", _("no VirtualBox driver path specified (try vbox:///session)")); return VIR_DRV_OPEN_ERROR; } if (uid != 0) { if (STRNEQ (conn->uri->path, "/session")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, + vboxError(VIR_ERR_INTERNAL_ERROR, _("unknown driver path '%s' specified (try vbox:///session)"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } } else { /* root */ if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR, + vboxError(VIR_ERR_INTERNAL_ERROR, _("unknown driver path '%s' specified (try vbox:///system)"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -807,8 +807,8 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, } if (!(data->caps = vboxCapsInit()) || - vboxInitialize(conn, data) < 0 || - vboxExtractVersion(conn, data) < 0) { + vboxInitialize(data) < 0 || + vboxExtractVersion(data) < 0) { vboxUninitialize(data); return VIR_DRV_OPEN_ERROR; } @@ -908,7 +908,7 @@ static int vboxListDomains(virConnectPtr conn, int *ids, int nids) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of Domains",(unsigned)rc); goto cleanup; } @@ -952,7 +952,7 @@ static int vboxNumOfDomains(virConnectPtr conn) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get number of Domains",(unsigned)rc); goto cleanup; } @@ -1021,7 +1021,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) { /* Internal vbox IDs start from 0, the public libvirt ID * starts from 1, so refuse id==0, and adjust the rest*/ if (id == 0) { - vboxError(conn, VIR_ERR_NO_DOMAIN, + vboxError(VIR_ERR_NO_DOMAIN, _("no domain with matching id %d"), id); return NULL; } @@ -1029,7 +1029,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of machines",(unsigned)rc); return NULL; } @@ -1090,7 +1090,7 @@ static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned ch rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of machines",(unsigned)rc); return NULL; } @@ -1162,7 +1162,7 @@ static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of machines",(unsigned)rc); return NULL; } @@ -1239,7 +1239,7 @@ static int vboxDomainIsActive(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of machines",(unsigned)rc); return ret; } @@ -1318,7 +1318,7 @@ static int vboxDomainSuspend(virDomainPtr dom) { vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1339,13 +1339,13 @@ static int vboxDomainSuspend(virDomainPtr dom) { VBOX_RELEASE(console); ret = 0; } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "error while suspend the domain"); goto cleanup; } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine not in running state to suspend it"); goto cleanup; } @@ -1377,7 +1377,7 @@ static int vboxDomainResume(virDomainPtr dom) { vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1398,13 +1398,13 @@ static int vboxDomainResume(virDomainPtr dom) { VBOX_RELEASE(console); ret = 0; } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "error while resuming the domain"); goto cleanup; } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine not paused, so can't resume it"); goto cleanup; } @@ -1435,7 +1435,7 @@ static int vboxDomainShutdown(virDomainPtr dom) { vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1448,11 +1448,11 @@ static int vboxDomainShutdown(virDomainPtr dom) { machine->vtbl->GetState(machine, &state); if (state == MachineState_Paused) { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine paused, so can't power it down"); goto cleanup; } else if (state == MachineState_PoweredOff) { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine already powered down"); goto cleanup; } @@ -1492,7 +1492,7 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSE vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1514,7 +1514,7 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSE } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine not running, so can't reboot it"); goto cleanup; } @@ -1545,7 +1545,7 @@ static int vboxDomainDestroy(virDomainPtr dom) { vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1558,7 +1558,7 @@ static int vboxDomainDestroy(virDomainPtr dom) { machine->vtbl->GetState(machine, &state); if (state == MachineState_PoweredOff) { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine already powered down"); goto cleanup; } @@ -1621,7 +1621,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { vboxIIDFromUUID(dom->uuid, iid); rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); goto cleanup; } @@ -1634,7 +1634,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { machine->vtbl->GetState(machine, &state); if (state != MachineState_PoweredOff) { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "memory size can't be changed unless domain is powered down"); goto cleanup; } @@ -1649,7 +1649,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { machine->vtbl->SaveSettings(machine); ret = 0; } else { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s:%lu Kb, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu Kb, rc=%08x", "could not set the memory size of the domain to", memory, (unsigned)rc); } @@ -1675,8 +1675,8 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(NULL, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", + "Could not get list of machines", (unsigned)rc); goto cleanup; } @@ -1853,17 +1853,17 @@ static int vboxDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { machine->vtbl->SaveSettings(machine); ret = 0; } else { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR, "%s: %u, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s: %u, rc=%08x", "could not set the number of cpus of the domain to", CPUCount, (unsigned)rc); } VBOX_RELEASE(machine); } else { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", dom->id); } } else { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, + vboxError(VIR_ERR_INVALID_DOMAIN, "can't open session to the domain with id %d", dom->id); } data->vboxSession->vtbl->Close(data->vboxSession); @@ -2461,7 +2461,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { maxPortPerInst, maxSlotPerPort); if (!def->disks[diskCount]->dst) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR, + vboxError(VIR_ERR_INTERNAL_ERROR, "%s: controller instance:%u, port:%d, slot:%d", "Could not generate medium name for the disk at", deviceInst, devicePort, deviceSlot); @@ -3036,7 +3036,7 @@ static int vboxListDefinedDomains(virConnectPtr conn, char ** const names, int m rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get list of Defined Domains",(unsigned)rc); goto cleanup; } @@ -3090,7 +3090,7 @@ static int vboxNumOfDefinedDomains(virConnectPtr conn) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", "Could not get number of Defined Domains",(unsigned)rc); goto cleanup; } @@ -3137,14 +3137,14 @@ static int vboxDomainCreate(virDomainPtr dom) { int i = 0; if (!dom->name) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", "Error while reading the domain name"); goto cleanup; } rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", "Could not get list of machines",(unsigned)rc); goto cleanup; } @@ -3213,7 +3213,7 @@ static int vboxDomainCreate(virDomainPtr dom) { if (valueDisplayUtf8) { sdlDisplay = strdup(valueDisplayUtf8); if (sdlDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(); /* just don't go to cleanup yet as it is ok to have * sdlDisplay as NULL and we check it below if it * exist and then only use it there @@ -3227,7 +3227,7 @@ static int vboxDomainCreate(virDomainPtr dom) { if (valueDisplayUtf8) { guiDisplay = strdup(valueDisplayUtf8); if (guiDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(); /* just don't go to cleanup yet as it is ok to have * guiDisplay as NULL and we check it below if it * exist and then only use it there @@ -3287,7 +3287,7 @@ static int vboxDomainCreate(virDomainPtr dom) { env, &progress ); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "openremotesession failed, domain can't be started"); ret = -1; } else { @@ -3319,7 +3319,7 @@ static int vboxDomainCreate(virDomainPtr dom) { data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(dom->conn, VIR_ERR_OPERATION_FAILED, + vboxError(VIR_ERR_OPERATION_FAILED, "%s", "machine is not in poweroff|saved|" "aborted state, so couldn't start it"); ret = -1; @@ -3375,21 +3375,21 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_UTF16_FREE(machineNameUtf16); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "could not define a domain",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", + "could not define a domain", (unsigned)rc); goto cleanup; } rc = machine->vtbl->SetMemorySize(machine, def->memory / 1024); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%lu Kb, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu Kb, rc=%08x", "could not set the memory size of the domain to", def->memory, (unsigned)rc); } rc = machine->vtbl->SetCPUCount(machine, def->vcpus); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%lu, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu, rc=%08x", "could not set the number of virtual CPUs to", def->vcpus, (unsigned)rc); } @@ -3403,7 +3403,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { (1 << VIR_DOMAIN_FEATURE_PAE)); #endif /* VBOX_API_VERSION >= 3001 */ if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not change PAE status to", ((def->features) & (1 << VIR_DOMAIN_FEATURE_PAE)) ? "Enabled" : "Disabled", (unsigned)rc); @@ -3414,7 +3414,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { rc = bios->vtbl->SetACPIEnabled(bios, (def->features) & (1 << VIR_DOMAIN_FEATURE_ACPI)); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not change ACPI status to", ((def->features) & (1 << VIR_DOMAIN_FEATURE_ACPI)) ? "Enabled" : "Disabled", (unsigned)rc); @@ -3422,7 +3422,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { rc = bios->vtbl->SetIOAPICEnabled(bios, (def->features) & (1 << VIR_DOMAIN_FEATURE_APIC)); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", "could not change APIC status to", ((def->features) & (1 << VIR_DOMAIN_FEATURE_APIC)) ? "Enabled" : "Disabled", (unsigned)rc); @@ -3433,8 +3433,8 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { /* Register the machine before attaching other devices to it */ rc = data->vboxObj->vtbl->RegisterMachine(data->vboxObj, machine); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "could not define a domain",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", + "could not define a domain", (unsigned)rc); goto cleanup; } @@ -3551,13 +3551,13 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (dvdImage) { rc = dvdImage->vtbl->imedium.GetId((IMedium *)dvdImage, &dvduuid); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached to cdrom", def->disks[i]->src, (unsigned)rc); } else { rc = dvdDrive->vtbl->MountImage(dvdDrive, dvduuid); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file to cdrom", def->disks[i]->src, (unsigned)rc); } else { @@ -3612,7 +3612,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (hardDisk) { rc = hardDisk->vtbl->imedium.GetId((IMedium *)hardDisk, &hdduuid); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached as harddisk", def->disks[i]->src, (unsigned)rc); } else { @@ -3655,7 +3655,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_UTF16_FREE(hddcnameUtf16); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file as harddisk", def->disks[i]->src, (unsigned)rc); } else { @@ -3709,13 +3709,13 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (floppyImage) { rc = floppyImage->vtbl->imedium.GetId((IMedium *)floppyImage, &fduuid); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached to floppy drive", def->disks[i]->src, (unsigned)rc); } else { rc = floppyDrive->vtbl->MountImage(floppyDrive, fduuid); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file to floppy drive", def->disks[i]->src, (unsigned)rc); } else { @@ -3857,7 +3857,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { } if (!medium) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "Failed to attach the following disk/dvd/floppy to the machine", def->disks[i]->src, (unsigned)rc); VBOX_UTF16_FREE(mediumFileUtf16); @@ -3866,7 +3866,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { rc = medium->vtbl->GetId(medium, &mediumUUID); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached as harddisk/dvd/floppy", def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); @@ -3906,7 +3906,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { &deviceInst, &devicePort, &deviceSlot)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the port/slot number of harddisk/dvd/floppy to be attached", def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); @@ -3924,7 +3924,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { mediumUUID); if (NS_FAILED(rc)) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file as harddisk/dvd/floppy", def->disks[i]->src, (unsigned)rc); } else { @@ -4625,7 +4625,7 @@ static int vboxDomainUndefine(virDomainPtr dom) { machine->vtbl->DeleteSettings(machine); ret = 0; } else { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", "could not delete the domain", (unsigned)rc); } @@ -4679,7 +4679,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN,"no domain with matching uuid"); + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); goto cleanup; } @@ -4731,7 +4731,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (dvdImage) { rc = dvdImage->vtbl->imedium.GetId((IMedium *)dvdImage, &dvduuid); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached to cdrom", dev->data.disk->src, (unsigned)rc); } else { @@ -4739,7 +4739,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, dvdDrive->vtbl->Unmount(dvdDrive); rc = dvdDrive->vtbl->MountImage(dvdDrive, dvduuid); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file to cdrom", dev->data.disk->src, (unsigned)rc); } else { @@ -4793,13 +4793,13 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (floppyImage) { rc = floppyImage->vtbl->imedium.GetId((IMedium *)floppyImage, &fduuid); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "can't get the uuid of the file to be attached to floppy drive", dev->data.disk->src, (unsigned)rc); } else { rc = floppyDrive->vtbl->MountImage(floppyDrive, fduuid); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not attach the file to floppy drive", dev->data.disk->src, (unsigned)rc); } else { @@ -4847,7 +4847,7 @@ static int vboxDomainAttachDevice(virDomainPtr dom, const char *xml) { static int vboxDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - vboxError(dom->conn, VIR_ERR_OPERATION_INVALID, "%s", + vboxError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot modify the persistent configuration of a domain")); return -1; } @@ -4858,7 +4858,7 @@ static int vboxDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, static int vboxDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - vboxError(dom->conn, VIR_ERR_OPERATION_INVALID, "%s", + vboxError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot modify the persistent configuration of a domain")); return -1; } @@ -4905,7 +4905,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); goto cleanup; } @@ -4935,7 +4935,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (dvdDrive) { rc = dvdDrive->vtbl->Unmount(dvdDrive); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", "could not de-attach the mounted ISO", (unsigned)rc); } else { @@ -4956,7 +4956,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (enabled) { rc = floppyDrive->vtbl->Unmount(floppyDrive); if (NS_FAILED(rc)) { - vboxError(dom->conn, VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", "could not attach the file to floppy drive", (unsigned)rc); } else { @@ -4999,7 +4999,7 @@ cleanup: static int vboxDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - vboxError(dom->conn, VIR_ERR_OPERATION_INVALID, "%s", + vboxError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot modify the persistent configuration of a domain")); return -1; } @@ -5638,7 +5638,7 @@ static int vboxListNetworks(virConnectPtr conn, char **const names, int nnames) DEBUG("nnames[%d]: %s", ret, nameUtf8); names[ret] = strdup(nameUtf8); if (names[ret] == NULL) { - vboxError(conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(); } else { ret++; } @@ -5719,7 +5719,7 @@ static int vboxListDefinedNetworks(virConnectPtr conn, char **const names, int n DEBUG("nnames[%d]: %s", ret, nameUtf8); names[ret] = strdup(nameUtf8); if (names[ret] == NULL) { - vboxError(conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(); } else { ret++; } @@ -6241,9 +6241,7 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE if (def->hosts[0].name == NULL) { VIR_FREE(def->hosts); def->nhosts = 0; - vboxError(network->conn, - VIR_ERR_SYSTEM_ERROR, - "%s", "strdup failed"); + virReportOOMError(); } else { PRUnichar *macAddressUtf16 = NULL; PRUnichar *ipAddressUtf16 = NULL; @@ -6280,8 +6278,7 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE vboxIIDUnalloc(vboxnet0IID); VBOX_UTF16_FREE(networkNameUtf16); } else { - vboxError(network->conn, VIR_ERR_SYSTEM_ERROR, - "%s", "strdup failed"); + virReportOOMError(); } } @@ -6398,7 +6395,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { hardDiskCount = 0; } else { hardDiskCount = -1; - vboxError(pool->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not get number of volumes in the pool", pool->name, (unsigned)rc); } @@ -6454,7 +6451,7 @@ static int vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names hardDiskCount = 0; } else { hardDiskCount = -1; - vboxError(pool->conn, VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", + vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", "could not get the volume list in the pool", pool->name, (unsigned)rc); } -- 1.6.3.3

--- src/xen/xend_internal.c | 528 +++++++++++++++++++++-------------------------- src/xen/xend_internal.h | 24 +-- src/xen/xm_internal.c | 16 +- 3 files changed, 254 insertions(+), 314 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 691a940..c4e73b7 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -85,8 +85,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn ATTRIBUTE_UNUSED, int xendConfigVersion, int isAttach); static int -xenDaemonFormatSxprOnePCI(virConnectPtr conn, - virDomainHostdevDefPtr def, +xenDaemonFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, int detach); @@ -98,12 +97,12 @@ virDomainXMLDevID(virDomainPtr domain, int ref_len); #endif -#define virXendError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_XEND, code, __FILE__, \ +#define virXendError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_XEND, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) -#define virXendErrorInt(conn, code, ival) \ - virXendError(conn, code, "%d", ival) +#define virXendErrorInt(code, ival) \ + virXendError(code, "%d", ival) /** * do_connect: @@ -123,7 +122,7 @@ do_connect(virConnectPtr xend) s = socket(priv->addrfamily, SOCK_STREAM, priv->addrprotocol); if (s == -1) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create a socket")); return -1; } @@ -146,7 +145,7 @@ do_connect(virConnectPtr xend) * error */ if (xenHavePrivilege()) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to connect to xend")); } } @@ -167,7 +166,7 @@ do_connect(virConnectPtr xend) * Returns the number of bytes exchanged, or -1 in case of error */ static size_t -wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read) +wr_sync(int fd, void *buffer, size_t size, int do_read) { size_t offset = 0; @@ -193,10 +192,10 @@ wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read) /* unrecoverable error */ if (len == -1) { if (do_read) - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to read from Xen Daemon")); else - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to write to Xen Daemon")); return (-1); @@ -210,7 +209,6 @@ wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read) /** * sread: - * @xend: the xend connection object * @fd: the file descriptor * @buffer: the I/O buffer * @size: the size of the I/O @@ -220,14 +218,13 @@ wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read) * Returns the number of bytes read, or -1 in case of error */ static ssize_t -sread(virConnectPtr xend, int fd, void *buffer, size_t size) +sread(int fd, void *buffer, size_t size) { - return wr_sync(xend, fd, buffer, size, 1); + return wr_sync(fd, buffer, size, 1); } /** * swrite: - * @xend: the xend connection object * @fd: the file descriptor * @buffer: the I/O buffer * @size: the size of the I/O @@ -237,14 +234,13 @@ sread(virConnectPtr xend, int fd, void *buffer, size_t size) * Returns the number of bytes written, or -1 in case of error */ static ssize_t -swrite(virConnectPtr xend, int fd, const void *buffer, size_t size) +swrite(int fd, const void *buffer, size_t size) { - return wr_sync(xend, fd, (void *) buffer, size, 0); + return wr_sync(fd, (void *) buffer, size, 0); } /** * swrites: - * @xend: the xend connection object * @fd: the file descriptor * @string: the string to write * @@ -253,14 +249,13 @@ swrite(virConnectPtr xend, int fd, const void *buffer, size_t size) * Returns the number of bytes written, or -1 in case of error */ static ssize_t -swrites(virConnectPtr xend, int fd, const char *string) +swrites(int fd, const char *string) { - return swrite(xend, fd, string, strlen(string)); + return swrite(fd, string, strlen(string)); } /** * sreads: - * @xend: the xend connection object * @fd: the file descriptor * @buffer: the I/O buffer * @n_buffer: the size of the I/O buffer @@ -270,7 +265,7 @@ swrites(virConnectPtr xend, int fd, const char *string) * Returns the number of bytes read, or -1 in case of error */ static ssize_t -sreads(virConnectPtr xend, int fd, char *buffer, size_t n_buffer) +sreads(int fd, char *buffer, size_t n_buffer) { size_t offset; @@ -280,7 +275,7 @@ sreads(virConnectPtr xend, int fd, char *buffer, size_t n_buffer) for (offset = 0; offset < (n_buffer - 1); offset++) { ssize_t ret; - ret = sread(xend, fd, buffer + offset, 1); + ret = sread(fd, buffer + offset, 1); if (ret == 0) break; else if (ret == -1) @@ -305,7 +300,6 @@ istartswith(const char *haystack, const char *needle) /** * xend_req: - * @xend: the xend connection object * @fd: the file descriptor * @content: the buffer to store the content * @n_content: the size of the buffer @@ -315,13 +309,13 @@ istartswith(const char *haystack, const char *needle) * Returns the HTTP return code. */ static int -xend_req(virConnectPtr xend, int fd, char *content, size_t n_content) +xend_req(int fd, char *content, size_t n_content) { char buffer[4096]; int content_length = -1; int retcode = 0; - while (sreads(xend, fd, buffer, sizeof(buffer)) > 0) { + while (sreads(fd, buffer, sizeof(buffer)) > 0) { if (STREQ(buffer, "\r\n")) break; @@ -337,7 +331,7 @@ xend_req(virConnectPtr xend, int fd, char *content, size_t n_content) if ((unsigned int) content_length > (n_content + 1)) content_length = n_content - 1; - ret = sread(xend, fd, content, content_length); + ret = sread(fd, content, content_length); if (ret < 0) return -1; @@ -370,21 +364,21 @@ xend_get(virConnectPtr xend, const char *path, if (s == -1) return s; - swrites(xend, s, "GET "); - swrites(xend, s, path); - swrites(xend, s, " HTTP/1.1\r\n"); + swrites(s, "GET "); + swrites(s, path); + swrites(s, " HTTP/1.1\r\n"); - swrites(xend, s, + swrites(s, "Host: localhost:8000\r\n" "Accept-Encoding: identity\r\n" "Content-Type: application/x-www-form-urlencoded\r\n" "\r\n"); - ret = xend_req(xend, s, content, n_content); + ret = xend_req(s, content, n_content); close(s); if (((ret < 0) || (ret >= 300)) && ((ret != 404) || (!STRPREFIX(path, "/xend/domain/")))) { - virXendError(xend, VIR_ERR_GET_FAILED, + virXendError(VIR_ERR_GET_FAILED, _("%d status from xen daemon: %s:%s"), ret, path, content); } @@ -417,28 +411,28 @@ xend_post(virConnectPtr xend, const char *path, const char *ops, if (s == -1) return s; - swrites(xend, s, "POST "); - swrites(xend, s, path); - swrites(xend, s, " HTTP/1.1\r\n"); + swrites(s, "POST "); + swrites(s, path); + swrites(s, " HTTP/1.1\r\n"); - swrites(xend, s, + swrites(s, "Host: localhost:8000\r\n" "Accept-Encoding: identity\r\n" "Content-Type: application/x-www-form-urlencoded\r\n" "Content-Length: "); snprintf(buffer, sizeof(buffer), "%d", (int) strlen(ops)); - swrites(xend ,s, buffer); - swrites(xend, s, "\r\n\r\n"); - swrites(xend, s, ops); + swrites(s, buffer); + swrites(s, "\r\n\r\n"); + swrites(s, ops); - ret = xend_req(xend, s, content, n_content); + ret = xend_req(s, content, n_content); close(s); if ((ret < 0) || (ret >= 300)) { - virXendError(xend, VIR_ERR_POST_FAILED, + virXendError(VIR_ERR_POST_FAILED, _("xend_post: error from xen daemon: %s"), content); } else if ((ret == 202) && (strstr(content, "failed") != NULL)) { - virXendError(xend, VIR_ERR_POST_FAILED, + virXendError(VIR_ERR_POST_FAILED, _("xend_post: error from xen daemon: %s"), content); ret = -1; } else if (((ret >= 200) && (ret <= 202)) && (strstr(content, "xend.err") != NULL)) { @@ -446,7 +440,7 @@ xend_post(virConnectPtr xend, const char *path, const char *ops, * which returns a success code, but the word 'xend.err' * in body to indicate error :-( */ - virXendError(xend, VIR_ERR_POST_FAILED, + virXendError(VIR_ERR_POST_FAILED, _("xend_post: error from xen daemon: %s"), content); ret = -1; } @@ -458,7 +452,6 @@ xend_post(virConnectPtr xend, const char *path, const char *ops, /** * http2unix: - * @xend: the xend connection object * @ret: the http return code * * Convert the HTTP return code to 0/-1 and set errno if needed @@ -466,7 +459,7 @@ xend_post(virConnectPtr xend, const char *path, const char *ops, * Return -1 in case of error code 0 otherwise */ static int -http2unix(virConnectPtr xend, int ret) +http2unix(int ret) { switch (ret) { case -1: @@ -482,7 +475,7 @@ http2unix(virConnectPtr xend, int ret) errno = EIO; break; default: - virXendErrorInt(xend, VIR_ERR_HTTP_ERROR, ret); + virXendErrorInt(VIR_ERR_HTTP_ERROR, ret); errno = EINVAL; break; } @@ -531,7 +524,7 @@ xend_op_ext(virConnectPtr xend, const char *path, char *error, } content = virBufferContentAndReset(&buf); - ret = http2unix(xend, xend_post(xend, path, content, error, n_error)); + ret = http2unix(xend_post(xend, path, content, error, n_error)); VIR_FREE(content); return ret; @@ -598,7 +591,7 @@ sexpr_get(virConnectPtr xend, const char *fmt, ...) va_end(ap); ret = xend_get(xend, path, buffer, sizeof(buffer)); - ret = http2unix(xend ,ret); + ret = http2unix(ret); if (ret == -1) return NULL; @@ -807,7 +800,7 @@ xenDaemonOpen_tcp(virConnectPtr conn, const char *host, const char *port) ret = getaddrinfo (host, port, &hints, &res); if (ret != 0) { - virXendError(NULL, VIR_ERR_UNKNOWN_HOST, + virXendError(VIR_ERR_UNKNOWN_HOST, _("unable to resolve hostname '%s': %s"), host, gai_strerror (ret)); return -1; @@ -962,7 +955,7 @@ xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr) ptr = urlencode(sexpr); if (ptr == NULL) { /* this should be caught at the interface but ... */ - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to urlencode the create S-Expr")); return (-1); } @@ -1003,18 +996,18 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname, value = sexpr_node(root, "domain/domid"); if (value == NULL) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing domid")); goto error; } ret = strtol(value, NULL, 0); if ((ret == 0) && (value[0] != '0')) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incorrect domid not numeric")); ret = -1; } else if (uuid != NULL) { if (sexpr_uuid(uuid, root, "domain/uuid") < 0) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing uuid")); } } @@ -1053,7 +1046,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend, name = sexpr_node(root, "domain/name"); if (name == NULL) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing name")); goto error; } @@ -1066,7 +1059,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend, } if (sexpr_uuid(uuid, root, "domain/uuid") < 0) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing uuid")); goto error; } @@ -1090,7 +1083,7 @@ xend_detect_config_version(virConnectPtr conn) { xenUnifiedPrivatePtr priv; if (!VIR_IS_CONNECT(conn)) { - virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virXendError(VIR_ERR_INVALID_CONN, __FUNCTION__); return (-1); } @@ -1123,7 +1116,6 @@ xend_detect_config_version(virConnectPtr conn) { /** * xenDaemonParseSxprOS - * @xend: the xend connection object * @node: the root of the parsed S-Expression * @def: the domain config * @hvm: true or 1 if no contains HVM S-Expression @@ -1134,8 +1126,7 @@ xend_detect_config_version(virConnectPtr conn) { * Returns 0 in case of success and -1 in case of error */ static int -xenDaemonParseSxprOS(virConnectPtr xend, - const struct sexpr *node, +xenDaemonParseSxprOS(const struct sexpr *node, virDomainDefPtr def, int hvm) { @@ -1147,7 +1138,7 @@ xenDaemonParseSxprOS(virConnectPtr xend, goto no_memory; if (def->os.loader == NULL) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing HVM loader")); return(-1); } @@ -1201,7 +1192,7 @@ xenDaemonParseSxprOS(virConnectPtr xend, if (!hvm && !def->os.kernel && !def->os.bootloader) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing kernel & bootloader")); return -1; } @@ -1215,8 +1206,7 @@ no_memory: int -xend_parse_sexp_desc_char(virConnectPtr conn, - virBufferPtr buf, +xend_parse_sexp_desc_char(virBufferPtr buf, const char *devtype, int portNum, const char *value, @@ -1265,7 +1255,7 @@ xend_parse_sexp_desc_char(virConnectPtr conn, type = "unix"; value += sizeof("unix:")-1; } else { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown char device type")); return -1; } @@ -1299,7 +1289,7 @@ xend_parse_sexp_desc_char(virConnectPtr conn, const char *mode, *protocol; if (offset == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1339,7 +1329,7 @@ xend_parse_sexp_desc_char(virConnectPtr conn, const char *offset2, *offset3; if (offset == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1355,7 +1345,7 @@ xend_parse_sexp_desc_char(virConnectPtr conn, offset3 = strchr(offset2, ':'); if (offset3 == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1435,8 +1425,7 @@ error: } virDomainChrDefPtr -xenDaemonParseSxprChar(virConnectPtr conn, - const char *value, +xenDaemonParseSxprChar(const char *value, const char *tty) { const char *prefix; @@ -1463,7 +1452,7 @@ xenDaemonParseSxprChar(virConnectPtr conn, def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; } else { if ((def->type = virDomainChrTypeFromString(prefix)) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unknown chr device type '%s'"), prefix); goto error; } @@ -1490,7 +1479,7 @@ xenDaemonParseSxprChar(virConnectPtr conn, const char *offset2; if (offset == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1518,7 +1507,7 @@ xenDaemonParseSxprChar(virConnectPtr conn, const char *offset2, *offset3; if (offset == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1534,7 +1523,7 @@ xenDaemonParseSxprChar(virConnectPtr conn, offset3 = strchr(offset2, ':'); if (offset3 == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed char device string")); goto error; } @@ -1589,8 +1578,7 @@ error: * Returns 0 if successful or -1 if failed. */ static int -xenDaemonParseSxprDisks(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, int hvm, int xendConfigVersion) @@ -1625,7 +1613,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, goto no_memory; if (dst == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, vbd has no dev")); goto error; } @@ -1636,7 +1624,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, if (!offset || !hvm || STRNEQ(offset, ":cdrom")) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, vbd has no src")); goto error; } @@ -1645,7 +1633,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, if (src != NULL) { offset = strchr(src, ':'); if (!offset) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot parse vbd filename, missing driver name")); goto error; } @@ -1654,7 +1642,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, goto no_memory; if (virStrncpy(disk->driverName, src, offset-src, (offset-src)+1) == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("Driver name %s too big for destination"), src); goto error; @@ -1665,7 +1653,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, if (STREQ (disk->driverName, "tap")) { offset = strchr(src, ':'); if (!offset) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot parse vbd filename, missing driver type")); goto error; } @@ -1674,7 +1662,7 @@ xenDaemonParseSxprDisks(virConnectPtr conn, goto no_memory; if (virStrncpy(disk->driverType, src, offset-src, (offset-src)+1) == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("Driver type %s too big for destination"), src); goto error; @@ -1760,8 +1748,7 @@ error: static int -xenDaemonParseSxprNets(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonParseSxprNets(virDomainDefPtr def, const struct sexpr *root) { virDomainNetDefPtr net = NULL; @@ -1820,7 +1807,7 @@ xenDaemonParseSxprNets(virConnectPtr conn, tmp = sexpr_node(node, "device/vif/mac"); if (tmp) { if (virParseMacAddr(tmp, net->mac) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("malformed mac address '%s'"), tmp); goto cleanup; } @@ -1854,8 +1841,7 @@ cleanup: int -xenDaemonParseSxprSound(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonParseSxprSound(virDomainDefPtr def, const char *str) { if (STREQ(str, "all")) { @@ -1899,7 +1885,7 @@ xenDaemonParseSxprSound(virConnectPtr conn, else len = strlen(offset); if (virStrncpy(model, offset, len, sizeof(model)) == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("Sound model %s too big for destination"), offset); goto error; @@ -2098,7 +2084,7 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn, goto no_memory; if ((graphics->type = virDomainGraphicsTypeFromString(tmp)) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unknown graphics type '%s'"), tmp); goto error; } @@ -2171,7 +2157,6 @@ error: /** * xenDaemonParseSxprPCI - * @conn: connection * @root: root sexpr * * This parses out block devices from the domain sexpr @@ -2179,8 +2164,7 @@ error: * Returns 0 if successful or -1 if failed. */ static int -xenDaemonParseSxprPCI(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonParseSxprPCI(virDomainDefPtr def, const struct sexpr *root) { const struct sexpr *cur, *tmp = NULL, *node; @@ -2225,43 +2209,43 @@ xenDaemonParseSxprPCI(virConnectPtr conn, continue; if (!(domain = sexpr_node(node, "dev/domain"))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing PCI domain")); goto error; } if (!(bus = sexpr_node(node, "dev/bus"))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing PCI bus")); goto error; } if (!(slot = sexpr_node(node, "dev/slot"))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing PCI slot")); goto error; } if (!(func = sexpr_node(node, "dev/func"))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing PCI func")); goto error; } if (virStrToLong_i(domain, NULL, 0, &domainID) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("cannot parse PCI domain '%s'"), domain); goto error; } if (virStrToLong_i(bus, NULL, 0, &busID) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("cannot parse PCI bus '%s'"), bus); goto error; } if (virStrToLong_i(slot, NULL, 0, &slotID) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("cannot parse PCI slot '%s'"), slot); goto error; } if (virStrToLong_i(func, NULL, 0, &funcID) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("cannot parse PCI func '%s'"), func); goto error; } @@ -2327,7 +2311,7 @@ xenDaemonParseSxpr(virConnectPtr conn, tmp = sexpr_node(root, "domain/domid"); if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */ - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing id")); goto error; } @@ -2340,14 +2324,14 @@ xenDaemonParseSxpr(virConnectPtr conn, if (sexpr_node_copy(root, "domain/name", &def->name) < 0) goto no_memory; if (def->name == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing name")); goto error; } tmp = sexpr_node(root, "domain/uuid"); if (tmp == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing name")); goto error; } @@ -2378,7 +2362,7 @@ xenDaemonParseSxpr(virConnectPtr conn, if (def->id != 0) { if (sexpr_lookup(root, "domain/image")) { - if (xenDaemonParseSxprOS(conn, root, def, hvm) < 0) + if (xenDaemonParseSxprOS(root, def, hvm) < 0) goto error; } } @@ -2398,7 +2382,7 @@ xenDaemonParseSxpr(virConnectPtr conn, if (virDomainCpuSetParse(&cpus, 0, def->cpumask, def->cpumasklen) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("invalid CPU mask %s"), cpus); goto error; } @@ -2409,7 +2393,7 @@ xenDaemonParseSxpr(virConnectPtr conn, tmp = sexpr_node(root, "domain/on_poweroff"); if (tmp != NULL) { if ((def->onPoweroff = virDomainLifecycleTypeFromString(tmp)) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; } @@ -2419,7 +2403,7 @@ xenDaemonParseSxpr(virConnectPtr conn, tmp = sexpr_node(root, "domain/on_reboot"); if (tmp != NULL) { if ((def->onReboot = virDomainLifecycleTypeFromString(tmp)) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; } @@ -2429,7 +2413,7 @@ xenDaemonParseSxpr(virConnectPtr conn, tmp = sexpr_node(root, "domain/on_crash"); if (tmp != NULL) { if ((def->onCrash = virDomainLifecycleTypeFromString(tmp)) < 0) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; } @@ -2461,13 +2445,13 @@ xenDaemonParseSxpr(virConnectPtr conn, goto no_memory; /* append block devices */ - if (xenDaemonParseSxprDisks(conn, def, root, hvm, xendConfigVersion) < 0) + if (xenDaemonParseSxprDisks(def, root, hvm, xendConfigVersion) < 0) goto error; - if (xenDaemonParseSxprNets(conn, def, root) < 0) + if (xenDaemonParseSxprNets(def, root) < 0) goto error; - if (xenDaemonParseSxprPCI(conn, def, root) < 0) + if (xenDaemonParseSxprPCI(def, root) < 0) goto error; /* New style graphics device config */ @@ -2562,7 +2546,7 @@ xenDaemonParseSxpr(virConnectPtr conn, tmp = sexpr_node(root, "domain/image/hvm/serial"); if (tmp && STRNEQ(tmp, "none")) { virDomainChrDefPtr chr; - if ((chr = xenDaemonParseSxprChar(conn, tmp, tty)) == NULL) + if ((chr = xenDaemonParseSxprChar(tmp, tty)) == NULL) goto error; if (VIR_REALLOC_N(def->serials, def->nserials+1) < 0) { virDomainChrDefFree(chr); @@ -2575,7 +2559,7 @@ xenDaemonParseSxpr(virConnectPtr conn, if (tmp && STRNEQ(tmp, "none")) { virDomainChrDefPtr chr; /* XXX does XenD stuff parallel port tty info into xenstore somewhere ? */ - if ((chr = xenDaemonParseSxprChar(conn, tmp, NULL)) == NULL) + if ((chr = xenDaemonParseSxprChar(tmp, NULL)) == NULL) goto error; if (VIR_REALLOC_N(def->parallels, def->nparallels+1) < 0) { virDomainChrDefFree(chr); @@ -2586,7 +2570,7 @@ xenDaemonParseSxpr(virConnectPtr conn, } } else { /* Fake a paravirt console, since that's not in the sexpr */ - if (!(def->console = xenDaemonParseSxprChar(conn, "pty", tty))) + if (!(def->console = xenDaemonParseSxprChar("pty", tty))) goto error; def->console->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_CONSOLE; } @@ -2597,7 +2581,7 @@ xenDaemonParseSxpr(virConnectPtr conn, if (hvm && (tmp = sexpr_node(root, "domain/image/hvm/soundhw")) != NULL && *tmp) { - if (xenDaemonParseSxprSound(conn, def, tmp) < 0) + if (xenDaemonParseSxprSound(def, tmp) < 0) goto error; } @@ -2749,8 +2733,7 @@ sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info) * Returns 0 in case of success, -1 in case of error */ static int -sexpr_to_xend_topology(virConnectPtr conn, - const struct sexpr *root, +sexpr_to_xend_topology(const struct sexpr *root, virCapsPtr caps) { const char *nodeToCpu; @@ -2815,7 +2798,7 @@ sexpr_to_xend_topology(virConnectPtr conn, return (0); parse_error: - virXendError(conn, VIR_ERR_XEN_CALL, "%s", _("topology syntax error")); + virXendError(VIR_ERR_XEN_CALL, "%s", _("topology syntax error")); error: VIR_FREE(cpuNums); VIR_FREE(cpuset); @@ -2878,7 +2861,7 @@ sexpr_to_domain(virConnectPtr conn, const struct sexpr *root) return (ret); error: - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse Xend domain information")); if (ret != NULL) virUnrefDomain(ret); @@ -2922,7 +2905,7 @@ xenDaemonOpen(virConnectPtr conn, if (conn->uri->scheme == NULL) { /* It should be a file access */ if (conn->uri->path == NULL) { - virXendError(NULL, VIR_ERR_NO_CONNECT, __FUNCTION__); + virXendError(VIR_ERR_NO_CONNECT, __FUNCTION__); goto failed; } if (xenDaemonOpen_unix(conn, conn->uri->path) < 0 || @@ -2956,7 +2939,7 @@ xenDaemonOpen(virConnectPtr conn, xend_detect_config_version(conn) == -1) goto failed; } else { - virXendError(NULL, VIR_ERR_NO_CONNECT, __FUNCTION__); + virXendError(VIR_ERR_NO_CONNECT, __FUNCTION__); goto failed; } @@ -2998,13 +2981,12 @@ int xenDaemonDomainSuspend(virDomainPtr domain) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3025,13 +3007,12 @@ int xenDaemonDomainResume(virDomainPtr domain) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3053,13 +3034,12 @@ int xenDaemonDomainShutdown(virDomainPtr domain) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3082,13 +3062,12 @@ int xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3113,13 +3092,12 @@ int xenDaemonDomainDestroy(virDomainPtr domain) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3144,8 +3122,7 @@ xenDaemonDomainGetOSType(virDomainPtr domain) xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } @@ -3191,13 +3168,12 @@ xenDaemonDomainSave(virDomainPtr domain, const char *filename) { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (filename == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3228,13 +3204,12 @@ xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename, { if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (filename == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } if (domain->id < 0) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXendError(VIR_ERR_OPERATION_INVALID, _("Domain %s isn't running."), domain->name); return(-1); } @@ -3262,7 +3237,7 @@ xenDaemonDomainRestore(virConnectPtr conn, const char *filename) { if ((conn == NULL) || (filename == NULL)) { /* this should be caught at the interface but ... */ - virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } return xend_op(conn, "", "op", "restore", "file", filename, NULL); @@ -3285,8 +3260,7 @@ xenDaemonDomainGetMaxMemory(virDomainPtr domain) xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -3325,8 +3299,7 @@ xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -3363,8 +3336,7 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory) xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -3395,7 +3367,7 @@ xenDaemonDomainFetch(virConnectPtr conn, else root = sexpr_get(conn, "/xend/domain/%d?detail=1", domid); if (root == NULL) { - virXendError (conn, VIR_ERR_XEN_CALL, + virXendError(VIR_ERR_XEN_CALL, "%s", _("xenDaemonDomainFetch failed to" " find this domain")); return (NULL); @@ -3436,8 +3408,7 @@ xenDaemonDomainDumpXML(virDomainPtr domain, int flags, const char *cpus) char *xml; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; @@ -3480,8 +3451,7 @@ xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (info == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -3518,7 +3488,7 @@ xenDaemonLookupByName(virConnectPtr conn, const char *domname) virDomainPtr ret = NULL; if ((conn == NULL) || (domname == NULL)) { - virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } @@ -3549,11 +3519,11 @@ xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) { struct sexpr *root; if (!VIR_IS_CONNECT(conn)) { - virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virXendError(VIR_ERR_INVALID_CONN, __FUNCTION__); return (-1); } if (info == NULL) { - virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -3582,12 +3552,12 @@ xenDaemonNodeGetTopology(virConnectPtr conn, struct sexpr *root; if (!VIR_IS_CONNECT(conn)) { - virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virXendError(VIR_ERR_INVALID_CONN, __FUNCTION__); return (-1); } if (caps == NULL) { - virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -3596,7 +3566,7 @@ xenDaemonNodeGetTopology(virConnectPtr conn, return (-1); } - ret = sexpr_to_xend_topology(conn, root, caps); + ret = sexpr_to_xend_topology(root, caps); sexpr_free(root); return (ret); } @@ -3620,11 +3590,11 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer) unsigned long version; if (!VIR_IS_CONNECT(conn)) { - virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virXendError(VIR_ERR_INVALID_CONN, __FUNCTION__); return (-1); } if (hvVer == NULL) { - virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } root = sexpr_get(conn, "/xend/node/"); @@ -3770,8 +3740,7 @@ xenDaemonDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (vcpus < 1)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -3811,8 +3780,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (cpumap == NULL) || (maplen < 1) || (maplen > (int)sizeof(cpumap_t))) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -3871,13 +3839,11 @@ xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (info == NULL) || (maxinfo < 1)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } if (cpumaps != NULL && maplen < 1) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -4102,8 +4068,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, char class[8], ref[80]; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; } @@ -4112,14 +4077,14 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (domain->id < 0) { /* If xendConfigVersion < 3 only live config can be changed */ if (priv->xendConfigVersion < 3) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; } /* Cannot modify live config if domain is inactive */ if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot modify live config if domain is inactive")); return -1; } @@ -4128,7 +4093,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (priv->xendConfigVersion < 3 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT || flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; @@ -4138,7 +4103,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, */ if (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend only supports modifying both live and " "persistent config")); return -1; @@ -4178,19 +4143,18 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, case VIR_DOMAIN_DEVICE_HOSTDEV: if (dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { - if (xenDaemonFormatSxprOnePCI(domain->conn, - dev->data.hostdev, + if (xenDaemonFormatSxprOnePCI(dev->data.hostdev, &buf, 0) < 0) goto cleanup; } else { - virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); goto cleanup; } break; default: - virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); goto cleanup; } @@ -4239,8 +4203,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, char class[8], ref[80]; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; } @@ -4249,14 +4212,14 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, if (domain->id < 0) { /* If xendConfigVersion < 3 only live config can be changed */ if (priv->xendConfigVersion < 3) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; } /* Cannot modify live config if domain is inactive */ if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot modify live config if domain is inactive")); return -1; } @@ -4265,7 +4228,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, if (priv->xendConfigVersion < 3 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT || flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; @@ -4275,7 +4238,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, */ if (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend only supports modifying both live and " "persistent config")); return -1; @@ -4304,7 +4267,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, break; default: - virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); goto cleanup; } @@ -4312,7 +4275,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, sexpr = virBufferContentAndReset(&buf); if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; } else { @@ -4351,8 +4314,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, virBuffer buf = VIR_BUFFER_INITIALIZER; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -4361,14 +4323,14 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, if (domain->id < 0) { /* If xendConfigVersion < 3 only live config can be changed */ if (priv->xendConfigVersion < 3) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; } /* Cannot modify live config if domain is inactive */ if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot modify live config if domain is inactive")); return -1; } @@ -4377,7 +4339,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, if (priv->xendConfigVersion < 3 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT || flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); return -1; @@ -4387,7 +4349,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, */ if (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) { - virXendError(domain->conn, VIR_ERR_OPERATION_INVALID, "%s", + virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend only supports modifying both live and " "persistent config")); return -1; @@ -4410,12 +4372,11 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { if (dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { - if (xenDaemonFormatSxprOnePCI(domain->conn, - dev->data.hostdev, + if (xenDaemonFormatSxprOnePCI(dev->data.hostdev, &buf, 1) < 0) goto cleanup; } else { - virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); goto cleanup; } @@ -4446,8 +4407,7 @@ xenDaemonDomainGetAutostart(virDomainPtr domain, xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } @@ -4460,7 +4420,7 @@ xenDaemonDomainGetAutostart(virDomainPtr domain, root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); if (root == NULL) { - virXendError (domain->conn, VIR_ERR_XEN_CALL, + virXendError(VIR_ERR_XEN_CALL, "%s", _("xenDaemonGetAutostart failed to find this domain")); return (-1); } @@ -4486,8 +4446,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INTERNAL_ERROR, - __FUNCTION__); + virXendError(VIR_ERR_INTERNAL_ERROR, __FUNCTION__); return (-1); } @@ -4500,7 +4459,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); if (root == NULL) { - virXendError (domain->conn, VIR_ERR_XEN_CALL, + virXendError(VIR_ERR_XEN_CALL, "%s", _("xenDaemonSetAutostart failed to find this domain")); return (-1); } @@ -4510,7 +4469,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, const char *val = (autonode->u.s.car->kind == SEXPR_VALUE ? autonode->u.s.car->u.value : NULL); if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected value from on_xend_start")); goto error; } @@ -4525,17 +4484,17 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, } if (sexpr2string(root, buf, sizeof(buf)) == 0) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("sexpr2string failed")); goto error; } if (xend_op(domain->conn, "", "op", "new", "config", buf, NULL) != 0) { - virXendError(domain->conn, VIR_ERR_XEN_CALL, + virXendError(VIR_ERR_XEN_CALL, "%s", _("Failed to redefine sexpr")); goto error; } } else { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("on_xend_start not present in sexpr")); goto error; } @@ -4579,7 +4538,6 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, unsigned long bandwidth) { /* Upper layers have already checked domain. */ - virConnectPtr conn = domain->conn; /* NB: Passing port=0 to xend means it ignores * the port. However this is somewhat specific to * the internals of the xend Python code. (XXX). @@ -4593,7 +4551,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, /* Xen doesn't support renaming domains during migration. */ if (dname) { - virXendError (conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("xenDaemonDomainMigrate: Xen does not support" " renaming domains during migration")); return -1; @@ -4603,7 +4561,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, * ignores it. */ if (bandwidth) { - virXendError (conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("xenDaemonDomainMigrate: Xen does not support" " bandwidth limits during migration")); return -1; @@ -4631,7 +4589,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, * a nice error message. */ if (flags & VIR_MIGRATE_PAUSED) { - virXendError (conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("xenDaemonDomainMigrate: xend cannot migrate paused domains")); return -1; } @@ -4639,7 +4597,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, /* XXX we could easily do tunnelled & peer2peer migration too if we want to. support these... */ if (flags != 0) { - virXendError (conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("xenDaemonDomainMigrate: unsupported flag")); return -1; } @@ -4652,19 +4610,19 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, if (strstr (uri, "//")) { /* Full URI. */ xmlURIPtr uriptr = xmlParseURI (uri); if (!uriptr) { - virXendError (conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: invalid URI")); return -1; } if (uriptr->scheme && STRCASENEQ (uriptr->scheme, "xenmigr")) { - virXendError (conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: only xenmigr://" " migrations are supported by Xen")); xmlFreeURI (uriptr); return -1; } if (!uriptr->server) { - virXendError (conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: a hostname must be" " specified in the URI")); xmlFreeURI (uriptr); @@ -4684,7 +4642,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, int port_nr, n; if (virStrToLong_i(p+1, NULL, 10, &port_nr) < 0) { - virXendError (conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: invalid port number")); return -1; } @@ -4749,13 +4707,13 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { if (!(def = virDomainDefParseString(priv->caps, xmlDesc, VIR_DOMAIN_XML_INACTIVE))) { - virXendError(conn, VIR_ERR_XML_ERROR, + virXendError(VIR_ERR_XML_ERROR, "%s", _("failed to parse domain description")); return (NULL); } if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) { - virXendError(conn, VIR_ERR_XML_ERROR, + virXendError(VIR_ERR_XML_ERROR, "%s", _("failed to build sexpr")); goto error; } @@ -4765,7 +4723,7 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { ret = xend_op(conn, "", "op", "new", "config", sexpr, NULL); VIR_FREE(sexpr); if (ret != 0) { - virXendError(conn, VIR_ERR_XEN_CALL, + virXendError(VIR_ERR_XEN_CALL, _("Failed to create inactive domain %s\n"), def->name); goto error; } @@ -4788,8 +4746,7 @@ int xenDaemonDomainCreate(virDomainPtr domain) virDomainPtr tmp; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -4816,8 +4773,7 @@ int xenDaemonDomainUndefine(virDomainPtr domain) xenUnifiedPrivatePtr priv; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } @@ -4937,15 +4893,14 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (nparams == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return NULL; } /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->xendConfigVersion < 4) { - virXendError (domain->conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported in xendConfigVersion < 4")); return NULL; } @@ -4957,7 +4912,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) /* get xen_scheduler from xend/node */ ret = sexpr_node(root, "node/xen_scheduler"); if (ret == NULL){ - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("node information incomplete, missing scheduler name")); goto error; } @@ -4976,7 +4931,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) } *nparams = XEN_SCHED_SEDF_NPARAM; } else { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); goto error; } @@ -5013,15 +4968,14 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (params == NULL) || (nparams == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->xendConfigVersion < 4) { - virXendError (domain->conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); } @@ -5034,7 +4988,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, /* get the scheduler type */ sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam); if (sched_type == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get a scheduler name")); goto error; } @@ -5047,18 +5001,18 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, case XEN_SCHED_CRED_NPARAM: /* get cpu_weight/cpu_cap from xend/domain */ if (sexpr_node(root, "domain/cpu_weight") == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing cpu_weight")); goto error; } if (sexpr_node(root, "domain/cpu_cap") == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing cpu_cap")); goto error; } if (virStrcpyStatic(params[0].field, str_weight) == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("Weight %s too big for destination"), str_weight); goto error; @@ -5067,7 +5021,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, params[0].value.ui = sexpr_int(root, "domain/cpu_weight"); if (virStrcpyStatic(params[1].field, str_cap) == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("Cap %s too big for destination"), str_cap); goto error; } @@ -5077,7 +5031,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, ret = 0; break; default: - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); goto error; } @@ -5110,15 +5064,14 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) || (params == NULL)) { - virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, - __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); return (-1); } /* Support only xendConfigVersion >=4 and active domains */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->xendConfigVersion < 4) { - virXendError (domain->conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); } @@ -5131,7 +5084,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, /* get the scheduler type */ sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam); if (sched_type == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get a scheduler name")); goto error; } @@ -5158,7 +5111,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { snprintf(buf_cap, sizeof(buf_cap), "%u", params[i].value.ui); } else { - virXendError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } } @@ -5167,7 +5120,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, if (strlen(buf_weight) == 0) { weight = sexpr_node(root, "domain/cpu_weight"); if (weight == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing cpu_weight")); goto error; } @@ -5176,7 +5129,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, if (strlen(buf_cap) == 0) { cap = sexpr_node(root, "domain/cpu_cap"); if (cap == NULL) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing cpu_cap")); goto error; } @@ -5189,7 +5142,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, break; } default: - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unknown scheduler")); goto error; } @@ -5234,13 +5187,13 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, domain->name); else { /* This call always fails for dom0. */ - virXendError (domain->conn, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("domainBlockPeek is not supported for dom0")); return -1; } if (!root) { - virXendError (domain->conn, VIR_ERR_XEN_CALL, __FUNCTION__); + virXendError(VIR_ERR_XEN_CALL, __FUNCTION__); return -1; } @@ -5255,7 +5208,7 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, } } if (!found) { - virXendError (domain->conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, _("%s: invalid path"), path); goto cleanup; } @@ -5352,13 +5305,12 @@ struct xenUnifiedDriver xenDaemonDriver = { * Returns 0 in case of success, -1 in case of error */ static int -xenDaemonFormatSxprGraphicsNew(virConnectPtr conn, - virDomainGraphicsDefPtr def, +xenDaemonFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, virBufferPtr buf) { if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL && def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected graphics type %d"), def->type); return -1; @@ -5397,14 +5349,13 @@ xenDaemonFormatSxprGraphicsNew(virConnectPtr conn, static int -xenDaemonFormatSxprGraphicsOld(virConnectPtr conn, - virDomainGraphicsDefPtr def, +xenDaemonFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf, int xendConfigVersion) { if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL && def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected graphics type %d"), def->type); return -1; @@ -5440,14 +5391,13 @@ xenDaemonFormatSxprGraphicsOld(virConnectPtr conn, } int -xenDaemonFormatSxprChr(virConnectPtr conn, - virDomainChrDefPtr def, +xenDaemonFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf) { const char *type = virDomainChrTypeToString(def->type); if (!type) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected chr device type")); return -1; } @@ -5530,7 +5480,7 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED, if (hvm && def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { if (isAttach) { - virXendError(conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, _("Cannot directly attach floppy %s"), def->src); return -1; } @@ -5542,7 +5492,7 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED, def->device == VIR_DOMAIN_DISK_DEVICE_CDROM && xendConfigVersion == 1) { if (isAttach) { - virXendError(conn, VIR_ERR_INVALID_ARG, + virXendError(VIR_ERR_INVALID_ARG, _("Cannot directly attach CDROM %s"), def->src); return -1; } @@ -5597,7 +5547,7 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED, else virBufferVSprintf(buf, "(uname 'phy:/dev/%s')", def->src); } else { - virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, + virXendError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported disk type %s"), virDomainDiskTypeToString(def->type)); return -1; @@ -5647,7 +5597,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn, if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && def->type != VIR_DOMAIN_NET_TYPE_NETWORK && def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unsupported network type %d"), def->type); return -1; } @@ -5680,7 +5630,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn, char *bridge; if (!network) { - virXendError(conn, VIR_ERR_NO_NETWORK, "%s", + virXendError(VIR_ERR_NO_NETWORK, "%s", def->data.network.name); return -1; } @@ -5688,7 +5638,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn, bridge = virNetworkGetBridgeName(network); virNetworkFree(network); if (!bridge) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("network %s is not active"), def->data.network.name); return -1; @@ -5761,13 +5711,12 @@ xenDaemonFormatSxprPCI(virDomainHostdevDefPtr def, } static int -xenDaemonFormatSxprOnePCI(virConnectPtr conn, - virDomainHostdevDefPtr def, +xenDaemonFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, int detach) { if (def->managed) { - virXendError(conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("managed PCI devices not supported with XenD")); return -1; } @@ -5784,8 +5733,7 @@ xenDaemonFormatSxprOnePCI(virConnectPtr conn, } static int -xenDaemonFormatSxprAllPCI(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) { int hasPCI = 0; @@ -5818,7 +5766,7 @@ xenDaemonFormatSxprAllPCI(virConnectPtr conn, if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { if (def->hostdevs[i]->managed) { - virXendError(conn, VIR_ERR_NO_SUPPORT, "%s", + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("managed PCI devices not supported with XenD")); return -1; } @@ -5832,8 +5780,7 @@ xenDaemonFormatSxprAllPCI(virConnectPtr conn, } int -xenDaemonFormatSxprSound(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) { const char *str; @@ -5841,7 +5788,7 @@ xenDaemonFormatSxprSound(virConnectPtr conn, for (i = 0 ; i < def->nsounds ; i++) { if (!(str = virDomainSoundModelTypeToString(def->sounds[i]->model))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected sound model %d"), def->sounds[i]->model); return -1; @@ -5859,8 +5806,7 @@ xenDaemonFormatSxprSound(virConnectPtr conn, static int -xenDaemonFormatSxprInput(virConnectPtr conn, - virDomainInputDefPtr input, +xenDaemonFormatSxprInput(virDomainInputDefPtr input, virBufferPtr buf) { if (input->bus != VIR_DOMAIN_INPUT_BUS_USB) @@ -5868,7 +5814,7 @@ xenDaemonFormatSxprInput(virConnectPtr conn, if (input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE && input->type != VIR_DOMAIN_INPUT_TYPE_TABLET) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected input type %d"), input->type); return -1; } @@ -5933,21 +5879,21 @@ xenDaemonFormatSxpr(virConnectPtr conn, } if (!(tmp = virDomainLifecycleTypeToString(def->onPoweroff))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onPoweroff); goto error; } virBufferVSprintf(&buf, "(on_poweroff '%s')", tmp); if (!(tmp = virDomainLifecycleTypeToString(def->onReboot))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onReboot); goto error; } virBufferVSprintf(&buf, "(on_reboot '%s')", tmp); if (!(tmp = virDomainLifecycleTypeToString(def->onCrash))) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onCrash); goto error; } @@ -5956,14 +5902,14 @@ xenDaemonFormatSxpr(virConnectPtr conn, /* Set localtime here for current XenD (both PV & HVM) */ if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { - virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, + virXendError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("configurable timezones are not supported")); goto error; } virBufferAddLit(&buf, "(localtime 1)"); } else if (def->clock.offset != VIR_DOMAIN_CLOCK_OFFSET_UTC) { - virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, + virXendError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported clock offset '%s'"), virDomainClockOffsetTypeToString(def->clock.offset)); goto error; @@ -5980,7 +5926,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if (hvm && def->os.loader == NULL) { - virXendError(conn, VIR_ERR_INTERNAL_ERROR, + virXendError(VIR_ERR_INTERNAL_ERROR, "%s",_("no HVM domain loader")); goto error; } @@ -6064,12 +6010,12 @@ xenDaemonFormatSxpr(virConnectPtr conn, virBufferAddLit(&buf, "(usb 1)"); for (i = 0 ; i < def->ninputs ; i++) - if (xenDaemonFormatSxprInput(conn, def->inputs[i], &buf) < 0) + if (xenDaemonFormatSxprInput(def->inputs[i], &buf) < 0) goto error; if (def->parallels) { virBufferAddLit(&buf, "(parallel "); - if (xenDaemonFormatSxprChr(conn, def->parallels[0], &buf) < 0) + if (xenDaemonFormatSxprChr(def->parallels[0], &buf) < 0) goto error; virBufferAddLit(&buf, ")"); } else { @@ -6077,7 +6023,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, } if (def->serials) { virBufferAddLit(&buf, "(serial "); - if (xenDaemonFormatSxprChr(conn, def->serials[0], &buf) < 0) + if (xenDaemonFormatSxprChr(def->serials[0], &buf) < 0) goto error; virBufferAddLit(&buf, ")"); } else { @@ -6090,7 +6036,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if (def->sounds) { virBufferAddLit(&buf, "(soundhw '"); - if (xenDaemonFormatSxprSound(conn, def, &buf) < 0) + if (xenDaemonFormatSxprSound(def, &buf) < 0) goto error; virBufferAddLit(&buf, "')"); } @@ -6105,7 +6051,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) || (hvm && xendConfigVersion < 4)) { if ((def->ngraphics == 1) && - xenDaemonFormatSxprGraphicsOld(conn, def->graphics[0], + xenDaemonFormatSxprGraphicsOld(def->graphics[0], &buf, xendConfigVersion) < 0) goto error; } @@ -6123,7 +6069,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, &buf, hvm, xendConfigVersion, 0) < 0) goto error; - if (xenDaemonFormatSxprAllPCI(conn, def, &buf) < 0) + if (xenDaemonFormatSxprAllPCI(def, &buf) < 0) goto error; /* New style PV graphics config xen >= 3.0.4, @@ -6131,7 +6077,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) || (xendConfigVersion >= 4 && hvm)) { if ((def->ngraphics == 1) && - xenDaemonFormatSxprGraphicsNew(conn, def->graphics[0], &buf) < 0) + xenDaemonFormatSxprGraphicsNew(def->graphics[0], &buf) < 0) goto error; } @@ -6246,7 +6192,7 @@ virDomainXMLDevID(virDomainPtr domain, if (tmp == NULL) return -1; } else { - virXendError(NULL, VIR_ERR_NO_SUPPORT, + virXendError(VIR_ERR_NO_SUPPORT, "%s", _("hotplug of device type not supported")); return -1; } diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h index 028a293..25a5421 100644 --- a/src/xen/xend_internal.h +++ b/src/xen/xend_internal.h @@ -96,12 +96,11 @@ xenDaemonDomainFetch(virConnectPtr xend, const char *name, const char *cpus); - int xend_parse_sexp_desc_char(virConnectPtr conn, - virBufferPtr buf, - const char *devtype, - int portNum, - const char *value, - const char *tty); +int xend_parse_sexp_desc_char(virBufferPtr buf, + const char *devtype, + int portNum, + const char *value, + const char *tty); virDomainDefPtr xenDaemonParseSxprString(virConnectPtr conn, @@ -109,21 +108,18 @@ xenDaemonParseSxprString(virConnectPtr conn, int xendConfigVersion); int -xenDaemonParseSxprSound(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonParseSxprSound(virDomainDefPtr def, const char *str); + virDomainChrDefPtr -xenDaemonParseSxprChar(virConnectPtr conn, - const char *value, +xenDaemonParseSxprChar(const char *value, const char *tty); int -xenDaemonFormatSxprChr(virConnectPtr conn, - virDomainChrDefPtr def, +xenDaemonFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf); int -xenDaemonFormatSxprSound(virConnectPtr conn, - virDomainDefPtr def, +xenDaemonFormatSxprSound(virDomainDefPtr def, virBufferPtr buf); char * diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 0d42b01..b4a8117 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1415,7 +1415,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (xenXMConfigGetString(conn, conf, "parallel", &str, NULL) < 0) goto cleanup; if (str && STRNEQ(str, "none") && - !(chr = xenDaemonParseSxprChar(conn, str, NULL))) + !(chr = xenDaemonParseSxprChar(str, NULL))) goto cleanup; if (chr) { @@ -1432,7 +1432,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (xenXMConfigGetString(conn, conf, "serial", &str, NULL) < 0) goto cleanup; if (str && STRNEQ(str, "none") && - !(chr = xenDaemonParseSxprChar(conn, str, NULL))) + !(chr = xenDaemonParseSxprChar(str, NULL))) goto cleanup; if (chr) { @@ -1445,7 +1445,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { def->nserials++; } } else { - if (!(def->console = xenDaemonParseSxprChar(conn, "pty", NULL))) + if (!(def->console = xenDaemonParseSxprChar("pty", NULL))) goto cleanup; def->console->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_CONSOLE; } @@ -1455,7 +1455,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { goto cleanup; if (str && - xenDaemonParseSxprSound(conn, def, str) < 0) + xenDaemonParseSxprSound(def, str) < 0) goto cleanup; } @@ -2572,7 +2572,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, char *str; int ret; - ret = xenDaemonFormatSxprChr(conn, def->parallels[0], &buf); + ret = xenDaemonFormatSxprChr(def->parallels[0], &buf); str = virBufferContentAndReset(&buf); if (ret == 0) ret = xenXMConfigSetString(conf, "parallel", str); @@ -2589,7 +2589,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, char *str; int ret; - ret = xenDaemonFormatSxprChr(conn, def->serials[0], &buf); + ret = xenDaemonFormatSxprChr(def->serials[0], &buf); str = virBufferContentAndReset(&buf); if (ret == 0) ret = xenXMConfigSetString(conf, "serial", str); @@ -2605,9 +2605,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, if (def->sounds) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *str = NULL; - int ret = xenDaemonFormatSxprSound(conn, - def, - &buf); + int ret = xenDaemonFormatSxprSound(def, &buf); str = virBufferContentAndReset(&buf); if (ret == 0) ret = xenXMConfigSetString(conf, "soundhw", str); -- 1.6.3.3

--- src/xen/xen_hypervisor.c | 160 +++++++++++++++++++++++----------------------- 1 files changed, 79 insertions(+), 81 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 4a8769f..ae17c60 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -804,16 +804,15 @@ struct xenUnifiedDriver xenHypervisorDriver = { }; #endif /* !PROXY */ -#define virXenError(conn, code, ...) \ +#define virXenError(code, ...) \ if (in_init == 0) \ - virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__, \ + virReportErrorHelper(NULL, VIR_FROM_XEN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifndef PROXY /** * virXenErrorFunc: - * @conn: connection, if known * @error: the error number * @func: the function failing * @info: extra information string @@ -822,8 +821,7 @@ struct xenUnifiedDriver xenHypervisorDriver = { * Handle an error at the xend daemon interface */ static void -virXenErrorFunc(virConnectPtr conn, - virErrorNumber error, const char *func, const char *info, +virXenErrorFunc(virErrorNumber error, const char *func, const char *info, int value) { char fullinfo[1000]; @@ -837,11 +835,11 @@ virXenErrorFunc(virConnectPtr conn, if (func != NULL) { snprintf(fullinfo, 999, "%s: %s", func, info); fullinfo[999] = 0; - virRaiseError(conn, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, + virRaiseError(NULL, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, errmsg, fullinfo, NULL, value, 0, errmsg, fullinfo, value); } else { - virRaiseError(conn, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, + virRaiseError(NULL, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, errmsg, info, NULL, value, 0, errmsg, info, value); } @@ -871,18 +869,18 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op) hc.arg[0] = (unsigned long) op; if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d", + virXenError(VIR_ERR_XEN_CALL, " ioctl %d", xen_ioctl_hypercall_cmd); } if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " releasing"); + virXenError(VIR_ERR_XEN_CALL, " releasing"); ret = -1; } @@ -913,18 +911,18 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op) hc.arg[0] = (unsigned long) op; if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d", + virXenError(VIR_ERR_XEN_CALL, " ioctl %d", xen_ioctl_hypercall_cmd); } if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " releasing"); + virXenError(VIR_ERR_XEN_CALL, " releasing"); ret = -1; } @@ -956,18 +954,18 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op) hc.arg[0] = (unsigned long) op; if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " sys ioctl %d", + virXenError(VIR_ERR_XEN_CALL, " sys ioctl %d", xen_ioctl_hypercall_cmd); } if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " releasing"); + virXenError(VIR_ERR_XEN_CALL, " releasing"); ret = -1; } @@ -999,18 +997,18 @@ xenHypervisorDoV2Dom(int handle, xen_op_v2_dom* op) hc.arg[0] = (unsigned long) op; if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %d", + virXenError(VIR_ERR_XEN_CALL, " ioctl %d", xen_ioctl_hypercall_cmd); } if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " releasing"); + virXenError(VIR_ERR_XEN_CALL, " releasing"); ret = -1; } @@ -1039,7 +1037,7 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, if (lock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } if (hypervisor_version > 1) { @@ -1094,7 +1092,7 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, } if (unlock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " release"); + virXenError(VIR_ERR_XEN_CALL, " release"); ret = -1; } return(ret); @@ -1132,19 +1130,19 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) xenUnifiedPrivatePtr priv; if (domain->conn == NULL) { - virXenErrorFunc(NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "domain or conn is NULL", 0); return NULL; } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->handle < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "priv->handle invalid", 0); return NULL; } if (domain->id < 0) { - virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXenError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); return NULL; } @@ -1155,7 +1153,7 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) * TODO: check on Xen 3.0.3 */ if (dom_interface_version < 5) { - virXenErrorFunc(domain->conn, VIR_ERR_NO_XEN, __FUNCTION__, + virXenErrorFunc(VIR_ERR_NO_XEN, __FUNCTION__, "unsupported in dom interface < 5", 0); return NULL; } @@ -1216,19 +1214,19 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, xenUnifiedPrivatePtr priv; if (domain->conn == NULL) { - virXenErrorFunc(NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "domain or conn is NULL", 0); return -1; } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->handle < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "priv->handle invalid", 0); return -1; } if (domain->id < 0) { - virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXenError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); return -1; } @@ -1239,7 +1237,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, * TODO: check on Xen 3.0.3 */ if (dom_interface_version < 5) { - virXenErrorFunc(domain->conn, VIR_ERR_NO_XEN, __FUNCTION__, + virXenErrorFunc(VIR_ERR_NO_XEN, __FUNCTION__, "unsupported in dom interface < 5", 0); return -1; } @@ -1273,16 +1271,16 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, return(-1); if (virStrcpyStatic(params[0].field, str_weight) == NULL) { - virXenError (domain->conn, VIR_ERR_INTERNAL_ERROR, - "Weight %s too big for destination", str_weight); + virXenError(VIR_ERR_INTERNAL_ERROR, + "Weight %s too big for destination", str_weight); return -1; } params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].value.ui = op_dom.u.getschedinfo.u.credit.weight; if (virStrcpyStatic(params[1].field, str_cap) == NULL) { - virXenError (domain->conn, VIR_ERR_INTERNAL_ERROR, - "Cap %s too big for destination", str_cap); + virXenError(VIR_ERR_INTERNAL_ERROR, + "Cap %s too big for destination", str_cap); return -1; } params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT; @@ -1291,7 +1289,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, *nparams = 2; break; default: - virXenErrorFunc(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, "Unknown scheduler", op_sys.u.getschedulerid.sched_id); return -1; } @@ -1319,25 +1317,25 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, char buf[256]; if (domain->conn == NULL) { - virXenErrorFunc (NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "domain or conn is NULL", 0); + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "domain or conn is NULL", 0); return -1; } if ((nparams == 0) || (params == NULL)) { - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "Noparameters given", 0); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "Noparameters given", 0); return(-1); } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->handle < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "priv->handle invalid", 0); return -1; } if (domain->id < 0) { - virXenError(domain->conn, VIR_ERR_OPERATION_INVALID, + virXenError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); return -1; } @@ -1348,7 +1346,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, * TODO: check on Xen 3.0.3 */ if (dom_interface_version < 5) { - virXenErrorFunc(domain->conn, VIR_ERR_NO_XEN, __FUNCTION__, + virXenErrorFunc(VIR_ERR_NO_XEN, __FUNCTION__, "unsupported in dom interface < 5", 0); return -1; } @@ -1389,7 +1387,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, val = params[i].value.ui; if ((val < 1) || (val > USHRT_MAX)) { snprintf(buf, sizeof(buf), _("Credit scheduler weight parameter (%d) is out of range (1-65535)"), val); - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, buf, val); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, buf, val); return(-1); } op_dom.u.getschedinfo.u.credit.weight = val; @@ -1398,14 +1396,14 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, val = params[i].value.ui; if (val > USHRT_MAX) { snprintf(buf, sizeof(buf), _("Credit scheduler cap parameter (%d) is out of range (0-65535)"), val); - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, buf, val); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, buf, val); return(-1); } op_dom.u.getschedinfo.u.credit.cap = val; } else { - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "Credit scheduler accepts 'cap' and 'weight' integer parameters", - 0); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "Credit scheduler accepts 'cap' and 'weight' integer parameters", + 0); return(-1); } } @@ -1416,7 +1414,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, break; } default: - virXenErrorFunc(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, "Unknown scheduler", op_sys.u.getschedulerid.sched_id); return -1; } @@ -1442,9 +1440,9 @@ xenHypervisorDomainBlockStats (virDomainPtr dom, xenUnifiedUnlock(priv); return ret; # else - virXenErrorFunc (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__, - "block statistics not supported on this platform", - dom->id); + virXenErrorFunc(VIR_ERR_NO_SUPPORT, __FUNCTION__, + "block statistics not supported on this platform", + dom->id); return -1; # endif } @@ -1468,20 +1466,20 @@ xenHypervisorDomainInterfaceStats (virDomainPtr dom, * domain. */ if (sscanf (path, "vif%d.%d", &rqdomid, &device) != 2) { - virXenErrorFunc (dom->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid path, should be vif<domid>.<n>.", 0); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "invalid path, should be vif<domid>.<n>.", 0); return -1; } if (rqdomid != dom->id) { - virXenErrorFunc (dom->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid path, vif<domid> should match this domain ID", 0); + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "invalid path, vif<domid> should match this domain ID", 0); return -1; } return linuxDomainInterfaceStats(path, stats); # else - virXenErrorFunc (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__, - "/proc/net/dev: Interface not found", 0); + virXenErrorFunc(VIR_ERR_NO_SUPPORT, __FUNCTION__, + "/proc/net/dev: Interface not found", 0); return -1; # endif } @@ -1717,7 +1715,7 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, xen_op_v2_dom op; if (lock_pages(cpumap, maplen) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } memset(&op, 0, sizeof(op)); @@ -1752,7 +1750,7 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, VIR_FREE(new); if (unlock_pages(cpumap, maplen) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " release"); + virXenError(VIR_ERR_XEN_CALL, " release"); ret = -1; } } else { @@ -1849,7 +1847,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, } if ((cpumap != NULL) && (maplen > 0)) { if (lock_pages(cpumap, maplen) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " locking"); + virXenError(VIR_ERR_XEN_CALL, " locking"); return (-1); } memset(cpumap, 0, maplen); @@ -1867,7 +1865,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, } ret = xenHypervisorDoV2Dom(handle, &op); if (unlock_pages(cpumap, maplen) < 0) { - virXenError(NULL, VIR_ERR_XEN_CALL, " release"); + virXenError(VIR_ERR_XEN_CALL, " release"); ret = -1; } } @@ -1963,7 +1961,7 @@ xenHypervisorInit(void) char error[100]; regerror (errcode, &flags_hvm_rec, error, sizeof error); regfree (&flags_hvm_rec); - virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error); + virXenError(VIR_ERR_INTERNAL_ERROR, "%s", error); in_init = 0; return -1; } @@ -1973,7 +1971,7 @@ xenHypervisorInit(void) regerror (errcode, &flags_pae_rec, error, sizeof error); regfree (&flags_pae_rec); regfree (&flags_hvm_rec); - virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error); + virXenError(VIR_ERR_INTERNAL_ERROR, "%s", error); in_init = 0; return -1; } @@ -1984,7 +1982,7 @@ xenHypervisorInit(void) regfree (&xen_cap_rec); regfree (&flags_pae_rec); regfree (&flags_hvm_rec); - virXenError (NULL, VIR_ERR_INTERNAL_ERROR, "%s", error); + virXenError(VIR_ERR_INTERNAL_ERROR, "%s", error); in_init = 0; return -1; } @@ -2038,7 +2036,7 @@ xenHypervisorInit(void) */ hypervisor_version = -1; - virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", + virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", (unsigned long) IOCTL_PRIVCMD_HYPERCALL); close(fd); in_init = 0; @@ -2124,7 +2122,7 @@ xenHypervisorInit(void) DEBUG0("Failed to find any Xen hypervisor method"); hypervisor_version = -1; - virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", + virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", (unsigned long)IOCTL_PRIVCMD_HYPERCALL); close(fd); in_init = 0; @@ -2164,7 +2162,7 @@ xenHypervisorOpen(virConnectPtr conn, ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR); if (ret < 0) { - virXenError(conn, VIR_ERR_NO_XEN, "%s", XEN_HYPERVISOR_SOCKET); + virXenError(VIR_ERR_NO_XEN, "%s", XEN_HYPERVISOR_SOCKET); return (-1); } @@ -2830,7 +2828,7 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) priv = (xenUnifiedPrivatePtr) dom->conn->privateData; if (priv->handle < 0) { - virXenErrorFunc(dom->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("domain shut off or invalid"), 0); return (NULL); } @@ -2838,7 +2836,7 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) /* HV's earlier than 3.1.0 don't include the HVM flags in guests status*/ if (hypervisor_version < 2 || dom_interface_version < 4) { - virXenErrorFunc(dom->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("unsupported in dom interface < 4"), 0); return (NULL); } @@ -2846,13 +2844,13 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) XEN_GETDOMAININFO_CLEAR(dominfo); if (virXen_getdomaininfo(priv->handle, dom->id, &dominfo) < 0) { - virXenErrorFunc(dom->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("cannot get domain details"), 0); return (NULL); } if (XEN_GETDOMAININFO_DOMAIN(dominfo) != dom->id) { - virXenErrorFunc(dom->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("cannot get domain details"), 0); return (NULL); } @@ -3218,7 +3216,7 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *free xenUnifiedPrivatePtr priv; if (conn == NULL) { - virXenErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid argument", 0); return -1; } @@ -3226,13 +3224,13 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *free priv = conn->privateData; if (priv->nbNodeCells < 0) { - virXenErrorFunc (conn, VIR_ERR_XEN_CALL, __FUNCTION__, - "cannot determine actual number of cells",0); + virXenErrorFunc(VIR_ERR_XEN_CALL, __FUNCTION__, + "cannot determine actual number of cells",0); return(-1); } if ((maxCells < 1) || (startCell >= priv->nbNodeCells)) { - virXenErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid argument", 0); return -1; } @@ -3241,13 +3239,13 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *free * Support only sys_interface_version >=4 */ if (sys_interface_version < SYS_IFACE_MIN_VERS_NUMA) { - virXenErrorFunc (conn, VIR_ERR_XEN_CALL, __FUNCTION__, + virXenErrorFunc(VIR_ERR_XEN_CALL, __FUNCTION__, "unsupported in sys interface < 4", 0); return -1; } if (priv->handle < 0) { - virXenErrorFunc (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "priv->handle invalid", 0); return -1; } @@ -3485,12 +3483,12 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, if (priv->handle < 0 || (domain->id < 0) || (info == NULL) || (maxinfo < 1) || (sizeof(cpumap_t) & 7)) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("domain shut off or invalid"), 0); return (-1); } if ((cpumaps != NULL) && (maplen < 1)) { - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid argument", 0); return -1; } @@ -3500,7 +3498,7 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, &dominfo); if ((ret < 0) || (XEN_GETDOMAININFO_DOMAIN(dominfo) != domain->id)) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("cannot get domain details"), 0); return (-1); } @@ -3517,7 +3515,7 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, (unsigned char *)VIR_GET_CPUMAP(cpumaps, maplen, i), maplen); if (ret < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("cannot get VCPUs info"), 0); return(-1); } @@ -3525,7 +3523,7 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, ret = virXen_getvcpusinfo(priv->handle, domain->id, i, ipt, NULL, 0); if (ret < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + virXenErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, _("cannot get VCPUs info"), 0); return(-1); } -- 1.6.3.3

--- src/xen/xen_inotify.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 8ff3256..d24b20f 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -44,7 +44,7 @@ #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY -#define virXenInotifyError(conn, code, ...) \ +#define virXenInotifyError(code, ...) \ virReportErrorHelper(NULL, VIR_FROM_XEN_INOTIFY, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) @@ -129,7 +129,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, uuid_str = filename + strlen(XEND_DOMAINS_DIR) + 1; if (virUUIDParse(uuid_str, rawuuid) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, _("parsing uuid %s"), uuid_str); return -1; } @@ -154,7 +154,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, return 0; } } - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("finding dom on config list")); return -1; } @@ -205,7 +205,7 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn, int i; if (virUUIDParse(uuidstr, uuid) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, _("parsing uuid %s"), uuidstr); return -1; } @@ -241,14 +241,14 @@ xenInotifyXendDomainsDirAddEntry(virConnectPtr conn, xenUnifiedPrivatePtr priv = conn->privateData; if (xenInotifyDomainLookup(conn, fname, &name, uuid) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error looking up domain")); return -1; } if (xenUnifiedAddDomainInfo(priv->configInfoList, -1, name, uuid) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config cache")); VIR_FREE(name); return -1; @@ -294,7 +294,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED, if( conn && conn->privateData ) { priv = conn->privateData; } else { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("conn, or private data is NULL")); return; } @@ -337,18 +337,18 @@ reread: if (event) xenUnifiedDomainEventDispatch(conn->privateData, event); else - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("looking up dom")); if (xenInotifyRemoveDomainConfigInfo(conn, fname) < 0 ) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config cache")); goto cleanup; } } else if (e->mask & ( IN_CREATE | IN_CLOSE_WRITE | IN_MOVED_TO) ) { virDomainEventPtr event; if (xenInotifyAddDomainConfigInfo(conn, fname) < 0 ) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config cache")); goto cleanup; } @@ -360,7 +360,7 @@ reread: if (event) xenUnifiedDomainEventDispatch(conn->privateData, event); else - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("looking up dom")); } @@ -423,7 +423,7 @@ xenInotifyOpen(virConnectPtr conn, strcat(path, ent->d_name); if (xenInotifyAddDomainConfigInfo(conn, path) < 0 ) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, + virXenInotifyError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config list")); closedir(dh); return -1; -- 1.6.3.3

--- src/nodeinfo.c | 47 +++++++++++++++++++++++------------------------ tests/nodeinfotest.c | 4 ++-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 4858e71..402a6b7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -51,8 +51,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE -#define nodeReportError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ +#define nodeReportError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifdef __linux__ @@ -60,7 +60,7 @@ # define CPU_SYS_PATH "/sys/devices/system/cpu" /* NB, this is not static as we need to call it from the testsuite */ -int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, +int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo); static unsigned long count_thread_siblings(unsigned int cpu) @@ -133,7 +133,7 @@ static int parse_socket(unsigned int cpu) goto cleanup; } if (virStrToLong_i(socket_str, &tmp, 10, &socket) < 0) { - nodeReportError(NULL, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, _("could not convert '%s' to an integer"), socket_str); goto cleanup; @@ -146,7 +146,7 @@ cleanup: return socket; } -int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, +int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo) { char line[1024]; @@ -178,7 +178,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, while (*buf && c_isspace(*buf)) buf++; if (*buf != ':') { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("parsing cpuinfo processor")); return -1; } @@ -190,7 +190,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("parsing cpuinfo cpu MHz")); return -1; } @@ -205,7 +205,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "parsing cpuinfo cpu cores %c", *buf); return -1; } @@ -217,7 +217,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, } if (!nodeinfo->cpus) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no cpus found")); return -1; } @@ -257,12 +257,12 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, /* there should always be at least one socket and one thread */ if (nodeinfo->sockets == 0) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no sockets found")); return -1; } if (nodeinfo->threads == 0) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no threads found")); return -1; } @@ -272,8 +272,7 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, #endif -int nodeGetInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { +int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { memset(nodeinfo, 0, sizeof(*nodeinfo)); #ifdef HAVE_UNAME @@ -296,7 +295,7 @@ int nodeGetInfo(virConnectPtr conn, _("cannot open %s"), CPUINFO_PATH); return -1; } - ret = linuxNodeInfoCPUPopulate(conn, cpuinfo, nodeinfo); + ret = linuxNodeInfoCPUPopulate(cpuinfo, nodeinfo); fclose(cpuinfo); if (ret < 0) return -1; @@ -308,7 +307,7 @@ int nodeGetInfo(virConnectPtr conn, } #else /* XXX Solaris will need an impl later if they port QEMU driver */ - nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("node info not implemented on this platform")); return -1; #endif @@ -380,7 +379,7 @@ cleanup: int -nodeGetCellsFreeMemory(virConnectPtr conn, +nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long *freeMems, int startCell, int maxCells) @@ -390,13 +389,13 @@ nodeGetCellsFreeMemory(virConnectPtr conn, int maxCell; if (numa_available() < 0) { - nodeReportError(conn, VIR_ERR_NO_SUPPORT, + nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA not supported on this host")); goto cleanup; } maxCell = numa_max_node(); if (startCell > maxCell) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, maxCell); goto cleanup; @@ -408,7 +407,7 @@ nodeGetCellsFreeMemory(virConnectPtr conn, for (numCells = 0, n = startCell ; n <= lastCell ; n++) { long long mem; if (numa_node_size64(n, &mem) < 0) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to query NUMA free memory")); goto cleanup; } @@ -421,13 +420,13 @@ cleanup: } unsigned long long -nodeGetFreeMemory(virConnectPtr conn) +nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) { unsigned long long freeMem = 0; int n; if (numa_available() < 0) { - nodeReportError(conn, VIR_ERR_NO_SUPPORT, + nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA not supported on this host")); goto cleanup; } @@ -435,7 +434,7 @@ nodeGetFreeMemory(virConnectPtr conn) for (n = 0 ; n <= numa_max_node() ; n++) { long long mem; if (numa_node_size64(n, &mem) < 0) { - nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to query NUMA free memory")); goto cleanup; } @@ -456,14 +455,14 @@ int nodeGetCellsFreeMemory(virConnectPtr conn, int startCell ATTRIBUTE_UNUSED, int maxCells ATTRIBUTE_UNUSED) { - nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA memory information not available on this platform")); return -1; } unsigned long long nodeGetFreeMemory(virConnectPtr conn) { - nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA memory information not available on this platform")); return 0; } diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index a6b9b7e..768fd4d 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -25,7 +25,7 @@ static char *abs_srcdir; # define MAX_FILE 4096 -extern int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr nodeinfo); +extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo); static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; @@ -40,7 +40,7 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile cpuinfo = fopen(cpuinfofile, "r"); if (!cpuinfo) return -1; - if (linuxNodeInfoCPUPopulate(NULL, cpuinfo, &nodeinfo) < 0) { + if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo) < 0) { fclose(cpuinfo); return -1; } -- 1.6.3.3

--- src/phyp/phyp_driver.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 365fb08..57ab00a 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -63,8 +63,8 @@ #define VIR_FROM_THIS VIR_FROM_PHYP -#define PHYP_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_PHYP, code, __FILE__, __FUNCTION__, \ +#define PHYP_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_PHYP, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) /* @@ -92,13 +92,13 @@ phypOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; if (conn->uri->server == NULL) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing server name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } if (conn->uri->path == NULL) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing managed system name in phyp:// URI")); return VIR_DRV_OPEN_ERROR; } @@ -145,13 +145,13 @@ phypOpen(virConnectPtr conn, *char_ptr = '\0'; if (escape_specialcharacters(conn->uri->path, string, len) == -1) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Error parsing 'path'. Invalid characters.")); goto failure; } if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Error while opening SSH session.")); goto failure; } @@ -273,7 +273,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, } } else { if (auth == NULL || auth->cb == NULL) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, + PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("No authentication callback provided.")); goto err; } @@ -281,7 +281,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, username = virRequestUsername(auth, NULL, conn->uri->server); if (username == NULL) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, "Username request failed"); + PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); goto err; } } @@ -293,7 +293,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, ret = getaddrinfo(hostname, "22", &hints, &ai); if (ret != 0) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, _("Error while getting %s address info"), hostname); goto err; } @@ -310,7 +310,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, cur = cur->ai_next; } - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, _("Failed to connect to %s"), hostname); freeaddrinfo(ai); goto err; @@ -330,7 +330,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, while ((rc = libssh2_session_startup(session, sock)) == LIBSSH2_ERROR_EAGAIN) ; if (rc) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + PHYP_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Failure establishing SSH session.")); goto disconnect; } @@ -353,7 +353,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, || rc == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED || rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) { if (auth == NULL || auth->cb == NULL) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, + PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("No authentication callback provided.")); goto disconnect; } @@ -361,7 +361,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, password = virRequestPassword(auth, username, conn->uri->server); if (password == NULL) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, "Password request failed"); + PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto disconnect; } @@ -371,7 +371,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, LIBSSH2_ERROR_EAGAIN) ; if (rc) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, + PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Authentication failed")); goto disconnect; } else -- 1.6.3.3

--- src/datatypes.c | 101 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 50 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index a361da6..ca20abf 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -31,8 +31,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE -#define virLibConnError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_THIS, code, __FILE__, \ +#define virLibConnError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /************************************************************************ @@ -255,7 +255,7 @@ virUnrefConnect(virConnectPtr conn) { int refs; if ((!VIR_IS_CONNECT(conn))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&conn->lock); @@ -311,7 +311,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { virDomainPtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -340,8 +340,8 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { if (virHashAddEntry(conn->domains, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add domain to connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add domain to connection hash table")); goto error; } conn->refs++; @@ -381,8 +381,8 @@ virReleaseDomain(virDomainPtr domain) { /* TODO search by UUID first as they are better differenciators */ if (virHashRemoveEntry(conn->domains, domain->name, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("domain missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domain missing from connection hash table")); conn = NULL; } @@ -418,7 +418,7 @@ virUnrefDomain(virDomainPtr domain) { int refs; if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&domain->conn->lock); @@ -453,7 +453,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { virNetworkPtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -481,8 +481,8 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { if (virHashAddEntry(conn->networks, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add network to connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add network to connection hash table")); goto error; } conn->refs++; @@ -519,8 +519,8 @@ virReleaseNetwork(virNetworkPtr network) { /* TODO search by UUID first as they are better differenciators */ if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("network missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("network missing from connection hash table")); conn = NULL; } @@ -555,7 +555,7 @@ virUnrefNetwork(virNetworkPtr network) { int refs; if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&network->conn->lock); @@ -592,7 +592,7 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virInterfacePtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } @@ -628,8 +628,9 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) { * interface, and that is unlikely to change. */ virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, -_("Failed to change interface mac address from %s to %s due to differing lengths."), + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Failed to change interface mac address " + "from %s to %s due to differing lengths."), ret->mac, mac); ret = NULL; goto error; @@ -659,8 +660,8 @@ _("Failed to change interface mac address from %s to %s due to differing lengths if (virHashAddEntry(conn->interfaces, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add interface to connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add interface to connection hash table")); goto error; } conn->refs++; @@ -698,8 +699,8 @@ virReleaseInterface(virInterfacePtr iface) { if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) { /* unlock before reporting error because error report grabs lock */ virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("interface missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("interface missing from connection hash table")); /* don't decr the conn refct if we weren't connected to it */ conn = NULL; } @@ -736,7 +737,7 @@ virUnrefInterface(virInterfacePtr iface) { int refs; if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&iface->conn->lock); @@ -772,7 +773,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui virStoragePoolPtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -800,7 +801,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui if (virHashAddEntry(conn->storagePools, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to add storage pool to connection hash table")); goto error; } @@ -839,8 +840,8 @@ virReleaseStoragePool(virStoragePoolPtr pool) { /* TODO search by UUID first as they are better differenciators */ if (virHashRemoveEntry(conn->storagePools, pool->name, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("pool missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("pool missing from connection hash table")); conn = NULL; } @@ -875,7 +876,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) { int refs; if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&pool->conn->lock); @@ -912,7 +913,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c virStorageVolPtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (key == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -938,7 +939,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c } if (virStrcpyStatic(ret->key, key) == NULL) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, _("Volume key %s too large for destination"), key); goto error; } @@ -947,8 +948,8 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c if (virHashAddEntry(conn->storageVols, key, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add storage vol to connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add storage vol to connection hash table")); goto error; } conn->refs++; @@ -987,8 +988,8 @@ virReleaseStorageVol(virStorageVolPtr vol) { /* TODO search by UUID first as they are better differenciators */ if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("vol missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("vol missing from connection hash table")); conn = NULL; } @@ -1024,7 +1025,7 @@ virUnrefStorageVol(virStorageVolPtr vol) { int refs; if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } virMutexLock(&vol->conn->lock); @@ -1060,7 +1061,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) virNodeDevicePtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -1083,7 +1084,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) if (virHashAddEntry(conn->nodeDevices, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to add node dev to conn hash table")); goto error; } @@ -1121,7 +1122,7 @@ virReleaseNodeDevice(virNodeDevicePtr dev) { if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("dev missing from connection hash table")); conn = NULL; } @@ -1192,7 +1193,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn) || uuid == NULL || usageID == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return NULL; } virMutexLock(&conn->lock); @@ -1217,8 +1218,8 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, } if (virHashAddEntry(conn->secrets, uuidstr, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add secret to conn hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add secret to conn hash table")); goto error; } conn->refs++; @@ -1256,8 +1257,8 @@ virReleaseSecret(virSecretPtr secret) { virUUIDFormat(secret->uuid, uuidstr); if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("secret missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("secret missing from connection hash table")); conn = NULL; } @@ -1291,7 +1292,7 @@ virUnrefSecret(virSecretPtr secret) { int refs; if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; } virMutexLock(&secret->conn->lock); @@ -1385,7 +1386,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) virNWFilterPtr ret = NULL; if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } virMutexLock(&conn->lock); @@ -1413,8 +1414,8 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) if (virHashAddEntry(conn->nwfilterPools, name, ret) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add network filter pool to connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to add network filter pool to connection hash table")); goto error; } conn->refs++; @@ -1452,8 +1453,8 @@ virReleaseNWFilterPool(virNWFilterPtr pool) { /* TODO search by UUID first as they are better differenciators */ if (virHashRemoveEntry(conn->nwfilterPools, pool->name, NULL) < 0) { virMutexUnlock(&conn->lock); - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("pool missing from connection hash table")); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("pool missing from connection hash table")); conn = NULL; } @@ -1488,7 +1489,7 @@ virUnrefNWFilter(virNWFilterPtr pool) { int refs; if (!VIR_IS_CONNECTED_NWFILTER(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; } virMutexLock(&pool->conn->lock); -- 1.6.3.3

--- src/esx/esx_device_monitor.c | 4 ++-- src/esx/esx_interface_driver.c | 4 ++-- src/esx/esx_network_driver.c | 4 ++-- src/esx/esx_secret_driver.c | 4 ++-- src/esx/esx_storage_driver.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 1962a11..31724f7 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -38,8 +38,8 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ +#define ESX_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index fef324d..b2fddbe 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -38,8 +38,8 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ +#define ESX_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 49492d1..e65b7eb 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -38,8 +38,8 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ +#define ESX_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index f8e030f..a29b546 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -37,8 +37,8 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ +#define ESX_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index accd001..80ba645 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -38,8 +38,8 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_ERROR(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ +#define ESX_ERROR(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) -- 1.6.3.3

--- src/opennebula/one_conf.c | 7 ++-- src/opennebula/one_conf.h | 6 ++-- src/opennebula/one_driver.c | 66 +++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c index a2f7073..029d475 100644 --- a/src/opennebula/one_conf.c +++ b/src/opennebula/one_conf.c @@ -135,8 +135,7 @@ no_memory: * @return the OpenNebula ID for the new VM or -1 in case of error */ -int oneSubmitVM(virConnectPtr conn, - one_driver_t* driver ATTRIBUTE_UNUSED, +int oneSubmitVM(one_driver_t* driver ATTRIBUTE_UNUSED, virDomainObjPtr vm) { char* templ; @@ -146,8 +145,8 @@ int oneSubmitVM(virConnectPtr conn, return -1; if ((oneid = c_oneAllocateTemplate(templ)) < 0) { - oneError(conn, NULL, VIR_ERR_OPERATION_FAILED, - "%s", _("Error submitting virtual machine to OpenNebula")); + oneError(VIR_ERR_OPERATION_FAILED, "%s", + _("Error submitting virtual machine to OpenNebula")); VIR_FREE(templ); return -1; } diff --git a/src/opennebula/one_conf.h b/src/opennebula/one_conf.h index 0d45bff..c53090c 100644 --- a/src/opennebula/one_conf.h +++ b/src/opennebula/one_conf.h @@ -43,12 +43,12 @@ typedef struct one_driver one_driver_t; virCapsPtr oneCapsInit(void); -int oneSubmitVM(virConnectPtr conn ,one_driver_t* driver, virDomainObjPtr vm); +int oneSubmitVM(one_driver_t* driver, virDomainObjPtr vm); char* xmlOneTemplate(virDomainDefPtr def); -# define oneError(conn, dom, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_ONE, code, __FILE__, \ +# define oneError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_ONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #endif /* ONE_CONF_H */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 91d7459..77d7d00 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -117,7 +117,7 @@ static virDomainPtr oneDomainLookupByID(virConnectPtr conn, oneDriverUnlock(driver); if (!vm) { - oneError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + oneError(VIR_ERR_NO_DOMAIN, NULL); goto return_point; } @@ -145,7 +145,7 @@ static virDomainPtr oneDomainLookupByUUID(virConnectPtr conn, vm = virDomainFindByUUID(&driver->domains, uuid); oneDriverUnlock(driver); if (!vm) { - oneError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + oneError(VIR_ERR_NO_DOMAIN, NULL); goto return_point; } @@ -174,7 +174,7 @@ static virDomainPtr oneDomainLookupByName(virConnectPtr conn, oneDriverUnlock(driver); if (!vm) { - oneError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + oneError(VIR_ERR_NO_DOMAIN, NULL); goto return_point; } @@ -279,14 +279,14 @@ static int oneDomainUndefine(virDomainPtr dom) oneDriverLock(driver); vm =virDomainFindByUUID(&driver->domains, dom->uuid); if (!vm) { - oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, - "%s", _("no domain with matching uuid")); + oneError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); goto return_point; } if (!vm->persistent) { - oneError(dom->conn, dom, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot undefine transient domain")); + oneError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot undefine transient domain")); goto return_point; } virDomainRemoveInactive(&driver->domains, vm); @@ -310,14 +310,14 @@ static int oneDomainGetInfo(virDomainPtr dom, oneDriverUnlock(driver); if (!vm) { - oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, - "%s", _("no domain with matching uuid")); + oneError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); return -1; } if(gettimeofday(&tv,NULL)<0) { - oneError(dom->conn,dom, VIR_ERR_INTERNAL_ERROR, - "%s",_("getting time of day")); + oneError(VIR_ERR_INTERNAL_ERROR, "%s", + _("getting time of day")); virDomainObjUnlock(vm); return -1; } @@ -385,8 +385,8 @@ static char *oneGetOSType(virDomainPtr dom) vm =virDomainFindByUUID(&driver->domains, dom->uuid); oneDriverUnlock(driver); if (!vm) { - oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, - "%s", _("no domain with matching uuid")); + oneError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); goto cleanup; } @@ -412,11 +412,11 @@ static int oneDomainStart(virDomainPtr dom) vm = virDomainFindByName(&driver->domains, dom->name); if (!vm) { - oneError(conn, dom, VIR_ERR_INVALID_DOMAIN, + oneError(VIR_ERR_INVALID_DOMAIN, _("no domain named %s"), dom->name); goto return_point; } - if((oneid = oneSubmitVM(dom->conn,driver,vm)) < 0) { + if((oneid = oneSubmitVM(driver, vm)) < 0) { goto return_point; } vm->pid=oneid; @@ -449,7 +449,7 @@ oneDomainCreateAndStart(virConnectPtr conn, vm = virDomainFindByName(&driver->domains, def->name); if (vm) { - oneError(conn,NULL, VIR_ERR_OPERATION_FAILED, + oneError(VIR_ERR_OPERATION_FAILED, _("Already an OpenNebula VM active with the name: '%s' id: %d "), def->name,def->id); goto return_point; @@ -460,7 +460,7 @@ oneDomainCreateAndStart(virConnectPtr conn, virDomainDefFree(def); goto return_point; } - if ((oneid = oneSubmitVM(conn, driver, vm)) < 0) { + if ((oneid = oneSubmitVM(driver, vm)) < 0) { virDomainRemoveInactive(&driver->domains, vm); vm=NULL; goto return_point; @@ -492,14 +492,14 @@ static int oneDomainShutdown(virDomainPtr dom) oneDriverLock(driver); if (!(vm=virDomainFindByID(&driver->domains, dom->id))) { - oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, + oneError(VIR_ERR_INVALID_DOMAIN, _("no domain with id %d"), dom->id); goto return_point; } if (c_oneShutdown(vm->pid)) { - oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - "%s", _("Wrong state to perform action")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("Wrong state to perform action")); goto return_point; } vm->state=VIR_DOMAIN_SHUTDOWN; @@ -527,15 +527,15 @@ static int oneDomainDestroy(virDomainPtr dom) oneDriverLock(driver); vm= virDomainFindByID(&driver->domains, dom->id); if (!vm) { - oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + oneError(VIR_ERR_INVALID_DOMAIN, _("no domain with id %d"), dom->id); goto return_point; } if(c_oneCancel(vm->pid)) { /* VM not running, delete the instance at ONE DB */ if(c_oneFinalize(vm->pid)){ - oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - "%s", _("Wrong state to perform action")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("Wrong state to perform action")); goto return_point; } } @@ -569,14 +569,14 @@ static int oneDomainSuspend(virDomainPtr dom) ret=0; goto return_point; } - oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - "%s", _("Wrong state to perform action")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("Wrong state to perform action")); goto return_point; } - oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); } else { - oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + oneError(VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); } @@ -602,14 +602,14 @@ static int oneDomainResume(virDomainPtr dom) ret=0; goto return_point; } - oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, - "%s", _("Wrong state to perform action")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("Wrong state to perform action")); goto return_point; } - oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not paused")); + oneError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not paused")); } else { - oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + oneError(VIR_ERR_INVALID_DOMAIN, _("no domain with matching id %d"), dom->id); } -- 1.6.3.3

Also rename ReportError to macvtapError. --- src/qemu/qemu_conf.c | 2 +- src/util/macvtap.c | 63 +++++++++++++++++++++++--------------------------- src/util/macvtap.h | 3 +- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b679b35..f20ee21 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1469,7 +1469,7 @@ qemudPhysIfaceConnect(virConnectPtr conn, net->model && STREQ(net->model, "virtio")) vnet_hdr = 1; - rc = openMacvtapTap(conn, net->ifname, net->mac, linkdev, brmode, + rc = openMacvtapTap(net->ifname, net->mac, linkdev, brmode, &res_ifname, vnet_hdr); if (rc >= 0) { VIR_FREE(net->ifname); diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 999e670..87c2800 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -49,9 +49,9 @@ # define VIR_FROM_THIS VIR_FROM_NET -# define ReportError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_NET, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) +# define macvtapError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) # define MACVTAP_NAME_PREFIX "macvtap" # define MACVTAP_NAME_PATTERN "macvtap%d" @@ -193,7 +193,7 @@ nlAppend(struct nlmsghdr *nlm, int totlen, const void *data, int datalen) static int -getIfIndex(virConnectPtr conn, +getIfIndex(int reportError, const char *ifname, int *idx) { @@ -206,20 +206,20 @@ getIfIndex(virConnectPtr conn, if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), sizeof(ifreq.ifr_name)) == NULL) { - if (conn) - ReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("invalid interface name %s"), - ifname); + if (reportError) + macvtapError(VIR_ERR_INTERNAL_ERROR, + _("invalid interface name %s"), + ifname); rc = EINVAL; goto err_exit; } if (ioctl(fd, SIOCGIFINDEX, &ifreq) >= 0) *idx = ifreq.ifr_ifindex; else { - if (conn) - ReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("interface %s does not exist"), - ifname); + if (reportError) + macvtapError(VIR_ERR_INTERNAL_ERROR, + _("interface %s does not exist"), + ifname); rc = ENODEV; } @@ -296,8 +296,7 @@ ifUp(const char *name, int up) static int -link_add(virConnectPtr conn, - const char *type, +link_add(const char *type, const unsigned char *macaddress, int macaddrsize, const char *ifname, const char *srcdev, @@ -315,7 +314,7 @@ link_add(virConnectPtr conn, char *recvbuf = NULL; int recvbuflen; - if (getIfIndex(conn, srcdev, &ifindex) != 0) + if (getIfIndex(1, srcdev, &ifindex) != 0) return -1; *retry = 0; @@ -434,14 +433,14 @@ link_add(virConnectPtr conn, return rc; malformed_resp: - ReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed netlink response message")); + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); VIR_FREE(recvbuf); return -1; buffer_too_small: - ReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("internal buffer is too small")); + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("internal buffer is too small")); return -1; } @@ -512,21 +511,20 @@ link_del(const char *name) return rc; malformed_resp: - ReportError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed netlink response message")); + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); VIR_FREE(recvbuf); return -1; buffer_too_small: - ReportError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("internal buffer is too small")); + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("internal buffer is too small")); return -1; } /* Open the macvtap's tap device. - * @conn: Pointer to virConnect object - * @name: Name of the macvtap interface + * @ifname: Name of the macvtap interface * @retries : Number of retries in case udev for example may need to be * waited for to create the tap chardev * Returns negative value in case of error, the file descriptor otherwise. @@ -677,7 +675,6 @@ configMacvtapTap(int tapfd, int vnet_hdr) * openMacvtapTap: * Create an instance of a macvtap device and open its tap character * device. - * @conn: Pointer to virConnect object * @tgifname: Interface name that the macvtap is supposed to have. May * be NULL if this function is supposed to choose a name * @macaddress: The MAC address for the macvtap device @@ -689,13 +686,11 @@ configMacvtapTap(int tapfd, int vnet_hdr) * to the caller to free the string. * * Returns file descriptor of the tap device in case of success, - * negative value otherwise with error message attached to the 'conn' - * object. + * negative value otherwise with error reported. * */ int -openMacvtapTap(virConnectPtr conn, - const char *tgifname, +openMacvtapTap(const char *tgifname, const unsigned char *macaddress, const char *linkdev, int mode, @@ -713,7 +708,7 @@ openMacvtapTap(virConnectPtr conn, *res_ifname = NULL; if (tgifname) { - if(getIfIndex(NULL, tgifname, &ifindex) == 0) { + if(getIfIndex(0, tgifname, &ifindex) == 0) { if (STRPREFIX(tgifname, MACVTAP_NAME_PREFIX)) { goto create_name; @@ -723,7 +718,7 @@ openMacvtapTap(virConnectPtr conn, return -1; } cr_ifname = tgifname; - rc = link_add(conn, type, macaddress, 6, tgifname, linkdev, + rc = link_add(type, macaddress, 6, tgifname, linkdev, macvtapMode, &do_retry); if (rc) return -1; @@ -732,8 +727,8 @@ create_name: retries = 5; for (c = 0; c < 8192; c++) { snprintf(ifname, sizeof(ifname), MACVTAP_NAME_PATTERN, c); - if (getIfIndex(NULL, ifname, &ifindex) == ENODEV) { - rc = link_add(conn, type, macaddress, 6, ifname, linkdev, + if (getIfIndex(0, ifname, &ifindex) == ENODEV) { + rc = link_add(type, macaddress, 6, ifname, linkdev, macvtapMode, &do_retry); if (rc == 0) break; diff --git a/src/util/macvtap.h b/src/util/macvtap.h index bd5f4d6..5d4ea5e 100644 --- a/src/util/macvtap.h +++ b/src/util/macvtap.h @@ -28,8 +28,7 @@ # include "internal.h" -int openMacvtapTap(virConnectPtr conn, - const char *ifname, +int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev, int mode, -- 1.6.3.3

--- src/libvirt.c | 1577 +++++++++++++++++++++++++-------------------------------- 1 files changed, 697 insertions(+), 880 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index fb683c0..788b943 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -428,38 +428,19 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, } #endif - -/** - * virLibConnError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibConnError(virConnectPtr conn, virErrorNumber error, const char *info) -{ - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - virRaiseError(conn, NULL, NULL, VIR_FROM_NONE, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} +#define virLibConnError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) /** * virLibConnWarning: - * @conn: the connection if available * @error: the error number * @info: extra information string * - * Handle an error at the connection level + * Handle a warning at the connection level */ static void -virLibConnWarning(virConnectPtr conn, virErrorNumber error, const char *info) +virLibConnWarning(virErrorNumber error, const char *info) { const char *errmsg; @@ -467,220 +448,41 @@ virLibConnWarning(virConnectPtr conn, virErrorNumber error, const char *info) return; errmsg = virErrorMsg(error, info); - virRaiseError(conn, NULL, NULL, VIR_FROM_NONE, error, VIR_ERR_WARNING, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -/** - * virLibDomainError: - * @domain: the domain if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibDomainError(virDomainPtr domain, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_DOMAIN) { - conn = domain->conn; - } - virRaiseError(conn, domain, NULL, VIR_FROM_DOM, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -/** - * virLibNetworkError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibNetworkError(virNetworkPtr network, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_NETWORK) { - conn = network->conn; - } - virRaiseError(conn, NULL, network, VIR_FROM_NET, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -/** - * virLibInterfaceError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibInterfaceError(virInterfacePtr iface, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_INTERFACE) { - conn = iface->conn; - } - virRaiseError(conn, NULL, NULL, VIR_FROM_INTERFACE, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -/** - * virLibStoragePoolError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibStoragePoolError(virStoragePoolPtr pool, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_STORAGE_POOL) - conn = pool->conn; - - virRaiseError(conn, NULL, NULL, VIR_FROM_STORAGE, error, VIR_ERR_ERROR, + virRaiseError(NULL, NULL, NULL, VIR_FROM_NONE, error, VIR_ERR_WARNING, errmsg, info, NULL, 0, 0, errmsg, info); } -/** - * virLibStorageVolError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibStorageVolError(virStorageVolPtr vol, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_STORAGE_VOL) - conn = vol->conn; - - virRaiseError(conn, NULL, NULL, VIR_FROM_STORAGE, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -/** - * virLibNodeDeviceError: - * @dev: the device if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the node device level - */ -static void -virLibNodeDeviceError(virNodeDevicePtr dev, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; - - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_NODE_DEVICE) - conn = dev->conn; - - virRaiseError(conn, NULL, NULL, VIR_FROM_NODEDEV, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} - -#define virLibStreamError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ +#define virLibDomainError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_DOM, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) -/** - * virLibSecretError: - * @secret: the secret if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the secret level - */ -static void -virLibSecretError(virSecretPtr secret, virErrorNumber error, const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; - - if (error == VIR_ERR_OK) - return; +#define virLibNetworkError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_SECRET) - conn = secret->conn; +#define virLibInterfaceError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_INTERFACE, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) - virRaiseError(conn, NULL, NULL, VIR_FROM_SECRET, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} +#define virLibStoragePoolError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_STORAGE, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) -/** - * virLibNWFilterError: - * @conn: the connection if available - * @error: the error number - * @info: extra information string - * - * Handle an error at the connection level - */ -static void -virLibNWFilterError(virNWFilterPtr pool, virErrorNumber error, - const char *info) -{ - virConnectPtr conn = NULL; - const char *errmsg; +#define virLibStorageVolError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_STORAGE, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) - if (error == VIR_ERR_OK) - return; +#define virLibNodeDeviceError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NODEDEV, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) - errmsg = virErrorMsg(error, info); - if (error != VIR_ERR_INVALID_NWFILTER) - conn = pool->conn; +#define virLibSecretError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_SECRET, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) - virRaiseError(conn, NULL, NULL, VIR_FROM_NWFILTER, error, VIR_ERR_ERROR, - errmsg, info, NULL, 0, 0, errmsg, info); -} +#define virLibNWFilterError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_NWFILTER, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) /** * virRegisterNetworkDriver: @@ -697,12 +499,12 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virNetworkDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -728,12 +530,12 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virInterfaceDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -759,12 +561,12 @@ virRegisterStorageDriver(virStorageDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virStorageDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -790,12 +592,12 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virDeviceMonitorTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -821,12 +623,12 @@ virRegisterSecretDriver(virSecretDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virSecretDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -852,12 +654,12 @@ virRegisterNWFilterDriver(virNWFilterDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return -1; } if (virNWFilterDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return -1; } @@ -884,19 +686,18 @@ virRegisterDriver(virDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (driver->no < 0) { - virLibConnError - (NULL, VIR_ERR_INVALID_ARG, - "virRegisterDriver: tried to register an internal Xen driver"); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", + _("Tried to register an internal Xen driver")); return -1; } @@ -923,12 +724,12 @@ virRegisterStateDriver(virStateDriverPtr driver) return -1; if (driver == NULL) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } if (virStateDriverTabCount >= MAX_DRIVERS) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); return(-1); } @@ -1107,7 +908,7 @@ virGetVersion(unsigned long *libVer, const char *type, *typeVer = remoteVersion(); # endif if (*typeVer == 0) { - virLibConnError(NULL, VIR_ERR_NO_SUPPORT, type); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", type); goto error; } #endif /* WITH_DRIVER_MODULES */ @@ -1161,8 +962,8 @@ do_open (const char *name, ret->uri = xmlParseURI (name); if (!ret->uri) { - virLibConnError (ret, VIR_ERR_INVALID_ARG, - _("could not parse connection URI")); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", + _("could not parse connection URI")); goto failed; } @@ -1204,7 +1005,7 @@ do_open (const char *name, if (!ret->driver) { /* If we reach here, then all drivers declined the connection. */ - virLibConnError (NULL, VIR_ERR_NO_CONNECT, name); + virLibConnError(VIR_ERR_NO_CONNECT, "%s", name); goto failed; } @@ -1217,8 +1018,8 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virNetworkDriverTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_NETWORK, - "Is the daemon running ?"); + virLibConnWarning(VIR_WAR_NO_NETWORK, + "Is the daemon running ?"); } break; } else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -1236,8 +1037,8 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virInterfaceDriverTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_INTERFACE, - "Is the daemon running ?"); + virLibConnWarning(VIR_WAR_NO_INTERFACE, + "Is the daemon running ?"); } break; } else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -1256,8 +1057,8 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virStorageDriverTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_STORAGE, - "Is the daemon running ?"); + virLibConnWarning(VIR_WAR_NO_STORAGE, + "Is the daemon running ?"); } break; } else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -1276,13 +1077,13 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virDeviceMonitorTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_NODE, - "Is the libvirtd daemon running ?"); + virLibConnWarning(VIR_WAR_NO_NODE, + "Is the libvirtd daemon running ?"); } else { char *msg; if (virAsprintf(&msg, "Is the %s daemon running?", virDeviceMonitorTab[i]->name) > 0) { - virLibConnWarning (NULL, VIR_WAR_NO_NODE, msg); + virLibConnWarning(VIR_WAR_NO_NODE, msg); VIR_FREE(msg); } } @@ -1303,8 +1104,8 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virSecretDriverTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_SECRET, - "Is the daemon running ?"); + virLibConnWarning(VIR_WAR_NO_SECRET, + "Is the daemon running ?"); } break; } else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -1323,8 +1124,8 @@ do_open (const char *name, (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virNWFilterDriverTab[i]->name, "remote")) { - virLibConnWarning (NULL, VIR_WAR_NO_NWFILTER, - _("Is the daemon running ?")); + virLibConnWarning(VIR_WAR_NO_NWFILTER, + _("Is the daemon running ?")); } break; } else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -1474,7 +1275,7 @@ virConnectClose(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); goto error; } @@ -1509,7 +1310,7 @@ int virConnectRef(virConnectPtr conn) { if ((!VIR_IS_CONNECT(conn))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -1533,7 +1334,7 @@ virDrvSupportsFeature (virConnectPtr conn, int feature) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -1566,7 +1367,7 @@ virConnectGetType(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -1599,13 +1400,13 @@ virConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (hvVer == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -1616,7 +1417,7 @@ virConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -1643,13 +1444,13 @@ virConnectGetLibVersion(virConnectPtr conn, unsigned long *libVer) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (libVer == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -1688,7 +1489,7 @@ virConnectGetHostname (virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -1700,7 +1501,7 @@ virConnectGetHostname (virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -1731,7 +1532,7 @@ virConnectGetURI (virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -1768,7 +1569,7 @@ virConnectGetMaxVcpus(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -1780,7 +1581,7 @@ virConnectGetMaxVcpus(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); return -1; @@ -1804,13 +1605,13 @@ virConnectListDomains(virConnectPtr conn, int *ids, int maxids) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if ((ids == NULL) || (maxids < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -1821,7 +1622,8 @@ virConnectListDomains(virConnectPtr conn, int *ids, int maxids) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -1843,7 +1645,7 @@ virConnectNumOfDomains(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -1855,7 +1657,8 @@ virConnectNumOfDomains(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -1883,7 +1686,7 @@ virDomainGetConnect (virDomainPtr dom) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -1914,16 +1717,16 @@ virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -1935,7 +1738,8 @@ virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return NULL; @@ -1980,12 +1784,12 @@ virDomainLookupByID(virConnectPtr conn, int id) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (id < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -1997,7 +1801,7 @@ virDomainLookupByID(virConnectPtr conn, int id) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -2022,12 +1826,12 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuid == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2039,7 +1843,7 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -2065,17 +1869,17 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuidstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2104,12 +1908,12 @@ virDomainLookupByName(virConnectPtr conn, const char *name) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2121,7 +1925,7 @@ virDomainLookupByName(virConnectPtr conn, const char *name) return dom; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -2149,14 +1953,14 @@ virDomainDestroy(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -2168,7 +1972,7 @@ virDomainDestroy(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -2192,7 +1996,7 @@ virDomainFree(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -2224,7 +2028,7 @@ int virDomainRef(virDomainPtr domain) { if ((!VIR_IS_CONNECTED_DOMAIN(domain))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -2257,12 +2061,12 @@ virDomainSuspend(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -2276,7 +2080,7 @@ virDomainSuspend(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2302,12 +2106,12 @@ virDomainResume(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -2321,7 +2125,7 @@ virDomainResume(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2350,17 +2154,17 @@ virDomainSave(virDomainPtr domain, const char *to) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; if (to == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2392,7 +2196,7 @@ virDomainSave(virDomainPtr domain, const char *to) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2417,16 +2221,16 @@ virDomainRestore(virConnectPtr conn, const char *from) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (from == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2439,14 +2243,14 @@ virDomainRestore(virConnectPtr conn, const char *from) t = strlen(from); if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) { - virLibConnError(conn, VIR_ERR_SYSTEM_ERROR, + virLibConnError(VIR_ERR_SYSTEM_ERROR, "%s", _("cannot get working directory")); goto error; } len = strlen(filepath); /* that should be covered by getcwd() semantic, but be 100% sure */ if (len > sizeof(filepath) - (t + 3)) { - virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("path too long")); goto error; } @@ -2463,7 +2267,7 @@ virDomainRestore(virConnectPtr conn, const char *from) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -2492,17 +2296,17 @@ virDomainCoreDump(virDomainPtr domain, const char *to, int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; if (to == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2515,14 +2319,14 @@ virDomainCoreDump(virDomainPtr domain, const char *to, int flags) t = strlen(to); if (getcwd(filepath, sizeof(filepath) - (t + 3)) == NULL) { - virLibDomainError(domain, VIR_ERR_SYSTEM_ERROR, + virLibDomainError(VIR_ERR_SYSTEM_ERROR, "%s", _("cannot get current directory")); goto error; } len = strlen(filepath); /* that should be covered by getcwd() semantic, but be 100% sure */ if (len > sizeof(filepath) - (t + 3)) { - virLibDomainError(domain, VIR_ERR_INTERNAL_ERROR, + virLibDomainError(VIR_ERR_INTERNAL_ERROR, "%s", _("path too long")); goto error; } @@ -2540,7 +2344,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2569,12 +2373,12 @@ virDomainShutdown(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -2588,7 +2392,7 @@ virDomainShutdown(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2615,12 +2419,12 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -2634,7 +2438,7 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2658,7 +2462,7 @@ virDomainGetName(virDomainPtr domain) virResetLastError(); if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -2682,12 +2486,12 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid) virResetLastError(); if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (uuid == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(domain->conn); return (-1); } @@ -2716,12 +2520,12 @@ virDomainGetUUIDString(virDomainPtr domain, char *buf) virResetLastError(); if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (buf == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2752,7 +2556,7 @@ virDomainGetID(virDomainPtr domain) virResetLastError(); if (!VIR_IS_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return ((unsigned int) -1); } @@ -2777,7 +2581,7 @@ virDomainGetOSType(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -2792,7 +2596,7 @@ virDomainGetOSType(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2818,7 +2622,7 @@ virDomainGetMaxMemory(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (0); } @@ -2833,7 +2637,7 @@ virDomainGetMaxMemory(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2864,16 +2668,16 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (memory < 4096) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -2886,7 +2690,7 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2917,16 +2721,16 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (memory < 4096) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2940,7 +2744,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -2967,12 +2771,12 @@ virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (info == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -2988,7 +2792,7 @@ virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -3015,7 +2819,7 @@ virDomainGetXMLDesc(virDomainPtr domain, int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -3023,7 +2827,7 @@ virDomainGetXMLDesc(virDomainPtr domain, int flags) conn = domain->conn; if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainGetXMLDesc with secure flag")); goto error; } @@ -3038,7 +2842,7 @@ virDomainGetXMLDesc(virDomainPtr domain, int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -3069,13 +2873,13 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (nativeFormat == NULL || nativeConfig == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -3090,7 +2894,7 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -3121,13 +2925,13 @@ char *virConnectDomainXMLToNative(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (nativeFormat == NULL || domainXml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -3142,7 +2946,7 @@ char *virConnectDomainXMLToNative(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -3186,7 +2990,7 @@ virDomainMigrateVersion1 (virDomainPtr domain, goto done; if (uri == NULL && uri_out == NULL) { - virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare did not set uri")); goto done; } @@ -3252,7 +3056,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, * and pass it to Prepare2. */ if (!domain->conn->driver->domainDumpXML) { - virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", __FUNCTION__); virDispatchError(domain->conn); return NULL; } @@ -3275,7 +3079,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, goto done; if (uri == NULL && uri_out == NULL) { - virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); virDispatchError(domain->conn); goto done; @@ -3329,7 +3133,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, unsigned long bandwidth) { if (!domain->conn->driver->domainMigratePerform) { - virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); virDispatchError(domain->conn); return -1; } @@ -3365,7 +3169,7 @@ virDomainMigrateDirect (virDomainPtr domain, unsigned long bandwidth) { if (!domain->conn->driver->domainMigratePerform) { - virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); virDispatchError(domain->conn); return -1; } @@ -3464,23 +3268,23 @@ virDomainMigrate (virDomainPtr domain, /* First checkout the source */ if (!VIR_IS_CONNECTED_DOMAIN (domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } /* Now checkout the destination */ if (!VIR_IS_CONNECT(dconn)) { - virLibConnError(domain->conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); goto error; } if (dconn->flags & VIR_CONNECT_RO) { /* NB, deliberately report error against source object, not dest */ - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3503,13 +3307,14 @@ virDomainMigrate (virDomainPtr domain, ddomain = virDomainLookupByName (dconn, dname ? dname : domain->name); } else { /* This driver does not support peer to peer migration */ - virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); goto error; } } else { if (flags & VIR_MIGRATE_TUNNELLED) { - virLibConnError(domain->conn, VIR_ERR_OPERATION_INVALID, - _("cannot perform tunnelled migration without using peer2peer flag")); + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot perform tunnelled migration without " + "using peer2peer flag")); goto error; } @@ -3526,7 +3331,7 @@ virDomainMigrate (virDomainPtr domain, ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); else { /* This driver does not support any migration method */ - virLibConnError(domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); goto error; } } @@ -3613,17 +3418,17 @@ virDomainMigrateToURI (virDomainPtr domain, /* First checkout the source */ if (!VIR_IS_CONNECTED_DOMAIN (domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (duri == NULL) { - virLibConnError (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -3634,7 +3439,7 @@ virDomainMigrateToURI (virDomainPtr domain, goto error; } else { /* No peer to peer migration supported */ - virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); goto error; } } else { @@ -3644,7 +3449,7 @@ virDomainMigrateToURI (virDomainPtr domain, goto error; } else { /* Cannot do a migration with only the perform step */ - virLibConnError (domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); goto error; } } @@ -3678,13 +3483,13 @@ virDomainMigratePrepare (virConnectPtr dconn, virResetLastError(); if (!VIR_IS_CONNECT (dconn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (dconn->flags & VIR_CONNECT_RO) { - virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3698,7 +3503,7 @@ virDomainMigratePrepare (virConnectPtr dconn, return ret; } - virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dconn); @@ -3726,14 +3531,14 @@ virDomainMigratePerform (virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (domain)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = domain->conn; if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3747,7 +3552,7 @@ virDomainMigratePerform (virDomainPtr domain, return ret; } - virLibDomainError (domain, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -3773,13 +3578,13 @@ virDomainMigrateFinish (virConnectPtr dconn, virResetLastError(); if (!VIR_IS_CONNECT (dconn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (dconn->flags & VIR_CONNECT_RO) { - virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3793,7 +3598,7 @@ virDomainMigrateFinish (virConnectPtr dconn, return ret; } - virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dconn); @@ -3824,13 +3629,13 @@ virDomainMigratePrepare2 (virConnectPtr dconn, virResetLastError(); if (!VIR_IS_CONNECT (dconn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (dconn->flags & VIR_CONNECT_RO) { - virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3845,7 +3650,7 @@ virDomainMigratePrepare2 (virConnectPtr dconn, return ret; } - virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dconn); @@ -3872,13 +3677,13 @@ virDomainMigrateFinish2 (virConnectPtr dconn, virResetLastError(); if (!VIR_IS_CONNECT (dconn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (dconn->flags & VIR_CONNECT_RO) { - virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -3893,7 +3698,7 @@ virDomainMigrateFinish2 (virConnectPtr dconn, return ret; } - virLibConnError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dconn); @@ -3921,18 +3726,18 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (conn != st->conn) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -3945,7 +3750,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, return rv; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -3970,12 +3775,12 @@ virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (info == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -3987,7 +3792,7 @@ virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4012,7 +3817,7 @@ virConnectGetCapabilities (virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT (conn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -4025,7 +3830,7 @@ virConnectGetCapabilities (virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4050,7 +3855,7 @@ virNodeGetFreeMemory(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT (conn)) { - virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return 0; } @@ -4063,7 +3868,7 @@ virNodeGetFreeMemory(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4089,7 +3894,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -4102,7 +3907,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) return schedtype; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4134,7 +3939,7 @@ virDomainGetSchedulerParameters(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -4148,7 +3953,7 @@ virDomainGetSchedulerParameters(virDomainPtr domain, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4177,12 +3982,12 @@ virDomainSetSchedulerParameters(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -4195,7 +4000,7 @@ virDomainSetSchedulerParameters(virDomainPtr domain, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4237,12 +4042,12 @@ virDomainBlockStats (virDomainPtr dom, const char *path, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (!path || !stats || size > sizeof stats2) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } conn = dom->conn; @@ -4255,7 +4060,7 @@ virDomainBlockStats (virDomainPtr dom, const char *path, return 0; } - virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dom->conn); @@ -4295,12 +4100,12 @@ virDomainInterfaceStats (virDomainPtr dom, const char *path, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (!path || !stats || size > sizeof stats2) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } conn = dom->conn; @@ -4313,7 +4118,7 @@ virDomainInterfaceStats (virDomainPtr dom, const char *path, return 0; } - virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dom->conn); @@ -4358,15 +4163,15 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, DEBUG("domain=%p, stats=%p, nr_stats=%u", dom, stats, nr_stats); if (flags != 0) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("flags must be zero")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", + _("flags must be zero")); goto error; } virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -4384,7 +4189,7 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, return nr_stats_ret; } - virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dom->conn); @@ -4445,33 +4250,30 @@ virDomainBlockPeek (virDomainPtr dom, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = dom->conn; if (dom->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (!path) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("path is NULL")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", _("path is NULL")); goto error; } if (flags != 0) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("flags must be zero")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", _("flags must be zero")); goto error; } /* Allow size == 0 as an access test. */ if (size > 0 && !buffer) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("buffer is NULL")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", _("buffer is NULL")); goto error; } @@ -4484,7 +4286,7 @@ virDomainBlockPeek (virDomainPtr dom, return ret; } - virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dom->conn); @@ -4536,14 +4338,14 @@ virDomainMemoryPeek (virDomainPtr dom, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { - virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = dom->conn; if (dom->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -4571,15 +4373,16 @@ virDomainMemoryPeek (virDomainPtr dom, */ if (flags != VIR_MEMORY_VIRTUAL && flags != VIR_MEMORY_PHYSICAL) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", + _("flags parameter must be VIR_MEMORY_VIRTUAL or " + "VIR_MEMORY_PHYSICAL")); goto error; } /* Allow size == 0 as an access test. */ if (size > 0 && !buffer) { - virLibDomainError (dom, VIR_ERR_INVALID_ARG, - _("buffer is NULL but size is non-zero")); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", + _("buffer is NULL but size is non-zero")); goto error; } @@ -4592,7 +4395,7 @@ virDomainMemoryPeek (virDomainPtr dom, return ret; } - virLibDomainError (dom, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibDomainError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dom->conn); @@ -4625,16 +4428,16 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) { virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -4646,7 +4449,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) { return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4669,13 +4472,13 @@ virDomainUndefine(virDomainPtr domain) { virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -4687,7 +4490,7 @@ virDomainUndefine(virDomainPtr domain) { return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4710,7 +4513,7 @@ virConnectNumOfDefinedDomains(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -4723,7 +4526,7 @@ virConnectNumOfDefinedDomains(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4749,13 +4552,13 @@ virConnectListDefinedDomains(virConnectPtr conn, char **const names, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -4767,7 +4570,7 @@ virConnectListDefinedDomains(virConnectPtr conn, char **const names, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -4791,13 +4594,13 @@ virDomainCreate(virDomainPtr domain) { virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -4809,7 +4612,7 @@ virDomainCreate(virDomainPtr domain) { return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4837,12 +4640,12 @@ virDomainGetAutostart(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (!autostart) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -4856,7 +4659,7 @@ virDomainGetAutostart(virDomainPtr domain, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4883,7 +4686,7 @@ virDomainSetAutostart(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -4891,7 +4694,7 @@ virDomainSetAutostart(virDomainPtr domain, conn = domain->conn; if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -4903,7 +4706,7 @@ virDomainSetAutostart(virDomainPtr domain, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4935,17 +4738,17 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (nvcpus < 1) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -4958,7 +4761,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -4996,17 +4799,17 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if ((vcpu > 32000) || (cpumap == NULL) || (maplen < 1)) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5020,7 +4823,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5059,12 +4862,12 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((info == NULL) || (maxinfo < 1)) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5072,7 +4875,7 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, try to memcpy anything into a NULL pointer. */ if ((cpumaps == NULL && maplen != 0) || (cpumaps && maplen <= 0)) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5087,7 +4890,7 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5115,7 +4918,7 @@ virDomainGetMaxVcpus(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -5130,7 +4933,7 @@ virDomainGetMaxVcpus(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5154,13 +4957,13 @@ virDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) virConnectPtr conn; if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (seclabel == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5174,7 +4977,7 @@ virDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5196,13 +4999,13 @@ int virNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) { if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (secmodel == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5214,7 +5017,7 @@ virNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5244,12 +5047,12 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -5262,7 +5065,7 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5303,11 +5106,12 @@ virDomainAttachDeviceFlags(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); + virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -5320,7 +5124,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5346,12 +5150,12 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -5364,7 +5168,7 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5401,11 +5205,11 @@ virDomainDetachDeviceFlags(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -5418,7 +5222,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5459,11 +5263,12 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); + virDispatchError(NULL); return (-1); } if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } conn = domain->conn; @@ -5476,7 +5281,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -5511,13 +5316,13 @@ virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((freeMems == NULL) || (maxCells <= 0) || (startCell < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5529,7 +5334,7 @@ virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5558,7 +5363,7 @@ virNetworkGetConnect (virNetworkPtr net) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK (net)) { - virLibNetworkError (NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -5581,7 +5386,7 @@ virConnectNumOfNetworks(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -5594,7 +5399,7 @@ virConnectNumOfNetworks(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5619,13 +5424,13 @@ virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5637,7 +5442,7 @@ virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5660,7 +5465,7 @@ virConnectNumOfDefinedNetworks(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -5673,7 +5478,7 @@ virConnectNumOfDefinedNetworks(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5699,13 +5504,13 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5718,7 +5523,7 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5743,12 +5548,12 @@ virNetworkLookupByName(virConnectPtr conn, const char *name) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5760,7 +5565,7 @@ virNetworkLookupByName(virConnectPtr conn, const char *name) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5785,12 +5590,12 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuid == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5802,7 +5607,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5828,17 +5633,17 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuidstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5867,16 +5672,16 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -5888,7 +5693,7 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5912,16 +5717,16 @@ virNetworkDefineXML(virConnectPtr conn, const char *xml) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -5933,7 +5738,7 @@ virNetworkDefineXML(virConnectPtr conn, const char *xml) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -5956,13 +5761,13 @@ virNetworkUndefine(virNetworkPtr network) { virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibNetworkError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -5974,7 +5779,7 @@ virNetworkUndefine(virNetworkPtr network) { return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -5999,13 +5804,13 @@ virNetworkCreate(virNetworkPtr network) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibNetworkError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6017,7 +5822,7 @@ virNetworkCreate(virNetworkPtr network) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6044,14 +5849,14 @@ virNetworkDestroy(virNetworkPtr network) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = network->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibNetworkError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6063,7 +5868,7 @@ virNetworkDestroy(virNetworkPtr network) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6087,7 +5892,7 @@ virNetworkFree(virNetworkPtr network) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -6119,7 +5924,7 @@ int virNetworkRef(virNetworkPtr network) { if ((!VIR_IS_CONNECTED_NETWORK(network))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -6147,7 +5952,7 @@ virNetworkGetName(virNetworkPtr network) virResetLastError(); if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -6171,12 +5976,12 @@ virNetworkGetUUID(virNetworkPtr network, unsigned char *uuid) virResetLastError(); if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (uuid == NULL) { - virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6208,12 +6013,12 @@ virNetworkGetUUIDString(virNetworkPtr network, char *buf) virResetLastError(); if (!VIR_IS_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (buf == NULL) { - virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6248,12 +6053,12 @@ virNetworkGetXMLDesc(virNetworkPtr network, int flags) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (flags != 0) { - virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6267,7 +6072,7 @@ virNetworkGetXMLDesc(virNetworkPtr network, int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6293,7 +6098,7 @@ virNetworkGetBridgeName(virNetworkPtr network) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -6308,7 +6113,7 @@ virNetworkGetBridgeName(virNetworkPtr network) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6336,12 +6141,12 @@ virNetworkGetAutostart(virNetworkPtr network, virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (!autostart) { - virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6355,7 +6160,7 @@ virNetworkGetAutostart(virNetworkPtr network, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6382,13 +6187,13 @@ virNetworkSetAutostart(virNetworkPtr network, virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibNetworkError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (network->conn->flags & VIR_CONNECT_RO) { - virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibNetworkError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6402,7 +6207,7 @@ virNetworkSetAutostart(virNetworkPtr network, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(network->conn); @@ -6431,7 +6236,7 @@ virInterfaceGetConnect (virInterfacePtr iface) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE (iface)) { - virLibInterfaceError (NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -6454,7 +6259,7 @@ virConnectNumOfInterfaces(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -6467,7 +6272,7 @@ virConnectNumOfInterfaces(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6493,13 +6298,13 @@ virConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6511,7 +6316,7 @@ virConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6534,7 +6339,7 @@ virConnectNumOfDefinedInterfaces(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -6547,7 +6352,7 @@ virConnectNumOfDefinedInterfaces(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6575,13 +6380,13 @@ virConnectListDefinedInterfaces(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6593,7 +6398,7 @@ virConnectListDefinedInterfaces(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6618,12 +6423,12 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6635,7 +6440,7 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6660,12 +6465,12 @@ virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (macstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6677,7 +6482,7 @@ virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6701,7 +6506,7 @@ virInterfaceGetName(virInterfacePtr iface) virResetLastError(); if (!VIR_IS_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -6727,7 +6532,7 @@ virInterfaceGetMACString(virInterfacePtr iface) virResetLastError(); if (!VIR_IS_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -6761,12 +6566,12 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if ((flags & ~VIR_INTERFACE_XML_INACTIVE) != 0) { - virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6780,7 +6585,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(iface->conn); @@ -6805,16 +6610,16 @@ virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -6826,7 +6631,7 @@ virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -6850,13 +6655,13 @@ virInterfaceUndefine(virInterfacePtr iface) { virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6868,7 +6673,7 @@ virInterfaceUndefine(virInterfacePtr iface) { return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(iface->conn); @@ -6893,13 +6698,13 @@ virInterfaceCreate(virInterfacePtr iface, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6911,7 +6716,7 @@ virInterfaceCreate(virInterfacePtr iface, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(iface->conn); @@ -6938,14 +6743,14 @@ virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -6957,7 +6762,7 @@ virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(iface->conn); @@ -6985,7 +6790,7 @@ int virInterfaceRef(virInterfacePtr iface) { if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -7013,7 +6818,7 @@ virInterfaceFree(virInterfacePtr iface) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); + virLibInterfaceError(VIR_ERR_INVALID_INTERFACE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -7047,7 +6852,7 @@ virStoragePoolGetConnect (virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL (pool)) { - virLibStoragePoolError (NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -7070,7 +6875,7 @@ virConnectNumOfStoragePools (virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -7083,7 +6888,7 @@ virConnectNumOfStoragePools (virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7112,13 +6917,13 @@ virConnectListStoragePools (virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7130,7 +6935,7 @@ virConnectListStoragePools (virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7154,7 +6959,7 @@ virConnectNumOfDefinedStoragePools(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -7167,7 +6972,7 @@ virConnectNumOfDefinedStoragePools(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7197,13 +7002,13 @@ virConnectListDefinedStoragePools(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7215,7 +7020,7 @@ virConnectListDefinedStoragePools(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7255,17 +7060,17 @@ virConnectFindStoragePoolSources(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (type == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7277,7 +7082,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7303,12 +7108,12 @@ virStoragePoolLookupByName(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7320,7 +7125,7 @@ virStoragePoolLookupByName(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7346,12 +7151,12 @@ virStoragePoolLookupByUUID(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuid == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7363,7 +7168,7 @@ virStoragePoolLookupByUUID(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7390,17 +7195,17 @@ virStoragePoolLookupByUUIDString(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuidstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7428,7 +7233,7 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -7441,7 +7246,7 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) return ret; } - virLibConnError (vol->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -7470,16 +7275,16 @@ virStoragePoolCreateXML(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7491,7 +7296,7 @@ virStoragePoolCreateXML(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7519,16 +7324,16 @@ virStoragePoolDefineXML(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7540,7 +7345,7 @@ virStoragePoolDefineXML(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -7566,13 +7371,13 @@ virStoragePoolBuild(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7584,7 +7389,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7609,13 +7414,13 @@ virStoragePoolUndefine(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_NETWORK, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7627,7 +7432,7 @@ virStoragePoolUndefine(virStoragePoolPtr pool) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7654,13 +7459,13 @@ virStoragePoolCreate(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7672,7 +7477,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7701,14 +7506,14 @@ virStoragePoolDestroy(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7720,7 +7525,7 @@ virStoragePoolDestroy(virStoragePoolPtr pool) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7748,14 +7553,14 @@ virStoragePoolDelete(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7767,7 +7572,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7792,7 +7597,7 @@ virStoragePoolFree(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -7826,7 +7631,7 @@ int virStoragePoolRef(virStoragePoolPtr pool) { if ((!VIR_IS_CONNECTED_STORAGE_POOL(pool))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -7858,14 +7663,14 @@ virStoragePoolRefresh(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = pool->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -7877,7 +7682,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -7901,7 +7706,7 @@ virStoragePoolGetName(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -7927,12 +7732,12 @@ virStoragePoolGetUUID(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (uuid == NULL) { - virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -7964,12 +7769,12 @@ virStoragePoolGetUUIDString(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (buf == NULL) { - virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8005,12 +7810,12 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (info == NULL) { - virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8026,7 +7831,7 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8055,12 +7860,12 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (flags != 0) { - virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8074,7 +7879,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8102,12 +7907,12 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (!autostart) { - virLibStoragePoolError(pool, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8121,7 +7926,7 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8148,13 +7953,13 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibStoragePoolError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (pool->conn->flags & VIR_CONNECT_RO) { - virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -8168,7 +7973,7 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8192,7 +7997,7 @@ virStoragePoolNumOfVolumes(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -8205,7 +8010,7 @@ virStoragePoolNumOfVolumes(virStoragePoolPtr pool) return ret; } - virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8234,13 +8039,13 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(pool->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8252,7 +8057,7 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, return ret; } - virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8282,7 +8087,7 @@ virStorageVolGetConnect (virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_STORAGE_VOL (vol)) { - virLibStoragePoolError (NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStoragePoolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -8309,12 +8114,12 @@ virStorageVolLookupByName(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(pool->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8326,7 +8131,7 @@ virStorageVolLookupByName(virStoragePoolPtr pool, return ret; } - virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8354,12 +8159,12 @@ virStorageVolLookupByKey(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (key == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8371,7 +8176,7 @@ virStorageVolLookupByKey(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -8397,12 +8202,12 @@ virStorageVolLookupByPath(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (path == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8414,7 +8219,7 @@ virStorageVolLookupByPath(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -8439,7 +8244,7 @@ virStorageVolGetName(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -8465,7 +8270,7 @@ virStorageVolGetKey(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -8495,13 +8300,13 @@ virStorageVolCreateXML(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (pool->conn->flags & VIR_CONNECT_RO) { - virLibConnError(pool->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -8513,7 +8318,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, return ret; } - virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8546,19 +8351,19 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virResetLastError(); if (!VIR_IS_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (!VIR_IS_STORAGE_VOL(clonevol)) { - virLibConnError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); goto error; } if (pool->conn->flags & VIR_CONNECT_RO || clonevol->conn->flags & VIR_CONNECT_RO) { - virLibConnError(pool->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -8572,7 +8377,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, return ret; } - virLibConnError (pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(pool->conn); @@ -8599,14 +8404,14 @@ virStorageVolDelete(virStorageVolPtr vol, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = vol->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStorageVolError(vol, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStorageVolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -8618,7 +8423,7 @@ virStorageVolDelete(virStorageVolPtr vol, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -8645,14 +8450,14 @@ virStorageVolWipe(virStorageVolPtr vol, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = vol->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibStorageVolError(vol, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibStorageVolError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -8665,7 +8470,7 @@ virStorageVolWipe(virStorageVolPtr vol, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -8690,7 +8495,7 @@ virStorageVolFree(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -8723,7 +8528,7 @@ int virStorageVolRef(virStorageVolPtr vol) { if ((!VIR_IS_CONNECTED_STORAGE_VOL(vol))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -8754,12 +8559,12 @@ virStorageVolGetInfo(virStorageVolPtr vol, virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (info == NULL) { - virLibStorageVolError(vol, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8775,7 +8580,7 @@ virStorageVolGetInfo(virStorageVolPtr vol, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -8803,12 +8608,12 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, virResetLastError(); if (!VIR_IS_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (flags != 0) { - virLibStorageVolError(vol, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8822,7 +8627,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -8851,7 +8656,7 @@ virStorageVolGetPath(virStorageVolPtr vol) virResetLastError(); if (!VIR_IS_STORAGE_VOL(vol)) { - virLibStorageVolError(NULL, VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -8866,7 +8671,7 @@ virStorageVolGetPath(virStorageVolPtr vol) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(vol->conn); @@ -8895,12 +8700,12 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (flags != 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8912,7 +8717,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -8947,12 +8752,12 @@ virNodeListDevices(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if ((flags != 0) || (names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -8964,7 +8769,7 @@ virNodeListDevices(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -8988,13 +8793,13 @@ virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9006,7 +8811,7 @@ virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9031,7 +8836,7 @@ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -9044,7 +8849,7 @@ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) return ret; } - virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9065,7 +8870,7 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev) DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -9089,7 +8894,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -9098,7 +8903,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceGetParent) { dev->parent = dev->conn->deviceMonitor->deviceGetParent (dev); } else { - virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); virDispatchError(dev->conn); return NULL; } @@ -9121,7 +8926,7 @@ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -9134,7 +8939,7 @@ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) return ret; } - virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9161,7 +8966,7 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -9174,7 +8979,7 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, return ret; } - virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9198,7 +9003,7 @@ int virNodeDeviceFree(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -9231,7 +9036,7 @@ int virNodeDeviceRef(virNodeDevicePtr dev) { if ((!VIR_IS_CONNECTED_NODE_DEVICE(dev))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -9269,7 +9074,7 @@ virNodeDeviceDettach(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -9282,7 +9087,7 @@ virNodeDeviceDettach(virNodeDevicePtr dev) return ret; } - virLibConnError(dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9312,7 +9117,7 @@ virNodeDeviceReAttach(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -9325,7 +9130,7 @@ virNodeDeviceReAttach(virNodeDevicePtr dev) return ret; } - virLibConnError(dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9357,7 +9162,7 @@ virNodeDeviceReset(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -9370,7 +9175,7 @@ virNodeDeviceReset(virNodeDevicePtr dev) return ret; } - virLibConnError(dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9399,18 +9204,18 @@ virNodeDeviceCreateXML(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9422,7 +9227,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, return dev; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9447,13 +9252,13 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) virResetLastError(); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { - virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); + virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (dev->conn->flags & VIR_CONNECT_RO) { - virLibConnError(dev->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -9467,7 +9272,7 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) return 0; } - virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(dev->conn); @@ -9512,12 +9317,12 @@ virConnectDomainEventRegister(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (cb == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9529,7 +9334,7 @@ virConnectDomainEventRegister(virConnectPtr conn, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); return -1; @@ -9558,12 +9363,12 @@ virConnectDomainEventDeregister(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (cb == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if ((conn->driver) && (conn->driver->domainEventDeregister)) { @@ -9574,7 +9379,7 @@ virConnectDomainEventDeregister(virConnectPtr conn, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); return -1; @@ -9600,7 +9405,7 @@ virSecretGetConnect (virSecretPtr secret) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET (secret)) { - virLibSecretError (NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -9623,7 +9428,7 @@ virConnectNumOfSecrets(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -9638,7 +9443,7 @@ virConnectNumOfSecrets(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9663,12 +9468,12 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (uuids == NULL || maxuuids < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9681,7 +9486,7 @@ virConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9707,12 +9512,12 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuid == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9725,7 +9530,7 @@ virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9752,17 +9557,17 @@ virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuidstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9797,12 +9602,12 @@ virSecretLookupByUsage(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (usageID == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9815,7 +9620,7 @@ virSecretLookupByUsage(virConnectPtr conn, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9846,16 +9651,16 @@ virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (xml == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9868,7 +9673,7 @@ virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -9893,12 +9698,12 @@ virSecretGetUUID(virSecretPtr secret, unsigned char *uuid) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (uuid == NULL) { - virLibSecretError(secret, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(secret->conn); return -1; } @@ -9927,12 +9732,12 @@ virSecretGetUUIDString(virSecretPtr secret, char *buf) virResetLastError(); if (!VIR_IS_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (buf == NULL) { - virLibSecretError(secret, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -9968,7 +9773,7 @@ virSecretGetUsageType(virSecretPtr secret) virResetLastError(); if (!VIR_IS_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -9999,7 +9804,7 @@ virSecretGetUsageID(virSecretPtr secret) virResetLastError(); if (!VIR_IS_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -10027,7 +9832,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } @@ -10042,7 +9847,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -10072,17 +9877,17 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = secret->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibSecretError(secret, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibSecretError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (value == NULL) { - virLibSecretError(secret, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -10095,7 +9900,7 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -10123,17 +9928,17 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } conn = secret->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibSecretError(secret, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibSecretError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } if (value_size == NULL) { - virLibSecretError(secret, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -10148,7 +9953,7 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -10174,13 +9979,13 @@ virSecretUndefine(virSecretPtr secret) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = secret->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibSecretError(secret, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibSecretError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -10193,7 +9998,7 @@ virSecretUndefine(virSecretPtr secret) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -10220,7 +10025,7 @@ int virSecretRef(virSecretPtr secret) { if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -10247,7 +10052,7 @@ virSecretFree(virSecretPtr secret) virResetLastError(); if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibSecretError(NULL, VIR_ERR_INVALID_SECRET, __FUNCTION__); + virLibSecretError(VIR_ERR_INVALID_SECRET, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -10289,7 +10094,7 @@ virStreamNew(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -10317,7 +10122,7 @@ int virStreamRef(virStreamPtr stream) { if ((!VIR_IS_CONNECTED_STREAM(stream))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return(-1); } @@ -10402,7 +10207,7 @@ int virStreamSend(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10418,7 +10223,7 @@ int virStreamSend(virStreamPtr stream, return ret; } - virLibConnError(stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10497,7 +10302,7 @@ int virStreamRecv(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10513,7 +10318,7 @@ int virStreamRecv(virStreamPtr stream, return ret; } - virLibConnError(stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10573,13 +10378,13 @@ int virStreamSendAll(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (stream->flags & VIR_STREAM_NONBLOCK) { - virLibConnError(NULL, VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("data sources cannot be used for non-blocking streams")); goto cleanup; } @@ -10670,13 +10475,13 @@ int virStreamRecvAll(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (stream->flags & VIR_STREAM_NONBLOCK) { - virLibConnError(NULL, VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("data sinks cannot be used for non-blocking streams")); goto cleanup; } @@ -10742,7 +10547,7 @@ int virStreamEventAddCallback(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10756,7 +10561,7 @@ int virStreamEventAddCallback(virStreamPtr stream, return ret; } - virLibConnError(stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10784,7 +10589,7 @@ int virStreamEventUpdateCallback(virStreamPtr stream, virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10798,7 +10603,7 @@ int virStreamEventUpdateCallback(virStreamPtr stream, return ret; } - virLibConnError (stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10820,7 +10625,7 @@ int virStreamEventRemoveCallback(virStreamPtr stream) virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10834,7 +10639,7 @@ int virStreamEventRemoveCallback(virStreamPtr stream) return ret; } - virLibConnError (stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10863,7 +10668,7 @@ int virStreamFinish(virStreamPtr stream) virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10877,7 +10682,7 @@ int virStreamFinish(virStreamPtr stream) return ret; } - virLibConnError (stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10904,7 +10709,7 @@ int virStreamAbort(virStreamPtr stream) virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10918,7 +10723,7 @@ int virStreamAbort(virStreamPtr stream) return ret; } - virLibConnError (stream->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(stream->conn); @@ -10946,7 +10751,7 @@ int virStreamFree(virStreamPtr stream) virResetLastError(); if (!VIR_IS_CONNECTED_STREAM(stream)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10976,7 +10781,7 @@ int virDomainIsActive(virDomainPtr dom) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(dom)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -10988,7 +10793,8 @@ int virDomainIsActive(virDomainPtr dom) return ret; } - virLibConnError(dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(dom->conn); return -1; @@ -11010,7 +10816,7 @@ int virDomainIsPersistent(virDomainPtr dom) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(dom)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11022,7 +10828,8 @@ int virDomainIsPersistent(virDomainPtr dom) return ret; } - virLibConnError(dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(dom->conn); return -1; @@ -11043,7 +10850,7 @@ int virNetworkIsActive(virNetworkPtr net) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(net)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11055,7 +10862,8 @@ int virNetworkIsActive(virNetworkPtr net) return ret; } - virLibConnError(net->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(net->conn); return -1; @@ -11078,7 +10886,7 @@ int virNetworkIsPersistent(virNetworkPtr net) virResetLastError(); if (!VIR_IS_CONNECTED_NETWORK(net)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11090,7 +10898,8 @@ int virNetworkIsPersistent(virNetworkPtr net) return ret; } - virLibConnError(net->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(net->conn); return -1; @@ -11112,7 +10921,7 @@ int virStoragePoolIsActive(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11124,7 +10933,8 @@ int virStoragePoolIsActive(virStoragePoolPtr pool) return ret; } - virLibConnError(pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(pool->conn); return -1; @@ -11147,7 +10957,7 @@ int virStoragePoolIsPersistent(virStoragePoolPtr pool) virResetLastError(); if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11159,7 +10969,8 @@ int virStoragePoolIsPersistent(virStoragePoolPtr pool) return ret; } - virLibConnError(pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(pool->conn); return -1; @@ -11183,7 +10994,7 @@ virConnectNumOfNWFilters(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -11196,7 +11007,7 @@ virConnectNumOfNWFilters(virConnectPtr conn) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11222,13 +11033,13 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if ((names == NULL) || (maxnames < 0)) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11240,7 +11051,7 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11266,12 +11077,12 @@ virNWFilterLookupByName(virConnectPtr conn, const char *name) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (name == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11283,7 +11094,7 @@ virNWFilterLookupByName(virConnectPtr conn, const char *name) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11308,12 +11119,12 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuid == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11325,7 +11136,7 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11351,17 +11162,17 @@ virNWFilterLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (uuidstr == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (virUUIDParse(uuidstr, uuid) < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11389,7 +11200,7 @@ virNWFilterFree(virNWFilterPtr nwfilter) virResetLastError(); if (!VIR_IS_CONNECTED_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -11417,7 +11228,7 @@ virNWFilterGetName(virNWFilterPtr nwfilter) virResetLastError(); if (!VIR_IS_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } @@ -11441,12 +11252,12 @@ virNWFilterGetUUID(virNWFilterPtr nwfilter, unsigned char *uuid) virResetLastError(); if (!VIR_IS_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (uuid == NULL) { - virLibNWFilterError(nwfilter, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11478,12 +11289,12 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) virResetLastError(); if (!VIR_IS_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } if (buf == NULL) { - virLibNWFilterError(nwfilter, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11517,16 +11328,16 @@ virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if (conn->flags & VIR_CONNECT_RO) { - virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -11538,7 +11349,7 @@ virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11565,14 +11376,14 @@ virNWFilterUndefine(virNWFilterPtr nwfilter) virResetLastError(); if (!VIR_IS_CONNECTED_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = nwfilter->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibNWFilterError(nwfilter, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibNWFilterError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -11584,7 +11395,7 @@ virNWFilterUndefine(virNWFilterPtr nwfilter) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(nwfilter->conn); @@ -11612,12 +11423,12 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, int flags) virResetLastError(); if (!VIR_IS_CONNECTED_NWFILTER(nwfilter)) { - virLibNWFilterError(NULL, VIR_ERR_INVALID_NWFILTER, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_NWFILTER, "%s", __FUNCTION__); virDispatchError(NULL); return (NULL); } if (flags != 0) { - virLibNWFilterError(nwfilter, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibNWFilterError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11631,7 +11442,7 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, int flags) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(nwfilter->conn); @@ -11660,7 +11471,7 @@ int virNWFilterRef(virNWFilterPtr nwfilter) { if ((!VIR_IS_CONNECTED_NWFILTER(nwfilter))) { - virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -11687,7 +11498,7 @@ int virInterfaceIsActive(virInterfacePtr iface) virResetLastError(); if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11699,7 +11510,8 @@ int virInterfaceIsActive(virInterfacePtr iface) return ret; } - virLibConnError(iface->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(iface->conn); return -1; @@ -11721,7 +11533,7 @@ int virConnectIsEncrypted(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11733,7 +11545,8 @@ int virConnectIsEncrypted(virConnectPtr conn) return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -11758,7 +11571,7 @@ int virConnectIsSecure(virConnectPtr conn) virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); virDispatchError(NULL); return (-1); } @@ -11770,7 +11583,8 @@ int virConnectIsSecure(virConnectPtr conn) return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -11797,12 +11611,12 @@ virConnectCompareCPU(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return VIR_CPU_COMPARE_ERROR; } if (xmlDesc == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11815,7 +11629,7 @@ virConnectCompareCPU(virConnectPtr conn, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11854,12 +11668,12 @@ virConnectBaselineCPU(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return NULL; } if (xmlCPUs == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11872,7 +11686,7 @@ virConnectBaselineCPU(virConnectPtr conn, return cpu; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11899,12 +11713,12 @@ virDomainGetJobInfo(virDomainPtr domain, virDomainJobInfoPtr info) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (info == NULL) { - virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -11920,7 +11734,7 @@ virDomainGetJobInfo(virDomainPtr domain, virDomainJobInfoPtr info) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(domain->conn); @@ -11948,14 +11762,14 @@ virDomainAbortJob(virDomainPtr domain) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -11967,7 +11781,7 @@ virDomainAbortJob(virDomainPtr domain) return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -11999,14 +11813,14 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -12016,7 +11830,8 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, return 0; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -12067,18 +11882,18 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (dom != NULL && !(VIR_IS_CONNECTED_DOMAIN(dom) && dom->conn == conn)) { - virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(conn); return (-1); } if (eventID < 0 || eventID >= VIR_DOMAIN_EVENT_ID_LAST || cb == NULL) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } @@ -12090,7 +11905,8 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -12115,12 +11931,12 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn, virResetLastError(); if (!VIR_IS_CONNECT(conn)) { - virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", __FUNCTION__); virDispatchError(NULL); return (-1); } if (callbackID < 0) { - virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibConnError(VIR_ERR_INVALID_ARG, "%s", __FUNCTION__); goto error; } if ((conn->driver) && (conn->driver->domainEventDeregisterAny)) { @@ -12131,7 +11947,8 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn, return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + error: virDispatchError(conn); return -1; @@ -12161,14 +11978,14 @@ int virDomainManagedSave(virDomainPtr dom, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(dom)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = dom->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -12181,7 +11998,7 @@ int virDomainManagedSave(virDomainPtr dom, unsigned int flags) return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -12209,7 +12026,7 @@ int virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(dom)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } @@ -12225,7 +12042,7 @@ int virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); @@ -12250,14 +12067,14 @@ int virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN(dom)) { - virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virLibDomainError(VIR_ERR_INVALID_DOMAIN, "%s", __FUNCTION__); virDispatchError(NULL); return -1; } conn = dom->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibDomainError(VIR_ERR_OPERATION_DENIED, "%s", __FUNCTION__); goto error; } @@ -12270,7 +12087,7 @@ int virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) return ret; } - virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); error: virDispatchError(conn); -- 1.6.3.3

And from all related macros and functions. --- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_event.c | 2 +- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.h | 2 +- src/conf/nwfilter_conf.h | 2 +- src/conf/secret_conf.h | 2 +- src/conf/storage_conf.h | 2 +- src/cpu/cpu.h | 2 +- src/datatypes.c | 2 +- src/esx/esx_device_monitor.c | 2 +- src/esx/esx_driver.c | 2 +- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_secret_driver.c | 2 +- src/esx/esx_storage_driver.c | 2 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_methods.c | 2 +- src/esx/esx_vi_types.c | 2 +- src/esx/esx_vmx.c | 2 +- src/interface/netcf_driver.c | 2 +- src/libvirt.c | 20 ++++++------ src/lxc/lxc_conf.h | 2 +- src/network/bridge_driver.c | 2 +- src/nodeinfo.c | 2 +- src/opennebula/one_conf.h | 2 +- src/openvz/openvz_conf.h | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_conf.h | 2 +- src/remote/remote_driver.c | 27 +++++++---------- src/security/security_driver.h | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_conf.h | 2 +- src/util/conf.c | 4 +- src/util/hooks.c | 2 +- src/util/hostusb.c | 2 +- src/util/json.c | 2 +- src/util/macvtap.c | 2 +- src/util/pci.c | 2 +- src/util/stats_linux.c | 2 +- src/util/util.c | 2 +- src/util/virterror.c | 15 +++------ src/util/virterror_internal.h | 22 ++++++-------- src/util/xml.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/xen/block_stats.c | 60 +++++++++++++++++++-------------------- src/xen/block_stats.h | 2 +- src/xen/proxy_internal.c | 6 ++-- src/xen/sexpr.c | 4 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 6 ++-- src/xen/xen_inotify.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- src/xen/xs_internal.c | 2 +- src/xenapi/xenapi_utils.c | 4 +- tests/statstest.c | 2 +- 60 files changed, 126 insertions(+), 142 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c51ac4e..1b5e362 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -32,7 +32,7 @@ #define VIR_FROM_THIS VIR_FROM_CPU #define virCPUReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_CPU, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_CPU, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) VIR_ENUM_IMPL(virCPUMatch, VIR_CPU_MATCH_LAST, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d6ba4f6..0864de3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -271,7 +271,7 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, "smpsafe"); #define virDomainReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_DOMAIN, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_DOMAIN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifndef PROXY diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index fac5e49..615e1af 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -32,7 +32,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE #define eventReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) struct _virDomainMeta { diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 920b090..76bd2af 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -46,7 +46,7 @@ virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDefPtr def, int level); #define virInterfaceReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_INTERFACE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_INTERFACE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) static diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 1f3a44c..2b8bdc5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -54,7 +54,7 @@ VIR_ENUM_IMPL(virNetworkForward, "none", "nat", "route" ) #define virNetworkReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NETWORK, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NETWORK, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjListPtr nets, diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index fe0f2bf..975abb3 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -219,7 +219,7 @@ struct _virDeviceMonitorState { }; # define virNodeDeviceReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NODEDEV, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NODEDEV, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) int virNodeDeviceHasCap(const virNodeDeviceObjPtr dev, const char *cap); diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 6c9dd4e..30d6c50 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -566,7 +566,7 @@ int virNWFilterConfLayerInit(virHashIterator domUpdateCB); void virNWFilterConfLayerShutdown(void); # define virNWFilterReportError(code, fmt...) \ - virReportErrorHelper(NULL, VIR_FROM_NWFILTER, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NWFILTER, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 66294ce..4b47c52 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -27,7 +27,7 @@ # include "util.h" # define virSecretReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_SECRET, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_SECRET, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) VIR_ENUM_DECL(virSecretUsageType) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 1c9ba04..38e4340 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -319,7 +319,7 @@ static inline int virStoragePoolObjIsActive(virStoragePoolObjPtr pool) { } # define virStorageReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_STORAGE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_STORAGE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) int virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 1494a7f..e13dcb3 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -31,7 +31,7 @@ # define virCPUReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_CPU, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_CPU, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) diff --git a/src/datatypes.c b/src/datatypes.c index ca20abf..009bab2 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -32,7 +32,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE #define virLibConnError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /************************************************************************ diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 31724f7..4c013e1 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a5b87df..f83e468 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -49,7 +49,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) static int esxDomainGetMaxVcpus(virDomainPtr domain); diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index b2fddbe..b369f76 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index e65b7eb..4526468 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index a29b546..315858c 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -38,7 +38,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 80ba645..b8d72a9 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index e8fd261..8d0123c 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) /* AI_ADDRCONFIG is missing on some systems. */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5ed1391..54aac4e 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -40,7 +40,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_VI_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) #define ESX_VI__SOAP__REQUEST_HEADER \ diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 87b7910..0313bae 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -34,7 +34,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_VI_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) #define ESX_VI__SOAP__REQUEST_HEADER \ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 500f8f1..e0b20a4 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -39,7 +39,7 @@ #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_VI_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e4512b3..2a56760 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -422,7 +422,7 @@ def->parallels[0]... #define VIR_FROM_THIS VIR_FROM_ESX #define ESX_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 708f1f8..dd36caf 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -34,7 +34,7 @@ #define VIR_FROM_THIS VIR_FROM_INTERFACE #define interfaceReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /* Main driver state */ diff --git a/src/libvirt.c b/src/libvirt.c index 788b943..32da9c4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -429,7 +429,7 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, #endif #define virLibConnError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /** @@ -448,40 +448,40 @@ virLibConnWarning(virErrorNumber error, const char *info) return; errmsg = virErrorMsg(error, info); - virRaiseError(NULL, NULL, NULL, VIR_FROM_NONE, error, VIR_ERR_WARNING, + virRaiseError(VIR_FROM_NONE, error, VIR_ERR_WARNING, errmsg, info, NULL, 0, 0, errmsg, info); } #define virLibDomainError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_DOM, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_DOM, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibNetworkError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NET, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibInterfaceError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_INTERFACE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_INTERFACE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibStoragePoolError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_STORAGE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_STORAGE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibStorageVolError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_STORAGE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_STORAGE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibNodeDeviceError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NODEDEV, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NODEDEV, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibSecretError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_SECRET, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_SECRET, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virLibNWFilterError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NWFILTER, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NWFILTER, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /** diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index e4c2c52..6ac4e7f 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -65,7 +65,7 @@ int lxcLoadDriverConfig(lxc_driver_t *driver); virCapsPtr lxcCapsInit(void); # define lxcError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_LXC, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_LXC, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #endif /* LXC_CONF_H */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4eeaeed..e008135 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -64,7 +64,7 @@ #define VIR_FROM_THIS VIR_FROM_NETWORK #define networkReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NETWORK, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NETWORK, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /* Main driver state */ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 402a6b7..4e1b69f 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -52,7 +52,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE #define nodeReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifdef __linux__ diff --git a/src/opennebula/one_conf.h b/src/opennebula/one_conf.h index c53090c..dc6eeab 100644 --- a/src/opennebula/one_conf.h +++ b/src/opennebula/one_conf.h @@ -48,7 +48,7 @@ int oneSubmitVM(one_driver_t* driver, virDomainObjPtr vm); char* xmlOneTemplate(virDomainDefPtr def); # define oneError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_ONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #endif /* ONE_CONF_H */ diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 50bcb5e..bd36534 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -34,7 +34,7 @@ # include "threads.h" # define openvzError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_OPENVZ, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_OPENVZ, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 57ab00a..bc7a821 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -64,7 +64,7 @@ #define VIR_FROM_THIS VIR_FROM_PHYP #define PHYP_ERROR(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_PHYP, code, __FILE__, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_PHYP, code, __FILE__, __FUNCTION__, \ __LINE__, __VA_ARGS__) /* diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 0b247d6..2315ad1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -168,7 +168,7 @@ typedef qemuDomainPCIAddressSet *qemuDomainPCIAddressSetPtr; # define QEMU_VIRTIO_SERIAL_PREFIX "virtio-serial" # define qemuReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_QEMU, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ea96deb..19a4c03 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -241,7 +241,7 @@ static int remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int #endif /* HAVE_POLKIT */ #define remoteError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_REMOTE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_REMOTE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); @@ -6583,7 +6583,7 @@ static char *addrToString(struct sockaddr_storage *sa, socklen_t salen) host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { - virRaiseError (NULL, NULL, NULL, VIR_FROM_REMOTE, + virRaiseError (VIR_FROM_REMOTE, VIR_ERR_UNKNOWN_HOST, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("Cannot resolve address %d: %s"), @@ -7930,8 +7930,7 @@ remoteStreamHasError(virStreamPtr st) { } VIR_WARN0("Raising async error"); - virRaiseErrorFull(st->conn, - __FILE__, __FUNCTION__, __LINE__, + virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, privst->err.domain, privst->err.code, privst->err.level, @@ -8883,8 +8882,7 @@ processCallDispatch(virConnectPtr conn, struct private_data *priv, break; default: - virRaiseError (in_open ? NULL : conn, - NULL, NULL, VIR_FROM_REMOTE, + virRaiseError (VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("got unexpected RPC call %d from server"), hdr.proc); @@ -8898,8 +8896,9 @@ processCallDispatch(virConnectPtr conn, struct private_data *priv, static int -processCallDispatchReply(virConnectPtr conn, struct private_data *priv, - int in_open, +processCallDispatchReply(virConnectPtr conn ATTRIBUTE_UNUSED, + struct private_data *priv, + int in_open ATTRIBUTE_UNUSED, remote_message_header *hdr, XDR *xdr) { struct remote_thread_call *thecall; @@ -8912,8 +8911,7 @@ processCallDispatchReply(virConnectPtr conn, struct private_data *priv, thecall = thecall->next; if (!thecall) { - virRaiseError (in_open ? NULL : conn, - NULL, NULL, VIR_FROM_REMOTE, + virRaiseError (VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("no call waiting for reply with serial %d"), hdr->serial); @@ -8921,8 +8919,7 @@ processCallDispatchReply(virConnectPtr conn, struct private_data *priv, } if (hdr->proc != thecall->proc_nr) { - virRaiseError (in_open ? NULL : conn, - NULL, NULL, VIR_FROM_REMOTE, + virRaiseError (VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown procedure (received %x, expected %x)"), hdr->proc, thecall->proc_nr); @@ -9479,8 +9476,7 @@ cleanup: * convert missing remote entry points into the unsupported * feature error */ - virRaiseErrorFull(flags & REMOTE_CALL_IN_OPEN ? NULL : conn, - __FILE__, __FUNCTION__, __LINE__, + virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, thiscall->err.domain, VIR_ERR_NO_SUPPORT, thiscall->err.level, @@ -9492,8 +9488,7 @@ cleanup: "%s", *thiscall->err.message); rv = -1; } else { - virRaiseErrorFull(flags & REMOTE_CALL_IN_OPEN ? NULL : conn, - __FILE__, __FUNCTION__, __LINE__, + virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, thiscall->err.domain, thiscall->err.code, thiscall->err.level, diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 3de234a..7fd421a 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -89,7 +89,7 @@ int virSecurityDriverVerify(virDomainDefPtr def); # define virSecurityReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_SECURITY, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_SECURITY, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /* Helpers */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a63005d..2ceff0e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -116,7 +116,7 @@ static const virNodeInfo defaultNodeInfo = { #define testError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_TEST, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_TEST, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) static int testClose(virConnectPtr conn); diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index b33acc8..748c3a8 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -63,7 +63,7 @@ struct uml_driver { # define umlReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_UML, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_UML, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) virCapsPtr umlCapsInit (void); diff --git a/src/util/conf.c b/src/util/conf.c index ae0459e..d985708 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -99,13 +99,13 @@ virConfError(virConfParserCtxtPtr ctxt, /* Construct the string 'filename:line: info' if we have that. */ if (ctxt && ctxt->filename) { - virRaiseError(NULL, NULL, NULL, VIR_FROM_CONF, error, VIR_ERR_ERROR, + virRaiseError(VIR_FROM_CONF, error, VIR_ERR_ERROR, info, ctxt->filename, NULL, ctxt->line, 0, "%s:%d: %s", ctxt->filename, ctxt->line, info); } else { format = virErrorMsg(error, info); - virRaiseError(NULL, NULL, NULL, VIR_FROM_CONF, error, VIR_ERR_ERROR, + virRaiseError(VIR_FROM_CONF, error, VIR_ERR_ERROR, info, NULL, NULL, ctxt ? ctxt->line : 0, 0, format, info); diff --git a/src/util/hooks.c b/src/util/hooks.c index 755679d..a49ece0 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -40,7 +40,7 @@ #define VIR_FROM_THIS VIR_FROM_HOOK #define virHookReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_HOOK, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_HOOK, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define LIBVIRT_HOOK_DIR SYSCONF_DIR "/libvirt/hooks" diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 78b601f..f436605 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -55,7 +55,7 @@ struct _usbDevice { #define VIR_FROM_THIS VIR_FROM_NONE #define usbReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) static int usbSysReadFile(const char *f_name, const char *d_name, diff --git a/src/util/json.c b/src/util/json.c index f90594c..51cc6e5 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -37,7 +37,7 @@ /* XXX fixme */ #define VIR_FROM_THIS VIR_FROM_NONE #define virJSONError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 87c2800..4adb910 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -50,7 +50,7 @@ # define VIR_FROM_THIS VIR_FROM_NET # define macvtapError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NET, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) # define MACVTAP_NAME_PREFIX "macvtap" diff --git a/src/util/pci.c b/src/util/pci.c index e8f985c..db3f344 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -76,7 +76,7 @@ struct _pciDeviceList { #define VIR_FROM_THIS VIR_FROM_NONE #define pciReportError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /* Specifications referenced in comments: diff --git a/src/util/stats_linux.c b/src/util/stats_linux.c index a12eb8c..da9649d 100644 --- a/src/util/stats_linux.c +++ b/src/util/stats_linux.c @@ -29,7 +29,7 @@ # define VIR_FROM_THIS VIR_FROM_STATS_LINUX # define virStatsError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) diff --git a/src/util/util.c b/src/util/util.c index 28a3c7e..cddf699 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -86,7 +86,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE #define virUtilError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_NONE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /* Like read(), but restarts after EINTR */ diff --git a/src/util/virterror.c b/src/util/virterror.c index 2537110..173ef3f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -641,7 +641,6 @@ virDispatchError(virConnectPtr conn) /** * virRaiseErrorFull: - * @conn: the connection to the hypervisor if available * @filename: filename where error was raised * @funcname: function name where error was raised * @linenr: line number where error was raised @@ -660,8 +659,7 @@ virDispatchError(virConnectPtr conn) * immediately if a callback is found and store it for later handling. */ void -virRaiseErrorFull(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, +virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, const char *funcname, size_t linenr, int domain, @@ -1160,7 +1158,6 @@ virErrorMsg(virErrorNumber error, const char *info) /** * virReportErrorHelper: * - * @conn: the connection to the hypervisor if available * @domcode: the virErrorDomain indicating where it's coming from * @errcode: the virErrorNumber code for the error * @filename: Source file error is dispatched from @@ -1172,8 +1169,7 @@ virErrorMsg(virErrorNumber error, const char *info) * Helper function to do most of the grunt work for individual driver * ReportError */ -void virReportErrorHelper(virConnectPtr conn, - int domcode, +void virReportErrorHelper(int domcode, int errcode, const char *filename, const char *funcname, @@ -1193,11 +1189,10 @@ void virReportErrorHelper(virConnectPtr conn, } virerr = virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL)); - virRaiseErrorFull(conn, filename, funcname, linenr, + virRaiseErrorFull(filename, funcname, linenr, domcode, errcode, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); - } /** @@ -1279,7 +1274,7 @@ void virReportSystemErrorFull(int domcode, if (!msgDetail) msgDetail = errnoDetail; - virRaiseErrorFull(NULL, filename, funcname, linenr, + virRaiseErrorFull(filename, funcname, linenr, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, msg, msgDetail, NULL, -1, -1, msg, msgDetail); } @@ -1302,7 +1297,7 @@ void virReportOOMErrorFull(int domcode, const char *virerr; virerr = virErrorMsg(VIR_ERR_NO_MEMORY, NULL); - virRaiseErrorFull(NULL, filename, funcname, linenr, + virRaiseErrorFull(filename, funcname, linenr, domcode, VIR_ERR_NO_MEMORY, VIR_ERR_ERROR, virerr, NULL, NULL, -1, -1, virerr, NULL); } diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h index 601a884..067b83b 100644 --- a/src/util/virterror_internal.h +++ b/src/util/virterror_internal.h @@ -33,8 +33,7 @@ extern void *virUserData; * * ************************************************************************/ int virErrorInitialize(void); -void virRaiseErrorFull(virConnectPtr conn, - const char *filename, +void virRaiseErrorFull(const char *filename, const char *funcname, size_t linenr, int domain, @@ -46,22 +45,19 @@ void virRaiseErrorFull(virConnectPtr conn, int int1, int int2, const char *fmt, ...) - ATTRIBUTE_FMT_PRINTF(13, 14); + ATTRIBUTE_FMT_PRINTF(12, 13); -/* Includes 'dom' and 'net' for compatbility, but they're ignored */ -# define virRaiseError(conn, dom, net, domain, code, level, \ - str1, str2, str3, int1, int2, msg, ...) \ - virRaiseErrorFull(conn, __FILE__, __FUNCTION__, __LINE__, \ +# define virRaiseError(domain, code, level, \ + str1, str2, str3, int1, int2, msg, ...) \ + virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ domain, code, level, str1, str2, str3, int1, int2, \ msg, __VA_ARGS__) const char *virErrorMsg(virErrorNumber error, const char *info); -void virReportErrorHelper(virConnectPtr conn, int domcode, int errcode, - const char *filename ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, - size_t linenr ATTRIBUTE_UNUSED, - const char *fmt, ...) - ATTRIBUTE_FMT_PRINTF(7, 8); +void virReportErrorHelper(int domcode, int errcode, + const char *filename, const char *funcname, + size_t linenr, const char *fmt, ...) + ATTRIBUTE_FMT_PRINTF(6, 7); void virReportSystemErrorFull(int domcode, int theerrno, diff --git a/src/util/xml.c b/src/util/xml.c index e2c2c6c..45cc65e 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -26,7 +26,7 @@ #define VIR_FROM_THIS VIR_FROM_XML #define virGenericReportError(from, code, ...) \ - virReportErrorHelper(NULL, from, code, __FILE__, \ + virReportErrorHelper(from, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virXMLError(code, ...) \ diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 36e7315..788f6f6 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -59,7 +59,7 @@ static virDriver vboxDriverDummy; #define VIR_FROM_THIS VIR_FROM_VBOX #define vboxError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_VBOX, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_VBOX, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) int vboxRegister(void) { diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 1310c1a..89e51f5 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -125,7 +125,7 @@ typedef IMediumAttachment IHardDiskAttachment; #endif /* VBOX_API_VERSION >= 3001 */ #define vboxError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_VBOX, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_VBOX, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define DEBUGPRUnichar(msg, strUtf16) \ diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index 6e7a5c3..13f6fff 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -41,9 +41,8 @@ * Handle a stats error. */ static void -statsErrorFunc (virConnectPtr conn, - virErrorNumber error, const char *func, const char *info, - int value) +statsErrorFunc(virErrorNumber error, const char *func, const char *info, + int value) { char fullinfo[1000]; const char *errmsg; @@ -54,8 +53,7 @@ statsErrorFunc (virConnectPtr conn, fullinfo[sizeof (fullinfo) - 1] = 0; info = fullinfo; } - virRaiseError(conn, NULL, NULL, VIR_FROM_STATS_LINUX, error, - VIR_ERR_ERROR, + virRaiseError(VIR_FROM_STATS_LINUX, error, VIR_ERR_ERROR, errmsg, info, NULL, value, 0, errmsg, info, value); } @@ -166,8 +164,8 @@ check_bd_connected (xenUnifiedPrivatePtr priv, int device, int domid) } static int -read_bd_stats (virConnectPtr conn, xenUnifiedPrivatePtr priv, - int device, int domid, struct _virDomainBlockStats *stats) +read_bd_stats(xenUnifiedPrivatePtr priv, + int device, int domid, struct _virDomainBlockStats *stats) { stats->rd_req = read_bd_stat (device, domid, "rd_req"); stats->rd_bytes = read_bd_stat (device, domid, "rd_sect"); @@ -181,8 +179,8 @@ read_bd_stats (virConnectPtr conn, xenUnifiedPrivatePtr priv, if (stats->rd_req == -1 && stats->rd_bytes == -1 && stats->wr_req == -1 && stats->wr_bytes == -1 && stats->errs == -1) { - statsErrorFunc (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "Failed to read any block statistics", domid); + statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "Failed to read any block statistics", domid); return -1; } @@ -194,8 +192,8 @@ read_bd_stats (virConnectPtr conn, xenUnifiedPrivatePtr priv, stats->wr_req == 0 && stats->wr_bytes == 0 && stats->errs == 0 && !check_bd_connected (priv, device, domid)) { - statsErrorFunc (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "Frontend block device not connected", domid); + statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "Frontend block device not connected", domid); return -1; } @@ -204,18 +202,18 @@ read_bd_stats (virConnectPtr conn, xenUnifiedPrivatePtr priv, */ if (stats->rd_bytes > 0) { if (stats->rd_bytes >= ((unsigned long long)1)<<(63-9)) { - statsErrorFunc (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "stats->rd_bytes would overflow 64 bit counter", - domid); + statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "stats->rd_bytes would overflow 64 bit counter", + domid); return -1; } stats->rd_bytes *= 512; } if (stats->wr_bytes > 0) { if (stats->wr_bytes >= ((unsigned long long)1)<<(63-9)) { - statsErrorFunc (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "stats->wr_bytes would overflow 64 bit counter", - domid); + statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "stats->wr_bytes would overflow 64 bit counter", + domid); return -1; } stats->wr_bytes *= 512; @@ -256,7 +254,7 @@ disk_re_match(const char *regex, const char *path, int *part) } int -xenLinuxDomainDeviceID(virConnectPtr conn, int domid, const char *path) +xenLinuxDomainDeviceID(int domid, const char *path) { int major, minor; int part; @@ -333,20 +331,20 @@ xenLinuxDomainDeviceID(virConnectPtr conn, int domid, const char *path) * beginning of the strings for better error messages */ else if (strlen(mod_path) >= 7 && STRPREFIX(mod_path, "/dev/sd")) - statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid path, device names must be in the range sda[1-15] - sdiv[1-15]", - domid); + statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "invalid path, device names must be in the range sda[1-15] - sdiv[1-15]", + domid); else if (strlen(mod_path) >= 7 && STRPREFIX(mod_path, "/dev/hd")) - statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid path, device names must be in the range hda[1-63] - hdt[1-63]", - domid); + statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "invalid path, device names must be in the range hda[1-63] - hdt[1-63]", + domid); else if (strlen(mod_path) >= 8 && STRPREFIX(mod_path, "/dev/xvd")) - statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid path, device names must be in the range xvda[1-15] - xvdiz[1-15]", - domid); + statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "invalid path, device names must be in the range xvda[1-15] - xvdiz[1-15]", + domid); else - statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "unsupported path, use xvdN, hdN, or sdN", domid); + statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__, + "unsupported path, use xvdN, hdN, or sdN", domid); VIR_FREE(mod_path); @@ -359,12 +357,12 @@ xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv, const char *path, struct _virDomainBlockStats *stats) { - int device = xenLinuxDomainDeviceID(dom->conn, dom->id, path); + int device = xenLinuxDomainDeviceID(dom->id, path); if (device < 0) return -1; - return read_bd_stats (dom->conn, priv, device, dom->id, stats); + return read_bd_stats(priv, device, dom->id, stats); } #endif /* __linux__ */ diff --git a/src/xen/block_stats.h b/src/xen/block_stats.h index ba113d7..c94f645 100644 --- a/src/xen/block_stats.h +++ b/src/xen/block_stats.h @@ -19,7 +19,7 @@ extern int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv, virDomainPtr dom, const char *path, struct _virDomainBlockStats *stats); -extern int xenLinuxDomainDeviceID(virConnectPtr conn, int domid, const char *dev); +extern int xenLinuxDomainDeviceID(int domid, const char *dev); # endif /* __linux__ */ diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index db209d1..143b5c3 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -94,8 +94,8 @@ struct xenUnifiedDriver xenProxyDriver = { ************************************************************************/ #define virProxyError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_PROXY, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) + virReportErrorHelper(VIR_FROM_PROXY, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) /************************************************************************ * * @@ -1023,7 +1023,7 @@ xenProxyDomainGetOSType(virDomainPtr domain) return(NULL); } if ((ans.len == sizeof(virProxyPacket)) && (ans.data.arg < 0)) { - virRaiseError (domain->conn, NULL, NULL, VIR_FROM_REMOTE, + virRaiseError (VIR_FROM_REMOTE, VIR_ERR_OPERATION_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s", _("Cannot get domain details")); return(NULL); diff --git a/src/xen/sexpr.c b/src/xen/sexpr.c index 7e370db..a5b2a32 100644 --- a/src/xen/sexpr.c +++ b/src/xen/sexpr.c @@ -25,8 +25,8 @@ #define VIR_FROM_THIS VIR_FROM_SEXPR #define virSexprError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_SEXPR, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) + virReportErrorHelper(VIR_FROM_SEXPR, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) /** * sexpr_new: diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index fb2f7c7..557f004 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -73,7 +73,7 @@ static struct xenUnifiedDriver const * const drivers[XEN_UNIFIED_NR_DRIVERS] = { static int inside_daemon; #define xenUnifiedError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_XEN, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XEN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /** diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index ae17c60..40dbe2a 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -806,7 +806,7 @@ struct xenUnifiedDriver xenHypervisorDriver = { #define virXenError(code, ...) \ if (in_init == 0) \ - virReportErrorHelper(NULL, VIR_FROM_XEN, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XEN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifndef PROXY @@ -835,11 +835,11 @@ virXenErrorFunc(virErrorNumber error, const char *func, const char *info, if (func != NULL) { snprintf(fullinfo, 999, "%s: %s", func, info); fullinfo[999] = 0; - virRaiseError(NULL, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, + virRaiseError(VIR_FROM_XEN, error, VIR_ERR_ERROR, errmsg, fullinfo, NULL, value, 0, errmsg, fullinfo, value); } else { - virRaiseError(NULL, NULL, NULL, VIR_FROM_XEN, error, VIR_ERR_ERROR, + virRaiseError(VIR_FROM_XEN, error, VIR_ERR_ERROR, errmsg, info, NULL, value, 0, errmsg, info, value); } diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index d24b20f..7b35f9d 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -45,7 +45,7 @@ #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY #define virXenInotifyError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_XEN_INOTIFY, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XEN_INOTIFY, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) struct xenUnifiedDriver xenInotifyDriver = { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index c4e73b7..8c5a3fa 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -98,7 +98,7 @@ virDomainXMLDevID(virDomainPtr domain, #endif #define virXendError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_XEND, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XEND, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #define virXendErrorInt(code, ival) \ diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index d1265ba..e1e3f10 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -122,7 +122,7 @@ struct xenUnifiedDriver xenXMDriver = { }; #define xenXMError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_XENXM, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XENXM, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) #ifndef WITH_XEN_INOTIFY diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 9296f25..0bd036b 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -89,7 +89,7 @@ struct xenUnifiedDriver xenStoreDriver = { #endif /* ! PROXY */ #define virXenStoreError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_XENSTORE, code, __FILE__, \ + virReportErrorHelper(VIR_FROM_XENSTORE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) /************************************************************************ diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 4eb17fa..90974b7 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -378,11 +378,11 @@ xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum, if (buf == NULL && priv != NULL && priv->session != NULL) { char *ret = returnErrorFromSession(priv->session); - virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret); + virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret); xen_session_clear_error(priv->session); VIR_FREE(ret); } else { - virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf); + virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf); } } diff --git a/tests/statstest.c b/tests/statstest.c index 5fad190..b6c9000 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -20,7 +20,7 @@ static void testQuietError(void *userData ATTRIBUTE_UNUSED, #if __linux__ && WITH_XEN static int testDevice(const char *path, int expect) { - int actual = xenLinuxDomainDeviceID(NULL, 1, path); + int actual = xenLinuxDomainDeviceID(1, path); if (actual == expect) { return 0; -- 1.6.3.3

--- src/remote/remote_driver.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 19a4c03..16ffe21 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6583,11 +6583,9 @@ static char *addrToString(struct sockaddr_storage *sa, socklen_t salen) host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { - virRaiseError (VIR_FROM_REMOTE, - VIR_ERR_UNKNOWN_HOST, VIR_ERR_ERROR, - NULL, NULL, NULL, 0, 0, - _("Cannot resolve address %d: %s"), - err, gai_strerror(err)); + remoteError(VIR_ERR_UNKNOWN_HOST, + _("Cannot resolve address %d: %s"), + err, gai_strerror(err)); return NULL; } @@ -8882,10 +8880,9 @@ processCallDispatch(virConnectPtr conn, struct private_data *priv, break; default: - virRaiseError (VIR_FROM_REMOTE, - VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - _("got unexpected RPC call %d from server"), - hdr.proc); + remoteError(VIR_ERR_RPC, + _("got unexpected RPC call %d from server"), + hdr.proc); rv = -1; break; } @@ -8911,18 +8908,16 @@ processCallDispatchReply(virConnectPtr conn ATTRIBUTE_UNUSED, thecall = thecall->next; if (!thecall) { - virRaiseError (VIR_FROM_REMOTE, - VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - _("no call waiting for reply with serial %d"), - hdr->serial); + remoteError(VIR_ERR_RPC, + _("no call waiting for reply with serial %d"), + hdr->serial); return -1; } if (hdr->proc != thecall->proc_nr) { - virRaiseError (VIR_FROM_REMOTE, - VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - _("unknown procedure (received %x, expected %x)"), - hdr->proc, thecall->proc_nr); + remoteError(VIR_ERR_RPC, + _("unknown procedure (received %x, expected %x)"), + hdr->proc, thecall->proc_nr); return -1; } -- 1.6.3.3

--- cfg.mk | 2 +- src/vbox/vbox_tmpl.c | 262 +++++++++++++++++++++++++++----------------------- 2 files changed, 143 insertions(+), 121 deletions(-) diff --git a/cfg.mk b/cfg.mk index d34a25e..f1de736 100644 --- a/cfg.mk +++ b/cfg.mk @@ -186,7 +186,7 @@ msg_gen_function += statsErrorFunc msg_gen_function += testError msg_gen_function += umlReportError msg_gen_function += usbReportError -#msg_gen_function += vboxError +msg_gen_function += vboxError msg_gen_function += virCPUReportError msg_gen_function += virConfError msg_gen_function += virDomainReportError diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 89e51f5..7c451c7 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -691,7 +691,8 @@ static int vboxInitialize(vboxGlobalData *data) { data->pFuncs->pfnGetEventQueue(&data->vboxQueue); if (data->vboxQueue == NULL) { - vboxError(VIR_ERR_INTERNAL_ERROR, "nsIEventQueue object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("nsIEventQueue object is null")); goto cleanup; } @@ -699,12 +700,14 @@ static int vboxInitialize(vboxGlobalData *data) { #endif /* !(VBOX_XPCOMC_VERSION == 0x00010000U) */ if (data->vboxObj == NULL) { - vboxError(VIR_ERR_INTERNAL_ERROR, "IVirtualBox object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("IVirtualBox object is null")); goto cleanup; } if (data->vboxSession == NULL) { - vboxError(VIR_ERR_INTERNAL_ERROR, "ISession object is null"); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ISession object is null")); goto cleanup; } @@ -736,8 +739,8 @@ static int vboxExtractVersion(vboxGlobalData *data) { } if (ret != 0) - vboxError(VIR_ERR_INTERNAL_ERROR,"%s", - "Cound not extract VirtualBox version"); + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cound not extract VirtualBox version")); return ret; } @@ -908,8 +911,8 @@ static int vboxListDomains(virConnectPtr conn, int *ids, int nids) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of Domains",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of Domains, rc=%08x"),(unsigned)rc); goto cleanup; } @@ -952,8 +955,8 @@ static int vboxNumOfDomains(virConnectPtr conn) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get number of Domains",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get number of Domains, rc=%08x"), (unsigned)rc); goto cleanup; } @@ -1029,8 +1032,8 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); return NULL; } @@ -1090,8 +1093,8 @@ static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned ch rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); return NULL; } @@ -1162,8 +1165,8 @@ static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); return NULL; } @@ -1239,8 +1242,8 @@ static int vboxDomainIsActive(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); return ret; } @@ -1319,7 +1322,7 @@ static int vboxDomainSuspend(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1339,14 +1342,14 @@ static int vboxDomainSuspend(virDomainPtr dom) { VBOX_RELEASE(console); ret = 0; } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "error while suspend the domain"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("error while suspend the domain")); goto cleanup; } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine not in running state to suspend it"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine not in running state to suspend it")); goto cleanup; } } @@ -1378,7 +1381,7 @@ static int vboxDomainResume(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1398,14 +1401,14 @@ static int vboxDomainResume(virDomainPtr dom) { VBOX_RELEASE(console); ret = 0; } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "error while resuming the domain"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("error while resuming the domain")); goto cleanup; } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine not paused, so can't resume it"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine not paused, so can't resume it")); goto cleanup; } } @@ -1436,7 +1439,7 @@ static int vboxDomainShutdown(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1448,12 +1451,12 @@ static int vboxDomainShutdown(virDomainPtr dom) { machine->vtbl->GetState(machine, &state); if (state == MachineState_Paused) { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine paused, so can't power it down"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine paused, so can't power it down")); goto cleanup; } else if (state == MachineState_PoweredOff) { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine already powered down"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine already powered down")); goto cleanup; } @@ -1493,7 +1496,7 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSE rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1514,8 +1517,8 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSE } data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine not running, so can't reboot it"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine not running, so can't reboot it")); goto cleanup; } } @@ -1546,7 +1549,7 @@ static int vboxDomainDestroy(virDomainPtr dom) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1558,8 +1561,8 @@ static int vboxDomainDestroy(virDomainPtr dom) { machine->vtbl->GetState(machine, &state); if (state == MachineState_PoweredOff) { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine already powered down"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine already powered down")); goto cleanup; } @@ -1622,7 +1625,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); goto cleanup; } @@ -1634,8 +1637,8 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { machine->vtbl->GetState(machine, &state); if (state != MachineState_PoweredOff) { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "memory size can't be changed unless domain is powered down"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("memory size can't be changed unless domain is powered down")); goto cleanup; } @@ -1649,8 +1652,9 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { machine->vtbl->SaveSettings(machine); ret = 0; } else { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu Kb, rc=%08x", - "could not set the memory size of the domain to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not set the memory size of the " + "domain to: %lu Kb, rc=%08x"), memory, (unsigned)rc); } } @@ -1675,8 +1679,8 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "Could not get list of machines", (unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); goto cleanup; } @@ -1853,18 +1857,19 @@ static int vboxDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { machine->vtbl->SaveSettings(machine); ret = 0; } else { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s: %u, rc=%08x", - "could not set the number of cpus of the domain to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not set the number of cpus of the domain " + "to: %u, rc=%08x"), CPUCount, (unsigned)rc); } VBOX_RELEASE(machine); } else { vboxError(VIR_ERR_INVALID_DOMAIN, - "no domain with matching id %d", dom->id); + _("no domain with matching id %d"), dom->id); } } else { vboxError(VIR_ERR_INVALID_DOMAIN, - "can't open session to the domain with id %d", dom->id); + _("can't open session to the domain with id %d"), dom->id); } data->vboxSession->vtbl->Close(data->vboxSession); @@ -2462,8 +2467,8 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { maxSlotPerPort); if (!def->disks[diskCount]->dst) { vboxError(VIR_ERR_INTERNAL_ERROR, - "%s: controller instance:%u, port:%d, slot:%d", - "Could not generate medium name for the disk at", + _("Could not generate medium name for the disk " + "at: controller instance:%u, port:%d, slot:%d"), deviceInst, devicePort, deviceSlot); VBOX_RELEASE(medium); VBOX_RELEASE(storageController); @@ -3036,8 +3041,9 @@ static int vboxListDefinedDomains(virConnectPtr conn, char ** const names, int m rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get list of Defined Domains",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of Defined Domains, rc=%08x"), + (unsigned)rc); goto cleanup; } @@ -3090,8 +3096,9 @@ static int vboxNumOfDefinedDomains(virConnectPtr conn) { rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s, rc=%08x", - "Could not get number of Defined Domains",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get number of Defined Domains, rc=%08x"), + (unsigned)rc); goto cleanup; } @@ -3138,14 +3145,14 @@ static int vboxDomainCreate(virDomainPtr dom) { if (!dom->name) { vboxError(VIR_ERR_INTERNAL_ERROR, "%s", - "Error while reading the domain name"); + _("Error while reading the domain name")); goto cleanup; } rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "Could not get list of machines",(unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); goto cleanup; } @@ -3287,8 +3294,8 @@ static int vboxDomainCreate(virDomainPtr dom) { env, &progress ); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "openremotesession failed, domain can't be started"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("openremotesession failed, domain can't be started")); ret = -1; } else { PRBool completed = 0; @@ -3319,9 +3326,9 @@ static int vboxDomainCreate(virDomainPtr dom) { data->vboxSession->vtbl->Close(data->vboxSession); } else { - vboxError(VIR_ERR_OPERATION_FAILED, - "%s", "machine is not in poweroff|saved|" - "aborted state, so couldn't start it"); + vboxError(VIR_ERR_OPERATION_FAILED, "%s", + _("machine is not in poweroff|saved|" + "aborted state, so couldn't start it")); ret = -1; } } @@ -3375,22 +3382,23 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_UTF16_FREE(machineNameUtf16); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "could not define a domain", (unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not define a domain, rc=%08x"), (unsigned)rc); goto cleanup; } rc = machine->vtbl->SetMemorySize(machine, def->memory / 1024); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu Kb, rc=%08x", - "could not set the memory size of the domain to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not set the memory size of the domain to: %lu Kb, " + "rc=%08x"), def->memory, (unsigned)rc); } rc = machine->vtbl->SetCPUCount(machine, def->vcpus); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%lu, rc=%08x", - "could not set the number of virtual CPUs to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not set the number of virtual CPUs to: %lu, rc=%08x"), def->vcpus, (unsigned)rc); } @@ -3403,10 +3411,10 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { (1 << VIR_DOMAIN_FEATURE_PAE)); #endif /* VBOX_API_VERSION >= 3001 */ if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not change PAE status to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not change PAE status to: %s, rc=%08x"), ((def->features) & (1 << VIR_DOMAIN_FEATURE_PAE)) - ? "Enabled" : "Disabled", (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned)rc); } machine->vtbl->GetBIOSSettings(machine, &bios); @@ -3414,18 +3422,18 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { rc = bios->vtbl->SetACPIEnabled(bios, (def->features) & (1 << VIR_DOMAIN_FEATURE_ACPI)); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not change ACPI status to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not change ACPI status to: %s, rc=%08x"), ((def->features) & (1 << VIR_DOMAIN_FEATURE_ACPI)) - ? "Enabled" : "Disabled", (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned)rc); } rc = bios->vtbl->SetIOAPICEnabled(bios, (def->features) & (1 << VIR_DOMAIN_FEATURE_APIC)); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR,"%s:%s, rc=%08x", - "could not change APIC status to", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not change APIC status to: %s, rc=%08x"), ((def->features) & (1 << VIR_DOMAIN_FEATURE_APIC)) - ? "Enabled" : "Disabled", (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned)rc); } VBOX_RELEASE(bios); } @@ -3433,8 +3441,8 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { /* Register the machine before attaching other devices to it */ rc = data->vboxObj->vtbl->RegisterMachine(data->vboxObj, machine); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "could not define a domain", (unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not define a domain, rc=%08x"), (unsigned)rc); goto cleanup; } @@ -3551,14 +3559,15 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (dvdImage) { rc = dvdImage->vtbl->imedium.GetId((IMedium *)dvdImage, &dvduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached to cdrom", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to " + "be attached to cdrom: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { rc = dvdDrive->vtbl->MountImage(dvdDrive, dvduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file to cdrom", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file to cdrom: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("CD/DVDImage UUID:", dvduuid); @@ -3612,8 +3621,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (hardDisk) { rc = hardDisk->vtbl->imedium.GetId((IMedium *)hardDisk, &hdduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached as harddisk", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to be " + "attached as harddisk: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { if (def->disks[i]->readonly) { @@ -3655,8 +3665,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_UTF16_FREE(hddcnameUtf16); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file as harddisk", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file as " + "harddisk: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("Attached HDD with UUID", hdduuid); @@ -3709,14 +3720,16 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { if (floppyImage) { rc = floppyImage->vtbl->imedium.GetId((IMedium *)floppyImage, &fduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached to floppy drive", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to " + "be attached to floppy drive: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { rc = floppyDrive->vtbl->MountImage(floppyDrive, fduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file to floppy drive", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file to " + "floppy drive: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("floppyImage UUID", fduuid); @@ -3857,8 +3870,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { } if (!medium) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "Failed to attach the following disk/dvd/floppy to the machine", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("Failed to attach the following disk/dvd/floppy " + "to the machine: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); VBOX_UTF16_FREE(mediumFileUtf16); continue; @@ -3866,8 +3880,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { rc = medium->vtbl->GetId(medium, &mediumUUID); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached as harddisk/dvd/floppy", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to be attached " + "as harddisk/dvd/floppy: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); VBOX_UTF16_FREE(mediumFileUtf16); @@ -3906,8 +3921,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { &deviceInst, &devicePort, &deviceSlot)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the port/slot number of harddisk/dvd/floppy to be attached", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the port/slot number of harddisk/" + "dvd/floppy to be attached: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); VBOX_UTF16_FREE(mediumUUID); @@ -3924,8 +3940,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { mediumUUID); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file as harddisk/dvd/floppy", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file as harddisk/" + "dvd/floppy: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("Attached HDD/DVD/Floppy with UUID", mediumUUID); @@ -4625,8 +4642,8 @@ static int vboxDomainUndefine(virDomainPtr dom) { machine->vtbl->DeleteSettings(machine); ret = 0; } else { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "could not delete the domain", (unsigned)rc); + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not delete the domain, rc=%08x"), (unsigned)rc); } #if VBOX_API_VERSION == 2002 @@ -4679,7 +4696,8 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + vboxError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); goto cleanup; } @@ -4731,16 +4749,17 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (dvdImage) { rc = dvdImage->vtbl->imedium.GetId((IMedium *)dvdImage, &dvduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached to cdrom", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to " + "be attached to cdrom: %s, rc=%08x"), dev->data.disk->src, (unsigned)rc); } else { /* unmount the previous mounted image */ dvdDrive->vtbl->Unmount(dvdDrive); rc = dvdDrive->vtbl->MountImage(dvdDrive, dvduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file to cdrom", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file to cdrom: %s, rc=%08x"), dev->data.disk->src, (unsigned)rc); } else { ret = 0; @@ -4793,14 +4812,15 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (floppyImage) { rc = floppyImage->vtbl->imedium.GetId((IMedium *)floppyImage, &fduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "can't get the uuid of the file to be attached to floppy drive", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("can't get the uuid of the file to be " + "attached to floppy drive: %s, rc=%08x"), dev->data.disk->src, (unsigned)rc); } else { rc = floppyDrive->vtbl->MountImage(floppyDrive, fduuid); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not attach the file to floppy drive", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file to floppy drive: %s, rc=%08x"), dev->data.disk->src, (unsigned)rc); } else { ret = 0; @@ -4905,7 +4925,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { rc = data->vboxObj->vtbl->GetMachine(data->vboxObj, iid, &machine); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + vboxError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); goto cleanup; } @@ -4935,8 +4956,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (dvdDrive) { rc = dvdDrive->vtbl->Unmount(dvdDrive); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "could not de-attach the mounted ISO", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not de-attach the mounted ISO, rc=%08x"), (unsigned)rc); } else { ret = 0; @@ -4956,8 +4977,9 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (enabled) { rc = floppyDrive->vtbl->Unmount(floppyDrive); if (NS_FAILED(rc)) { - vboxError(VIR_ERR_INTERNAL_ERROR, "%s, rc=%08x", - "could not attach the file to floppy drive", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach the file " + "to floppy drive, rc=%08x"), (unsigned)rc); } else { ret = 0; @@ -6395,8 +6417,8 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { hardDiskCount = 0; } else { hardDiskCount = -1; - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not get number of volumes in the pool", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not get number of volumes in the pool: %s, rc=%08x"), pool->name, (unsigned)rc); } @@ -6451,8 +6473,8 @@ static int vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names hardDiskCount = 0; } else { hardDiskCount = -1; - vboxError(VIR_ERR_INTERNAL_ERROR, "%s:%s, rc=%08x", - "could not get the volume list in the pool", + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not get the volume list in the pool: %s, rc=%08x"), pool->name, (unsigned)rc); } -- 1.6.3.3