April 2022 - Devel - libvirt List Archives

[PATCH v2] conf: Move validation from virDomainDiskDefIotuneParse into the validation callback
by Moteen Shah 08 Apr '22

08 Apr '22

From: Moteen Shah <moteenshah.02(a)gmail.com> all the option collision total and... error messages in virDomainDiskDefIotuneParse shifted to validation callback Signed-off-by: Moteen Shah <moteenshah.02(a)gmail.com> --- src/conf/domain_conf.c | 55 +++----------------------------------- src/conf/domain_validate.c | 42 ++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 52 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f2480f37f6..48132c2f97 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1408,7 +1408,6 @@ VIR_ENUM_IMPL(virDomainSnapshotLocation, "no", "internal", "external", - "manual", ); /* Internal mapping: subset of block job types that can be present in @@ -6229,51 +6228,6 @@ virDomainDefPostParseCheckFailure(virDomainDef *def, return 0; } -static int -virDomainDefPostParseCheck(virDomainDiskDef *def) -{ - if ((def->blkdeviotune.total_bytes_sec && - def->blkdeviotune.read_bytes_sec) || - (def->blkdeviotune.total_bytes_sec && - def->blkdeviotune.write_bytes_sec)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("total and read/write bytes_sec " - "cannot be set at the same time")); - return -1; - } - - if ((def->blkdeviotune.total_iops_sec && - def->blkdeviotune.read_iops_sec) || - (def->blkdeviotune.total_iops_sec && - def->blkdeviotune.write_iops_sec)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("total and read/write iops_sec " - "cannot be set at the same time")); - return -1; - } - - if ((def->blkdeviotune.total_bytes_sec_max && - def->blkdeviotune.read_bytes_sec_max) || - (def->blkdeviotune.total_bytes_sec_max && - def->blkdeviotune.write_bytes_sec_max)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("total and read/write bytes_sec_max " - "cannot be set at the same time")); - return -1; - } - - if ((def->blkdeviotune.total_iops_sec_max && - def->blkdeviotune.read_iops_sec_max) || - (def->blkdeviotune.total_iops_sec_max && - def->blkdeviotune.write_iops_sec_max)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("total and read/write iops_sec_max " - "cannot be set at the same time")); - return -1; - } - return 0; -} - int virDomainDefPostParse(virDomainDef *def, unsigned int parseFlags, @@ -8826,9 +8780,9 @@ virDomainDiskDefIotuneParse(virDomainDiskDef *def, PARSE_IOTUNE(write_iops_sec_max_length); def->blkdeviotune.group_name = - virXPathString("string(./iotune/group_name)", ctxt); - - return virDomainDefPostParseCheck(def); + virXPathString("string(./iotune/group_name)", ctxt); + + return 0; } #undef PARSE_IOTUNE @@ -9278,8 +9232,7 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, return NULL; } - if (virDomainDiskDefIotuneParse(def, ctxt) < 0) - return NULL; + virDomainDiskDefIotuneParse(def, ctxt); def->domain_name = virXPathString("string(./backenddomain/@name)", ctxt); def->serial = virXPathString("string(./serial)", ctxt); diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index d6869e8fd8..4bdb95aa13 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -597,7 +597,6 @@ virDomainDiskDefSourceLUNValidate(const virStorageSource *src) return 0; } - static int virDomainDiskDefValidate(const virDomainDef *def, const virDomainDiskDef *disk) @@ -651,6 +650,47 @@ virDomainDiskDefValidate(const virDomainDef *def, } } + /* Validate IotuneParse */ + if ((disk->blkdeviotune.total_bytes_sec && + disk->blkdeviotune.read_bytes_sec) || + (disk->blkdeviotune.total_bytes_sec && + disk->blkdeviotune.write_bytes_sec)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total and read/write bytes_sec " + "cannot be set at the same time")); + return -1; + } + + if ((disk->blkdeviotune.total_iops_sec && + disk->blkdeviotune.read_iops_sec) || + (disk->blkdeviotune.total_iops_sec && + disk->blkdeviotune.write_iops_sec)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total and read/write iops_sec " + "cannot be set at the same time")); + return -1; + } + + if ((disk->blkdeviotune.total_bytes_sec_max && + disk->blkdeviotune.read_bytes_sec_max) || + (disk->blkdeviotune.total_bytes_sec_max && + disk->blkdeviotune.write_bytes_sec_max)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total and read/write bytes_sec_max " + "cannot be set at the same time")); + return -1; + } + + if ((disk->blkdeviotune.total_iops_sec_max && + disk->blkdeviotune.read_iops_sec_max) || + (disk->blkdeviotune.total_iops_sec_max && + disk->blkdeviotune.write_iops_sec_max)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("total and read/write iops_sec_max " + "cannot be set at the same time")); + return -1; + } + /* Reject disks with a bus type that is not compatible with the * given address type. The function considers only buses that are * handled in common code. For other bus types it's not possible -- 2.35.1

2 1

[libvirt PATCH] drivers: Group global feature together
by Andrea Bolognani 07 Apr '22

07 Apr '22

All these features are supposed to be handled by the call to virDriverFeatureIsGlobal() placed right above the switch statement, so group them together and add a comment. If any of these features is actually encountered as part of the switch statements, that means there's a bug in the driver and we should error out. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Applies on top of [PATCH 0/8] driver: Fix handling of driver feature flags https://listman.redhat.com/archives/libvir-list/2022-February/msg00644.html src/ch/ch_driver.c | 13 +++++++------ src/esx/esx_driver.c | 21 +++++++++++---------- src/libxl/libxl_driver.c | 16 +++++++++------- src/lxc/lxc_driver.c | 11 ++++++----- src/network/bridge_driver.c | 15 ++++++++------- src/openvz/openvz_driver.c | 16 +++++++++------- src/qemu/qemu_driver.c | 16 +++++++++------- 7 files changed, 59 insertions(+), 49 deletions(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index ac9298c0b5..9cbd7b71df 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -928,23 +928,24 @@ chConnectSupportsFeature(virConnectPtr conn, return supported; switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: - return 1; + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: case VIR_DRV_FEATURE_MIGRATION_P2P: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: - case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_XML_MIGRATABLE: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_V1: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: default: return 0; } diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3149f3e963..6e5f9c8cc1 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1024,7 +1024,17 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature) return supported; switch ((virDrvFeature) feature) { - case VIR_DRV_FEATURE_MIGRATION_V1: + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: + case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; + + case VIR_DRV_FEATURE_MIGRATION_V1: supportsVMotion = esxSupportsVMotion(priv); if (supportsVMotion == esxVI_Boolean_Undefined) @@ -1034,10 +1044,6 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature) return priv->vCenter && supportsVMotion == esxVI_Boolean_True ? 1 : 0; - case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: - return 1; - - case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: @@ -1045,11 +1051,6 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature) case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: - case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_XML_MIGRATABLE: default: return 0; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 478ab3e941..46596978d4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5706,22 +5706,24 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) return supported; switch ((virDrvFeature) feature) { - case VIR_DRV_FEATURE_MIGRATION_V3: + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; + case VIR_DRV_FEATURE_MIGRATION_V3: case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_P2P: - case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: return 1; - case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_V1: case VIR_DRV_FEATURE_MIGRATION_V2: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: case VIR_DRV_FEATURE_XML_MIGRATABLE: default: return 0; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 020ec257ae..023292a75a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1627,10 +1627,15 @@ lxcConnectSupportsFeature(virConnectPtr conn, int feature) return supported; switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: - return 1; case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: @@ -1639,10 +1644,6 @@ lxcConnectSupportsFeature(virConnectPtr conn, int feature) case VIR_DRV_FEATURE_MIGRATION_V1: case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: case VIR_DRV_FEATURE_XML_MIGRATABLE: default: return 0; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d6ae05360b..559600d2af 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -866,23 +866,24 @@ networkConnectSupportsFeature(virConnectPtr conn, int feature) return supported; switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: + case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: - return 1; + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: case VIR_DRV_FEATURE_MIGRATION_P2P: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: - case VIR_DRV_FEATURE_FD_PASSING: - case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_XML_MIGRATABLE: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_V1: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: default: return 0; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index aa1db09540..c034fd5af9 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1944,22 +1944,24 @@ openvzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) return supported; switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: + case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_V3: - case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: return 1; - case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_P2P: case VIR_DRV_FEATURE_MIGRATION_V1: case VIR_DRV_FEATURE_MIGRATION_V2: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: - case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_XML_MIGRATABLE: default: return 0; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f1f708e511..433ba09745 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1182,23 +1182,25 @@ qemuConnectSupportsFeature(virConnectPtr conn, int feature) return supported; switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: + case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: + case VIR_DRV_FEATURE_FD_PASSING: + /* Should have already been handled by virDriverFeatureIsGlobal() */ + return -1; case VIR_DRV_FEATURE_MIGRATION_V2: case VIR_DRV_FEATURE_MIGRATION_V3: case VIR_DRV_FEATURE_MIGRATION_P2P: case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: - case VIR_DRV_FEATURE_FD_PASSING: - case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_XML_MIGRATABLE: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_PARAMS: - case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: return 1; case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_V1: - case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: - case VIR_DRV_FEATURE_REMOTE: - case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: - case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: default: return 0; } -- 2.35.1

2 4

[libvirt PATCH] ci: Refresh Dockerfiles and vars files
by Erik Skultety 07 Apr '22

07 Apr '22

In this batch: - dnsmasq is dropped as build dependency - Alpine Edge rpcgen package collision fix Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- corresponding pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/510287873 ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/almalinux-8.Dockerfile | 1 - ci/containers/alpine-314.Dockerfile | 1 - ci/containers/alpine-edge.Dockerfile | 2 +- ci/containers/centos-stream-8.Dockerfile | 3 +-- ci/containers/centos-stream-9.Dockerfile | 3 +-- ci/containers/debian-10-cross-aarch64.Dockerfile | 1 - ci/containers/debian-10-cross-armv6l.Dockerfile | 1 - ci/containers/debian-10-cross-armv7l.Dockerfile | 1 - ci/containers/debian-10-cross-i686.Dockerfile | 1 - ci/containers/debian-10-cross-mips.Dockerfile | 1 - ci/containers/debian-10-cross-mips64el.Dockerfile | 1 - ci/containers/debian-10-cross-mipsel.Dockerfile | 1 - ci/containers/debian-10-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-10-cross-s390x.Dockerfile | 1 - ci/containers/debian-10.Dockerfile | 1 - ci/containers/debian-11-cross-aarch64.Dockerfile | 1 - ci/containers/debian-11-cross-armv6l.Dockerfile | 1 - ci/containers/debian-11-cross-armv7l.Dockerfile | 1 - ci/containers/debian-11-cross-i686.Dockerfile | 1 - ci/containers/debian-11-cross-mips64el.Dockerfile | 1 - ci/containers/debian-11-cross-mipsel.Dockerfile | 1 - ci/containers/debian-11-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-11-cross-s390x.Dockerfile | 1 - ci/containers/debian-11.Dockerfile | 1 - ci/containers/debian-sid-cross-aarch64.Dockerfile | 1 - ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 - ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 - ci/containers/debian-sid-cross-i686.Dockerfile | 1 - ci/containers/debian-sid-cross-mips64el.Dockerfile | 1 - ci/containers/debian-sid-cross-mipsel.Dockerfile | 1 - ci/containers/debian-sid-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-sid-cross-s390x.Dockerfile | 1 - ci/containers/debian-sid.Dockerfile | 1 - ci/containers/fedora-34.Dockerfile | 1 - ci/containers/fedora-35-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-35-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-35.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-152.Dockerfile | 1 - ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2004.Dockerfile | 1 - 47 files changed, 7 insertions(+), 49 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index eb6d6db18f..a5afb4eb4d 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='augeas bash-completion ccache codespell cppi curl diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' +PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile index 55ce0908a3..1b55e9f66f 100644 --- a/ci/containers/almalinux-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile index 4ca35a949b..1cd3fc6b0c 100644 --- a/ci/containers/alpine-314.Dockerfile +++ b/ci/containers/alpine-314.Dockerfile @@ -21,7 +21,6 @@ RUN apk update && \ curl-dev \ cyrus-sasl-dev \ diffutils \ - dnsmasq \ eudev-dev \ fuse-dev \ gcc \ diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index d171ed1be7..76e85b4386 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -21,7 +21,6 @@ RUN apk update && \ curl-dev \ cyrus-sasl-dev \ diffutils \ - dnsmasq \ eudev-dev \ fuse-dev \ gcc \ @@ -62,6 +61,7 @@ RUN apk update && \ python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 2496c5b0bb..82cbd7cde7 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/centos/centos:stream8 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index d20602b847..34ff3a06eb 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/centos/centos:stream9 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ dnf install -y \ @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index ca6b36b439..f4054490df 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index 6818d6c409..96a6fa94aa 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 726d5d5846..d3c221e87a 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 16e29e00c9..37f4962286 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index d5cabb47c4..7c8847260f 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index ff63c2b5da..0cc7bc7034 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 93b68bd10e..ae3fd260ea 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index 5577056754..7cd3a3a419 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index 886d532927..589a5b1d9c 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 63d070cb37..41691c708f 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index d57a7c0e6e..778eed4be1 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index cead78f3ca..6c13a93b95 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index bb3ce1c70c..66f95d5cd8 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index a3408eb6fe..a12e703f42 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index cf28516bb9..9c880ba1f1 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index 535e8a53f1..b4d2b53f27 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 147a45c837..bd2d62b0bb 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index d3e879b084..aa73a79210 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 102973de0b..2609c83928 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 96f3651e54..7e4e5d0b7c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 332e0d6570..c64bf14f67 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 1372fe954d..81604816f7 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 9557986f1b..4f0f1a992a 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 0738f5bdad..c6186a2454 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 8fabe91bfd..eece32d2da 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 4b71bba63c..1605ca2771 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 68f35fc72d..7b5a6b4b79 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 0cabbcea66..52f1724415 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 9153ec2ca1..6949231a62 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile index 0181237702..3cc5e7b59b 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile index 889f32bbfc..b6662f6da7 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile index 48d22cb056..117b2736c3 100644 --- a/ci/containers/fedora-35.Dockerfile +++ b/ci/containers/fedora-35.Dockerfile @@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 3e474578f0..5c4a124e33 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index a27fb5af4e..7e626a8230 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 9615f22230..beca9062f5 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -31,7 +31,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index 864dfa4fa7..19161f60cf 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -21,7 +21,6 @@ RUN zypper update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ fuse-devel \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 8f249ccb61..72824c5505 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -21,7 +21,6 @@ RUN zypper dist-upgrade -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ fuse-devel \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index b6b10f2cbe..81115ab338 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ -- 2.34.1

2 1

[PATCH 0/4] Restrictive numatune mode related fixes
by Michal Privoznik 07 Apr '22

07 Apr '22

*** BLURB HERE *** Michal Prívozník (4): lib: Don't short circuit around virDomainCgroupSetupVcpuBW() hypervisor: Drop dead code in virDomainCgroupSetupGlobalCpuCgroup() ch: Explicitly forbid live changing nodeset for strict numatune lib: Set up cpuset controller for restrictive numatune src/ch/ch_driver.c | 2 +- src/ch/ch_process.c | 6 +++--- src/hypervisor/domain_cgroup.c | 25 ++----------------------- src/hypervisor/domain_cgroup.h | 3 +-- src/lxc/lxc_controller.c | 3 ++- src/qemu/qemu_driver.c | 12 ------------ src/qemu/qemu_process.c | 11 ++++++----- 7 files changed, 15 insertions(+), 47 deletions(-) -- 2.35.1

2 5

[PATCH] lib: Use virReportSystemError() more
by Michal Privoznik 07 Apr '22

07 Apr '22

Instead of reporting virReportError(..., g_strerror(), ...) let's use proper virReportSystemError(). Generated with help of cocci: @@ expression c; @@ <... - virReportError(c, + virReportSystemError(errno, ..., - g_strerror(errno), ...); ...> But then I had to hand fix format strings, because I'm not sure if cocci even knows how to do that. And even if it did, I surely don't. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_conf.c | 7 +++---- src/libxl/libxl_driver.c | 35 +++++++++++++++-------------------- src/qemu/qemu_interface.c | 8 ++++---- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0fc51c74a..6398129195 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1775,10 +1775,9 @@ libxlDriverConfigInit(libxlDriverConfig *cfg) uint64_t free_mem; if (g_mkdir_with_parents(cfg->logDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create log dir '%s': %s"), - cfg->logDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create log dir '%s'"), + cfg->logDir); return -1; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 01f281d0a5..5d76eb9752 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -721,38 +721,33 @@ libxlStateInitialize(bool privileged, libxl_driver->config = cfg; if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create state dir '%s': %s"), - cfg->stateDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create state dir '%s'"), + cfg->stateDir); goto error; } if (g_mkdir_with_parents(cfg->libDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create lib dir '%s': %s"), - cfg->libDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create lib dir '%s'"), + cfg->libDir); goto error; } if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create save dir '%s': %s"), - cfg->saveDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create save dir '%s'"), + cfg->saveDir); goto error; } if (g_mkdir_with_parents(cfg->autoDumpDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create dump dir '%s': %s"), - cfg->autoDumpDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create dump dir '%s'"), + cfg->autoDumpDir); goto error; } if (g_mkdir_with_parents(cfg->channelDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create channel dir '%s': %s"), - cfg->channelDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create channel dir '%s'"), + cfg->channelDir); goto error; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 676bc896d6..d0dcce5690 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -370,10 +370,10 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfig *cfg, if (errbuf && *errbuf) errstr = g_strdup_printf("\nstderr=%s", errbuf); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: failed to communicate with bridge helper: %s%s"), - cmdstr, g_strerror(errno), - NULLSTR_EMPTY(errstr)); + virReportSystemError(errno, + _("%s: failed to communicate with bridge helper: %s"), + cmdstr, + NULLSTR_EMPTY(errstr)); VIR_FREE(errstr); goto cleanup; } -- 2.35.1

2 1

[RFC PING PATCH 0/2] logging: add service to cleanup internal log files
by Nikolay Shirokovskiy 07 Apr '22

07 Apr '22

Hi all! Please take a look a RFC linked below. Sorry I switched to a new email and can't reply to it directly to draw attention. [RFC PATCH 0/2] logging: add service to cleanup internal log files https://listman.redhat.com/archives/libvir-list/2022-February/228817.html Nikolay

1 0

[PATCH 0/7] docs: Convert some pages to rST and clean up (part 3)
by Peter Krempa 06 Apr '22

06 Apr '22

This iteration has some patches from Pavel who also converted the pages to RST but didn't send it out yet. Included are those that didn't diverge yet. Additionally since I've moved the descriptions of types used in the C# bindings to the libvirt-csharp repo this series also cleans out the redundancy and converts the 'csharp' page. Pavel Hrdina (4): docs: convert 'dbus' page to rst docs: convert 'python' page to rst docs: convert 'tlscerts' page to rst docs: convert 'windows' page to rst Peter Krempa (3): docs: Move 'tlscerts' page to 'kbase/' docs: csharp: Remove project-specific information docs: convert 'csharp' page to rst docs/csharp.html.in | 470 ---------------------------------------- docs/csharp.rst | 38 ++++ docs/daemons.rst | 2 +- docs/dbus.html.in | 94 -------- docs/dbus.rst | 75 +++++++ docs/docs.html.in | 3 - docs/kbase/index.rst | 3 + docs/kbase/meson.build | 1 + docs/kbase/tlscerts.rst | 331 ++++++++++++++++++++++++++++ docs/meson.build | 9 +- docs/python.html.in | 72 ------ docs/python.rst | 79 +++++++ docs/remote.html.in | 2 +- docs/tlscerts.html.in | 413 ----------------------------------- docs/windows.html.in | 194 ----------------- docs/windows.rst | 139 ++++++++++++ 16 files changed, 672 insertions(+), 1253 deletions(-) delete mode 100644 docs/csharp.html.in create mode 100644 docs/csharp.rst delete mode 100644 docs/dbus.html.in create mode 100644 docs/dbus.rst create mode 100644 docs/kbase/tlscerts.rst delete mode 100644 docs/python.html.in create mode 100644 docs/python.rst delete mode 100644 docs/tlscerts.html.in delete mode 100644 docs/windows.html.in create mode 100644 docs/windows.rst -- 2.35.1

2 8

[PATCH v1 0/4] Add 'version' to other exported types
by Victor Toso 06 Apr '22

06 Apr '22

Hi, This series is an extension of what Daniel did in e0e0bf6628 "scripts: include function versions in API definition". The main motivation behind this is to help code generators to consider if a given symbol is present in a given version of libvirt that they are either running/building against, more specifically: https://gitlab.com/libvirt/libvirt-go-module/-/merge_requests/7 As headers are already a great source of documentation for developers, I'm suggesting to add a specific comment to each of this exported types: /* ... Since <version> */ For the use case I mentioned above, I'm adding small parsing function in apibuild.py to fetch the above metadata and included it on the generated XML API. To avoid adding too much noise in the githistory, I'm proposing the addition of symbols.versions.allowlist file, that apibuild.py can use to fetch the first git tag that a given symbol appeared in. I did a small script to generate it, but it sums up to calling the bellow command for any tag that starts with 'v' and has not '-rc'. git grep $symbol $tag ./include I'm trying the simples approach I could find but I'm happy to improve this further based on your suggestions. Ah, the diff in the generated XMLs, per patch (sadly, pasteben drops it after a single day). The initial reference is current master 67c77744d7 'tests: Fixing compiler warning in cputest' 0001 (enums) ... https://paste.centos.org/view/e9137ef0 0002 (typedefs) https://paste.centos.org/view/76f0b397 0003 (macros) .. https://paste.centos.org/view/b68fb03a 0004 (variables) https://paste.centos.org/view/4a20d9bb Cheers, Victor Victor Toso (4): scripts: apibuild: parse 'Since' version for enums scripts: apibuild: parse 'Since' for typedefs scripts: apibuild: parse 'Since' for macros scripts: apibuild: add 'version' to variables scripts/apibuild.py | 68 +- symbols.versions.allowlist | 2144 ++++++++++++++++++++++++++++++++++++ 2 files changed, 2199 insertions(+), 13 deletions(-) create mode 100644 symbols.versions.allowlist -- 2.35.1

3 17

[PATCH] qemu: Rename @main variable in qemuDomainRemoveLogs()
by Michal Privoznik 06 Apr '22

06 Apr '22

Older GCC fails to understand that 'char *main' is a variable and not main() function. Rename the variable to appease old GCC. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c35e5c09a3..a4334de158 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11828,7 +11828,7 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autofree char *format = NULL; - g_autofree char *main = NULL; + g_autofree char *main_log = NULL; g_autoptr(DIR) dir = NULL; struct dirent *entry; int rc; @@ -11840,13 +11840,13 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, if (virDirOpen(&dir, cfg->logDir) < 0) return -1; - main = g_strdup_printf("%s.log", name); + main_log = g_strdup_printf("%s.log", name); format = g_strdup_printf("%s.log.%%u", name); while ((rc = virDirRead(dir, &entry, cfg->logDir)) > 0) { unsigned int u; - if (STREQ(entry->d_name, main) || + if (STREQ(entry->d_name, main_log) || sscanf(entry->d_name, format, &u) == 1) { g_autofree char *path = NULL; -- 2.35.1

2 1

[PATCH] virsh: Remove any reference of KVM device assignment
by Michal Privoznik 05 Apr '22

05 Apr '22

The KVM device assignment was removed in v5.7.0-rc1~103 but virsh and its manpage still mention it. Don't do that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/manpages/virsh.rst | 7 +++---- tools/virsh-nodedev.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index d2e6528533..215beabd96 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5198,10 +5198,9 @@ guests via <hostdev> passthrough. This is reversed with ``nodedev-reattach``, and is done automatically for managed devices. Different backend drivers expect the device to be bound to different -dummy devices. For example, QEMU's "kvm" backend driver (the default) -expects the device to be bound to pci-stub, but its "vfio" backend -driver expects the device to be bound to vfio-pci. The *--driver* -parameter can be used to specify the desired backend driver. +dummy devices. For example, QEMU's "vfio" backend driver expects the +device to be bound to vfio-pci. The *--driver* parameter can be used +to specify the desired backend driver. nodedev-dumpxml diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index d21b2baab6..90066249af 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -615,7 +615,7 @@ static const vshCmdOptDef opts_node_device_detach[] = { {.name = "driver", .type = VSH_OT_STRING, .completer = virshNodeDevicePCIBackendCompleter, - .help = N_("pci device assignment backend driver (e.g. 'vfio' or 'kvm')") + .help = N_("pci device assignment backend driver (e.g. 'vfio' or 'xen')") }, {.name = NULL} }; -- 2.35.1

2 1