[libvirt] [PATCH] spec: Explicitly require matching libvirt-libs
by Jiri Denemark
All drivers now link directly to libvirt.so rather than getting the
symbols from the daemon. Let's explicitly mention this dependency in the
spec file.
Theoretically, the automatic libvirt.so.0(LIBVIRT_PRIVATE_4.5.0)
dependency should take care of everything, but rpmdiff complains it
would like to see an explicit dependency on the exact libvirt-libs
version too.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
Notes:
The rpmdiff check may also be wrong, but I figured the explicit
requires statement makes some sense and can't harm in any case.
libvirt.spec.in | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 720870e2b1..6f0d399064 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -544,6 +544,7 @@ Network filter configuration files for cleaning guest traffic
%package daemon-driver-network
Summary: Network driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: dnsmasq >= 2.41
Requires: radvd
Requires: iptables
@@ -560,6 +561,7 @@ bridge capabilities.
%package daemon-driver-nwfilter
Summary: Nwfilter driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: iptables
%if 0%{?rhel} && 0%{?rhel} < 7
Requires: iptables-ipv6
@@ -575,6 +577,7 @@ iptables and ip6tables capabilities
%package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
# needed for device enumeration
%if 0%{?fedora} || 0%{?rhel} >= 7
Requires: systemd >= 185
@@ -591,6 +594,7 @@ capabilities.
%package daemon-driver-interface
Summary: Interface driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%if (0%{?fedora} || 0%{?rhel} >= 7)
Requires: netcf-libs >= 0.2.2
%endif
@@ -604,6 +608,7 @@ netcf library
%package daemon-driver-secret
Summary: Secret driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-secret
The secret driver plugin for the libvirtd daemon, providing
@@ -612,6 +617,7 @@ an implementation of the secret key APIs.
%package daemon-driver-storage-core
Summary: Storage driver plugin including base backends for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: nfs-utils
# For mkfs
Requires: util-linux
@@ -628,6 +634,7 @@ iSCSI, and multipath storage.
%package daemon-driver-storage-logical
Summary: Storage driver plugin for lvm volumes
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: lvm2
%description daemon-driver-storage-logical
@@ -638,6 +645,7 @@ volumes using lvm.
%package daemon-driver-storage-disk
Summary: Storage driver plugin for disk
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: parted
Requires: device-mapper
@@ -649,6 +657,7 @@ volumes using the host disks.
%package daemon-driver-storage-scsi
Summary: Storage driver plugin for local scsi devices
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-storage-scsi
The storage driver backend adding implementation of the storage APIs for scsi
@@ -658,6 +667,7 @@ host devices.
%package daemon-driver-storage-iscsi
Summary: Storage driver plugin for iscsi
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: iscsi-initiator-utils
%description daemon-driver-storage-iscsi
@@ -668,6 +678,7 @@ volumes using the host iscsi stack.
%package daemon-driver-storage-mpath
Summary: Storage driver plugin for multipath volumes
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: device-mapper
%description daemon-driver-storage-mpath
@@ -679,6 +690,7 @@ multipath storage using device mapper.
%package daemon-driver-storage-gluster
Summary: Storage driver plugin for gluster
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%if 0%{?fedora}
Requires: glusterfs-client >= 2.0.1
%endif
@@ -696,6 +708,7 @@ volumes using libgfapi.
%package daemon-driver-storage-rbd
Summary: Storage driver plugin for rbd
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-storage-rbd
The storage driver backend adding implementation of the storage APIs for rbd
@@ -707,6 +720,7 @@ volumes using the ceph protocol.
%package daemon-driver-storage-sheepdog
Summary: Storage driver plugin for sheepdog
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Requires: sheepdog
%description daemon-driver-storage-sheepdog
@@ -719,6 +733,7 @@ sheepdog volumes using.
%package daemon-driver-storage-zfs
Summary: Storage driver plugin for ZFS
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
# Support any conforming implementation of zfs
Requires: /sbin/zfs
Requires: /sbin/zpool
@@ -760,6 +775,7 @@ parted and more.
%package daemon-driver-qemu
Summary: QEMU driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
# There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -784,6 +800,7 @@ QEMU
%package daemon-driver-lxc
Summary: LXC driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
# There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -801,6 +818,7 @@ the Linux kernel
%package daemon-driver-uml
Summary: Uml driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-uml
The UML driver plugin for the libvirtd daemon, providing
@@ -813,6 +831,7 @@ User Mode Linux
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-vbox
The vbox driver plugin for the libvirtd daemon, providing
@@ -825,6 +844,7 @@ VirtualBox
%package daemon-driver-libxl
Summary: Libxl driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
Obsoletes: libvirt-daemon-driver-xen < 4.3.0
%description daemon-driver-libxl
--
2.18.0
6 years, 4 months
[libvirt] [PATCH 0/2] Usb and sata for virsh attach-disk --address
by Han Han
Add usb and sata support for attach-disk of address parameter in virsh.
Han Han (2):
virsh: usb support for virsh attach-disk --address
virsh: sata support for virsh attach-disk --address
tools/virsh-domain.c | 82 +++++++++++++++++++++++++++++++++++++++++++-
tools/virsh.pod | 2 +-
2 files changed, 82 insertions(+), 2 deletions(-)
--
2.17.1
6 years, 4 months
[libvirt] [RFC PATCH 0/4] Add new macro to check for existent server
by Marcos Paulo de Souza
Hello,
I am trying to add a generic way to check for server, specially in drivers that
needs the server to be declared. If there is better way to put the check, or a
better way to check this setting, let me know.
Thanks in advance!
Marcos Paulo de Souza (4):
driver.h: Add macro VIR_DRV_CONN_CHECK_SERVER
esx_driver: Use VIR_DRV_CONN_CHECK_SERVER macro
hyperv_driver: Use VIR_DRV_CONN_CHECK_SERVER macro
phyp_driver: Use VIR_DRV_CONN_CHECK_SERVER macro
src/driver.h | 9 +++++++++
src/esx/esx_driver.c | 7 +------
src/hyperv/hyperv_driver.c | 7 +------
src/phyp/phyp_driver.c | 6 +-----
4 files changed, 12 insertions(+), 17 deletions(-)
--
2.17.1
6 years, 4 months
[libvirt] [PATCH] qemu: Fix typo in qemu_command.c
by Boris Fiuczynski
Rename qemuBulildFloppyCommandLineOptions into
qemuBuildFloppyCommandLineOptions.
Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
src/qemu/qemu_command.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 32eb59b6ab..ea567262a9 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2138,10 +2138,10 @@ qemuBuildDriveDevStr(const virDomainDef *def,
static int
-qemuBulildFloppyCommandLineOptions(virCommandPtr cmd,
- const virDomainDef *def,
- virDomainDiskDefPtr disk,
- unsigned int bootindex)
+qemuBuildFloppyCommandLineOptions(virCommandPtr cmd,
+ const virDomainDef *def,
+ virDomainDiskDefPtr disk,
+ unsigned int bootindex)
{
virBuffer fdc_opts = VIR_BUFFER_INITIALIZER;
@@ -2252,8 +2252,8 @@ qemuBuildDiskCommandLine(virCommandPtr cmd,
if (qemuDiskBusNeedsDeviceArg(disk->bus)) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {
- if (qemuBulildFloppyCommandLineOptions(cmd, def, disk,
- bootindex) < 0)
+ if (qemuBuildFloppyCommandLineOptions(cmd, def, disk,
+ bootindex) < 0)
return -1;
} else {
virCommandAddArg(cmd, "-device");
--
2.17.0
6 years, 4 months
[libvirt] [PATCH 0/4] Clean up QMP schema testing and add support for RBD auth for -blockdev
by Peter Krempa
QEMU recently added support for passing RBD credentials also for
-blockdev/blockdev-add.
First two patches remove the need for a separate stash for the QMP
schema data, patch 3 adds new capabilities and finally the last patch
adds the RBD auth support.
Peter Krempa (4):
tests: qemu: Use qmp schema data from the qemucapabilities test
tests: remove qemuqapischema.json
tests: qemucaps: Add test data for upcoming qemu 3.0.0
qemu: block: Add support for RBD authentication for blockdev
src/qemu/qemu_block.c | 26 +-
tests/Makefile.am | 1 -
.../network-qcow2-backing-chain-cache-unsafe.json | 5 +
...etwork-qcow2-backing-chain-encryption_auth.json | 5 +
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 22718 +++++++++++++++++++
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1213 +
tests/qemucapabilitiestest.c | 1 +
tests/qemumonitorjsontest.c | 13 +-
tests/qemuqapischema.json | 11364 ----------
tests/testutilsqemuschema.c | 65 +-
tests/testutilsqemuschema.h | 3 +
11 files changed, 24040 insertions(+), 11374 deletions(-)
create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
delete mode 100644 tests/qemuqapischema.json
--
2.16.2
6 years, 4 months
Re: [libvirt] [dbus PATCH] gitignore: add tests/.pytest_cache
by Andrea Bolognani
[re-adding libvirt-list]
On Mon, 2018-07-09 at 09:23 -0400, Anya Harter wrote:
> On 07/09/2018 04:34 AM, Andrea Bolognani wrote:
> > On Thu, 2018-07-05 at 13:48 -0400, Anya Harter wrote:
> > > +/tests/.pytest_cache
> >
> > When does the directory (or file?) get created? I just ran 'make
> > test' but it's not there for me.
>
> The tests/.pytest_cache/ directory is created when make check is run and
> the test suite fails.
>
> Additionally, a .pytest_cache/ directory is created in the home
> directory if ./run tests/<testfile> fails.
s/home directory/top-level directory of the project/ ;)
> If you want I can give you a patch that breaks the test suite and
> creates the directories in the two ways above.
No need: I verified the above on my own, and in that light...
> > Either way, this looks like it should be a more generic exclude
> > pattern like the one we already have for __pycache__ directories
> > instead of being limited to tests/.
... this suggestion was spot-on, as adding the pattern you
suggested would take care of the failed 'make check' case but
not of the failed './run tests/...' case.
Looking forward to v2 :)
--
Andrea Bolognani / Red Hat / Virtualization
6 years, 4 months
[libvirt] [PATCH] domain_nwfilter: Return early if net has no name in virDomainConfNWFilterTeardownImpl
by Michal Privoznik
This function is called from various clean up paths (e.g.
from qemuBuildInterfaceCommandLine). However, depending on the
stage the interface creation process failed at, net->ifname might
still be not filled in when control jumps to cleanup label. If
that is the case return early (avoiding useless error message
produced in virNWFilterBindingLookupByPortDev) as there is no
NWFilter to tear down anyway.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_nwfilter.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
index 24b5f42ddd..f39c8a1f9b 100644
--- a/src/conf/domain_nwfilter.c
+++ b/src/conf/domain_nwfilter.c
@@ -133,6 +133,9 @@ virDomainConfNWFilterTeardownImpl(virConnectPtr conn,
{
virNWFilterBindingPtr binding;
+ if (!net->ifname)
+ return;
+
binding = virNWFilterBindingLookupByPortDev(conn, net->ifname);
if (!binding)
return;
--
2.16.4
6 years, 4 months
[libvirt] [PATCH 0/6] Couple of important fixes
by Michal Privoznik
I think the most important fix is 2/6 as it might touch live user
data.
Also, I haven't run 'make check-access' in a while. If I did I
would have noticed new paths being accessed. I'll try to update
white list (in a separate patch set) and hopefully we can then
enable by default and threat its errors as fatal.
Michal Prívozník (6):
qemuBuildSCSIiSCSIHostdevDrvStr: Don't leak @netsource and @srcprops
qemuxml2argvtest: Don't spawn session daemon
Forget last daemon/ dir artefacts
virtestmock: Track connect() too
check-file-access: Allow specifying action
virtestmock: Track action
Makefile.am | 2 +-
run.in | 2 +-
src/driver.h | 2 +-
src/qemu/qemu_command.c | 6 ++---
tests/check-file-access.pl | 32 ++++++++++++++++++----
tests/file_access_whitelist.txt | 15 +++++++----
tests/libvirtd-fail | 4 +--
tests/qemuxml2argvmock.c | 7 +++++
tests/virtestmock.c | 59 ++++++++++++++++++++++++++++++-----------
9 files changed, 95 insertions(+), 34 deletions(-)
--
2.16.4
6 years, 4 months
[libvirt] [PATCH] qemu: monitor: Note change in output of query-cpus-fast
by Peter Krempa
We did not use the field that has changed but note it in the code which
extracts the data for future reference. Especially since there is an
example of the output.
https://bugzilla.redhat.com/show_bug.cgi?id=1598829
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor_json.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 3e90279b71..41abb920ab 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1645,6 +1645,9 @@ qemuMonitorJSONExtractCPUArchInfo(virJSONValuePtr jsoncpu,
* ...},
* {...}
* ]
+ *
+ * Note that since QEMU 2.13.0 the "arch" output member of the
+ * "query-cpus-fast" command is replaced by "target".
*/
static int
qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
--
2.16.2
6 years, 4 months
