- Devel - libvirt List Archives

[Libvir] [PATCH] (vshCloseLogFile): Diagnose close/write failure.
by Jim Meyering 28 Nov '07

28 Nov '07

I noticed a minor problem in vshCloseLogFile. Although callers do check for log-file write failure, this function doesn't check for close failure (which can happen, and indicates a write failure). I considered changing the function to return an int and propagating that success/failure "up" to callers, but that change is more invasive, and I'm not sure it's desirable. If any of you prefer it, let me know and I'll rewrite accordingly: Also slightly ugly: ctl->logfile may be null, so if/when it is (however unlikely), the diagnostic prints "?" as the file name rather than trying to dereference a NULL pointer. * src/virsh.c (vshCloseLogFile): Diagnose close/write failure. --- src/virsh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 5b50524..86f5b8b 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -4643,7 +4643,9 @@ vshCloseLogFile(vshControl *ctl) { /* log file close */ if (ctl->log_fd >= 0) { - close(ctl->log_fd); + if (close(ctl->log_fd) < 0) + vshError(ctl, FALSE, _("%s: failed to write log file: %s") + ctl->logfile ? ctl->logfile : "?", strerror (errno)); ctl->log_fd = -1; } -- 1.5.3.6.961.gecf4

2 1

[Libvir] Web page for libvirt on Windows
by Richard W.M. Jones 27 Nov '07

27 Nov '07

Just a note to say that there is a web page tracking the status of libvirt, virt-manager, etc. on Windows. http://libvirt.org/windows.html Not a lot there at the moment! Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] When reporting errors, use "conn" whenever possible.
by Jim Meyering 27 Nov '07

27 Nov '07

Here's a first cut at cleaning up. There are more ab/uses in other files, but nowhere near as many as in this one, so I'm starting here: When reporting errors, use "conn" whenever possible. * src/remote_internal.c: change all error (NULL, ... to error (conn, ... (check_cert_file): Add+use parameter, conn. Adjust callers. (initialise_gnutls): The "conn" parameter *is* used, so remove ATTRIBUTE_UNUSED. Suggested by Richard Jones. --- src/remote_internal.c | 90 ++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index c365ff8..40c12c7 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -280,7 +280,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, else if (strcasecmp (transport_str, "tcp") == 0) transport = trans_tcp; else { - error (NULL, VIR_ERR_INVALID_ARG, + error (conn, VIR_ERR_INVALID_ARG, "remote_open: transport in URL not recognised " "(should be tls|unix|ssh|ext|tcp)"); return VIR_DRV_OPEN_ERROR; @@ -308,7 +308,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, server = strdup (uri->server ? uri->server : "localhost"); if (!server) { out_of_memory: - error (NULL, VIR_ERR_NO_MEMORY, "duplicating server name"); + error (conn, VIR_ERR_NO_MEMORY, "duplicating server name"); goto failed; } if (uri->port != 0) { @@ -394,7 +394,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, /* For ext transport, command is required. */ if (transport == trans_ext && !command) { - error (NULL, VIR_ERR_INVALID_ARG, "remote_open: for 'ext' transport, command is required"); + error (conn, VIR_ERR_INVALID_ARG, "remote_open: for 'ext' transport, command is required"); goto failed; } @@ -438,7 +438,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, hints.ai_flags = AI_ADDRCONFIG; int e = getaddrinfo (server, port, &hints, &res); if (e != 0) { - error (NULL, VIR_ERR_INVALID_ARG, gai_strerror (e)); + error (conn, VIR_ERR_INVALID_ARG, gai_strerror (e)); goto failed; } @@ -458,7 +458,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, priv->sock = socket (r->ai_family, SOCK_STREAM, 0); if (priv->sock == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); continue; } @@ -468,7 +468,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, sizeof no_slow_start); if (connect (priv->sock, r->ai_addr, r->ai_addrlen) == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); close (priv->sock); continue; } @@ -504,12 +504,12 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, uid_t uid = getuid(); if (!(pw = getpwuid(uid))) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } if (asprintf (&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, pw->pw_dir) < 0) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } } else { @@ -518,7 +518,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, else sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET); if (sockname == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } } @@ -539,7 +539,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, autostart_retry: priv->sock = socket (AF_UNIX, SOCK_STREAM, 0); if (priv->sock == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } if (connect (priv->sock, (struct sockaddr *) &addr, sizeof addr) == -1) { @@ -561,7 +561,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, goto autostart_retry; } } - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -576,7 +576,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, command = command ? : strdup ("ssh"); if (command == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -584,7 +584,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] cmd_argv = malloc (nr_args * sizeof (char *)); if (cmd_argv == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } @@ -611,7 +611,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, assert (j == nr_args); for (j = 0; j < nr_args; j++) if (cmd_argv[j] == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); goto failed; } } @@ -626,13 +626,13 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, * to faff around with two file descriptors (a la 'pipe(2)'). */ if (socketpair (PF_UNIX, SOCK_STREAM, 0, sv) == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } pid = fork (); if (pid == -1) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } else if (pid == 0) { /* Child. */ close (sv[0]); @@ -647,7 +647,7 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, if (!cmd_argv) { cmd_argv = malloc (2 * sizeof (char *)); if (cmd_argv == NULL) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); goto failed; } cmd_argv[0] = command; @@ -724,7 +724,7 @@ remoteOpen (virConnectPtr conn, xmlURIPtr uri, int flags) priv = malloc (sizeof(struct private_data)); if (!priv) { - error (NULL, VIR_ERR_NO_MEMORY, "struct private_data"); + error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); return VIR_DRV_OPEN_ERROR; } @@ -947,11 +947,11 @@ static gnutls_certificate_credentials_t x509_cred; static int -check_cert_file (const char *type, const char *file) +check_cert_file (virConnectPtr conn, const char *type, const char *file) { struct stat sb; if (stat(file, &sb) < 0) { - __virRaiseError (NULL, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, + __virRaiseError (conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, LIBVIRT_CACERT, NULL, NULL, 0, 0, "Cannot access %s '%s': %s (%d)", type, file, strerror(errno), errno); @@ -962,7 +962,7 @@ check_cert_file (const char *type, const char *file) static int -initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) +initialise_gnutls (virConnectPtr conn) { static int initialised = 0; int err; @@ -974,16 +974,16 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) /* X509 stuff */ err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } - if (check_cert_file("CA certificate", LIBVIRT_CACERT) < 0) + if (check_cert_file(conn, "CA certificate", LIBVIRT_CACERT) < 0) return -1; - if (check_cert_file("client key", LIBVIRT_CLIENTKEY) < 0) + if (check_cert_file(conn, "client key", LIBVIRT_CLIENTKEY) < 0) return -1; - if (check_cert_file("client certificate", LIBVIRT_CLIENTCERT) < 0) + if (check_cert_file(conn, "client certificate", LIBVIRT_CLIENTCERT) < 0) return -1; /* Set the trusted CA cert. */ @@ -994,7 +994,7 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) gnutls_certificate_set_x509_trust_file (x509_cred, LIBVIRT_CACERT, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } @@ -1009,7 +1009,7 @@ initialise_gnutls (virConnectPtr conn ATTRIBUTE_UNUSED) LIBVIRT_CLIENTKEY, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return -1; } @@ -1035,21 +1035,21 @@ negotiate_gnutls_on_connection (virConnectPtr conn, */ err = gnutls_init (&session, GNUTLS_CLIENT); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } /* Use default priorities */ err = gnutls_set_default_priority (session); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } err = gnutls_certificate_type_set_priority (session, cert_type_priority); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1057,7 +1057,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, */ err = gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred); if (err) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1070,7 +1070,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, if (err < 0) { if (err == GNUTLS_E_AGAIN || err == GNUTLS_E_INTERRUPTED) goto again; - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); return NULL; } @@ -1091,11 +1091,11 @@ negotiate_gnutls_on_connection (virConnectPtr conn, if (len < 0 && len != GNUTLS_E_UNEXPECTED_PACKET_LENGTH) { if (len == GNUTLS_E_AGAIN || len == GNUTLS_E_INTERRUPTED) goto again_2; - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (len)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (len)); return NULL; } if (len != 1 || buf[0] != '\1') { - error (NULL, VIR_ERR_RPC, + error (conn, VIR_ERR_RPC, "server verification (of our certificate or IP address) failed\n"); return NULL; } @@ -1120,12 +1120,12 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); return -1; } if ((now = time(NULL)) == ((time_t)-1)) { - error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); return -1; } @@ -1146,17 +1146,17 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, reason = "The certificate uses an insecure algorithm"; #endif - error (NULL, VIR_ERR_RPC, reason); + error (conn, VIR_ERR_RPC, reason); return -1; } if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) { - error (NULL, VIR_ERR_RPC, "Certificate type is not X.509"); + error (conn, VIR_ERR_RPC, "Certificate type is not X.509"); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - error (NULL, VIR_ERR_RPC, "gnutls_certificate_get_peers failed"); + error (conn, VIR_ERR_RPC, "gnutls_certificate_get_peers failed"); return -1; } @@ -1165,25 +1165,25 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, ret = gnutls_x509_crt_init (&cert); if (ret < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); return -1; } ret = gnutls_x509_crt_import (cert, &certs[i], GNUTLS_X509_FMT_DER); if (ret < 0) { - error (NULL, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - error (NULL, VIR_ERR_RPC, "The certificate has expired"); + error (conn, VIR_ERR_RPC, "The certificate has expired"); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - error (NULL, VIR_ERR_RPC, "The certificate is not yet activated"); + error (conn, VIR_ERR_RPC, "The certificate is not yet activated"); gnutls_x509_crt_deinit (cert); return -1; } @@ -1191,7 +1191,7 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, if (i == 0) { if (!gnutls_x509_crt_check_hostname (cert, hostname)) { __virRaiseError - (NULL, NULL, NULL, + (conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, hostname, NULL, NULL, 0, 0, @@ -2390,7 +2390,7 @@ remoteNetworkOpen (virConnectPtr conn, struct private_data *priv = malloc (sizeof(struct private_data)); int ret, rflags = 0; if (!priv) { - error (NULL, VIR_ERR_NO_MEMORY, "struct private_data"); + error (conn, VIR_ERR_NO_MEMORY, "struct private_data"); return VIR_DRV_OPEN_ERROR; } if (flags & VIR_DRV_OPEN_RO) -- 1.5.3.6.950.g92b7b

3 3

[Libvir] [PATCH] add a gcc-printf attribute to remoteDispatchError
by Jim Meyering 26 Nov '07

26 Nov '07

Spotted this a week ago: add a gcc-printf attribute to remoteDispatchError diff --git a/qemud/remote.c b/qemud/remote.c index f4d76a1..047cae7 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -54,7 +54,8 @@ static void remoteDispatchError (struct qemud_client *client, remote_message_header *req, - const char *fmt, ...); + const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); static void make_nonnull_domain (remote_nonnull_domain *dom_dst, virDomainPtr dom_src); -- 1.5.3.6.950.g92b7b

2 1

[Libvir] [PATCH] Compile libvirt under Windows (Cygwin)
by Richard W.M. Jones 26 Nov '07

26 Nov '07

The following patchset allows an incomplete compilation of libvirt under Windows using Cygwin. Current limitations are: (1) Xen driver does not work. This is not an important limitation because Windows cannot act as dom0 in a Xen hypervisor anyway (or if it can, it's not a very common configuration). (2) QEMU driver / libvirtd cannot be compiled. It's probably not too hard to fix this. The major area of concern is networking, in particular the very Linux-specific code in src/bridge.c. (2b) I have assumed for the purposes of (2) above that ./configure --without-qemu also disables libvirtd (server) support. QEMU and libvirtd are too entangled at the moment. (3) Cygwin is required. In other words, there is no true native compilation using VC++ or anything like that. However you still get *.exe files, so maybe this isn't an important limitation. Attached is a screenshot showing virsh being used to list QEMU instances over a TLS-encrypted remote connection. To compile this yourself: (a) Set up a Windows machine with plenty of free disk space (10GB+). (b) Install Cygwin (http://www.cygwin.com/) Cygwin has an obscure, unusable packaging system. The trick is to click the "recycling symbol" next to "All". This will download and install everything. You may if you prefer install just the packages you need, but the list of dependencies is long and currently undocumented. (c) Check out libvirt from CVS, apply these patches. (d) rm qemud/remote_protocol.[ch] qemud/remote_dispatch_*.h (e) ./configure --without-xen --without-qemu (f) make -C qemud remote_protocol.c (g) make (h) make install Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

5 33

[Libvir] Bindings for ruby
by Grabber 26 Nov '07

26 Nov '07

Yeah! I'm new to list! I search in archive and google for infomartions about bindings for ruby scripting language. I found some peoples saying ideas to organize class and structs, others using SWIG to simple generate the .so file compatible with ruby. But.... today how are the work? I'm confusing, SWIG can generate really good codes or the better way is develop by hand? -- Regards, Luiz Vitor Martinez Cardoso [Grabber].

5 6

[Libvir] PATCH: 0/4: Remote authentication support
by Daniel P. Berrange 26 Nov '07

26 Nov '07

This is the 2nd iteration of my remote authentication / SASL patches previously provided here: http://www.redhat.com/archives/libvir-list/2007-October/msg00131.html In this iteration I've changed the wire protocol to give better compatability with older libvirt clients. My previous version clients would get a cryptic "unknown status 3" if the server was mandating authentication. This is because I extended the reply codes for RPC to include a specific 'auth required' code which old clients are not expecting. The idea was that the new client would run the REMOTE_PROC_OPEN rpc call & it would return a special NEED_AUTH code, the client would then authenticate & redo the REMOTE_PROC_OPEN. In the new way of doing things, instead of calling REMOTE_PROC_OPEN as the first RPC, a new client will do REMOTE_PROC_AUTH_LIST to query auth types required by the server. It will choose an auth method (there may be several to choose from), then complete the auth sequence. Only then will it try to do the REMOTE_PROC_OPEN. For compatability with older servers which do not implement the REMOTE_PROC_AUTH_LIST rpc, it will catch & ignore the error this may generate. Old clients which don't know to call REMOTE_PROC_AUTH_LIST will get a proper virErrorPtr object returned from REMOTE_PROC_OPEN with a clear 'authentication required' message. The end result is that new client <-> new server has same level of functionality as my previous patches, and old client <-> new server gets friendly errors reported (if server mandates auth - if no auth is enabled old client works just fine). The main outstanding item to be finalized before these patches can be added to CVS is the question of callbacks. For some auth methods we need to be able to gather credentials from the user. There is no way for the caller to know ahead of time what credentials are needed, because this is deterined by the config of the server. Thus we need callbacks in some form. I've come up with a couple of ideas... 1. A global method to supply a list of callbacks per credential type: enum { VIR_CONN_AUTH_PASSWORD, VIR_CONN_AUTH_USERNAME, VIR_CONN_AUTH_LANG, VIR_CONN_AUTH_CHALLENGE, VIR_CONN_AUTH_REALM, } virConnectAuthToken; typedef int (virConnectAuthCBSimple)(const char **result, unsigned *len); typedef int (virConnectAuthCBPrompt)(const char *challenge, const char *prompt, const char *defresult, const char *result, unsigned *len); typedef int (virConnetAuthCBRealm)(const char **availrealms, const char *result); typedef struct { int token; union { virConnectAuthCBSimple simple; virConnectAuthCBPrompt prompt; virConnectAuthCBRealm realm; } cb; } virConnectAuthCallback; virConnectSetAuthCallbacks(virConnectAuthCallback *cbs, int ncbs) This is described a little more here: http://www.redhat.com/archives/libvir-list/2007-January/msg00024.html 2. A new variant of virConnectOpen which takes a callback. The callback gives invoked with a list of required credentials struct _virConnectInteract { int type; /* One of virConnectInteractType constants */ const char *prompt; const char *challenge; const char *defresult; char *result; unsigned int resultlen; }; typedef struct _virConnectInteract virConnectInteract; typedef virConnectInteract *virConnectInteractPtr; /** * When authentication requires one or more interactions, this callback * is invoked. For each interaction supplied, data must be gathered * from the user and filled in to the 'result' and 'resultlen' fields. * If an interaction can not be filled, fill in NULL and 0. * * Return 0 if all interactions were filled, or -1 upon error */ typedef int (*virConnectAuthCallbackPtr)(const char *uri, virConnectInteractPtr interact, unsigned int ninteract); virConnectPtr virConnectOpenAuth (const char *name, virConnectAuthCallbackPtr cb, int flags); Iternally the virConnectOpen & virConnectOpenReadOnly can both just be delegating to this new virConnectOpenAuth call. Existing users of libvirt won't know about this new call, but that doesn't matter because they're not loosing any functionality - merely not able to put up UI to prompt for auth credentials/ The compelling thing about the 2nd way of doing things is that the callback gets a complete list of all required data items at once. This makes it very easy to present a UI with form entry fields for all items. The first way where there is a separate callback per item makes UI very hard. There is one issue not addressed by those two options though - there may be a choice of authentication methods to use. eg SASL vs PolicyKit. The callback only provides a way to supply credentials, no way to choose between auth types if a server offers more than one. Again there's a couple of ways to address this. 1. A global method to set preferred auth type. Simply a sorted list of auth types. Internally, we pick the first auth type in this list that the server supports virConnectSetAuthPriority(int types[], int ntypes); 2. A 2nd callback providing the int types[] and letting the client app choose which one they want to use per connection. 3. Separate out the operation of creating a virConnectPtr object, from the act of connecting, eg /* Allocate a handle */ virConnectPtr virConnectNew(const char *uri); /* List available auth methods */ int virConnectListAuth(virConnectPtr conn, int **types, int *ntypes); /* Connect to HV, with a speciifc auth method */ int virConnectInit(virConnectPtr conn, int auth); Any of these three, can be combined with either of the 2 options for supplying auth credentials. So we've got a choice of 6 :-) My preference, is to go for option 2, of the credentials choice, and option 1 of the auth type priority choice. eg a static priority list for auth types, and a single callback passed into a new virConnectOpenAuth() call. The final tedious bit, is the question of how we deal with underlying HV which may need further authentication. eg, if connecting to XenAPI we may need to provide a username & password. If the XenAPI connection is being made through a local libvirt driver hooking up the callbacks as described is fairly easy. If the XenAPI connection is made indirectly via the remote driver, then we have two drivers requiring auth - the initial remote driver, and then the remotely run XenAPi driver. This would need us to figure out a way to hook up the callbacks to the REMOTE_PROC_OPEN api call. Not pleasant ! Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 12

[Libvir] netcat "-U" option
by Richard W.M. Jones 23 Nov '07

23 Nov '07

Debian ship a completely different version of netcat from Fedora. Not just a different version, but it appears to be a different codebase. Debian's netcat doesn't support the (very useful) -U option, so this code fails in src/remote_internal.c: cmd_argv[j++] = strdup (command); //..... cmd_argv[j++] = strdup (server); cmd_argv[j++] = strdup (netcat ? netcat : "nc"); cmd_argv[j++] = strdup ("-U"); cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; As a result of this remote-over-ssh fails on Debian. I'm not completely sure how to solve this at the moment. If anyone has any ideas ... Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 4

[Libvir] [PATCH] fixes when running as user or in tree tests
by Daniel Veillard 23 Nov '07

23 Nov '07

The following patches does 3 things which correct annoyances when running as an user or when running from a tree built with --prefix=/usr - avoid error message when non-root cannot open xenstore - avoid error message when non-root cannot directly access xend in those two cases the proxy (or remote code) should implement the access so there is no need to raise the error there. - when configuring with --prefix=/usr i.e. the same prefix as the installed libvirt, use the same localstatedir /var (instead of /usr/var) and sysconfdir /etc (instead of /usr/etc) to be able to connect to the system daemon, and use the system local options Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] (remoteInitializeGnuTLS): Fix a typo in a variable name.
by Jim Meyering 22 Nov '07

22 Nov '07

2007-11-21 Jim Meyering <meyering(a)redhat.com> Fix a typo in a variable name. * qemud/qemud.c: Check crl_file, not ca_file, for revocation list, in remoteInitializeGnuTLS. diff --git a/qemud/qemud.c b/qemud/qemud.c index 55bd805..f6cd026 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -165,7 +165,7 @@ remoteInitializeGnuTLS (void) } if (crl_file && crl_file[0] != '\0') { - if (remoteCheckCertFile("CA revocation list", ca_file) < 0) + if (remoteCheckCertFile("CA revocation list", crl_file) < 0) return -1; qemudDebug ("loading CRL from %s", crl_file); -- 1.5.3.6.736.gb7f30

2 2

[Libvir] <disk> <shareable/> has no effect
by Markus Armbruster 21 Nov '07

21 Nov '07

Looks like <shareable/> within <disk> has no effect. I ran virsh dumpxml, inserted the <shareable/>, redefined the domain, and ran virsh dumpxml again. No shareable. I even ran virsh undefine and virsh define again, same thing. XML and output of xm list --long for this guest attached.

3 4

[Libvir] brSetForwardDelay / brSetEnableSTP
by Richard W.M. Jones 21 Nov '07

21 Nov '07

This code in qemu_driver.c doesn't look right to me. I think the second should be a call to brSetEnableSTP? Rich. if (network->def->forwardDelay && (err = brSetForwardDelay(driver->brctl, network->bridge, network->def->forwardDelay))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "failed to set bridge forward delay to %d\n", network->def->forwardDelay); goto err_delbr; } if ((err = brSetForwardDelay(driver->brctl, network->bridge, network->def->disableSTP ? 0 : 1))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "failed to set bridge STP to %s\n", network->def->disableSTP ? "off" : "on"); goto err_delbr; } -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] virterror Cleanups
by Saori Fukuta 20 Nov '07

20 Nov '07

Hi, The virsh command sometimes says wrong message that indicating where the error is coming from. So I have some fixes for libvirt error. * Add two number for virErrorDomain (virterror.h) * Add six message indicating where it's coming from (virterror.c) * Fix virErrorDomain number specified with __virRaiseError (openvz_conf.c/openvz_driver.c/stats_linux.c/xm_internal.c) Regards, Saori Fukuta

3 4

[Libvir] ANNOUNCE: Ruby bindings for libvirt
by David Lutterkort 20 Nov '07

20 Nov '07

I'm pleased to announce the availability of Ruby bindings for libvirt. The main site for them is http://libvirt.org/ruby API docs can be found at http://libvirt.org/ruby/api/index.html An initial release is at http://libvirt.org/ruby/download - the bindings are mostly complete, though there are a number of less frequently used functions that are not covered yet. Please send all your patches (and comments/questions) to this list. David

3 3

[Libvir] [PATCH]: Add virNodeGetInfo to ruby bindings
by Chris Lalancette 19 Nov '07

19 Nov '07

All, Attached is a patch to add the virNodeGetInfo() call to the Libvirt Ruby bindings. Although it is not technically a virConn* function, it acts like one since it uses the virConnectPtr structure, so I put it with those functions. Let me know if I am doing anything completely crazy in here; this is my first stab at Ruby binding code. It works like so: require 'libvirt' conn = Libvirt::open("qemu:///system") ni = c.nodeGetInfo print ni Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

[Libvir] [Suggestion] The "ISP scenario"
by Richard W.M. Jones 19 Nov '07

19 Nov '07

This pattern has come up a few times now: ISP provides a Xen hosting service to customers. ISP wants to provide some basic statistics to their customers. The statistics could be provided to a customer through the libvirt remote protocol, eg: customer$ virsh -c xen://dom0/ dominfo mydom But the problem with this is that (as libvirt is currently architected) _any_ access to dom0, if it authenticates, gives access to information from all domains. We've previously discussed adding access control using something like SELinux (see for example: https://www.redhat.com/archives/libvir-list/2007-August/msg00030.html) but nothing much has come of it so far. But can we solve the single common case above directly, without thwarting our ability to solve the bigger picture later? My suggestion is that we add an option to /etc/libvirt/libvirtd.conf, something like: tls_restrict_dn: [ "DN1", "name:customer1", "DN2", "uuid:12345678", "DN3", "*" ] with the meaning that (presumably a customer) connecting with certificate DN1 could only find out information about the domain "customer1", DN2 similarly, DN3 is a privileged client, and any other DN would be rejected. (Compare and contrast to tls_allowed_dn_list: http://libvirt.org/remote.html#Remote_libvirtd_configuration) An implementation of this would modify the call to virConnectOpen to add an additional flag (or call?) allowing the access control to be passed, and this would have to be checked in the relevant virDomain* calls. This is not dissimilar to how read-only connections are implemented in libvirtd currently. I would also suggest as a matter of course that we modify all public API calls in src/libvirt.c to add a call to a generic permission checking routine, for example: int virDomainSuspend(virDomainPtr domain) { virConnectPtr conn; DEBUG("domain=%p", domain); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); return (-1); } - if (domain->conn->flags & VIR_CONNECT_RO) { - virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); - return (-1); - } + if (!check_permission (domain, OP_SUSPEND)) return -1; With the initial implementation of check_permission just doing the VIR_CONNECT_RO check to start with, but able to do other checks in future. Also relevant to this is SASL support, see: https://www.redhat.com/archives/libvir-list/2007-November/msg00005.html since AIUI this changes the possible formats for Distinguished Names, or could even make DNs irrelevant. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 2

[Libvir] [Bug] keymap tag for vnc connections ignored for qemu and kvm
by C. Hemsing 19 Nov '07

19 Nov '07

The keymap entry in the respective xml file is being ignored when starting qemu. It should be honoured in src/qemu_conf.c when setting up argv in function qemudBuildCommandLine in case keymap is set and vnc has been chosen. Ignoring the keymap (not issuing -k ...) will make vnc impossible to use for many international keyboards. I've filed a bug report (https://bugzilla.redhat.com/show_bug.cgi?id=390461) Cheers, Chris

1 0

[Libvir] [Bug] keymap tag for vnc connections ignored for qemu and kvm
by C. Hemsing 19 Nov '07

19 Nov '07

The keymap entry in the respective xml file is being ignored when starting qemu. It should be honoured in src/qemu_conf.c when setting up argv in function qemudBuildCommandLine in case keymap is set and vnc has been chosen. Ignoring the keymap (not issuing -k ...) will make vnc impossible to use for many international keyboards. I've filed a bug report (https://bugzilla.redhat.com/show_bug.cgi?id=390461) Cheers, Chris

1 0

[Libvir] PATCH: Fix stats overflow
by Daniel P. Berrange 19 Nov '07

19 Nov '07

FYI, I have just applied the attached patch to fix a 32-bit overflow in the stats code. We were doing a left shift of more than 32 bits on '1L' which is only 32-bit wide on 32-bit platforms. I simply cast to a long long instead. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 3

[Libvir] diagnose invalid domain ID numbers (and invalid integers, in general)
by Jim Meyering 18 Nov '07

18 Nov '07

Hello, There are over 30 uses of strtol in libvirt, and they all can silently accept invalid input. The invalid string might range from an outlandish domain ID like 4294967298 to strings of digits followed by bogus alpha. Maybe not worth worrying about, you say? But what if they indicate user confusion, e.g., 1,000 vs 1000? Silently interpreting "1,000" as "1" would leave the poor user even more confused :-) IMHO, they should all be diagnosed. Fixing them properly requires some infrastructure, so that you don't end up duplicating too much logic. This patch adds part of that infrastructure and fixes only a single instance, to start with. I'll fix the others once we're all agreed on the form of the infrastructure. I've fixed the bug that would make this command: echo domname $(echo 2^32+2|bc)|src/virsh ... act just like this one: echo domname 2|src/virsh ... Now, it does this: $ echo domname 4294967298|src/virsh --quiet --connect test://$PWD/docs/testnode.xml virsh > error: failed to get domain '4294967298' virsh > The new test script, tests/int-overflow demonstrates precisely that before/after behavior. This change adds some other new files. src/xstrtol.c and .h contain the first of a few new strtol-like functions. This first one, xstrtol_i, converts to an "int". Other wrappers will convert to wider types. The goal is to put the tedious tests into the wrappers so that applications can be robust without all the duplicated gore. It is important (from type-safety and maintainability standpoints) to ensure that the resulting integral value be "returned" via an argument pointer, not a return value. With the former, you're guaranteed to have matching types. Simply getting the value via "return", it is too easy to mistakenly change width or signedness. Here's the new function's description and signature: /* Like strtol, but produce an "int" result, and check more carefully. Return 0 upon success; return -1 to indicate failure. When END_PTR is NULL, the byte after the final valid digit must be NUL. Otherwise, it's like strtol and lets the caller check any suffix for validity. This function is careful to return -1 when the string S represents a number that is not representable as an "int". */ int xstrtol_i(char const *s, char **end_ptr, int base, int *result) My first attempt put the definition of xstrtol_i in the logical place: util.c. But that would have required linking virsh with util.c, and that fails due to an unsatisfied reference to __virRaiseError. So instead, it's in its own file, now. If you want it in some other file, just tell me where. BTW, I have no strong preference for the name xstrtol_i. Bear in mind that the name tells you that it's based on (and limited to) strtol's "long" type, and produces an 'i'nt value. It happens to be the same one used in at least one other project, and closely resembles the xstrto* functions in gnulib. Note that there are almost certainly places in the code where we'll want to use a variant that targets an unsigned type like "size_t" or a wider type like long long. In addition to other uses of strtol that I plan to fix, there are three uses of strtoll, too. Patch attached below. If you apply it with plain-old-patch, remember to run this: chmod a+x tests/int-overflow Thu Nov 8 09:59:43 CET 2007 Jim Meyering <meyering(a)redhat.com> Diagnose an invalid domain ID number. * src/virsh.c: Include "xstrtol.h" (vshCommandOptDomainBy): Detect integer overflow in domain ID number. * tests/int-overflow: New script. Test for the above-fixed bug. * tests/Makefile.am (TESTS): Add int-overflow. (TESTS_ENVIRONMENT): Define, to propagate $abs_top_* variables into the int-overflow script. (valgrind): Adapt rule not to clobber new TESTS_ENVIRONMENT. * src/xstrtol.h, src/xstrtol.c: New files. * src/Makefile.am (virsh_SOURCES): Add xstrtol.c and xstrtol.h. --- src/Makefile.am | 2 +- src/virsh.c | 10 ++++------ src/xstrtol.c | 33 +++++++++++++++++++++++++++++++++ src/xstrtol.h | 7 +++++++ tests/Makefile.am | 10 ++++++++-- tests/int-overflow | 22 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 src/xstrtol.c create mode 100644 src/xstrtol.h create mode 100755 tests/int-overflow

3 8

[Libvir] [PATCH 0/2] KVM network stats
by Richard W.M. Jones 15 Nov '07

15 Nov '07

This two part patch collects network interface stats from KVM domains. With this patch, virt-top will show the stats in its network interface view, as in the screengrab below. Rich. virt-top 15:47:38 - x86_64 4/4CPU 2814MHz 3967MB 0.1% 1 domains, 1 active, 1 running, 0 sleeping, 0 paused, 0 inactive D:0 O:0 X:0 CPU: 3.0% Mem: 250 MB (250 MB by guests) ID S RXBY TXBY RXPK TXPK DOMAIN INTERFACE 1 R 222K 5436 175 78 debian32kvm vnet0 -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 5

[Libvir] [PATCH] Miscellaneous cleanups for virNodeGetFreeMemory and virNodeGetCellsFreeMemory
by Richard W.M. Jones 15 Nov '07

15 Nov '07

(1) Add documentation to the hvsupport page for virNodeGetFreeMemory (2) Fix documentation on the hvsupport page to show that the two new functions aren't supported in the QEMU, KVM or remote cases yet. (3) Add DEBUG() calls to both new functions. (4) xen_internal.c functions may now support a connection argument to virXenError / virXenErrorFunc. I have modified this file so that where the connection is known, it is passed. Because of the way virterror works, errors should always be attached to a connection if at all possible, otherwise there is no sane way to turn non-connection errors into exceptions in language bindings, and also error handling in threaded code won't work. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] Make "make distcheck" work.
by Jim Meyering 15 Nov '07

15 Nov '07

Here's another infrastructure-fixing patch. I got most of the way to an honest "make distcheck", but fixing a final failing sub-test wasn't worth the effort, so I punted and added the top level "distuninstallcheck" target to make it skip that part. Make "make distcheck" work. * Makefile.am: Expand some "*" wildcards, and (for now) disable the relatively unimportant, distuninstallcheck target. Fix a few redirect-directly-to-target bugs. Add a few $(srcdir)/ prefixes and add an uninstall-local rule. * docs/Makefile.am: More of the same. Split some long lines. * docs/examples/Makefile.am: Likewise. * python/Makefile.am: Likewise. * python/tests/Makefile.am: Likewise. * qemud/Makefile.am: Likewise. * tests/Makefile.am: Remove the directories already listed in SUBDIRS. --- Makefile.am | 3 + docs/Makefile.am | 95 +++++++++++++++++++++++++++++++++++++++----- docs/examples/Makefile.am | 13 ++++-- python/Makefile.am | 6 ++- python/tests/Makefile.am | 2 + qemud/Makefile.am | 26 ++++++++---- tests/Makefile.am | 8 +--- 7 files changed, 120 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index e1e6884..eaa204e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,3 +41,6 @@ cov-am: > $(top_builddir)/coverage/index.html for i in $(top_builddir)/src/*.gcov ; do o=`echo $$i | sed -e 's,$(top_builddir)/src,coverage,'` ; \ perl $(srcdir)/scripts/coverage-report-entry.pl $$i > $$o.html ; done + +# disable this check +distuninstallcheck: diff --git a/docs/Makefile.am b/docs/Makefile.am index c7dfe24..2aa923d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -7,18 +7,82 @@ DOC_SOURCE_DIR=../src PAGES= index.html bugs.html FAQ.html remote.html APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \ APIsymbols.html APIchunk0.html -EXTRA_DIST= \ - libvirt-api.xml libvirt-refs.xml apibuild.py \ - *.xsl *.html *.gif html/*.html html/*.png \ - *.xml *.rng - man_MANS= +html = \ + book1.html \ + index.html \ + libvirt-conf.html \ + libvirt-lib.html \ + libvirt-libvirt.html \ + libvirt-virterror.html + +png = \ + left.png \ + up.png \ + home.png \ + right.png + +gif = \ + Libxml2-Logo-90x34.gif \ + architecture.gif \ + node.gif \ + redhat.gif + +dot_html = \ + APIchunk0.html \ + APIchunk1.html \ + APIchunk2.html \ + APIchunk3.html \ + APIchunk4.html \ + APIchunk5.html \ + APIchunk6.html \ + APIchunk7.html \ + APIconstructors.html \ + APIfiles.html \ + APIfunctions.html \ + APIsymbols.html \ + FAQ.html \ + architecture.html \ + bugs.html \ + downloads.html \ + errors.html \ + format.html \ + hvsupport.html \ + index.html \ + intro.html \ + libvir.html \ + news.html \ + python.html \ + remote.html \ + uri.html + +xml = \ + libvirt-api.xml \ + libvirt-refs.xml \ + testdomfc4.xml \ + testdomfv0.xml \ + testnetdef.xml \ + testnetpriv.xml \ + testnode.xml + +rng = \ + libvirt.rng \ + network.rng + +EXTRA_DIST= \ + libvirt-api.xml libvirt-refs.xml apibuild.py \ + site.xsl newapi.xsl api.xsl \ + $(dot_html) $(gif) html \ + $(xml) $(rng) + all: web $(top_builddir)/NEWS $(man_MANS) virsh.1: virsh.pod - pod2man -c "Virtualization Support" virsh.pod > virsh.1 && cp virsh.1 $(top_builddir) + pod2man -c "Virtualization Support" $(srcdir)/virsh.pod > $@-t + mv $@-t $@ + cp $@ $(top_builddir) api: libvirt-api.xml libvirt-refs.xml $(APIPAGES) $(srcdir)/html/index.html @@ -50,7 +114,9 @@ $(srcdir)/html/index.html: libvirt-api.xml $(srcdir)/newapi.xsl echo "Validating the resulting XHTML pages" ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; fi ); -libvirt-api.xml libvirt-refs.xml: apibuild.py ../include/libvirt/*.h ../src/*.h ../src/*.c +libvirt-api.xml libvirt-refs.xml: apibuild.py \ + $(srcdir)/../include/libvirt/*.h \ + $(srcdir)/../src/*.h $(srcdir)/../src/*.c -(./apibuild.py) $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html @@ -67,8 +133,15 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html \ + $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif \ + $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html - -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html - + for h in $(html); do \ + $(INSTALL) -m 0644 $(srcdir)/html/$$h $(DESTDIR)$(HTML_DIR)/html; done + for p in $(png); do \ + $(INSTALL) -m 0644 $(srcdir)/html/$$p $(DESTDIR)$(HTML_DIR)/html; done + +uninstall-local: + for h in $(html); do rm $(DESTDIR)$(HTML_DIR)/html/$$h; done + for p in $(png); do rm $(DESTDIR)$(HTML_DIR)/html/$$p; done diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index c62d128..8a66999 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -6,15 +6,20 @@ LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la rebuild: examples.xml index.html -examples.xml: index.py *.c +examples.xml: index.py info1.c suspend.c -(a)($(srcdir)/index.py) index.html: examples.xml examples.xsl $(top_srcdir)/docs/site.xsl - -@(if [ -x $(XSLTPROC) ] ; then $(XSLTPROC) examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html ; fi) + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) examples.xsl examples.xml \ + && echo "Rebuilt web page" \ + && xmllint --valid --noout index.html; \ + fi) install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \ + $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) EXTRA_DIST=examples.xsl index.py examples.xml @@ -37,5 +42,3 @@ tests: $(noinst_PROGRAMS) @(echo '## examples regression tests') @($(CHECKER) ./suspend) @($(CHECKER) ./info1) - - diff --git a/python/Makefile.am b/python/Makefile.am index 4f97610..1fe60ff 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -49,7 +49,8 @@ $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC) $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir) libvirt.py: $(srcdir)/libvir.py libvirtclass.py - cat $(srcdir)/libvir.py libvirtclass.py > libvirt.py + cat $(srcdir)/libvir.py libvirtclass.py > $@-t + mv $@-t $@ $(libvirtmod_la_OBJECTS): $(GENERATED) @@ -60,6 +61,9 @@ install-data-local: @(for doc in $(DOCS) ; \ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) +uninstall-local: + rm -f $(DESTDIR)$(pythondir)/libvirt.py + CLEANFILES= $(GENERATED) libvirt.py else diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index dfa52e4..6011fef 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -32,3 +32,5 @@ install-data-local: -(for test in $(PYTESTS); \ do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) +uninstall-local: + for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 3da6265..6aedf8c 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,19 +47,23 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS) libvirtd_LDADD += $(AVAHI_LIBS) endif +default_xml_dest = libvirt/qemu/networks/default.xml install-data-local: install-init mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart - $(INSTALL_DATA) $(srcdir)/default-network.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml - sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + $(INSTALL_DATA) $(srcdir)/default-network.xml \ + $(DESTDIR)$(sysconfdir)/$(default_xml_dest) + sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \ + $(DESTDIR)$(sysconfdir)/$(default_xml_dest) test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ - ln -s ../default.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + ln -s ../default.xml \ + $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt uninstall-local: uninstall-init rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml - rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml + rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest) rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || : rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || : rmdir $(DESTDIR)$(localstatedir)/run/libvirt || : @@ -95,20 +99,24 @@ remote_dispatch_proc_switch.h: remote_generate_stubs.pl remote_protocol.x if LIBVIRT_INIT_SCRIPTS_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + $(INSTALL_SCRIPT) libvirtd.init \ + $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig - $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd uninstall-init: - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd libvirtd.init: libvirtd.init.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ -e s!\@sbindir\@!@sbindir@!g \ -e s!\@sysconfdir\@!@sysconfdir@!g \ - < $< > $@ - chmod a+x libvirtd.init + < $< > $@-t + chmod a+x $@-t + mv $@-t $@ CLEANFILES = libvirtd.init else diff --git a/tests/Makefile.am b/tests/Makefile.am index fec2f20..998877a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,14 +34,8 @@ LDADDS = \ EXTRA_DIST = \ xmlrpcserver.py \ test_conf.sh \ - confdata \ qemuxml2argvdata \ - xml2sexprdata \ - nodeinfodata \ - virshdata \ - xencapsdata \ - sexpr2xmldata \ - xmconfigdata + nodeinfodata noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ -- 1.5.3.5.666.gfb5f

2 5

[Libvir] [PATCH] stats_linux.c: Only include xs.h if WITH_XEN.
by Jim Paris 15 Nov '07

15 Nov '07

Fixes compile error when building --without-xen on a host that has no Xen headers installed. --- src/stats_linux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/stats_linux.c b/src/stats_linux.c index 5e6d06c..125af45 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -19,7 +19,9 @@ #include <string.h> #include <unistd.h> +#ifdef WITH_XEN #include <xs.h> +#endif #include "internal.h" #include "xen_unified.h" -- 1.5.3.4

3 3

[Libvir] documentation on the website is not in sync
by Gildas 15 Nov '07

15 Nov '07

Hi, As reported on the irc channel, the documentation at http://libvirt.org/uri.html#URI_qemu is not in sync with what is reported/supported by libvirtd v 0.3.3 Regards, Gildas

3 2

[Libvir] The problem of the definition of tuning informations
by Daniel Veillard 15 Nov '07

15 Nov '07

I promised that mail for the beginning of the week but I still have a very hard time to try to formulate a good plan of action, I'm still stuck in a dilemna, see below. What is it? ----------- I think tuning informations are that set of parameters associated to a domain or a host, which are not stricly needed to get the domain(s) working but improve their runtime behaviour. To me this includes: - scheduling parameters the scope may be host/hypervisor/domain - vcpu affinity i.e. to which set of physical CPU each of the vcpu may be bound - and possibly others ... The problem: ------------ People would like to associate those to the XML domain informations, the goal being to be able to restore those informations when a domain (re-)starts. I have been objecting it so far because, I think those informations don't have the same lifetime and scope as the other domain informations saved in the XML. Since they are not needed to start the domain, and that once the domain is started the existing domain API can be used to change those informations, it is better to keep them separate. However I got objections from David Lutterkort [1], Jim Fehlig [2], and John Levon [3] plus of course the initial request for it from Tatsuro Enokura (and the Fujistu people in general) [4] The problem to me comes from 2 things: 1/ storing tuning informations in domains descriptions is not sufficient 2/ if we store them there we also need to always save them when exporting the XML domain file 2/ is fairly important to avoid a lot of problems as we have experienced before for example with console informations. If the input for virsh create gets different from the output of dumpxml, a lot of rather annoying things happen in practice, it certainly generate confusion. So we really need to output those tuning data if we put them in. Also I strongly believe in 1/, i.e. tuning informations are cross domain and they are vey likely to change fast as soon as the management applications will get deployed, but even in relatively small deployment the tuning is rather a per host informations, which may depend on the current workload of the machine. I don't believe in tuning being loaded at create time and never changing later. Even in my own very basic usage that doesn't match my use which lead me to load and stop domain on demand for short period of time. My opinion: ----------- We need better tools, even for simple use case to be able to save an existing tuning for a domain or a full machine, and reload it when needed. This is IMHO better done on top of the existing API which already have the entry points to implement them. My idea is to provide tuning commands in virsh [5]. If you implement tuning both at creation time and in the tool, this mean you either make them different in which case you have no coherency between what you say when you create a domain or save its config and what you do at the virsh level. If you don't make it different (for example trying to use the same kind of XML syntax), then you need code for doing this both in the tool and in the library itself, or you export as a new API the tuning load and save. Exporting as a parallel API what we have already for scheduling and VCPU affinity makes the API more complex, and less coherent. I don't want to force the decision one way or another, it is probable I missed something, but I don't think adding tuning informations to the domain configuration file to be really that convenient, I could be done better, and with less associated problems by keeping those separate. Daniel [1] https://www.redhat.com/archives/libvir-list/2007-October/msg00250.html [2] https://www.redhat.com/archives/libvir-list/2007-November/msg00003.html [3] https://www.redhat.com/archives/libvir-list/2007-October/msg00046.html [4] https://www.redhat.com/archives/libvir-list/2007-October/msg00221.html [5] https://www.redhat.com/archives/libvir-list/2007-October/msg00245.html -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

5 13

[Libvir] latest NUMA/cpuset code testing
by beth kon 15 Nov '07

15 Nov '07

I tested the latest CVS libvirt on a 128-way x3950 and create, define, and start appear to work well with various cpusets specified. The only thing I noticed was that dumpxml does not grab the cpuset info. I have not looked at the code to verify, but is this expected? Maybe you discussed this Daniel, but I can't remember at the moment. -- Elizabeth Kon (Beth) IBM Linux Technology Center Open Hypervisor Team email: eak(a)us.ibm.com

3 2

[Libvir] ANNOUNCE: ocaml-libvirt 0.3.3.1 released
by Richard W.M. Jones 14 Nov '07

14 Nov '07

I'm pleased to announce the release of ocaml-libvirt 0.3.3.1, type-safe libvirt bindings for OCaml. Main page: http://et.redhat.com/~rjones/ocaml-libvirt/ Source repo: http://hg.et.redhat.com/virt/applications/virt-top--devel Change log: http://et.redhat.com/~rjones/ocaml-libvirt/ChangeLog.txt This minor update contains bindings for the new API calls virNodeGetFreeMemory and virNodeGetCellsFreeMemory. http://et.redhat.com/~rjones/ocaml-libvirt/html/Libvirt.Connect.html#VALnod… The 'mlvirsh' command now has a new 'freecell' subcommand: mlvirsh freecell - Calls virNodeGetFreeMemory and prints free memory in the whole system. mlvirsh freecell <start> - Calls virNodeGetCellsFreeMemory (conn, start, 1) and prints free memory on a single NUMA cell. mlvirsh freecell <start> <max> - Calls virNodeGetCellsFreeMemory (conn, start, max) and prints free memory on the given range of NUMA cells. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 1

[Libvir] [PATCH] Handle failed strdup and malloc.
by Jim Meyering 14 Nov '07

14 Nov '07

I noticed a bunch of unchecked strdup's in a row, and audited the rest of the file: Handle failed strdup and malloc. * src/remote_internal.c: Don't dereference NULL after failed strdup or malloc in doRemoteOpen. --- src/remote_internal.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index 1420a88..bd8b5a7 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -522,6 +522,10 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET_RO); else sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET); + if (sockname == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } } } @@ -576,10 +580,19 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */ command = command ? : strdup ("ssh"); + if (command == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } // Generate the final command argv[] array. // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] cmd_argv = malloc (nr_args * sizeof (char *)); + if (cmd_argv == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } + j = 0; cmd_argv[j++] = strdup (command); cmd_argv[j++] = strdup ("-p"); @@ -601,6 +614,11 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; assert (j == nr_args); + for (j = 0; j < nr_args; j++) + if (cmd_argv[j] == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); + goto failed; + } } /*FALLTHROUGH*/ @@ -633,6 +651,10 @@ doRemoteOpen (virConnectPtr conn, struct private_data *priv, const char *uri_str // Run the external process. if (!cmd_argv) { cmd_argv = malloc (2 * sizeof (char *)); + if (cmd_argv == NULL) { + error (NULL, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto failed; + } cmd_argv[0] = command; cmd_argv[1] = 0; } -- 1.5.3.5.666.gfb5f

2 3

[Libvir] [PATCH] Enhanced stats for fullvirt domains
by Richard W.M. Jones 14 Nov '07

14 Nov '07

This patch does a couple of primary things: Firstly it allows you to use "hda", etc. as a path for getting block device stats from fullvirt domains. Secondly it separates out the stats code into a new file called 'stats_linux.c'. The reasoning behind the name is that this code can be shared between Xen & QEMU, and that the code is Linux-specific (it never worked on Solaris, but now this is explicit). I anticipate a 'stats_solaris.c' file once I can get Solaris + Xen going on a test machine. Also we try to detect the case where the block dev stats of a fullvirt domain are stuck at 0 -- caused by there being no frontend driver connected. We detect the condition by a query to xenstore. XENVBD_MAJOR is no longer hard-coded if we can get it instead from Linux header files. This patch adds bytes written/read to block devices for Xen PV domains if available. This also corrects a bug where stats from xvdb, xvdc, .. could not be read out because the device number was being miscalculated. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 7

[Libvir] [PATCH] Fix xen://hostname URIs with no trailing slash
by Richard W.M. Jones 14 Nov '07

14 Nov '07

It turns out that xmlParseURI gives an error if asked to parse the string "xen://". This string arises because after a URI such as "xen://hostname" has been stripped of its server field, it becomes "xen://" on the remote end of the connection, and the failure of xmlParseURI causes the whole connection to fail. I'm not sure of the best way to fix it. The attached patch is a semi-hack which at least allows xen://hostname to work. It's not a problem for qemu because these URIs should always contain a path. Nor for test for the same reason. Not sure about OpenVZ. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] parse URI once in src/libvirt.c, pass parsed URI to all drivers
by Richard W.M. Jones 14 Nov '07

14 Nov '07

The basic change here is that the virDrvOpen call (the internal "open" call for drivers) now takes the parsed xmlURIPtr instead of the raw name string. typedef virDrvOpenStatus (*virDrvOpen) (virConnectPtr conn, - const char *name, + xmlURIPtr uri, int flags); So we avoid the redundant URI parsing which was going on inside all the drivers, and also the ad-hoc "does-it-look-like-a-URI" string comparisons. That's straightforward enough except that all of the drivers were saving the name string in their private data so that they could implement the virConnectGetURI call. I've changed this so that the name is copied and saved in the main virConnect structure, and virConnectGetURI will return that unless the driver wants to override it. You need another patch (coming shortly) to allow URIs like xen://localhost (without the trailing slash) to work, which was IIRC the original point of this discussion. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] [PATCH] Parse integers more carefully, cont'd.
by Jim Meyering 13 Nov '07

13 Nov '07

Here's part two in the strtol fix-up series: Parse integers more carefully, cont'd. * qemud/qemud.c: Replace uses of strtol with uses of xstrtol_i. Avoid overflow for very large --timeout=N values. * src/nodeinfo.c: In linuxNodeInfoMemPopulate and linuxNodeInfoCPUPopulate, use xstrtol_i rather than strtol. Unlike in qemud.c, here we allow trailing "isspace", and in the case of "cpuinfo cpu MHz", also allow a "." terminator, since we ignore the decimal and any following digits. * src/internal.h: Define xstrtol_iu, too. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 16 ++++++---------- src/internal.h | 19 +++++++++++++++++++ src/nodeinfo.c | 24 +++++++++++++++++++----- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 8e3ba54..ee6f6ce 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1583,9 +1583,7 @@ remoteReadConfigFile (const char *filename) p = virConfGetValue (conf, "unix_sock_ro_perms"); CHECK_TYPE ("unix_sock_ro_perms", VIR_CONF_STRING); if (p && p->str) { - char *tmp = NULL; - unix_sock_ro_perms = strtol(p->str, &tmp, 8); - if (*tmp) { + if (xstrtol_i(p->str, NULL, 8, &unix_sock_ro_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); return -1; } @@ -1594,9 +1592,7 @@ remoteReadConfigFile (const char *filename) p = virConfGetValue (conf, "unix_sock_rw_perms"); CHECK_TYPE ("unix_sock_rw_perms", VIR_CONF_STRING); if (p && p->str) { - char *tmp = NULL; - unix_sock_rw_perms = strtol(p->str, &tmp, 8); - if (*tmp) { + if (xstrtol_i(p->str, NULL, 8, &unix_sock_rw_perms) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", p->str); return -1; } @@ -1797,10 +1793,10 @@ int main(int argc, char **argv) { break; case 't': - timeout = strtol(optarg, &tmp, 10); - if (!tmp) - timeout = -1; - if (timeout <= 0) + if (xstrtol_i(optarg, &tmp, 10, &timeout) != 0 + || timeout <= 0 + /* Ensure that we can multiply by 1000 without overflowing. */ + || timeout > INT_MAX / 1000) timeout = -1; break; diff --git a/src/internal.h b/src/internal.h index 4a31ea6..f6fb1c5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -264,6 +264,25 @@ xstrtol_i(char const *s, char **end_ptr, int base, int *result) return 0; } +/* Just like xstrtol_i, above, but produce an "unsigned int" value. */ +static inline int +xstrtol_ui(char const *s, char **end_ptr, int base, unsigned int *result) +{ + unsigned long int val; + char *p; + int err; + + errno = 0; + val = strtoul(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 01d7e28..a0a26eb 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -63,6 +63,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n } nodeinfo->cpus++; } else if (STREQLEN(buf, "cpu MHz", 7)) { + char *p; + unsigned int ui; buf += 9; while (*buf && isspace(*buf)) buf++; @@ -72,8 +74,12 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n "parsing cpuinfo cpu MHz"); return -1; } - nodeinfo->mhz = (unsigned int)strtol(buf+1, NULL, 10); + if (xstrtol_ui(buf+1, &p, 10, &ui) == 0 + /* Accept trailing fractional part. */ + && (*p == '\0' || *p == '.' || isspace(*p))) + nodeinfo->mhz = ui; } else if (STREQLEN(buf, "cpu cores", 9)) { /* aka cores */ + char *p; unsigned int id; buf += 9; while (*buf && isspace(*buf)) @@ -84,8 +90,9 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n "parsing cpuinfo cpu cores %c", *buf); return -1; } - id = (unsigned int)strtol(buf+1, NULL, 10); - if (id > nodeinfo->cores) + if (xstrtol_ui(buf+1, &p, 10, &id) == 0 + && (*p == '\0' || isspace(*p)) + && id > nodeinfo->cores) nodeinfo->cores = id; } } @@ -108,14 +115,21 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n } -int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, virNodeInfoPtr nodeinfo) { +int linuxNodeInfoMemPopulate(virConnectPtr conn, FILE *meminfo, + virNodeInfoPtr nodeinfo) { char line[1024]; nodeinfo->memory = 0; while (fgets(line, sizeof(line), meminfo) != NULL) { if (STREQLEN(line, "MemTotal:", 9)) { - nodeinfo->memory = (unsigned int)strtol(line + 10, NULL, 10); + char *p; + unsigned int ui; + if (xstrtol_ui(line + 10, &p, 10, &ui) == 0 + && (*p == '\0' || isspace(*p))) { + nodeinfo->memory = ui; + break; + } } } if (!nodeinfo->memory) { -- 1.5.3.5.643.g40e25

2 2

[Libvir] [PATCH] Arrange for tests to pass in a non-srcdir build.
by Jim Meyering 13 Nov '07

13 Nov '07

Most of the tests assumed that $(srcdir) == . This makes it so "make check" passes in a non-srcdir build, i.e., "mkdir build && cd build && ../configure && make && make check" Arrange for tests to pass in a non-srcdir build. * tests/Makefile.am: Include the contents of the *data directories in the make-dist-built tarball by adding each of that *data directories to EXTRA_DIST. Also add int-overflow (via $(test_scripts)) to EXTRA_DIST. * tests/nodeinfotest.c: Prepend "$abs_top_srcdir/tests" to each input file name. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/test_conf.sh: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise. --- tests/Makefile.am | 18 ++++++++++++++++-- tests/nodeinfotest.c | 14 +++++++++++--- tests/qemuxml2argvtest.c | 11 +++++++++-- tests/qemuxml2xmltest.c | 8 +++++++- tests/sexpr2xmltest.c | 13 ++++++++++++- tests/test_conf.sh | 5 +++-- tests/virshtest.c | 13 +++++++++---- tests/xencapstest.c | 22 +++++++++++++++++++--- tests/xmconfigtest.c | 21 +++++++++++++++++++-- tests/xml2sexprtest.c | 13 ++++++++++++- 10 files changed, 117 insertions(+), 21 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a472f8..fec2f20 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,15 +31,29 @@ LDADDS = \ $(LIBVIRT) \ $(COVERAGE_LDFLAGS) -EXTRA_DIST = xmlrpcserver.py test_conf.sh +EXTRA_DIST = \ + xmlrpcserver.py \ + test_conf.sh \ + confdata \ + qemuxml2argvdata \ + xml2sexprdata \ + nodeinfodata \ + virshdata \ + xencapsdata \ + sexpr2xmldata \ + xmconfigdata noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ nodeinfotest +test_scripts = \ + int-overflow +EXTRA_DIST += $(test_scripts) + TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh xmconfigtest \ xencapstest qemuxml2argvtest qemuxml2xmltest nodeinfotest \ - int-overflow + $(test_scripts) if ENABLE_XEN_TESTS TESTS += reconnect endif diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 604f5a4..8b22b71 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -10,6 +10,7 @@ #include "nodeinfo.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 @@ -67,9 +68,12 @@ static int linuxTestNodeInfo(const void *data) { char cpuinfo[PATH_MAX]; char meminfo[PATH_MAX]; char output[PATH_MAX]; - snprintf(cpuinfo, PATH_MAX, "nodeinfodata/linux-%s.cpuinfo", (const char*)data); - snprintf(meminfo, PATH_MAX, "nodeinfodata/linux-%s.meminfo", (const char*)data); - snprintf(output, PATH_MAX, "nodeinfodata/linux-%s.txt", (const char*)data); + snprintf(cpuinfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.cpuinfo", + abs_top_srcdir, (const char*)data); + snprintf(meminfo, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.meminfo", + abs_top_srcdir, (const char*)data); + snprintf(output, PATH_MAX, "%s/tests/nodeinfodata/linux-%s.txt", + abs_top_srcdir, (const char*)data); return linuxTestCompareFiles(cpuinfo, meminfo, output); } #endif @@ -90,6 +94,10 @@ main(int argc, char **argv) "nodeinfo-6", }; + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return EXIT_FAILURE; + progname = argv[0]; if (argc > 1) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a91cd03..052f3f3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; struct qemud_driver driver; #define MAX_FILE 4096 @@ -93,8 +94,10 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) { static int testCompareXMLToArgvHelper(const void *data) { char xml[PATH_MAX]; char args[PATH_MAX]; - snprintf(xml, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.xml", (const char*)data); - snprintf(args, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.args", (const char*)data); + snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_top_srcdir, (const char*)data); + snprintf(args, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.args", + abs_top_srcdir, (const char*)data); return testCompareXMLToArgvFiles(xml, args); } @@ -112,6 +115,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("QEMU XML-2-ARGV minimal", 1, testCompareXMLToArgvHelper, "minimal") < 0) ret = -1; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 59eaf8a..11d8239 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; struct qemud_driver driver; #define MAX_FILE 4096 @@ -59,7 +60,8 @@ static int testCompareXMLToXMLFiles(const char *xml) { static int testCompareXMLToXMLHelper(const void *data) { char xml[PATH_MAX]; - snprintf(xml, PATH_MAX, "qemuxml2argvdata/qemuxml2argv-%s.xml", (const char*)data); + snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_top_srcdir, (const char*)data); return testCompareXMLToXMLFiles(xml); } @@ -76,6 +78,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("QEMU XML-2-ARGV minimal", 1, testCompareXMLToXMLHelper, "minimal") < 0) ret = -1; diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index eda1397..563941b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -8,16 +8,23 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) { +static int testCompareFiles(const char *xml_rel, const char *sexpr_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char sexprData[MAX_FILE]; char *gotxml = NULL; char *xmlPtr = &(xmlData[0]); char *sexprPtr = &(sexprData[0]); int ret = -1; + char xml[PATH_MAX]; + char sexpr[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); + snprintf(sexpr, sizeof sexpr - 1, "%s/tests/%s", abs_top_srcdir, sexpr_rel); if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) goto fail; @@ -175,6 +182,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (virtTestRun("SEXPR-2-XML PV config (version 1)", 1, testComparePVversion1, NULL) != 0) ret = -1; diff --git a/tests/test_conf.sh b/tests/test_conf.sh index b5a6366..7735a66 100755 --- a/tests/test_conf.sh +++ b/tests/test_conf.sh @@ -1,9 +1,10 @@ #!/bin/bash +set -x NOK=0 -for f in confdata/*.conf +for f in $abs_top_srcdir/tests/confdata/*.conf do ./conftest $f > conftest.$$ - outfile=`echo $f | sed s+\.conf+\.out+` + outfile=`echo "$f" | sed s+\.conf$+\.out+` diff $outfile conftest.$$ > /dev/null if [ $? != 0 ] then diff --git a/tests/virshtest.c b/tests/virshtest.c index dc33c27..e26ef5c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -9,6 +9,7 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 static int testFilterLine(char *buffer, @@ -27,11 +28,15 @@ static int testFilterLine(char *buffer, return 0; } -static int testCompareOutput(const char *expect, const char *filter, const char *const argv[]) { +static int testCompareOutput(const char *expect_rel, const char *filter, + const char *const argv[]) { char expectData[MAX_FILE]; char actualData[MAX_FILE]; char *expectPtr = &(expectData[0]); char *actualPtr = &(actualData[0]); + char expect[PATH_MAX]; + + snprintf(expect, sizeof expect - 1, "%s/tests/%s", abs_top_srcdir, expect_rel); if (virtTestLoadFile(expect, &expectPtr, MAX_FILE) < 0) return -1; @@ -268,13 +273,13 @@ int main(int argc, char **argv) { int ret = 0; - char cwd[PATH_MAX]; char buffer[PATH_MAX]; - if (!getcwd(cwd, PATH_MAX-1)) + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) return 1; - snprintf(buffer, PATH_MAX-1, "test://%s/../docs/testnode.xml", cwd); + snprintf(buffer, PATH_MAX-1, "test://%s/docs/testnode.xml", abs_top_srcdir); buffer[PATH_MAX-1] = '\0'; progname = argv[0]; custom_uri = buffer; diff --git a/tests/xencapstest.c b/tests/xencapstest.c index 418bb7d..5744262 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -13,13 +13,14 @@ #include "xen_internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 static int testCompareFiles(const char *hostmachine, - const char *xml, - const char *cpuinfo, - const char *capabilities) { + const char *xml_rel, + const char *cpuinfo_rel, + const char *capabilities_rel) { char xmlData[MAX_FILE]; char *expectxml = &(xmlData[0]); char *actualxml = NULL; @@ -27,6 +28,17 @@ static int testCompareFiles(const char *hostmachine, int ret = -1; + char xml[PATH_MAX]; + char cpuinfo[PATH_MAX]; + char capabilities[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", + abs_top_srcdir, xml_rel); + snprintf(cpuinfo, sizeof cpuinfo - 1, "%s/tests/%s", + abs_top_srcdir, cpuinfo_rel); + snprintf(capabilities, sizeof capabilities - 1, "%s/tests/%s", + abs_top_srcdir, capabilities_rel); + if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0) goto fail; @@ -152,6 +164,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + virInitialize(); if (virtTestRun("Capabilities for i686, no PAE, no HVM", diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 524ef52..10024b9 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -32,10 +32,12 @@ #include "conf.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion) { +static int testCompareParseXML(const char *xmcfg_rel, const char *xml_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char xmcfgData[MAX_FILE]; char gotxmcfgData[MAX_FILE]; @@ -48,6 +50,11 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfi int wrote = MAX_FILE; void *old_priv; struct _xenUnifiedPrivate priv; + char xmcfg[PATH_MAX]; + char xml[PATH_MAX]; + + snprintf(xmcfg, sizeof xmcfg - 1, "%s/tests/%s", abs_top_srcdir, xmcfg_rel); + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); conn = virConnectOpenReadOnly("test:///default"); if (!conn) goto fail; @@ -92,7 +99,8 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, int xendConfi return ret; } -static int testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion) { +static int testCompareFormatXML(const char *xmcfg_rel, const char *xml_rel, + int xendConfigVersion) { char xmlData[MAX_FILE]; char xmcfgData[MAX_FILE]; char *xmlPtr = &(xmlData[0]); @@ -103,6 +111,11 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml, int xendConf virConnectPtr conn; void *old_priv; struct _xenUnifiedPrivate priv; + char xmcfg[PATH_MAX]; + char xml[PATH_MAX]; + + snprintf(xmcfg, sizeof xmcfg - 1, "%s/tests/%s", abs_top_srcdir, xmcfg_rel); + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); conn = virConnectOpenReadOnly("test:///default"); if (!conn) goto fail; @@ -259,6 +272,10 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + /* Config -> XML */ if (virtTestRun("Paravirt old PVFB (Format)", 1, testCompareParavirtOldPVFBFormat, NULL) != 0) diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 2fcc6b3..4b356d4 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -9,10 +9,12 @@ #include "internal.h" static char *progname; +static char *abs_top_srcdir; #define MAX_FILE 4096 -static int testCompareFiles(const char *xml, const char *sexpr, const char *name, int xendConfigVersion) { +static int testCompareFiles(const char *xml_rel, const char *sexpr_rel, + const char *name, int xendConfigVersion) { char xmlData[MAX_FILE]; char sexprData[MAX_FILE]; char *gotname = NULL; @@ -20,6 +22,11 @@ static int testCompareFiles(const char *xml, const char *sexpr, const char *name char *xmlPtr = &(xmlData[0]); char *sexprPtr = &(sexprData[0]); int ret = -1; + char xml[PATH_MAX]; + char sexpr[PATH_MAX]; + + snprintf(xml, sizeof xml - 1, "%s/tests/%s", abs_top_srcdir, xml_rel); + snprintf(sexpr, sizeof sexpr - 1, "%s/tests/%s", abs_top_srcdir, sexpr_rel); if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) goto fail; @@ -225,6 +232,10 @@ main(int argc, char **argv) progname = argv[0]; + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + return 1; + if (argc > 1) { fprintf(stderr, "Usage: %s\n", progname); exit(EXIT_FAILURE); -- 1.5.3.5.643.g40e25

2 1

[Libvir] bug #384443 - packages for virt-install and virt-manager
by Richard W.M. Jones 13 Nov '07

13 Nov '07

1 1

[Libvir] [PATCH] Make qemud's install-init rule work in a non-srcdir build.
by Jim Meyering 13 Nov '07

13 Nov '07

When building from other than the source directory, several things currently fail. This one fails because $(srcdir)/libvirtd.init doesn't exist. The libvirtd.init file we want to install is the one just built, in the current directory. Here's the fix: Make qemud's install-init rule work in a non-srcdir build. * qemud/Makefile.am: In the install-init, remove an unneeded $(srcdir)/ prefix. --- qemud/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 506fde5..3da6265 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -95,7 +95,7 @@ remote_dispatch_proc_switch.h: remote_generate_stubs.pl remote_protocol.x if LIBVIRT_INIT_SCRIPTS_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) $(srcdir)/libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + $(INSTALL_SCRIPT) libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -- 1.5.3.5.643.g40e25

2 2

[Libvir] bug #384300 - libvirt package for Debian
by Richard W.M. Jones 13 Nov '07

13 Nov '07

This is a libvirt package for Debian. It's derived from the Ubuntu libvirt package, rebuilt for Debian testing. I'm not the greatest Debian packager in the world, so any comments / feedback are welcome. The previous patch to the base Xen package is also required before this can be built. Source: http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3.orig.tar.gz http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1_i386.changes http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.dsc http://et.redhat.com/~rjones/debian-libvirt/libvirt_0.3.3-1.diff.gz Binary for i386: http://et.redhat.com/~rjones/debian-libvirt/libvirt-bin_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt-dev_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/libvirt0_0.3.3-1_i386.deb http://et.redhat.com/~rjones/debian-libvirt/python-libvirt_0.3.3-1_i386.deb There is a Debian ITP for libvirt here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=384300 Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] bug #402249 - include <xen/*.h> header files
by Richard W.M. Jones 13 Nov '07

13 Nov '07

When you build Xen from source, the "make install" rule installs extra header files such as <xen/xen.h> and <xen/dom0_ops.h> which are all required for building libvirt. However the Debian package doesn't run the install rule, but instead runs (effectively) "make -C tools install" and that only installs a partial set of header files. In particular none of the vital public Xen header files are installed, making it impossible to build libvirt, and probably other stuff as well. This patch fixes that by copying the required files by hand: http://et.redhat.com/~rjones/debian-libvirt/debian-xen-includes.patch (It is similar to what the Fedora RPM does, faced with the same situation). There is a bug which is somewhat related to this issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402249 Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] conftest: fix transposed size and count arguments to fwrite.
by Jim Meyering 12 Nov '07

12 Nov '07

I noticed conftest fail and tracked it down to this: conftest: fix transposed size and count arguments to fwrite. * tests/conftest.c: Include <string.h> and <errno.h>. Also include strerror in diagnostic. --- tests/conftest.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/conftest.c b/tests/conftest.c index 604e410..9c8e3a6 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -1,6 +1,8 @@ #include <unistd.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <errno.h> #include "conf.h" int main(int argc, char **argv) { @@ -25,8 +27,8 @@ int main(int argc, char **argv) { exit(3); } virConfFree(conf); - if (fwrite(buffer, len, 1, stdout) != len) { - fprintf(stderr, "Write failed\n"); + if (fwrite(buffer, 1, len, stdout) != len) { + fprintf(stderr, "Write failed: %s\n", strerror (errno)); exit(1); } exit(0); -- 1.5.3.5.643.g40e25

2 2

[Libvir] Question about specifications of virsh start
by Masayuki Sunou 12 Nov '07

12 Nov '07

Hi I have a question about specifications of virsh start. It is necessary to remove "type=ioemu" from the configuration file of Xen, when HVM domain installed Para Virtualized Driver use unmodified driver on Xen 3.0.3. But,libvirt always adds "type=ioemu" to vif of HVM domain in xm_internal.c. Therefore virsh start cannot start correctly HVM domain installed Para Virtualized Driver. Could you teach why does libvirt disregard setting of configuration file and set type=ioemu ? Thanks, Masayuki Sunou.

3 4

[Libvir] [PATCH] missing printf attributes
by Jim Meyering 08 Nov '07

08 Nov '07

I stumbled across two more missing printf attributes: 2007-11-08 Jim Meyering <meyering(a)redhat.com> * src/virsh.c (vshPrintExtra, vshDebug): Use gcc's printf attribute. Attaching differently, in an attempt to defy mailman-2.1.5:

2 1

[Libvir] Re: [collectd] collectd libvirtstats plugin
by Florian Forster 08 Nov '07

08 Nov '07

Hi Rich, as promised, I've taken a more in-depth look at the `libvirtstats' plugin (I've adopted this as a working title for now and will do the renaming on the weekend or so..) and it looks very good, thanks again :) The `_virDomainInfo' structure has the members `memory' and `maxMem'. Can one calculate `unused' or `free' (or whatever the preferred term in this particular case is) memory using `maxMem - memory'? Would that be an interesting metric? I'm not sure what the best way to store the CPU usage is. Is the `cpuTime' member of the `_virDomainInfo' structure the same as the sum over all `(struct _virVcpuInfo).cpuTime'? Does collecting the total make sense in this case? I'd much rather use the same `type' for ``normal'' CPU statistics and this case which would be much simpler if we didn't collect the total.. I've done some minor things while looking through the code. It basically a mix of coding style and personal convention. Since there's no Debian package yet I didn't install try to compile it yet. I'll install the library and fix the errors I've made as soon as I have some more spare time. The things I've changed are basically: - Rather use `sizeof (array);' than the `DATA_MAX_NAME_LEN' define. - NULL-terminate the strings unconditionally after `strncpy' or `snprintf' was used. - Rather use -- 8< -- if (status != 0) { handle_error (); } -- >8 -- than -- 8< -- if (status == -1) { handle_error (); } -- >8 -- On Mon, Nov 05, 2007 at 02:00:12PM +0000, Richard W.M. Jones wrote: > In the types.db, I have set the max for virt_cpu_total to be > 256,000,000,000. [...] Therefore I have assumed here that > max CPUs = 256. That's basically the reason why I'd rather collect each virtual CPU in a separate file and ``simply'' combine the graphs. This will work for n+1 CPUs ;) > I'm using CSV output, which works, but it seems to report the > aggregate counter values instead of the differences. Is that to be > expected? Yes, that is expected. The changes I've made for the next feature release (4.3) include an easy way to get the rates for a counter value. So I will certainly add an option to store rates instead. Regards, -octo -- Florian octo Forster Hacker in training GnuPG: 0x91523C3D http://verplant.org/

2 1

Re: [Libvir] [PATCH] * src/virsh.c (vshCommandOptInt): Correct indentation
by Jim Meyering 08 Nov '07

08 Nov '07

Well, mailman-2.1.5 mangled yet another of my messages. [ I know why, and have reported the bug. Maybe we'll get a fixed/newer version of mailman. ] But at least the patch got through. Here's the part that it removed: Here's a tiny patch to fix indentation, since I'm about to change the code in that area, I'm submitting this first, so we don't mix syntax-only changes with ones that change semantics. The last two times I tried to send an attachment, mailman removed them. I'll try one more time, with this one: Jim Meyering <meyering(a)redhat.com> wrote: > Signed-off-by: Jim Meyering <meyering(a)redhat.com> > --- > ChangeLog | 4 ++++ > src/virsh.c | 10 +++++----- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index ce68401..a6de485 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,7 @@ > +2007-11-08 Jim Meyering <meyering(a)redhat.com> > + > + * src/virsh.c (vshCommandOptInt): Correct indentation > + > Wed Nov 7 14:38:43 CET 2007 Daniel Veillard <veillard(a)redhat.com> > > * docs/libvir.html docs/site.xsl: small updates with references > diff --git a/src/virsh.c b/src/virsh.c > index 0615a7d..852dea2 100644 > --- a/src/virsh.c > +++ b/src/virsh.c > @@ -1,7 +1,7 @@ > /* > * virsh.c: a Xen shell used to exercise the libvirt API > * > - * Copyright (C) 2005 Red Hat, Inc. > + * Copyright (C) 2005, 2007 Red Hat, Inc. > * > * See COPYING.LIB for the License of this software > * > @@ -3956,10 +3956,10 @@ vshCommandOptInt(vshCmd * cmd, const char *name, int *found) > > if ((arg != NULL) && (arg->data != NULL)) { > res = strtol(arg->data, &end_p, 10); > - if ((arg->data == end_p) || (*end_p!= 0)) > - num_found = FALSE; > - else > - num_found = TRUE; > + if ((arg->data == end_p) || (*end_p!= 0)) > + num_found = FALSE; > + else > + num_found = TRUE; > } > if (found) > *found = num_found;

2 1

[Libvir] fix misleading indentation
by Jim Meyering 08 Nov '07

08 Nov '07

Here's a tiny patch to fix indentation, since I'm about to change the code in that area, I'm submitting this first, so we don't mix syntax-only changes with ones that change semantics. The last two times I tried to send an attachment, mailman removed them. I'll try one more time, with this one:

1 0

[Libvir] Strange warnings with gcc 4.1.2
by Richard W.M. Jones 07 Nov '07

07 Nov '07

This is with libvirt from CVS. They don't look like errors to me though... ------------ In function ‘open’, inlined from ‘readFile’ at virsh.c:850: /usr/include/bits/fcntl2.h:45: error: call to ‘__open_too_many_args’ declared with attribute error: open can be called either with 2 or 3 arguments, not more /usr/include/bits/fcntl2.h:51: error: call to ‘__open_missing_mode’ declared with attribute error: open with O_CREAT in second argument needs 3 arguments The code in question is: if ((fd = open(filename, O_RDONLY)) == -1) { Not a newly created file, so mode isn't needed AFAICS. ------------ In function ‘read’, inlined from ‘readFile’ at virsh.c:864: /usr/include/bits/unistd.h:43: warning: call to ‘__read_chk_warn’ declared with attribute warning: read called with bigger length than size of the destination buffer The code in question is: char buffer[1024]; char *new; int ret; if ((ret = read(fd, buffer, sizeof(buffer))) == 0) break; Also seems correct to me. ------------ Other warnings: virsh.c: In function ‘cmdSchedinfo’: virsh.c:1138: warning: ‘weight’ may be used uninitialized in this function virsh.c:1140: warning: ‘cap’ may be used uninitialized in this function For some reason gcc appears to have lots its ability to do the data flow analysis to find out that these warnings are bogus. In any case the fix is trivial: Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.105 diff -u -r1.105 virsh.c --- src/virsh.c 6 Nov 2007 09:41:18 -0000 1.105 +++ src/virsh.c 7 Nov 2007 12:37:07 -0000 @@ -1135,9 +1135,9 @@ int nr_inputparams = 0; int inputparams = 0; int weightfound = 0; - int weight; + int weight = 0; int capfound = 0; - int cap; + int cap = 0; char str_weight[] = "weight"; char str_cap[] = "cap"; int ret_val = FALSE; Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 3

[Libvir] PATCH: Avoid format string abuse (also avoids gcc warnings).
by Jim Meyering 07 Nov '07

07 Nov '07

This patch was prompted by warnings like this: util.c:56: warning: format not a string literal and no format arguments and they're legitimate. Imagine a format string contains "%%..." goes through the vnsprintf call, which reduces it to "%...". If the result string is then passed to __virRaiseError as the format string, then *boom*. Instead, use "%s" as the format, with the non-literal as the matching argument. Patch below. I searched the sources for %% and *did* find one potential problem: $ git-grep -B1 %% > k po/ms.po-msgid "too many drivers registered in %s" po/ms.po:msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -- src/xend_internal.c- case '\n': src/xend_internal.c: snprintf(ptr, 4, "%%%02x", string[i]); since "% p" does happen to be a valid format string! So if someone using Malaysian messages provoked that particular diagnostic in a code path that takes it through __virRaiseError, bad things might happen. Big "if", of course :-) I didn't try. 2007-11-06 Jim Meyering <meyering(a)redhat.com> Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise.

3 3

[Libvir] PATCH: Avoid format string abuse (also avoids gcc warnings).
by Jim Meyering 06 Nov '07

06 Nov '07

[resending with the patch in-line, not as an attachment -- mailman removed my attached patch the first time! Bad mailman. Bad. ] This patch was prompted by warnings like this: util.c:56: warning: format not a string literal and no format arguments and they're legitimate. Imagine a format string contains "%%..." goes through the vnsprintf call, which reduces it to "%...". If the result string is then passed to __virRaiseError as the format string, then *boom*. Instead, use "%s" as the format, with the non-literal as the matching argument. Patch below. I searched the sources for %% and *did* find one potential problem: $ git-grep -B1 %% > k po/ms.po-msgid "too many drivers registered in %s" po/ms.po:msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -- src/xend_internal.c- case '\n': src/xend_internal.c: snprintf(ptr, 4, "%%%02x", string[i]); since "% p" does happen to be a valid format string! So if someone using Malaysian messages provoked that particular diagnostic in a code path that takes it through __virRaiseError, bad things might happen. Big "if", of course :-) I didn't try. 2007-11-06 Jim Meyering <meyering(a)redhat.com> Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise. ----------------------------- >From 8e0cafec021ba3cbec55a4d691f19c14ed9e587f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Nov 2007 20:14:21 +0100 Subject: [PATCH] Avoid risk of format string abuse (also avoids gcc warnings). * src/util.c (ReportError): Use a literal "%s" format string. * src/remote_internal.c (server_error): Likewise. * src/qemu_conf.c (qemudReportError): Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 7 +++++++ src/qemu_conf.c | 2 +- src/remote_internal.c | 2 +- src/util.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 511ed6a..535173d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-06 Jim Meyering <meyering(a)redhat.com> + + Avoid risk of format string abuse (also avoids gcc warnings). + * src/util.c (ReportError): Use a literal "%s" format string. + * src/remote_internal.c (server_error): Likewise. + * src/qemu_conf.c (qemudReportError): Likewise. + Tue Nov 6 17:24:16 CET 2007 Daniel Veillard <veillard(a)redhat.com> * src/xs_internals.c: patch from Chris Lalancette, forgot to diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 78f4699..3556a9a 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -64,7 +64,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, errorMessage); + NULL, NULL, NULL, -1, -1, "%s", errorMessage); } int qemudLoadDriverConfig(struct qemud_driver *driver, diff --git a/src/remote_internal.c b/src/remote_internal.c index 3af326f..1420a88 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -3073,7 +3073,7 @@ server_error (virConnectPtr conn, remote_error *err) err->domain, err->code, err->level, str1, str2, str3, err->int1, err->int2, - message); + "%s", message); } /* get_nonnull_domain and get_nonnull_network turn an on-wire diff --git a/src/util.c b/src/util.c index eb57859..c964a63 100644 --- a/src/util.c +++ b/src/util.c @@ -53,7 +53,7 @@ ReportError(virConnectPtr conn, errorMessage[0] = '\0'; } __virRaiseError(conn, dom, net, VIR_FROM_NONE, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, errorMessage); + NULL, NULL, NULL, -1, -1, "%s", errorMessage); } static int virSetCloseExec(int fd) { -- 1.5.3.5.561.g140d

1 0

[Libvir] [PATCH]: Fix build warning in xs_internal.c
by Chris Lalancette 06 Nov '07

06 Nov '07

All, Attached is a trivial patch to fix a build warning in xs_internal.c; basically the xenUnifiedDriver structure doesn't have a domainDumpXML method, so we had one too many NULLs. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

[Libvir] [RFC] Linux-VServer support
by Daniel Hokka Zakrisson 06 Nov '07

06 Nov '07

Hi, This is an initial stab at adding Linux-VServer support to libvirt. There are still a couple of things missing, like scheduler support in the XML parsing, and proper network support. I've got a few questions though. virsh's schedinfo hardcodes the available options, should I be adding new ones there? Would better introspection from getSchedulerType make this a non-issue? How do the network domains interact and associate with the regular domains? -- Daniel Hokka Zakrisson

4 24

[Libvir] [PATCH] Fix failure of virsh attach-disk (BZ346281)
by Masayuki Sunou 06 Nov '07

06 Nov '07

Hi Virsh attach-disk fails when the disk is attached to domain. And error message displays that device_configure() failed. # virsh attach-disk PV_RH51RC_12 /dev/hda8 xvdb --driver phy libvir: Xen Daemon error : POST operation failed: (xend.err'device_configure() takes exactly 2 arguments (3 given)') --> BZ346281 : https://bugzilla.redhat.com/show_bug.cgi?id=346281 This problem occurs because search of device ID of disk doesn't operate correctly. This patch fixes it. And this fixes a little comment too. Signed-off-by: Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> Thanks, Masayuki Sunou.

2 1