[PATCH v3] spec: don't touch existing nwfilters on update
by Nikolay Shirokovskiy
Nwfilter can be edited by the user and we don't want to overwrite the editings.
Also the filters in %{datadir} does not have UUIDs and these are generated on
libvirtd start. Thus this patch also fixes regeneration of UUIDs on libvirtd
update.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
---
It is a successor to PATCH v2[1].
Diff to v2:
- Misc changes according to Andrea's review
[1] PATCH v2
https://www.redhat.com/archives/libvir-list/2020-December/msg00399.html
libvirt.spec.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 880051b..f20a1c7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1439,9 +1439,13 @@ fi
rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
%post daemon-config-nwfilter
-cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
-# libvirt saves these files with mode 600
-chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml
+for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
+ sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file")
+ if [ ! -f "$sysconfdir_file" ]; then
+ # libvirt saves these files with mode 600
+ install -m 0600 "$datadir_file" "$sysconfdir_file"
+ fi
+done
# Make sure libvirt picks up the new nwfilter defininitons
mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
--
1.8.3.1
3 years, 11 months
[libvirt PATCH 0/3] coverity diaries
by Ján Tomko
Ján Tomko (3):
virsh: virshAddressParse: check for malformed address
qemuBuildMemoryDeviceStr: check return of qemuBuildDeviceAddressStr
hyperv: remove duplicit addr check
src/hyperv/hyperv_driver.c | 3 ---
src/qemu/qemu_command.c | 3 ++-
tools/virsh-domain.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
--
2.26.2
3 years, 11 months
[PATCH 0/7] fix PCI vs PCIe detection when running libvirtd as root, but unprivileged
by Laine Stump
I think there's an adequate description in patch 6 (and maybe in the
bugzilla record: https://bugzilla.redhat.com/1901685). I already typed
a long description once, and git send-email failed due to network
problems and threw away everything I typed. I don't feel like typing
it again.
Laine Stump (7):
qemu: use g_autoptr for a virPCIDevice
util: simplify calling of virPCIDeviceDetectFunctionLevelReset()
util: simplify call to virPCIDeviceDetectPowerManagementReset()
util: make read error of PCI config file more detailed
util: change call sequence for virPCIDeviceFindCapabilityOffset()
util: make virPCIDeviceIsPCIExpress() more intelligent
qemu: remove now-redundant check for file length when determining PCIe
vs. PCI
src/qemu/qemu_domain_address.c | 43 ++-----------
src/util/virpci.c | 107 ++++++++++++++++++++++++---------
2 files changed, 82 insertions(+), 68 deletions(-)
--
2.28.0
3 years, 11 months
[PATCH] tests: qemucapabilities: Update capabilities for qemu-5.2 release (x86_64)
by Peter Krempa
qemu-5.2 is out! Let's update the capabilities for the final version.
Note that the 'enable-fips' feature vanishing in this update is expected
as the removal was tied to a version check (see commit 7b1ed1cd733a0 ).
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_5.2.0.x86_64.replies | 505 +++++++++---------
.../caps_5.2.0.x86_64.xml | 5 +-
.../fips-enabled.x86_64-latest.args | 1 -
3 files changed, 262 insertions(+), 249 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 140a3312a5..6988ae010f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -17,11 +17,11 @@
{
"return": {
"qemu": {
- "micro": 91,
- "minor": 1,
+ "micro": 0,
+ "minor": 2,
"major": 5
},
- "package": "v5.2.0-rc1"
+ "package": "v5.2.0"
},
"id": "libvirt-2"
}
@@ -1154,8 +1154,8 @@
"parent": "sys-bus-device"
},
{
- "name": "pc-q35-2.8-machine",
- "parent": "generic-pc-machine"
+ "name": "i82557a",
+ "parent": "pci-device"
},
{
"name": "vhost-user-scsi-pci-non-transitional",
@@ -1170,12 +1170,12 @@
"parent": "chardev"
},
{
- "name": "generic-sdhci",
- "parent": "sys-bus-device"
+ "name": "pc-q35-2.8-machine",
+ "parent": "generic-pc-machine"
},
{
- "name": "i82557a",
- "parent": "pci-device"
+ "name": "generic-sdhci",
+ "parent": "sys-bus-device"
},
{
"name": "virtio-scsi-pci-non-transitional",
@@ -1310,12 +1310,12 @@
"parent": "ide-device"
},
{
- "name": "tcg-accel",
- "parent": "accel"
+ "name": "EPYC-v1-x86_64-cpu",
+ "parent": "x86_64-cpu"
},
{
- "name": "piix4-ide",
- "parent": "pci-ide"
+ "name": "tcg-accel",
+ "parent": "accel"
},
{
"name": "virtio-balloon-pci",
@@ -1350,24 +1350,24 @@
"parent": "pci-device"
},
{
- "name": "i82551",
- "parent": "pci-device"
- },
- {
- "name": "EPYC-v1-x86_64-cpu",
- "parent": "x86_64-cpu"
+ "name": "pc-i440fx-2.6-machine",
+ "parent": "generic-pc-machine"
},
{
"name": "isa-ipmi-kcs",
"parent": "isa-device"
},
+ {
+ "name": "i82551",
+ "parent": "pci-device"
+ },
{
"name": "Icelake-Server-noTSX-x86_64-cpu",
"parent": "x86_64-cpu"
},
{
- "name": "pc-i440fx-2.6-machine",
- "parent": "generic-pc-machine"
+ "name": "piix4-ide",
+ "parent": "pci-ide"
},
{
"name": "SandyBridge-x86_64-cpu",
@@ -1405,14 +1405,14 @@
"name": "kvm-apic",
"parent": "apic-common"
},
- {
- "name": "kvm64-x86_64-cpu",
- "parent": "x86_64-cpu"
- },
{
"name": "isa-pit",
"parent": "pit-common"
},
+ {
+ "name": "kvm64-x86_64-cpu",
+ "parent": "x86_64-cpu"
+ },
{
"name": "Broadwell-v4-x86_64-cpu",
"parent": "x86_64-cpu"
@@ -1461,14 +1461,14 @@
"name": "ati-vga",
"parent": "pci-device"
},
- {
- "name": "pentium3-x86_64-cpu",
- "parent": "x86_64-cpu"
- },
{
"name": "kvm-i8259",
"parent": "pic-common"
},
+ {
+ "name": "pentium3-x86_64-cpu",
+ "parent": "x86_64-cpu"
+ },
{
"name": "isa-serial",
"parent": "isa-device"
@@ -1485,6 +1485,10 @@
"name": "vhost-user-blk-pci-non-transitional",
"parent": "vhost-user-blk-pci-base"
},
+ {
+ "name": "virtio-rng-pci-non-transitional",
+ "parent": "virtio-rng-pci-base"
+ },
{
"name": "cirrus-vga",
"parent": "pci-device"
@@ -1501,17 +1505,13 @@
"name": "pc-i440fx-2.1-machine",
"parent": "generic-pc-machine"
},
- {
- "name": "virtio-serial-pci",
- "parent": "virtio-serial-pci-base"
- },
{
"name": "i82559er",
"parent": "pci-device"
},
{
- "name": "virtio-rng-pci-non-transitional",
- "parent": "virtio-rng-pci-base"
+ "name": "virtio-serial-pci",
+ "parent": "virtio-serial-pci-base"
},
{
"name": "Skylake-Client-x86_64-cpu",
@@ -1750,11 +1750,11 @@
"parent": "base-sysbus-fdc"
},
{
- "name": "AMDVI-PCI",
+ "name": "i82559c",
"parent": "pci-device"
},
{
- "name": "i82559c",
+ "name": "AMDVI-PCI",
"parent": "pci-device"
},
{
@@ -1989,14 +1989,14 @@
"name": "usb-ehci",
"parent": "pci-ehci-usb"
},
- {
- "name": "pc-i440fx-2.11-machine",
- "parent": "generic-pc-machine"
- },
{
"name": "pxb",
"parent": "pci-device"
},
+ {
+ "name": "pc-i440fx-2.11-machine",
+ "parent": "generic-pc-machine"
+ },
{
"name": "AC97",
"parent": "pci-device"
@@ -2026,8 +2026,8 @@
"parent": "isa-device"
},
{
- "name": "virtio-iommu-pci-non-transitional",
- "parent": "virtio-iommu-device-base"
+ "name": "hyperv-testdev",
+ "parent": "isa-device"
},
{
"name": "scsi-hd",
@@ -2074,28 +2074,28 @@
"parent": "x86_64-cpu"
},
{
- "name": "hyperv-testdev",
- "parent": "isa-device"
+ "name": "virtio-iommu-pci-non-transitional",
+ "parent": "virtio-iommu-device-base"
},
{
"name": "s3c-sdhci",
"parent": "generic-sdhci"
},
{
- "name": "Westmere-v2-x86_64-cpu",
- "parent": "x86_64-cpu"
+ "name": "tpm-tis",
+ "parent": "isa-device"
},
{
"name": "fw_cfg_mem",
"parent": "fw_cfg"
},
{
- "name": "ccid-card-emulated",
- "parent": "ccid-card"
+ "name": "Westmere-v2-x86_64-cpu",
+ "parent": "x86_64-cpu"
},
{
- "name": "tpm-tis",
- "parent": "isa-device"
+ "name": "ccid-card-emulated",
+ "parent": "ccid-card"
},
{
"name": "pc-q35-5.1-machine",
@@ -2517,14 +2517,14 @@
"name": "vhost-user-gpu",
"parent": "virtio-gpu-base"
},
- {
- "name": "hda-duplex",
- "parent": "hda-audio"
- },
{
"name": "pentium-v1-x86_64-cpu",
"parent": "x86_64-cpu"
},
+ {
+ "name": "hda-duplex",
+ "parent": "hda-audio"
+ },
{
"name": "amd-iommu-iommu-memory-region",
"parent": "qemu:iommu-memory-region"
@@ -2533,10 +2533,6 @@
"name": "can-bus",
"parent": "object"
},
- {
- "name": "virtio-balloon-device",
- "parent": "virtio-device"
- },
{
"name": "Cooperlake-v1-x86_64-cpu",
"parent": "x86_64-cpu"
@@ -2545,14 +2541,18 @@
"name": "Cascadelake-Server-v3-x86_64-cpu",
"parent": "x86_64-cpu"
},
- {
- "name": "Nehalem-IBRS-x86_64-cpu",
- "parent": "x86_64-cpu"
- },
{
"name": "cfi.pflash01",
"parent": "sys-bus-device"
},
+ {
+ "name": "virtio-balloon-device",
+ "parent": "virtio-device"
+ },
+ {
+ "name": "Nehalem-IBRS-x86_64-cpu",
+ "parent": "x86_64-cpu"
+ },
{
"name": "pc-q35-2.7-machine",
"parent": "generic-pc-machine"
@@ -2782,8 +2782,8 @@
"parent": "x86_64-cpu"
},
{
- "name": "kvm64-v1-x86_64-cpu",
- "parent": "x86_64-cpu"
+ "name": "pcie-root-port",
+ "parent": "pcie-root-port-base"
},
{
"name": "IDE",
@@ -2793,10 +2793,6 @@
"name": "486-x86_64-cpu",
"parent": "x86_64-cpu"
},
- {
- "name": "pcie-root-port",
- "parent": "pcie-root-port-base"
- },
{
"name": "mptsas1068",
"parent": "pci-device"
@@ -2805,6 +2801,10 @@
"name": "scsi-block",
"parent": "scsi-disk-base"
},
+ {
+ "name": "kvm64-v1-x86_64-cpu",
+ "parent": "x86_64-cpu"
+ },
{
"name": "Snowridge-v1-x86_64-cpu",
"parent": "x86_64-cpu"
@@ -4006,11 +4006,6 @@
"name": "x-no-kvm-msix",
"type": "bool"
},
- {
- "default-value": false,
- "name": "x-no-mmap",
- "type": "bool"
- },
{
"default-value": 0,
"name": "yres",
@@ -4022,6 +4017,17 @@
"description": "on/off",
"type": "bool"
},
+ {
+ "default-value": "on",
+ "name": "x-pre-copy-dirty-page-tracking",
+ "description": "on/off/auto",
+ "type": "OnOffAuto"
+ },
+ {
+ "name": "x-nv-gpudirect-clique",
+ "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
+ "type": "uint4"
+ },
{
"default-value": "off",
"name": "x-msix-relocation",
@@ -4057,6 +4063,11 @@
"name": "x-pci-sub-vendor-id",
"type": "uint32"
},
+ {
+ "default-value": false,
+ "name": "x-enable-migration",
+ "type": "bool"
+ },
{
"default-value": false,
"name": "x-no-geforce-quirks",
@@ -4106,9 +4117,9 @@
"type": "bool"
},
{
- "name": "x-nv-gpudirect-clique",
- "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
- "type": "uint4"
+ "default-value": 4294967295,
+ "name": "x-pci-vendor-id",
+ "type": "uint32"
},
{
"default-value": 0,
@@ -4116,9 +4127,9 @@
"type": "uint32"
},
{
- "default-value": 4294967295,
- "name": "x-pci-vendor-id",
- "type": "uint32"
+ "default-value": false,
+ "name": "x-no-mmap",
+ "type": "bool"
},
{
"default-value": false,
@@ -4809,7 +4820,6 @@
{
"default-value": false,
"name": "removable",
- "description": "on/off",
"type": "bool"
},
{
@@ -4834,6 +4844,11 @@
"name": "opt_io_size",
"type": "size"
},
+ {
+ "default-value": false,
+ "name": "commandlog",
+ "type": "bool"
+ },
{
"name": "drive",
"description": "Node name or ID of a block device to use as a backend",
@@ -10724,6 +10739,170 @@
],
"option": "vnc"
},
+ {
+ "parameters": [
+ {
+ "name": "resourcecontrol",
+ "type": "string"
+ },
+ {
+ "name": "spawn",
+ "type": "string"
+ },
+ {
+ "name": "elevateprivileges",
+ "type": "string"
+ },
+ {
+ "name": "obsolete",
+ "type": "string"
+ },
+ {
+ "name": "enable",
+ "type": "boolean"
+ }
+ ],
+ "option": "sandbox"
+ },
+ {
+ "parameters": [
+ ],
+ "option": "smbios"
+ },
+ {
+ "parameters": [
+ {
+ "name": "rendernode",
+ "type": "string"
+ },
+ {
+ "name": "gl",
+ "type": "boolean"
+ },
+ {
+ "name": "head",
+ "type": "number"
+ },
+ {
+ "name": "display",
+ "type": "string"
+ },
+ {
+ "name": "seamless-migration",
+ "type": "boolean"
+ },
+ {
+ "name": "playback-compression",
+ "type": "boolean"
+ },
+ {
+ "name": "agent-mouse",
+ "type": "boolean"
+ },
+ {
+ "name": "streaming-video",
+ "type": "string"
+ },
+ {
+ "name": "zlib-glz-wan-compression",
+ "type": "string"
+ },
+ {
+ "name": "jpeg-wan-compression",
+ "type": "string"
+ },
+ {
+ "name": "image-compression",
+ "type": "string"
+ },
+ {
+ "name": "plaintext-channel",
+ "type": "string"
+ },
+ {
+ "name": "tls-channel",
+ "type": "string"
+ },
+ {
+ "name": "tls-ciphers",
+ "type": "string"
+ },
+ {
+ "name": "x509-dh-key-file",
+ "type": "string"
+ },
+ {
+ "name": "x509-cacert-file",
+ "type": "string"
+ },
+ {
+ "name": "x509-cert-file",
+ "type": "string"
+ },
+ {
+ "name": "x509-key-password",
+ "type": "string"
+ },
+ {
+ "name": "x509-key-file",
+ "type": "string"
+ },
+ {
+ "name": "x509-dir",
+ "type": "string"
+ },
+ {
+ "name": "sasl",
+ "type": "boolean"
+ },
+ {
+ "name": "disable-agent-file-xfer",
+ "type": "boolean"
+ },
+ {
+ "name": "disable-copy-paste",
+ "type": "boolean"
+ },
+ {
+ "name": "disable-ticketing",
+ "type": "boolean"
+ },
+ {
+ "name": "password",
+ "type": "string"
+ },
+ {
+ "name": "unix",
+ "type": "boolean"
+ },
+ {
+ "name": "ipv6",
+ "type": "boolean"
+ },
+ {
+ "name": "ipv4",
+ "type": "boolean"
+ },
+ {
+ "name": "addr",
+ "type": "string"
+ },
+ {
+ "name": "tls-port",
+ "type": "number"
+ },
+ {
+ "name": "port",
+ "type": "number"
+ }
+ ],
+ "option": "spice"
+ },
+ {
+ "parameters": [
+ ],
+ "option": "acpi"
+ },
{
"parameters": [
{
@@ -10913,170 +11092,6 @@
],
"option": "fsdev"
},
- {
- "parameters": [
- {
- "name": "rendernode",
- "type": "string"
- },
- {
- "name": "gl",
- "type": "boolean"
- },
- {
- "name": "head",
- "type": "number"
- },
- {
- "name": "display",
- "type": "string"
- },
- {
- "name": "seamless-migration",
- "type": "boolean"
- },
- {
- "name": "playback-compression",
- "type": "boolean"
- },
- {
- "name": "agent-mouse",
- "type": "boolean"
- },
- {
- "name": "streaming-video",
- "type": "string"
- },
- {
- "name": "zlib-glz-wan-compression",
- "type": "string"
- },
- {
- "name": "jpeg-wan-compression",
- "type": "string"
- },
- {
- "name": "image-compression",
- "type": "string"
- },
- {
- "name": "plaintext-channel",
- "type": "string"
- },
- {
- "name": "tls-channel",
- "type": "string"
- },
- {
- "name": "tls-ciphers",
- "type": "string"
- },
- {
- "name": "x509-dh-key-file",
- "type": "string"
- },
- {
- "name": "x509-cacert-file",
- "type": "string"
- },
- {
- "name": "x509-cert-file",
- "type": "string"
- },
- {
- "name": "x509-key-password",
- "type": "string"
- },
- {
- "name": "x509-key-file",
- "type": "string"
- },
- {
- "name": "x509-dir",
- "type": "string"
- },
- {
- "name": "sasl",
- "type": "boolean"
- },
- {
- "name": "disable-agent-file-xfer",
- "type": "boolean"
- },
- {
- "name": "disable-copy-paste",
- "type": "boolean"
- },
- {
- "name": "disable-ticketing",
- "type": "boolean"
- },
- {
- "name": "password",
- "type": "string"
- },
- {
- "name": "unix",
- "type": "boolean"
- },
- {
- "name": "ipv6",
- "type": "boolean"
- },
- {
- "name": "ipv4",
- "type": "boolean"
- },
- {
- "name": "addr",
- "type": "string"
- },
- {
- "name": "tls-port",
- "type": "number"
- },
- {
- "name": "port",
- "type": "number"
- }
- ],
- "option": "spice"
- },
- {
- "parameters": [
- {
- "name": "resourcecontrol",
- "type": "string"
- },
- {
- "name": "spawn",
- "type": "string"
- },
- {
- "name": "elevateprivileges",
- "type": "string"
- },
- {
- "name": "obsolete",
- "type": "string"
- },
- {
- "name": "enable",
- "type": "boolean"
- }
- ],
- "option": "sandbox"
- },
- {
- "parameters": [
- ],
- "option": "acpi"
- },
- {
- "parameters": [
- ],
- "option": "smbios"
- },
{
"parameters": [
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 5e9fa8575a..cebacc249d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='kvm-pit-lost-tick-policy'/>
<flag name='boot-strict'/>
<flag name='pvpanic'/>
- <flag name='enable-fips'/>
<flag name='spice-file-xfer-disable'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
@@ -251,10 +250,10 @@
<flag name='fsdev.createmode'/>
<flag name='dc390'/>
<flag name='am53c974'/>
- <version>5001091</version>
+ <version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100243</microcodeVersion>
- <package>v5.2.0-rc1</package>
+ <package>v5.2.0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
<property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
index c06046c398..4740e52499 100644
--- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
@@ -12,7 +12,6 @@ QEMU_AUDIO_DRV=none \
-S \
-object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--enable-fips \
-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu qemu64 \
-m 214 \
--
2.29.2
3 years, 11 months
[libvirt PATCH v3 00/10] Add missing feature detection to sync tool in cpu_map
by Tim Wiederhake
sync_qemu_i386.py in src/cpu_map is a tool to sync CPU models from qemu
with libvirt. It currently has no provisions for detecting new features
that are not implemented in libvirt yet. This series changes that.
Currently missing x86 CPU models:
* "Denverton"
* "KnightsMill"
* "Snowridge"
Currently missing x86 CPU features:
* "core-capability"
* "fsrm"
* "split-lock-detect"
This series adds "core-capability", "fsrm", "split-lock-detect" and the
CPU model for "Snowridge".
V1: https://www.redhat.com/archives/libvir-list/2020-November/msg01002.html
V2: https://www.redhat.com/archives/libvir-list/2020-November/msg01023.html
Tim Wiederhake (10):
cpu_map: sync_qemu_cpu_i386: Factor out translation of vendors
cpu_map: sync_qemu_cpu_i386: Factor out translation of features
cpu_map: sync_qemu_cpu_i386: Translate features in model versions
cpu_map: sync_qemu_cpu_i386: Simplify ignore features
cpu_map: sync_qemu_cpu_i386: Add missing features to translation table
cpu_map: sync_qemu_cpu_i386: Detect features missing in libvirt
cpu_map: Add support for fsrm CPU feature
cpu_map: Add support for core-capability CPU feature
cpu_map: Add support for split-lock-detect CPU feature
cpu_map: Define and enable Snowridge model
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/sync_qemu_i386.py | 340 ++++++++++--------
src/cpu_map/x86_Snowridge.xml | 71 ++++
src/cpu_map/x86_features.xml | 11 +
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
22 files changed, 294 insertions(+), 147 deletions(-)
create mode 100644 src/cpu_map/x86_Snowridge.xml
--
2.26.2
3 years, 11 months
[PATCH 0/2] qemuDomainCheckpointLoad: Two fixes
by Peter Krempa
Peter Krempa (2):
qemuDomainCheckpointLoad: Don't align disks when restoring config from
disk
qemuDomainCheckpointLoad: Remove stale comment
src/qemu/qemu_driver.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
--
2.29.2
3 years, 11 months
[PATCH v3 00/14] move checks from parse to validate callbacks
by Daniel Henrique Barboza
This is the v3 of
https://www.redhat.com/archives/libvir-list/2020-December/msg00419.html
Michal mentioned in his v2 review that we should move these validations
out of domain_conf.c to a new file. Let's create a new file called
domain_validate.c and start move the validations done in v2 into it,
instead of pushing the already reviewed v2 series just to have more
stuff to be moved later on.
A follow up series will push more validations from domain_conf.c
to domain_validate.c.
Michal's R-bs were kept in all patches but patch 01.
Daniel Henrique Barboza (14):
domain_conf: move boot timeouts check to domain_validate.c
domain_conf.c: move primary video check to validate callback
domain_conf.c: move virDomainVideoDefValidate() to domain_validate.c
domain_conf.c: move QXL attributes check to
virDomainVideoDefValidate()
domain_conf: move virDomainDiskDefValidate() to domain_validate.c
domain_conf: move vendor, product and tray checks to domain_validate.c
domain_validate.c: rename virSecurityDeviceLabelDefValidateXML()
domain_conf: move all ChrSource checks to domain_validate.c
domain_conf.c: move smartcard address check to domain_validate.c
domain_conf.c: move blkio path check to domain_validate.c
domain_conf.c: move virDomainControllerDefValidate() to
domain_validate.c
domain_conf: move virDomainPCIControllerOpts checks to
domain_validate.c
domain_conf: move pci-root/pcie-root address check to
domain_validate.c
domain_conf.c: move idmapEntry checks to domain_validate.c
po/POTFILES.in | 1 +
src/conf/domain_conf.c | 562 +--------------
src/conf/domain_validate.c | 637 ++++++++++++++++++
src/conf/domain_validate.h | 47 ++
src/conf/meson.build | 1 +
tests/qemuxml2argvdata/pci-root-address.err | 2 +-
.../pseries-default-phb-numa-node.err | 2 +-
.../video-multiple-primaries.err | 1 +
.../video-multiple-primaries.xml | 32 +
tests/qemuxml2argvtest.c | 14 +-
10 files changed, 756 insertions(+), 543 deletions(-)
create mode 100644 src/conf/domain_validate.c
create mode 100644 src/conf/domain_validate.h
create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.err
create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.xml
--
2.26.2
3 years, 11 months
[PATCH v2] spec: don't touch existing nwfilters on update
by Nikolay Shirokovskiy
Nwfilter can be edited by the user and we don't want to overwrite the editings.
Also the filters in %{datadir} does not have UUIDs and these are generated on
libvirtd start. Thus this patch also fixes regeneration of UUIDs on libvirtd
update.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
It is a successor to original version of the patch [1]. The discussion can
be found in [2].
Diff to v1:
- just keep existing nwfilters untouched instead of bringing new
version of nwfilter while keeping UUID
[1] https://www.redhat.com/archives/libvir-list/2020-October/msg01357.html
[2] https://www.redhat.com/archives/libvir-list/2020-December/msg00260.html
libvirt.spec.in | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 880051b..98914ce 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1439,12 +1439,21 @@ fi
rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
%post daemon-config-nwfilter
-cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
-# libvirt saves these files with mode 600
-chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml
+restart_daemon=0
+for dfile in %{_datadir}/libvirt/nwfilter/*.xml; do
+ sfile=%{_sysconfdir}/libvirt/nwfilter/`basename $dfile`
+ if [ ! -f "$sfile" ]; then
+ cp "$dfile" "$sfile"
+ # libvirt saves these files with mode 600
+ chmod 600 "$sfile"
+ restart_daemon=1
+ fi
+done
# Make sure libvirt picks up the new nwfilter defininitons
-mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
-touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+if [ $restart_daemon -eq 1 ]; then
+ mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
+ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+fi
%posttrans daemon-config-nwfilter
if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
--
1.8.3.1
3 years, 11 months
[libvirt PATCH] qemu: Simplify size check for ppc64 NVDIMMs
by Andrea Bolognani
We already calculated the guest area, which is what is subject
to minimum size requirements, a few lines earlier.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/qemu/qemu_domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f14a15d3b4..4d007bc4a0 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5363,7 +5363,7 @@ qemuDomainNVDimmAlignSizePseries(virDomainMemoryDefPtr mem)
/* Align down guest_area. 256MiB is the minimum size. Error
* out if target_size is smaller than 256MiB + label_size,
* since aligning it up will cause QEMU errors. */
- if (mem->size < (ppc64AlignSize + mem->labelsize)) {
+ if (guestArea < ppc64AlignSize) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("minimum target size for the NVDIMM "
"must be 256MB plus the label size"));
--
2.26.2
3 years, 11 months
[PATCH] qemu: Fix logic bug in inactive snapshot deletion
by Peter Krempa
Commit 926563dc3a6 which refactored the function call deleting the
snapshot's on disk state introduced a logic bug, which skips over the
deletion of libvirt metadata after the disk state deletion is done.
To fix it we must not return early.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/109
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d6fded9dd1..1af1e4dac8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6667,7 +6667,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver,
if (!def)
def = vm->def;
- return qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true);
+ if (qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true) < 0)
+ return -1;
} else {
priv = vm->privateData;
qemuDomainObjEnterMonitor(driver, vm);
--
2.29.2
3 years, 11 months
