- Devel - libvirt List Archives

[libvirt] [PATCH v2] rpc: fixing compilation error due to deprecated ssh_get_publickey().
by Julio Faracco 09 May '18

09 May '18

After 0.7.5 release, libssh deprecated ssh_get_publickey() method to introduce ssh_get_server_publickey(). This commit check the current version of libssh and use the proper method during the compilation. See the error: make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC rpc/libvirt_net_rpc_la-virnetlibsshsession.lo rpc/virnetlibsshsession.c:217:9: error: 'ssh_get_publickey' is deprecated [-Werror,-Wdeprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^ /usr/include/libssh/libssh.h:489:1: note: 'ssh_get_publickey' has been explicitly marked deprecated here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^ /usr/include/libssh/libssh.h:99:40: note: expanded from macro 'SSH_DEPRECATED' ^ 1 error generated. Makefile:8604: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetlibsshsession.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 309e8a9340..9dc7976828 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -214,7 +214,11 @@ virLibsshServerKeyAsString(virNetLibsshSessionPtr sess) size_t keyhashlen; char *str; - if (ssh_get_publickey(sess->session, &key) != SSH_OK) { +#if LIBSSH_VERSION_INT <= 0x0705 /* 0.7.5 */ +# define ssh_get_server_publickey ssh_get_publickey +#endif + + if (ssh_get_server_publickey(sess->session, &key) != SSH_OK) { virReportError(VIR_ERR_LIBSSH, "%s", _("failed to get the key of the current " "session")); -- 2.17.0

2 1

[libvirt] [PATCH 0/3] spec: drop deprecated el5 bits
by Cole Robinson 09 May '18

09 May '18

2 patches from a Fedora contributor, 1 from me, dropping spec bits that aren't required on el6 and later builds Cole Robinson (1): spec: Remove Group: tags Igor Gnatenko (2): spec: Remove BuildRoot definition spec: Remove %clean section libvirt.spec.in | 45 --------------------------------------------- 1 file changed, 45 deletions(-) -- 2.17.0

3 6

[libvirt] [RFC 0/3] LXC with block device and enabled userns
by Radostin Stoyanov 09 May '18

09 May '18

Problem background ------------------ The LXC driver has support for the filesystem types "file" and "block" that allow a disk image to be mounted in the guest (container). [1] However, when user-namespace is enabled (uid/gid mapping is used) the mount of the root filesystem block device fails. [2] According to "man 7 user_namespaces": Mounting block-based filesystems can be done only by a process that holds CAP_SYS_ADMIN in the initial user namespace. Suggested approach ------------------ Mount the root file system block device before the clone() call, then set filesystem type to VIR_DOMAIN_FS_TYPE_MOUNT and filesystem source to the folder where it was mounted. Issues encountered -------------------- This patch series implements the basic idea of the mentioned approach. In result, a container with configured idmap and NBD filesystem is able to start. However, on guest shutdown this kernel error [3] occurs. Similar messages [4] occur on shutdown when NBD filesystem is used with LXC container without idmap. Perhaps, one reason could be that on guest shutdown the LXC driver kills qemu-nbd process without sending disconnect for the specified device. References ---------- [1] https://libvirt.org/formatdomain.html#elementsFilesystems [2] https://bugzilla.redhat.com/show_bug.cgi?id=1328946 [3] https://pastebin.com/raw/jMBk5mtG [4] https://pastebin.com/raw/wTKbuRP9 Radostin Stoyanov (3): lxc: Make lxcContainerMountFSBlock non static lxc: Move up virLXCControllerAppendNBDPids lxc: Mount NBD devices before clone src/lxc/lxc_container.c | 58 +------------------ src/lxc/lxc_container.h | 4 ++ src/lxc/lxc_controller.c | 145 +++++++++++++++++++++++++++-------------------- 3 files changed, 87 insertions(+), 120 deletions(-) -- 2.14.3

3 7

[libvirt] [dbus PATCH 00/19] StoragePool APIs till libvirt 3.0
by Katerina Koukiou 09 May '18

09 May '18

Katerina Koukiou (19): Introduce StoragePool Interface Implement ListStoragePools method for Connect Interface Register StoragePool Lifecycle Events Implement Destroy method for StoragePool Interface Implement Build method for StoragePool Interface Implement Create method for StoragePool Interface Implement Delete method for StoragePool Interface Implement getter for Autostart property for StoragePool Interface Implement GetInfo method for StoragePool Interface Implement Name property for StoragePool Interface Implement UUID property for StoragePool Interface Implement GetXMLDesc method for StoragePool Interface Implement Active property for StoragePool Interface Implement Persistent property for StoragePool Interface Implement StoragePoolLookupByName method for Connect Interface Implement StoragePoolLookupByUUID method for Connect Interface Implement Refresh method for StoragePool Interface Implement setter for Autostart property for StoragePool Interface Implement Undefine method for StoragePool Interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 24 +++ data/org.libvirt.StoragePool.xml | 69 +++++++ src/Makefile.am | 3 +- src/connect.c | 120 +++++++++++ src/connect.h | 2 + src/events.c | 43 ++++ src/storagepool.c | 422 +++++++++++++++++++++++++++++++++++++++ src/storagepool.h | 9 + src/util.c | 33 +++ src/util.h | 15 ++ tests/libvirttest.py | 29 +++ tests/test_connect.py | 28 +++ tests/test_storage.py | 112 +++++++++++ 14 files changed, 910 insertions(+), 2 deletions(-) create mode 100644 data/org.libvirt.StoragePool.xml create mode 100644 src/storagepool.c create mode 100644 src/storagepool.h create mode 100755 tests/test_storage.py -- 2.15.0

2 23

[libvirt] [jenkins-ci PATCH] Build libosinfo and osinfo-db-tools on mingw platform
by Daniel P. Berrangé 09 May '18

09 May '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 ++ guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libosinfo+mingw.yml | 8 ++++++++ guests/vars/projects/osinfo-db-tools+mingw.yml | 10 ++++++++++ projects/libosinfo.yaml | 12 ++++++++++++ projects/osinfo-db-tools.yaml | 12 ++++++++++++ 6 files changed, 50 insertions(+) create mode 100644 guests/vars/projects/libosinfo+mingw.yml create mode 100644 guests/vars/projects/osinfo-db-tools+mingw.yml diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 43555d0..82d46e8 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -4,6 +4,7 @@ PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: - libosinfo + - libosinfo+mingw - libvirt - libvirt+mingw - libvirt-cim @@ -18,6 +19,7 @@ projects: - libvirt-tck - osinfo-db - osinfo-db-tools + - osinfo-db-tools+mingw - virt-manager - virt-viewer - virt-viewer+mingw diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index f1777fe..3e33bf1 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -368,6 +368,9 @@ mappings: mingw32-gtk-vnc2: FedoraRawhide: mingw32-gtk-vnc2 + mingw32-libarchive: + FedoraRawhide: mingw32-libarchive + mingw32-libgovirt: FedoraRawhide: mingw32-libgovirt @@ -437,6 +440,9 @@ mappings: mingw64-gtk-vnc2: FedoraRawhide: mingw64-gtk-vnc2 + mingw64-libarchive: + FedoraRawhide: mingw64-libarchive + mingw64-libgovirt: FedoraRawhide: mingw64-libgovirt diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw.yml new file mode 100644 index 0000000..e3fc3cb --- /dev/null +++ b/guests/vars/projects/libosinfo+mingw.yml @@ -0,0 +1,8 @@ +--- +packages: + - mingw32-glib2 + - mingw32-libxml2 + - mingw32-libxslt + - mingw64-glib2 + - mingw64-libxml2 + - mingw64-libxslt diff --git a/guests/vars/projects/osinfo-db-tools+mingw.yml b/guests/vars/projects/osinfo-db-tools+mingw.yml new file mode 100644 index 0000000..578e185 --- /dev/null +++ b/guests/vars/projects/osinfo-db-tools+mingw.yml @@ -0,0 +1,10 @@ +--- +packages: + - mingw32-glib2 + - mingw32-libxml2 + - mingw32-libxslt + - mingw32-libarchive + - mingw64-glib2 + - mingw64-libxml2 + - mingw64-libxslt + - mingw64-libarchive diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 0d25447..8e3d105 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -13,3 +13,15 @@ - autotools-rpm-job: parent_jobs: 'libosinfo-master-check' machines: '{rpm_machines}' + - autotools-build-job: + parent_jobs: 'osinfo-db-tools-master-build-mingw32' + variant: -mingw32 + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' + machines: '{mingw_machines}' + - autotools-build-job: + parent_jobs: 'osinfo-db-tools-master-build-mingw64' + variant: -mingw64 + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' + machines: '{mingw_machines}' diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index 6b451ef..cab85af 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -13,3 +13,15 @@ - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-master-check' machines: '{rpm_machines}' + - autotools-build-job: + parent_jobs: + variant: -mingw32 + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' + machines: '{mingw_machines}' + - autotools-build-job: + parent_jobs: + variant: -mingw64 + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' + machines: '{mingw_machines}' -- 2.17.0

2 3

[libvirt] [PATCH] qemu: domain: Replace qemuDomainFilePathIsHostCDROM with virFileIsCDROM
by Peter Krempa 09 May '18

09 May '18

Use the new helper when checking that the VM needs to be tainted as a host-cdrom passthrough. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b13e6d8ca4..ec865e68c8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6483,35 +6483,6 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver, } -/* qemuDomainFilePathIsHostCDROM - * @path: Supplied path. - * - * Determine if the path is a host CD-ROM path. Typically this is - * either /dev/cdrom[n] or /dev/srN, so those are easy checks, but - * it's also possible that @path resolves to /dev/srN, so check for - * those conditions on @path in order to emit the tainted message. - * - * Returns true if the path is a CDROM, false otherwise or on error. - */ -static bool -qemuDomainFilePathIsHostCDROM(const char *path) -{ - bool ret = false; - char *linkpath = NULL; - - if (virFileResolveLink(path, &linkpath) < 0) - goto cleanup; - - if (STRPREFIX(path, "/dev/cdrom") || STRPREFIX(path, "/dev/sr") || - STRPREFIX(linkpath, "/dev/sr")) - ret = true; - - cleanup: - VIR_FREE(linkpath); - return ret; -} - - void qemuDomainObjTaint(virQEMUDriverPtr driver, virDomainObjPtr obj, virDomainTaintFlags taint, @@ -6630,7 +6601,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->path && qemuDomainFilePathIsHostCDROM(disk->src->path)) + disk->src->path && virFileIsCDROM(disk->src->path)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); -- 2.16.2

2 2

[libvirt] Question about verifying same uid:gid in src and dst for live migration
by Fei Li 09 May '18

09 May '18

Hi, When I do live migration using virsh command line based on NFS shared storage between two systems having the same security mechanism and having the same kvm/qemu/libvirt version, I encounter the following error: debug : qemuMonitorJSONIOProcessLine:193 : Line [{"timestamp": {"seconds": 1524893525, "microseconds": 522686}, "event": "BLOCK_IO_ERROR", "data": {"device": "drive-virtio-disk0", "nospace": false, "node-name": "#block120", "reason": "Permission denied", "operation": "write", "action": "report"}}] ... error: internal error: qemu unexpectedly closed the monitor: qemu-system-x86_64: load of migration failed: Input/output error ... According to the "Permission denied" && "write" information, I find the below 2 ways can fix this error: - Change the mode of guest's .qcow2 file from 644 to 646 - Keep qemu's uid the same one between src host and dst host (They are not same before I change them) My environment and test cases: src:~ # id qemu uid=473(qemu) gid=476(qemu) groups=488(kvm),476(qemu) dst:~ # id qemu uid=467(qemu) gid=470(qemu) groups=488(kvm),470(qemu) In /etc/libvirt/qemu.conf, my confifuration is the following default: # The user for QEMU processes run by the system instance. It can be # specified as a user name or as a user id. The qemu driver will try to # parse this value first as a name and then, if the name doesn't exist, # as a user id. # # Since a sequence of digits is a valid user name, a leading plus sign # can be used to ensure that a user id will not be interpreted as a user # name. # # Some examples of valid values are: # # user = "qemu" # A user named "qemu" # user = "+0" # Super user (uid=0) # user = "100" # A user named "100" or a user with uid=100 # #user = "root" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. #group = "root" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. # Set to 0 to disable file ownership changes. #dynamic_ownership = 1 On the src, do live migration "virsh -d 0 migrate --live vm-name qemu+ssh://dst-ip/system": - after a vm is defined, user:group=root:root - after a vm is started, user:group=qemu:qemu - after migration begins, user:group=467:470 (that is dst's uid:gid) - after migration succeeds, user:group=467:470 (that is dst's uid:gid) - after a vm is destroyed, user:group=root:root (back to the src's) - after migration fails, user:group=467:470; the vm is still running in src but the file inside the guest becomes read-only even its mode is 644 Other notes: - I tried libvirt v3.3.0 && v4.0.0 to do the same test, both can see such error. After confirming that keeping qemu's uid identical between src host and dst host can fix such issue, my question is whether a fix in libvirt should be pursued or just document the requirement for same uid:gid across host systems in a migration cluster is ok? BTW, if a fix is needed, maybe the pre-migration checks in libvirt could determine different uid and/or gid and fail sooner with a better/explicit error like "Should keep the qemu uid in src and dst be the same for migration, or elsemigration will fail"? Does anyone have noticed this and could give some suggestions? Thanks a lot! Have a nice day, thanks again Fei

3 2

[libvirt] [jenkins-ci PATCH] projects: Run libvirt's 'make check' on all machines
by Andrea Bolognani 09 May '18

09 May '18

Up until now, we had to skip it on FreeBSD due to some portability issues in the test suite, but as of libvirt commit 0b86e23d2569 they've all been fixed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 9b9b0b4..6f5464b 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -18,13 +18,6 @@ - libvirt-fedora-rawhide - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' - machines: - - libvirt-centos-7 - - libvirt-debian-8 - - libvirt-debian-9 - - libvirt-fedora-27 - - libvirt-fedora-28 - - libvirt-fedora-rawhide local_env: | export VIR_TEST_EXPENSIVE=1 export VIR_TEST_DEBUG=2 -- 2.14.3

2 3

[libvirt] [PATCHv2] Deprecate QEMU_CAPS_NESTING
by Ján Tomko 09 May '18

09 May '18

Unused since commit <a7424fa>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- v2: also delete the hasHwVirt variable as well as the whole 'svm' checking src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index abd6eff14a..b9628b8266 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -105,7 +105,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 40 */ X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ + X_QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 50b0ffcf94..22c560c67c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6652,7 +6652,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, { virArch hostarch = virArchFromHost(); char *cpu = NULL, *cpu_flags = NULL; - bool hasHwVirt = false; int ret = -1; virBuffer cpu_buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6662,26 +6661,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { if (qemuBuildCpuModelArgStr(driver, def, &cpu_buf, qemuCaps) < 0) goto cleanup; - - /* Only 'svm' requires --enable-nesting. The nested 'vmx' patches now - * simply hook off the CPU features. */ - if (ARCH_IS_X86(def->os.arch) && - def->virtType == VIR_DOMAIN_VIRT_KVM) { - virCPUDefPtr cpuDef = NULL; - - if (def->cpu->mode == VIR_CPU_MODE_CUSTOM) - cpuDef = def->cpu; - else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) - cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType, - VIR_QEMU_CAPS_HOST_CPU_REPORTED); - - if (cpuDef) { - int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm"); - if (svm < 0) - goto cleanup; - hasHwVirt = svm > 0; - } - } } else { /* * Need to force a 32-bit guest CPU type if @@ -6870,9 +6849,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (cpu) { virCommandAddArg(cmd, "-cpu"); virCommandAddArgFormat(cmd, "%s%s", cpu, cpu_flags ? cpu_flags : ""); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NESTING) && hasHwVirt) - virCommandAddArg(cmd, "-enable-nesting"); } ret = 0; -- 2.16.1

2 1

[libvirt] [PATCH] rpc: fixing compilation error due to deprecated ssh_get_publickey().
by Julio Faracco 08 May '18

08 May '18

After 0.7.5 release, libssh deprecated ssh_get_publickey() method to introduce ssh_get_server_publickey(). This commit check the current version of libssh and use the proper method during the compilation. See the error: make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC rpc/libvirt_net_rpc_la-virnetlibsshsession.lo rpc/virnetlibsshsession.c:217:9: error: 'ssh_get_publickey' is deprecated [-Werror,-Wdeprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^ /usr/include/libssh/libssh.h:489:1: note: 'ssh_get_publickey' has been explicitly marked deprecated here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^ /usr/include/libssh/libssh.h:99:40: note: expanded from macro 'SSH_DEPRECATED' ^ 1 error generated. Makefile:8604: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetlibsshsession.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 309e8a9340..96c5bc0882 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -214,7 +214,11 @@ virLibsshServerKeyAsString(virNetLibsshSessionPtr sess) size_t keyhashlen; char *str; +#if LIBSSH_VERSION_INT > 0x0705 /* 0.7.5 */ + if (ssh_get_server_publickey(sess->session, &key) != SSH_OK) { +#else if (ssh_get_publickey(sess->session, &key) != SSH_OK) { +#endif virReportError(VIR_ERR_LIBSSH, "%s", _("failed to get the key of the current " "session")); -- 2.17.0

5 7