- Devel - libvirt List Archives

[libvirt] RFC: Implement virDomainGetIPAddress()
by Michal Novotny 22 Jul '11

22 Jul '11

Hi guys, some time ago I've been investigating the options to get the guest's IP address information without having to connect to guest's VNC window or console. It was for one project I've been working on and I found that the solution lies in the procfs, precisely in the /proc/{PID}/net/arp... The format is as follows: $ cat /proc/{PID}/net/arp IP address HW type Flags HW address Mask Device 192.168.122.36 0x1 0x2 52:54:00:35:76:e6 * virbr0 where the HW address matches the MAC address associated to the guest's NIC. Implementing such an API shouldn't be a big problem however I know that there's some option to run libvirt on Windows machines. It should be just the client so it shouldn't really matter however I'd like to ask you whether it's really not an issue. The function should return a string of the guest's IP address as read from the procfs or return a NULL value if there's no IP address associated with the guest. If the multiple NICs are being used by the guest then the function should return either the IP address matching the MAC address passed to the function or the first IP address if omitted. The prototype should be: char *virDomainGetIPAddress(virDomainPtr domain, char *devmac); For this the internal information about PID of the process spawned should be used (this is already being tracked and stored by libvirt IMHO) to access the /proc/{PID}/net/arp file. This API function would be very useful since it would give libvirt users option to get the information of the guest's IP address without having to connect to guest's VNC window or console. For virsh this could be implemented directly into the dominfo subcommand. What do you think about implementing this ? Thanks, Michal -- Michal Novotny <minovotn(a)redhat.com>, RHCE, Red Hat Virtualization | libvirt-php bindings | php-virt-control.org

3 12

[libvirt] [PATCH 0/3] Support readonly mounts in LXC
by Daniel P. Berrange 22 Jul '11

22 Jul '11

This patch series introduces support for readonly mounts in LXC. In includes general refactoring which will help other patches coming later too.

2 7

[libvirt] [PATCH] xenapi: Fix double-freeing the session in xenapiClose
by Matthias Bolte 22 Jul '11

22 Jul '11

xen_session_logout already frees the whole session object. Don't call xenSessionFree on a freed session object. Reported by Sharmila Radhakrishnan. --- src/xenapi/xenapi_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 97da1d1..dbc03cb 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -230,7 +230,7 @@ xenapiClose (virConnectPtr conn) if (priv->session != NULL) { xen_session_logout(priv->session); - xenSessionFree(priv->session); + priv->session = NULL; } VIR_FREE(priv->url); -- 1.7.4.1

2 2

[libvirt] [PATCH] remote/ssh: optional "keyfile" parameter.
by Oskari Saarenmaa 22 Jul '11

22 Jul '11

New optional parameter "keyfile" for ssh transport allows the user to select the private key to be used to authenticate to the remote host. --- docs/remote.html.in | 16 ++++++++++++++++ src/remote/remote_driver.c | 9 ++++++++- src/rpc/virnetclient.c | 4 +++- src/rpc/virnetclient.h | 1 + src/rpc/virnetsocket.c | 3 +++ src/rpc/virnetsocket.h | 1 + tests/virnetsockettest.c | 12 ++++++++++++ 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index 39d65aa..b554950 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -275,6 +275,22 @@ Note that parameter values must be <td colspan="2"/> <td> Example: <code>netcat=/opt/netcat/bin/nc</code> </td> </tr> + + <tr> + <td> + <code>keyfile</code> + </td> + <td> ssh </td> + <td> + The name of the private key file to use to authentication to the remote + machine. If this option is not used the default keys are used. + </td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>keyfile=/root/.ssh/example_key</code> </td> + </tr> + <tr> <td> <code>no_verify</code> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c2f8bbd..3878fc9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -343,7 +343,7 @@ doRemoteOpen (virConnectPtr conn, char *name = NULL, *command = NULL, *sockname = NULL, *netcat = NULL; char *port = NULL, *authtype = NULL, *username = NULL; int no_verify = 0, no_tty = 0; - char *pkipath = NULL; + char *pkipath = NULL, *keyfile = NULL; /* Return code from this function, and the private data. */ int retcode = VIR_DRV_OPEN_ERROR; @@ -416,6 +416,11 @@ doRemoteOpen (virConnectPtr conn, netcat = strdup (var->value); if (!netcat) goto out_of_memory; var->ignore = 1; + } else if (STRCASEEQ (var->name, "keyfile")) { + VIR_FREE(keyfile); + keyfile = strdup (var->value); + if (!keyfile) goto out_of_memory; + var->ignore = 1; } else if (STRCASEEQ (var->name, "no_verify")) { no_verify = atoi (var->value); var->ignore = 1; @@ -573,6 +578,7 @@ doRemoteOpen (virConnectPtr conn, no_tty, no_verify, netcat ? netcat : "nc", + keyfile, sockname))) goto failed; @@ -672,6 +678,7 @@ doRemoteOpen (virConnectPtr conn, VIR_FREE(sockname); VIR_FREE(authtype); VIR_FREE(netcat); + VIR_FREE(keyfile); VIR_FREE(username); VIR_FREE(port); VIR_FREE(pkipath); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index d3965c6..1bda763 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -189,11 +189,13 @@ virNetClientPtr virNetClientNewSSH(const char *nodename, bool noTTY, bool noVerify, const char *netcat, + const char *keyfile, const char *path) { virNetSocketPtr sock; - if (virNetSocketNewConnectSSH(nodename, service, binary, username, noTTY, noVerify, netcat, path, &sock) < 0) + if (virNetSocketNewConnectSSH(nodename, service, binary, username, noTTY, + noVerify, netcat, keyfile, path, &sock) < 0) return NULL; return virNetClientNew(sock, NULL); diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 6acdf50..3e5659c 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -46,6 +46,7 @@ virNetClientPtr virNetClientNewSSH(const char *nodename, bool noTTY, bool noVerify, const char *netcat, + const char *keyfile, const char *path); virNetClientPtr virNetClientNewExternal(const char **cmdargv); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 7ea1ab7..57373a0 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -578,6 +578,7 @@ int virNetSocketNewConnectSSH(const char *nodename, bool noTTY, bool noVerify, const char *netcat, + const char *keyfile, const char *path, virNetSocketPtr *retsock) { @@ -594,6 +595,8 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddArgList(cmd, "-p", service, NULL); if (username) virCommandAddArgList(cmd, "-l", username, NULL); + if (keyfile) + virCommandAddArgList(cmd, "-i", keyfile, NULL); if (noTTY) virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", "-e", "none", NULL); diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 5f882ac..479be28 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -69,6 +69,7 @@ int virNetSocketNewConnectSSH(const char *nodename, bool noTTY, bool noVerify, const char *netcat, + const char *keyfile, const char *path, virNetSocketPtr *addr); diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 1697ced..fd8151b 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -379,6 +379,7 @@ struct testSSHData { bool noTTY; bool noVerify; const char *netcat; + const char *keyfile; const char *path; const char *expectOut; @@ -400,6 +401,7 @@ static int testSocketSSH(const void *opaque) data->noTTY, data->noVerify, data->netcat, + data->keyfile, data->path, &csock) < 0) goto cleanup; @@ -542,6 +544,16 @@ mymain(void) if (virtTestRun("SSH test 5", 1, testSocketSSH, &sshData5) < 0) ret = -1; + struct testSSHData sshData6 = { + .nodename = "example.com", + .path = "/tmp/socket", + .keyfile = "/root/.ssh/example_key", + .noVerify = true, + .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com nc -U /tmp/socket\n", + }; + if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0) + ret = -1; + #endif return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 1.7.6

2 1

[libvirt] [PATCH RESEND RFC v4 0/6] support cpu bandwidth in libvirt
by Wen Congyang 22 Jul '11

22 Jul '11

Resend this patchset TODO: 1. We create sub directory for each vcpu in cpu subsystem. So we should recalculate cpu.shares for each vcpu. Changelog: v4: address Adam Litke's comment v3: fix some small bugs implement the simple way v2: almost rewrite the patchset to support to control each vcpu's bandwidth. Limit quota to [-1, 2^64/1000] at the schemas level. We will check it at cgroup level. Wen Congyang (6): Introduce the function virCgroupForVcpu cgroup: Implement cpu.cfs_period_us and cpu.cfs_quota_us tuning API Update XML Schema for new entries qemu: Implement period and quota tunable XML configuration and parsing qemu: Implement cfs_period and cfs_quota's modification doc: Add documentation for new cputune elements period and quota docs/formatdomain.html.in | 19 ++ docs/schemas/domain.rng | 26 ++- src/conf/domain_conf.c | 20 ++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 5 + src/qemu/qemu_cgroup.c | 137 ++++++++++ src/qemu/qemu_cgroup.h | 4 + src/qemu/qemu_driver.c | 312 +++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + src/util/cgroup.c | 153 +++++++++++- src/util/cgroup.h | 11 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 12 files changed, 659 insertions(+), 36 deletions(-)

6 35

[libvirt] [PATCH 0/3] More work on TLS certificate code
by Daniel P. Berrange 22 Jul '11

22 Jul '11

This series started off with an attempt to refactor the TLS certificate validation code to remove duplication. I then realized I ought to be testing such sensitive code too. So the big interesting part of this patch is a test case todo validation using very certificates. Rather than add a bunch of certs to GIT, I have written (nasty) GNUTLS code to generate certs on the fly with a variety of good & bad data in them.

2 7

[libvirt] [PATCHv2 0/9] network: physical device abstraction aka 'virtual switch'
by Laine Stump 21 Jul '11

21 Jul '11

This series deprecates patches 04/10 - 10/10 of the previous series of the same name, posted here: https://www.redhat.com/archives/libvir-list/2011-July/msg00149.html This patch is in response to the following bug reports: https://bugzilla.redhat.com/show_bug.cgi?id=643947 (RHEL) https://bugzilla.redhat.com/show_bug.cgi?id=636106 (upstream) The first 4 patches of the earlier series were reasonable cleanups in their own right, and were ACKed, so I pushed them earlier. I reorganized the remaining 6 patches accord to advice from Dan Berrange and Eric Blake. Some notes about correlation between v1 and v2: [PATCHv2 1/9] util: define MAX A new patch [PATCHv2 2/9] conf: put virtPortProfile struct / functions in a common location Was 05/10 in v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00154.html [PATCHv2 3/9] conf: virDomainNetDef points to (rather than contains) virtPortProfile This was also part of 05/10 in v1. I separated it out to make review of pure code movement (in 2/9) easier. [PATCHv2 4/9] conf: support abstracted interface info in domain interface XML [PATCHv2 5/9] conf: support abstracted interface info in network XML These two were 06/10 and 07/10 in v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00155.html https://www.redhat.com/archives/libvir-list/2011-July/msg00156.html However, they were split differently. In v1 it was split into RNG changes vs. parser changes with network and domain combined in each patch. In v2, I reorganized (based on Dan's advice) to have one patch containing all domain XML changes, from RNG up through parser, test cases, and documentation, and one patch for network XML changes. [PATCHv2 6/9] network: separate Start/Shutdown functions for new network types This was patch 08/10 in v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00157.html It is unchanged from the original. [PATCHv2 7/9] qemu: use virDomainNetGetActual*() functions where appropriate [PATCHv2 8/9] qemu: use virDomainNetGetActual*() in qemuDomainXMLToNative These two were patch 09/10 in v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00158.html In v2, I just split out one piece of code that was more complicated than just replacing direct data references with helper functions, and modified the commit message to be more clear about the "NOP" nature of the change. [PATCHv2 9/9] network: internal API functions to manage assignment of physdev to guest This was 10/10 in v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00159.html The main modification here was to remove all of the #if WITH_NETWORK from qemu_*.c, and instead define static inline NOP functions for the functions I'd previously eliminated references to with #if WITH_NETWORK (in the case that libvirt is build --without-network). This works out very well, except that make syntax-check doesn't like ATTRIBUTE_UNUSED in the inline static functions (I think we should change syntax-check rather than going back to the old #if WITH_NETWORK). Comments about other changes I've made *within* each patch are in the responses to the original patches, as well as in the annotations to the new patches.

3 24

[libvirt] [PATCHv2 00/16] bypass-cache in save/restore
by Eric Blake 21 Jul '11

21 Jul '11

Incorporating review comments from v1: https://www.redhat.com/archives/libvir-list/2011-July/msg00842.html Still to be written: new API for managing save state images in isolation: https://www.redhat.com/archives/libvir-list/2011-July/msg00855.html virConnectDomainSaveGetXMLDesc virConnectDomainSaveModify as well as virsh commands to wrap them: virsh managedsave-dumpxml file virsh managedsave-define file xml virsh managedsave-edit file Eric Blake (16): command: move all docs into .c file command: avoid leaking fds across fork build: rename files.h to virfile.h qemu: fix error message with migrate2 xml save: document new public API save: wire up remote protocol save: wire up trivial save/restore flags implementations save: add --bypass-cache flag to virsh save/restore operations save: support --xml to virsh save/restore save: let iohelper handle inherited fd save: let iohelper work on O_DIRECT fds save: add virFileDirectFd wrapper type save: support BYPASS_CACHE during qemu save/restore save: support bypass-cache flag in qemu.conf save: support bypass-cache flag in libvirt-guests init script save: support qemu modifying xml on domain save/restore HACKING | 2 +- cfg.mk | 3 +- configure.ac | 6 +- daemon/libvirtd.c | 2 +- docs/hacking.html.in | 2 +- include/libvirt/libvirt.h.in | 30 ++- po/POTFILES.in | 1 + src/Makefile.am | 2 +- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/storage_encryption_conf.c | 2 +- src/driver.h | 12 + src/fdstream.c | 36 +-- src/libvirt.c | 181 ++++++++++++- src/libvirt_private.syms | 16 +- src/libvirt_public.syms | 2 + src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 36 +++- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_linux_sysfs.c | 2 +- src/nodeinfo.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 16 + src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 18 +-- src/qemu/qemu_conf.c | 12 +- src/qemu/qemu_conf.h | 5 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 229 ++++++++++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 4 +- src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 13 + src/rpc/virnetclient.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/secret/secret_driver.c | 2 +- src/security/security_apparmor.c | 2 +- src/security/security_selinux.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 2 +- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 44 +++- src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/bridge.c | 2 +- src/util/cgroup.c | 2 +- src/util/command.c | 430 +++++++++++++++++++++-------- src/util/command.h | 223 +-------------- src/util/conf.c | 2 +- src/util/dnsmasq.c | 2 +- src/util/event_poll.c | 2 +- src/util/files.c | 80 ------ src/util/hooks.c | 2 +- src/util/interface.c | 2 +- src/util/iohelper.c | 194 ++++++++++--- src/util/logging.c | 2 +- src/util/macvtap.c | 2 +- src/util/pci.c | 2 +- src/util/stats_linux.c | 2 +- src/util/storage_file.c | 2 +- src/util/util.c | 2 +- src/util/uuid.c | 2 +- src/util/viraudit.c | 2 +- src/util/virfile.c | 253 +++++++++++++++++ src/util/{files.h => virfile.h} | 33 ++- src/vbox/vbox_tmpl.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/xen/block_stats.c | 2 +- src/xen/xen_driver.c | 36 +++- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xend_internal.c | 2 +- tests/commandhelper.c | 2 +- tests/commandtest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/testutils.c | 2 +- tests/virnetsockettest.c | 2 +- tests/xencapstest.c | 2 +- tools/console.c | 2 +- tools/libvirt-guests.init.sh | 10 +- tools/libvirt-guests.sysconf | 5 + tools/virsh.c | 107 ++++++-- tools/virsh.pod | 47 +++- 102 files changed, 1560 insertions(+), 685 deletions(-) delete mode 100644 src/util/files.c create mode 100644 src/util/virfile.c rename src/util/{files.h => virfile.h} (57%) -- 1.7.4.4

2 45

[libvirt] [PATCH] Ensure that libvirtd shuts down if initialization fails
by Daniel P. Berrange 21 Jul '11

21 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the virStateInitialize call fails we must shutdown libvirtd since drivers will not be available. Just free'ing the virNetServer is not sufficient, we must send a SIGTERM to ourselves so that we interrupt the event loop and trigger a orderly shutdown * daemon/libvirtd.c: Kill ourselves if state init fails * src/rpc/virnetserver.c: Add some debugging to event loop --- daemon/libvirtd.c | 2 ++ src/rpc/virnetserver.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 8f8b8b1..4a5f671 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1160,6 +1160,8 @@ static void daemonRunStateInit(void *opaque) * seriously delay OS bootup process */ if (virStateInitialize(virNetServerIsPrivileged(srv)) < 0) { VIR_ERROR(_("Driver state initialization failed")); + /* Ensure the main event loop quits */ + kill(getpid(), SIGTERM); virNetServerFree(srv); return; } diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 35f18b9..8f3ac4b 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -671,6 +671,7 @@ void virNetServerRun(virNetServerPtr srv) goto cleanup; } + VIR_DEBUG("srv=%p quit=%d", srv, srv->quit); while (!srv->quit) { /* A shutdown timeout is specified, so check * if any drivers have active state, if not @@ -731,6 +732,7 @@ void virNetServerQuit(virNetServerPtr srv) { virNetServerLock(srv); + VIR_DEBUG("Quit requested %p", srv); srv->quit = 1; virNetServerUnlock(srv); -- 1.7.6

2 1

[libvirt] [PATCH] Remove call to deprecated gnutls_certificate_type_set_priority (again)
by Daniel P. Berrange 21 Jul '11

21 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The gnutls_certificate_type_set_priority method is deprecated. Since we already set the default gnutls priority, it was not serving any useful purpose and can be removed * src/rpc/virnettlscontext.c: Remove gnutls_certificate_type_set_priority call --- src/rpc/virnettlscontext.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 9279ded..ae16dbb 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1115,7 +1115,6 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, { virNetTLSSessionPtr sess; int err; - static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; VIR_DEBUG("ctxt=%p hostname=%s isServer=%d", ctxt, NULLSTR(hostname), ctxt->isServer); @@ -1142,9 +1141,7 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, /* avoid calling all the priority functions, since the defaults * are adequate. */ - if ((err = gnutls_set_default_priority(sess->session)) != 0 || - (err = gnutls_certificate_type_set_priority(sess->session, - cert_type_priority))) { + if ((err = gnutls_set_default_priority(sess->session)) != 0) { virNetError(VIR_ERR_SYSTEM_ERROR, _("Failed to set TLS session priority %s"), gnutls_strerror(err)); -- 1.7.6

2 1