- Devel - libvirt List Archives

[libvirt] [PATCH] docs: More html/docs changes from libvirt.h.in split
by John Ferlan 03 Dec '14

03 Dec '14

This changes the display from: libvirt-storage: APIs for management of storages to libvirt-storage: APIs for management of storage pools and volumes In making that change I expected my build tree html output to be regenerated; however, it wasn't because the dependency for the separated libvirt-storage.h wasn't there. It was only present for libvirt.h.in So I added each in the order displayed on the docs/html/index.html page Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/Makefile.am | 11 +++++++++++ include/libvirt/libvirt-storage.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index bb52c35..d624827 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -291,6 +291,17 @@ $(python_generated_files): $(APIBUILD_STAMP) $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(srcdir)/../include/libvirt/libvirt.h.in \ + $(srcdir)/../include/libvirt/libvirt-domain-snapshot.h \ + $(srcdir)/../include/libvirt/libvirt-domain.h \ + $(srcdir)/../include/libvirt/libvirt-event.h \ + $(srcdir)/../include/libvirt/libvirt-host.h \ + $(srcdir)/../include/libvirt/libvirt-interface.h \ + $(srcdir)/../include/libvirt/libvirt-network.h \ + $(srcdir)/../include/libvirt/libvirt-nodedev.h \ + $(srcdir)/../include/libvirt/libvirt-nwfilter.h \ + $(srcdir)/../include/libvirt/libvirt-secret.h \ + $(srcdir)/../include/libvirt/libvirt-storage.h \ + $(srcdir)/../include/libvirt/libvirt-stream.h \ $(srcdir)/../include/libvirt/libvirt-lxc.h \ $(srcdir)/../include/libvirt/libvirt-qemu.h \ $(srcdir)/../include/libvirt/virterror.h \ diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 7b2a72d..1f3087b 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -1,7 +1,7 @@ /* * libvirt-storage.h - * Summary: APIs for management of storages - * Description: Provides APIs for the management of storages + * Summary: APIs for management of storage pools and volumes + * Description: Provides APIs for the management of storage pools and volumes * Author: Daniel Veillard <veillard(a)redhat.com> * * Copyright (C) 2006-2014 Red Hat, Inc. -- 1.9.3

2 1

[libvirt] how to pin disk order when adding SATA disk with virt-manager ?
by Jason Vas Dias 03 Dec '14

03 Dec '14

Hi - this is my first post to this list - sorry if this is a newbie question, but: I want to mount 7 LVM disk volumes under my guest : Physical Host Volume: Guest Device: Guest FS: /dev/mapper/VG_A-vol1 : /dev/sda : /root file system /dev/mapper/VG_S-swap2 : swap : swap partition /dev/mapper/VG_C-vol3 : /dev/sdc : /home file system /dev/mapper/VG_G-vol7 : /dev/sdg : /x some necessary other storage I am booting with the "Direct Boot" option and kernel command line containing "root=/dev/sda" - ie. there HAS to be some particular /dev/sdX where X is the virtual order of the disks on the virtual SATA bus / device minor number to letter mapping . Every time I add a new volume via the virt-manager the ordering of ALL disks change , and I must manually discover which drive letter ('a-g' in /dev/sd[a-g]) maps to which disk , even though the ordering as shown in the GUI remains the same - ie. when I click on the 'SATA Disk 1' icon in the virt-manager 'Details...' tab, it still shows the correct LVM is associated with Disk 1, but the system does not boot because what was '/dev/sda' is now '/dev/sdb' . Is this a bug ? Can I request a "New Feature" which would allow me to specify the "Bus Sequence Number" in the Virtual Disk panel (where I currently can specify Source Path, Disk Bus, Advanced Options etc... ) - surely you could let users map disks to devices in a way that does not change with each new disk added ? Anyway, that's my 2 cents on $subject . Any thoughts / suggestions gratefully received . Thanks & Regards , Jason

1 0

[libvirt] [PATCH] cpu: fix possible crash in getModels
by Pavel Hrdina 03 Dec '14

03 Dec '14

Commit 86a15a25 introduced a new cpu driver API 'getModels'. Public API allow you to pass NULL for models to get only number of existing models. However the new code will crash with segfault so we have to count with the possibility that the user wants only the number. There is also difference in order of the models gathered by this new API as the old approach was inserting the elements to the end of the array so we should use 'VIR_APPEND_ELEMENT'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/cpu/cpu_powerpc.c | 15 ++++++++++----- src/cpu/cpu_x86.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 871401b..86f80b3 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -666,11 +666,15 @@ ppcGetModels(char ***models) model = map->models; while (model != NULL) { - if (VIR_STRDUP(name, model->name) < 0) - goto error; + if (models) { + if (VIR_STRDUP(name, model->name) < 0) + goto error; - if (VIR_INSERT_ELEMENT(*models, 0, nmodels, name) < 0) - goto error; + if (VIR_APPEND_ELEMENT(*models, nmodels, name) < 0) + goto error; + } else { + nmodels++; + } model = model->next; } @@ -681,7 +685,8 @@ ppcGetModels(char ***models) return nmodels; error: - virStringFreeList(*models); + if (models) + virStringFreeList(*models); nmodels = -1; goto cleanup; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f6dcba4..dfbc16c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2176,11 +2176,15 @@ x86GetModels(char ***models) model = map->models; while (model != NULL) { - if (VIR_STRDUP(name, model->name) < 0) - goto error; + if (models) { + if (VIR_STRDUP(name, model->name) < 0) + goto error; - if (VIR_INSERT_ELEMENT(*models, 0, nmodels, name) < 0) - goto error; + if (VIR_APPEND_ELEMENT(*models, nmodels, name) < 0) + goto error; + } else { + nmodels++; + } model = model->next; } @@ -2188,7 +2192,8 @@ x86GetModels(char ***models) return nmodels; error: - virStringFreeList(*models); + if (models) + virStringFreeList(*models); return -1; } -- 2.0.4

2 2

[libvirt] [PATCH 0/2] qemu: Refactor reconnecting after daemon restart
by Peter Krempa 03 Dec '14

03 Dec '14

Peter Krempa (2): qemu: driver: Reload snapshots and managedsaves prior to reconnecting qemu: process: Refactor reconnecting to qemu processes src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 167 ++++++++++++++++++++++-------------------------- 2 files changed, 78 insertions(+), 93 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH 0/2] leaseshelper: Coverity/whitespace fixes
by Peter Krempa 03 Dec '14

03 Dec '14

Peter Krempa (2): leaseshelper: Skip entries missing expiry time on INIT action leaseshelper: Fix incorrect alignment of a switch case src/network/leaseshelper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH] tests: Fix misplaced parenthesis in qemumonitorjsontest
by Martin Kletzander 03 Dec '14

03 Dec '14

When trying clang, it found out that we were comparing sizeof with 0 even though we wanted to check the return value of memcmp. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemumonitorjsontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5bfcd20..d3ae29a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1879,7 +1879,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) "drive-virtio-disk0", &info, false) < 0) goto cleanup; - if (memcmp(&info, &expectedInfo, sizeof(info) != 0)) { + if (memcmp(&info, &expectedInfo, sizeof(info)) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Invalid @info"); goto cleanup; -- 2.1.3

3 3

[libvirt] [PATCHv5 0/3] leaseshelper: Couple of improvements
by Peter Krempa 03 Dec '14

03 Dec '14

Nehal J Wani (1): leaseshelper: improvements to support all events Peter Krempa (2): leaseshelper: Refactor control flow network: dnsmasq: Don't format lease file path src/network/bridge_driver.c | 16 +- src/network/bridge_driver.h | 3 - src/network/leaseshelper.c | 246 +++++++++++++++------ tests/networkxml2confdata/dhcp6-nat-network.conf | 1 - tests/networkxml2confdata/dhcp6-network.conf | 1 - tests/networkxml2confdata/isolated-network.conf | 1 - .../nat-network-dns-srv-record-minimal.conf | 1 - .../nat-network-dns-srv-record.conf | 1 - .../nat-network-dns-txt-record.conf | 1 - tests/networkxml2confdata/nat-network.conf | 1 - tests/networkxml2confdata/netboot-network.conf | 1 - .../networkxml2confdata/netboot-proxy-network.conf | 1 - tests/networkxml2conftest.c | 12 - 13 files changed, 181 insertions(+), 105 deletions(-) -- 2.1.0

4 8

[libvirt] [PATCH] storage: fix crash caused by no check return before set close
by Luyao Huang 03 Dec '14

03 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1087104#c5 When try to use a invalid offset do volupload, libvirt will get failed in virFDStreamOpenFileInternal, but seems libvirt do not check the return in storageVolUpload, and call virFDStreamSetInternalCloseCb , but stream doesn't have a privateData (is NULL), then crash. Although libvirt have a check for invalid offset in cmdVolUpload, but i think there should have some other way to touch off this crash. 0 0x00007f09429a9c10 in pthread_mutex_lock () from /lib64/libpthread.so.0 1 0x00007f094514dbf5 in virMutexLock (m=<optimized out>) at util/virthread.c:88 2 0x00007f09451cb211 in virFDStreamSetInternalCloseCb at fdstream.c:795 3 0x00007f092ff2c9eb in storageVolUpload at storage/storage_driver.c:2098 4 0x00007f09451f46e0 in virStorageVolUpload at libvirt.c:14000 5 0x00007f0945c78fa1 in remoteDispatchStorageVolUpload at remote_dispatch.h:14339 6 remoteDispatchStorageVolUploadHelper at remote_dispatch.h:14309 7 0x00007f094524a192 in virNetServerProgramDispatchCall at rpc/virnetserverprogram.c:437 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/storage/storage_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7f33d6f..7f4de19 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2111,8 +2111,9 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } - ret = backend->uploadVol(obj->conn, pool, vol, stream, - offset, length, flags); + if ((ret = backend->uploadVol(obj->conn, pool, vol, stream, + offset, length, flags)) < 0) + goto cleanup; /* Add cleanup callback - call after uploadVol since the stream * is then fully set up -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Rework reference locking; in QEMU, for starters
by Martin Kletzander 03 Dec '14

03 Dec '14

Our reference locking for objects is great and powerful thing. The problem is that it was either not followed through completely or the design was not complete, but it doesn't matter now. There are few bugs in the code due to the reference counting and the daemon is lacking some performance in specific scenarios. This "series" tried to fix that using the following idea: - Each API working with a domain object that has to get it from the list will have its *own* reference, not borrowed one from the list. - When adding a domain into the list, the reference counter is increased (this is the reference that is there just for being in the list) and when being removed, it is decreased. No special-casing of "if this is was the last reference" and other funny stuff. - When job is created, there is no need to increase the reference counter as there are at least two references for the domain: 1) The API that created the job has one, so if it's not async it will be kept until the API ends and at that point the job won't exist any more. 2) The domain list has one and even though I said nobody needs to rely on that, async APIs probably will do that, but there's an excuse for that. In order to remove the domain from the list, you need a job and that won't succeed unless the async one ended. So we're good in this case as well. After searching through the code for all things that needed to be removed and fixing everything I could possibly think of, I tried a few things on my setup and it looks like it works. However, I haven't tried *every single API*, but I hope that's understandable. On the other hand, I asked Pavel to try running virt-test with these patches applied, hopefully we'll get an idea about how reliable this "series" is. I used "series" (with quotes) on purpose, because first patch just adds two new wrappers for slightly modified function and the second one changes the whole qemu driver at once. Unfortunately the second patch couldn't be broken up to more parts due to the nature of the fix. Enough chit-chat, let's look at the codes! Martin Kletzander (2): conf: Rework virDomainObjListFindByUUID to allow more concurrent APIs qemu: completely rework reference counting src/conf/domain_conf.c | 27 +- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/THREADS.txt | 40 ++- src/qemu/qemu_domain.c | 28 +- src/qemu/qemu_domain.h | 12 +- src/qemu/qemu_driver.c | 708 ++++++++++++++++------------------------------ src/qemu/qemu_migration.c | 108 +++---- src/qemu/qemu_migration.h | 10 +- src/qemu/qemu_process.c | 126 ++++----- 10 files changed, 406 insertions(+), 656 deletions(-) -- 2.1.3

3 13

[libvirt] [PATCH v2] qemu: Allow UEFI paths to be specified at compile time
by Michal Privoznik 03 Dec '14

03 Dec '14

Up until now there are just two ways how to specify UEFI paths to libvirt. The first one is editing qemu.conf, the other is editing qemu_conf.c and recompile. Therefore, two new configure options are invented: --with-default-loader --with-default-nvram. At the same time, the list of default paths is extended to AAVMF. which is an aarch64 port of OVMF. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -introduce configure options too configure.ac | 22 ++++++++++++++++++++++ src/qemu/qemu.conf | 12 +++++++++--- src/qemu/qemu_conf.c | 24 ++++++++++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 9fd44b2..c22ac75 100644 --- a/configure.ac +++ b/configure.ac @@ -2786,6 +2786,28 @@ AC_ARG_WITH([default-editor], [DEFAULT_EDITOR=vi]) AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$DEFAULT_EDITOR"], [Default editor to use]) +AC_ARG_WITH([default-loader], + [AS_HELP_STRING([--with-default-loader], + [Default UEFI loader path @<:@default=paths to OVMF and its clones@:>@])], + [with_default_loader=${withval}], + [with_default_loader=no]) +AC_ARG_WITH([default-nvram], + [AS_HELP_STRING([--with-default-nvram], + [Default UEFI NVRAM path @<:@default=paths to OVMF and its clones@:>@])], + [with_default_nvram=${withval}], + [with_default_nvram=no]) + +if test "$with_default_loader:$with_default_nvram" != "no:no"; then + if test "$with_default_loader" = "no"; then + AC_MSG_ERROR([Can't use nvram without loader]) + fi + if test "$with_default_nvram" = "no"; then + AC_MSG_ERROR([Can't use loader without nvram]) + fi + AC_DEFINE_UNQUOTED([DEFAULT_LOADER], ["$with_default_loader"], [Default UEFI loader]) + AC_DEFINE_UNQUOTED([DEFAULT_NVRAM], ["$with_default_nvram"], [Default UEFI nvram]) +fi + # Some GNULIB base64 symbols clash with a kerberos library AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..1c589a2 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -506,6 +506,12 @@ # however, have different variables store. Therefore the nvram is # a list of strings when a single item is in form of: # ${PATH_TO_UEFI_FW}:${PATH_TO_UEFI_VARS}. -# Later, when libvirt creates per domain variable store, this -# list is searched for the master image. -#nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ] +# Later, when libvirt creates per domain variable store, this list is +# searched for the master image. The UEFI firmware can be called +# differently for different guest architectures. For instance, it's OVMF +# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default +# follows this scheme. +#nvram = [ +# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd", +# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" +#] diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4764bef..d268fc3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -107,8 +107,10 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) VIR_FREE(def); } -#define VIR_QEMU_LOADER_FILE_PATH "/usr/share/OVMF/OVMF_CODE.fd" -#define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#define VIR_QEMU_OVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" +#define VIR_QEMU_OVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" +#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/OVMF/OVMF_CODE.fd" +#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { @@ -258,15 +260,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->logTimestamp = true; +#if defined(DEFAULT_LOADER) && defined(DEFAULT_NVRAM) if (VIR_ALLOC_N(cfg->loader, 1) < 0 || VIR_ALLOC_N(cfg->nvram, 1) < 0) goto error; cfg->nloader = 1; - if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_LOADER_FILE_PATH) < 0 || - VIR_STRDUP(cfg->nvram[0], VIR_QEMU_NVRAM_FILE_PATH) < 0) + if (VIR_STRDUP(cfg->loader[0], DEFAULT_LOADER) < 0 || + VIR_STRDUP(cfg->nvram[0], DEFAULT_NVRAM) < 0) goto error; +#else /* defined(DEFAULT_LOADER && defined(DEFAULT_NVRAM) */ + + if (VIR_ALLOC_N(cfg->loader, 2) < 0 || + VIR_ALLOC_N(cfg->nvram, 2) < 0) + goto error; + cfg->nloader = 2; + + if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_OVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[0], VIR_QEMU_OVMF_NVRAM_PATH) < 0 || + VIR_STRDUP(cfg->loader[1], VIR_QEMU_AAVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[1], VIR_QEMU_AAVMF_NVRAM_PATH) < 0) + goto error; +#endif /* defined(DEFAULT_LOADER && defined(DEFAULT_NVRAM) */ return cfg; error: diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 30fd27e..fc4935b 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,4 +76,5 @@ module Test_libvirtd_qemu = { "log_timestamp" = "0" } { "nvram" { "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" } + { "2" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" } } -- 2.0.4

5 12