- Devel - libvirt List Archives

Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses
by Jim Fehlig 23 May '16

23 May '16

Chun Yan Liu wrote: > >>>> On 5/14/2016 at 07:47 AM, in message <5736677D.8030209(a)suse.com>, Jim Fehlig > <jfehlig(a)suse.com> wrote: >> On 05/13/2016 12:21 AM, Chunyan Liu wrote: >>> Add .domainInterfaceAddresses so that user can have a way to >>> get domain interface address by 'virsh domifaddr'. Currently >>> it only supports '--source lease'. >>> >>> Signed-off: Chunyan Liu <cyliu(a)suse.com> >>> --- >>> src/libxl/libxl_driver.c | 140 >> +++++++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 140 insertions(+) >>> >>> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c >>> index 062d6f8..f2bd6fa 100644 >>> --- a/src/libxl/libxl_driver.c >>> +++ b/src/libxl/libxl_driver.c >>> @@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr >> conn, >>> return 0; >>> } >>> >>> +static int >>> +libxlGetDHCPInterfaces(virDomainPtr dom, >>> + virDomainObjPtr vm, >>> + virDomainInterfacePtr **ifaces) >>> +{ >>> + int rv = -1; >>> + int n_leases = 0; >>> + size_t i, j; >>> + size_t ifaces_count = 0; >>> + virNetworkPtr network = NULL; >>> + char macaddr[VIR_MAC_STRING_BUFLEN]; >>> + virDomainInterfacePtr iface = NULL; >>> + virNetworkDHCPLeasePtr *leases = NULL; >>> + virDomainInterfacePtr *ifaces_ret = NULL; >>> + >>> + if (!dom->conn->networkDriver || >>> + !dom->conn->networkDriver->networkGetDHCPLeases) { >>> + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", >>> + _("Network driver does not support DHCP lease >> query")); >>> + return -1; >>> + } >>> + >>> + for (i = 0; i < vm->def->nnets; i++) { >>> + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) >>> + continue; >>> + >>> + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); >>> + virObjectUnref(network); >>> + network = virNetworkLookupByName(dom->conn, >>> + vm->def->nets[i]->data.network.name); >>> + >>> + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, >>> + &leases, 0)) < 0) >>> + goto error; >>> + >>> + if (n_leases) { >>> + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) >>> + goto error; >>> + >>> + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) >>> + goto error; >>> + >>> + iface = ifaces_ret[ifaces_count - 1]; >>> + /* Assuming each lease corresponds to a separate IP */ >>> + iface->naddrs = n_leases; >>> + >>> + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) >>> + goto error; >>> + >>> + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) >>> + goto cleanup; >>> + >>> + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) >>> + goto cleanup; >>> + } >>> + >>> + for (j = 0; j < n_leases; j++) { >>> + virNetworkDHCPLeasePtr lease = leases[j]; >>> + virDomainIPAddressPtr ip_addr = &iface->addrs[j]; >>> + >>> + if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) >>> + goto cleanup; >>> + >>> + ip_addr->type = lease->type; >>> + ip_addr->prefix = lease->prefix; >>> + } >>> + >>> + for (j = 0; j < n_leases; j++) >>> + virNetworkDHCPLeaseFree(leases[j]); >>> + >>> + VIR_FREE(leases); >>> + } >>> + >>> + *ifaces = ifaces_ret; >>> + ifaces_ret = NULL; >>> + rv = ifaces_count; >>> + >>> + cleanup: >>> + virObjectUnref(network); >>> + if (leases) { >>> + for (i = 0; i < n_leases; i++) >>> + virNetworkDHCPLeaseFree(leases[i]); >>> + } >>> + VIR_FREE(leases); >>> + >>> + return rv; >>> + >>> + error: >>> + if (ifaces_ret) { >>> + for (i = 0; i < ifaces_count; i++) >>> + virDomainInterfaceFree(ifaces_ret[i]); >>> + } >>> + VIR_FREE(ifaces_ret); >>> + >>> + goto cleanup; >>> +} >> >> It's unfortunate this is a copy-paste from the qemu driver. The code is not >> trivial and any bug fixes in one copy could be missed in the other. A lot of >> the >> function is domain related, so probably can't be abstracted further to the >> network code. Have you considered approaches that allow the drivers to share >> this code? > > Well, it can be extracted and placed in bridge_driver.c as networkGetDHCPInterfaces, > but I don't know if that is acceptable? Hmm, maybe something like networkGetDHCPLeasesAll() is a better name. Regardless of the name, I see that other functions in bridge_driver.c take a virDomainDefPtr, so maybe extracting the code to bridge_driver.c is acceptable. Laine (cc'd) is generally regarded as the libvirt networking expert :-). Let's see if he has an opinion. Regards, Jim

3 2

[libvirt] [PATCH] util: compilation fix if build without GNUTLS library
by Mikhail Feoktistov 22 May '16

22 May '16

--- src/util/vircrypto.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 5183d49..4f288f0 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -24,6 +24,7 @@ #include "virlog.h" #include "virerror.h" #include "viralloc.h" +#include "virrandom.h" #include "md5.h" #include "sha256.h" @@ -220,14 +221,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, */ int virCryptoEncryptData(virCryptoCipher algorithm, - uint8_t *enckey, + uint8_t *enckey ATTRIBUTE_UNUSED, size_t enckeylen, - uint8_t *iv, + uint8_t *iv ATTRIBUTE_UNUSED, size_t ivlen, - uint8_t *data, - size_t datalen, - uint8_t **ciphertext, - size_t *ciphertextlen) + uint8_t *data ATTRIBUTE_UNUSED, + size_t datalen ATTRIBUTE_UNUSED, + uint8_t **ciphertext ATTRIBUTE_UNUSED, + size_t *ciphertextlen ATTRIBUTE_UNUSED) { switch (algorithm) { case VIR_CRYPTO_CIPHER_AES256CBC: -- 1.8.3.1

4 3

[libvirt] [PATCH 0/4] Couple of random and crypto adjustments
by John Ferlan 22 May '16

22 May '16

Patches 1&2 alter the virRandomBytes to accomodate the lone holdout code that was using /dev/urandom directly to add a range of bytes that are acceptible returns for the caller. Patches 3&4 modify the virCryptoEncryptData algorithm to "A" (hopefully) build right in a non gnutls environment and "B" make it so there future adjustments won't be doing cut, copy, & paste based on the key size and whether the iv is required. If AES192CBC were added the first two parameters to the DO_CRYPT macro would be 24, 16, while AES192CBC would have 16, 16. John Ferlan (4): util: Add range parameters to virRandomBytes storage: Use virRandomBytes for virStorageGenerateQcowPassphrase util: Alter virCryptoEncryptData for non GNUTLS builds util: Adjust virCryptoEncryptData code to use macros src/storage/storage_backend.c | 10 +++-- src/util/vircrypto.c | 88 +++++++++++++++++++++++++---------------- src/util/virrandom.c | 13 ++++-- src/util/virrandom.h | 3 +- src/util/virstorageencryption.c | 42 +++++++------------- src/util/virstorageencryption.h | 4 +- src/util/viruuid.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/vircryptotest.c | 4 +- tests/virrandommock.c | 10 +++-- tests/virrandomtest.c | 32 +++++++++++---- 11 files changed, 124 insertions(+), 86 deletions(-) -- 2.5.5

1 4

[libvirt] [PATCH] tests: Allow multiple mock libraries
by Peter Krempa 20 May '16

20 May '16

Make virtTestMain take variable number of libraries to mock. --- tests/testutils.c | 11 ++++++++--- tests/testutils.h | 10 +++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 9180e86..f4fbad2 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> @@ -842,9 +843,11 @@ virTestSetEnvPath(void) int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)) + int (*func)(void), + ...) { + const char *lib; + va_list ap; int ret; char *testRange = NULL; #ifdef TEST_OOM @@ -854,8 +857,10 @@ int virtTestMain(int argc, if (getenv("VIR_TEST_FILE_ACCESS")) VIRT_TEST_PRELOAD(TEST_MOCK); - if (lib) + va_start(ap, func); + while ((lib = va_arg(ap, const char *))) VIRT_TEST_PRELOAD(lib); + va_end(ap); progname = last_component(argv[0]); if (STRPREFIX(progname, "lt-")) diff --git a/tests/testutils.h b/tests/testutils.h index d1caf20..c892902 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -102,13 +102,13 @@ const char *virtTestCounterNext(void); int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)); + int (*func)(void), + ...); /* Setup, then call func() */ # define VIRT_TEST_MAIN(func) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, NULL, func); \ + return virtTestMain(argc, argv, func, NULL); \ } # define VIRT_TEST_PRELOAD(lib) \ @@ -131,9 +131,9 @@ int virtTestMain(int argc, } \ } while (0) -# define VIRT_TEST_MAIN_PRELOAD(func, lib) \ +# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, lib, func); \ + return virtTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } virCapsPtr virTestGenericCapsInit(void); -- 2.8.2

3 2

[libvirt] [PATCH] Replace VIR_ERROR with standard vir*Error in state driver init
by Jovanka Gulicoska 20 May '16

20 May '16

Replace VIR_ERROR logging macros for error reporting in driver startup routines with vir*Error function. Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#Replace_VIR_ERROR_with_standard… Jovanka Gulicoska (1): Replace VIR_ERROR with standard vir*Error in state driver init src/bhyve/bhyve_driver.c | 5 +++-- src/libxl/libxl_driver.c | 6 ++--- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_hal.c | 19 ++++++++-------- src/node_device/node_device_udev.c | 32 +++++++++++++------------- src/nwfilter/nwfilter_driver.c | 4 ++-- src/qemu/qemu_driver.c | 43 ++++++++++++++++++----------------- src/storage/storage_driver.c | 46 +++++++++++++++++++------------------- src/uml/uml_driver.c | 21 ++++++++--------- src/xen/xen_driver.c | 5 +++-- 10 files changed, 95 insertions(+), 88 deletions(-) -- 2.5.5

2 2

[libvirt] [PATCH 0/4] auto-assign controller indexes
by Laine Stump 20 May '16

20 May '16

The purpose of this series is just to eliminate the need to "count indexes" when adding controllers. Patch 4/4 is the meat of this series. 2/4 and 3/4 are code movement to enable 4/4, and 1/4 is a small code simplification that I noticed while testing the rest. Laine Stump (4): qemu: simplify addition of USB controller in qemuParseCommandLine conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/schemas/domaincommon.rng | 8 ++-- src/conf/domain_conf.c | 92 ++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_domain_address.c | 7 ---- src/qemu/qemu_parse_command.c | 8 +--- 5 files changed, 92 insertions(+), 30 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH v3 0/2] qemu: parse: Introduce qemuParseCommandLineMem
by Nishith Shah 20 May '16

20 May '16

This series moves the parsing of qemu -m memory into a separate function and adds suffix support for the -m option. The first patch introduces the function qemuParseCommandLineMem, and the second patch handles suffixes for the -m values and adds a test for the same. Nishith Shah (2): qemu: parse: Use qemuParseCommandLineMem for -m memory qemu: parse: Handle suffixes for -m memory src/qemu/qemu_parse_command.c | 35 ++++++++++++++++---- tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args | 22 +++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml | 37 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml -- 2.1.4

2 4

[libvirt] [PATCH v5 0/6] Add AES Secret Object support (for RBD only)
by John Ferlan 20 May '16

20 May '16

This is a combination of two series... The first 2 patches are a followon to (v1 from yesterday): http://www.redhat.com/archives/libvir-list/2016-May/msg01396.html But there really were a offshoot of the original AES/IV Secret changes (v4): http://www.redhat.com/archives/libvir-list/2016-May/msg01292.html Hopefully I haven't forgotten anything along the way. There's been numerous adjustments and changes along the way. Patch 1 is a combination with adjustments of patches 1&2 from v1. This should make virRandomBytes available in the virrandommock library which then is used in later patches. Patch 2 mostly adjust names, comments, adds #ifdef's for unavailable code This patch will make use of the virrandommock library instead of self-populating the enc_alg and iv_buf. Mainly because it's possible, but also since it's the basis for later patches to utilize the same virrandommock library. Patch 3 splits out the existing qemuDomainGenerateRandomKey into a vircrypto.c API. The vircrypto.c was chosen over virrandom.c because virrandom.c ends up being included in setuid_rpc_client and it wasn't overly clear that it was desired to drag in all of gnutls for just this one mock function. Patch 4 splits out the qemuDomainSecretSetup as was suggested in one review Patch 5 is new to handle the ability to have more than one mock library to preload from a VIRT_TEST_MAIN_PRELOAD macro. As it turns out the qemuxml2argvtest will need not only the qemuxml2argvmock, but also the virrandommock libraries. I went with comma separated, but a "space" separated list is fine with me too. Patch 6 is the remainder of the v4 of the original series. Splitting it up with ATTRIBUTE_UNUSED markers just no longer made sense. Lots of changes here to keep up with the previous patches, but also to adjust error messages, variable/API names, etc. Also changed were the secret alias (leading to adjustments in each of the .args file for the secret alias. Along the way I also had to adjust the expected encoded ciphertext and iv since the mock algorithm changed from all 0xff to an increasing sequence starting at 0x00 through the length of the buffer. John Ferlan (6): tests: Add mock for virRandomBytes util: Introduce encryption APIs util: Introduce virCryptoGenerateRandom qemu: Introduce qemuDomainSecretSetup tests: Allow comma separate list of libs to preload qemu: Utilize qemu secret objects for RBD auth/secret configure.ac | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 23 ++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 117 ++++++++++- src/qemu/qemu_domain.c | 200 +++++++++++++----- src/util/vircrypto.c | 233 ++++++++++++++++++++- src/util/vircrypto.h | 22 +- tests/Makefile.am | 12 ++ ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 31 +++ ...emuxml2argv-disk-drive-network-rbd-auth-AES.xml | 42 ++++ tests/qemuxml2argvmock.c | 16 ++ tests/qemuxml2argvtest.c | 5 +- tests/testutils.c | 12 +- tests/vircryptotest.c | 100 ++++++++- tests/virrandommock.c | 39 ++++ tests/virrandomtest.c | 86 ++++++++ 17 files changed, 879 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml create mode 100644 tests/virrandommock.c create mode 100644 tests/virrandomtest.c -- 2.5.5

2 16

[libvirt] VirtualBox 5 support
by Martin Pietsch 20 May '16

20 May '16

Dear libvirt-developer-team, I want to manage virtual machine of VirtualBox with libvirt. In a test I found out, that VirtualBox 5 is not support by the current version of libvirt. For this reason I have added this support in the source code. Now I want to commit these changes to the libvirt project, but I do not know, if there are any interests. Who can help me? Best Regards Martin -- Martin Pietsch Technische Univeristät Dresden Fakultät Mathematik und Naturwissenschaften / Fachrichtung Mathematik Besucheranschrift Willersbau, C-Flügel (Anbau), Raum C 232 Zellescher Weg 12-14 01069 Dresden Postanschrift Technische Universität Dresden Fachrichtung Mathematik 01062 Dresden Telefon +49-351-463 32646 Fax +49-351-463 37114 E-Mail martin.pietsch(a)tu-dresden.de

5 4

[libvirt] [PATCH 0/3] Couple of virtestmock fixes
by Michal Privoznik 20 May '16

20 May '16

Behold! This is not a trivial patch set and you will need a lot of courage to review it. Sorry. I hadn't had a nice time writing the patches neither. Michal Privoznik (3): tests: Drop VIR_MOCK_CALL_STAT virtestmock: Mock stat() properly tests: Link virtestmock with probes cfg.mk | 3 ++ configure.ac | 1 + tests/Makefile.am | 1 + tests/vircgroupmock.c | 14 +++---- tests/virmock.h | 23 ----------- tests/virpcimock.c | 19 ++++----- tests/virtestmock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 124 insertions(+), 43 deletions(-) -- 2.8.1

2 6