- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Strip XML declaration when extracting CPU XMLs
by Jiri Denemark 28 Nov '18

28 Nov '18

Since commit v4.3.0-336-gc84726fbdd all {hypervisor-,}cpu-{baseline,compare} commands use a generic vshExtractCPUDefXMLs helper for extracting individual CPU definitions from the provided input file. The helper wraps the input file in a <container> element so that several independent elements can be easily parsed from the file. This works fine except when the file starts with XML declaration (<?xml version="1.0" ... ?>) because the XML declaration cannot be put inside any element. In fact it has to be at the very beginning of the XML document without any preceding white space characters. We can just simply skip the XML declaration. https://bugzilla.redhat.com/show_bug.cgi?id=1595993 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-host.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 16f504bafe..b7f86bdd91 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1130,13 +1130,20 @@ vshExtractCPUDefXMLs(vshControl *ctl, xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr *nodes = NULL; + char *doc; size_t i; int n; if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &buffer) < 0) goto error; - if (virAsprintf(&xmlStr, "<container>%s</container>", buffer) < 0) + /* Strip possible XML declaration */ + if (STRPREFIX(buffer, "<?xml") && (doc = strstr(buffer, "?>"))) + doc += 2; + else + doc = buffer; + + if (virAsprintf(&xmlStr, "<container>%s</container>", doc) < 0) goto error; if (!(xml = virXMLParseStringCtxt(xmlStr, xmlFile, &ctxt))) -- 2.19.1

2 3

[libvirt] [PATCH v2 0/2] lxc: Fix a bug related to IPv{4, 6} gateway persistent setting.
by Julio Faracco 28 Nov '18

28 Nov '18

This serie fixes a bug related to IPv{4,6} gateway settings when it is defined and used with multiple network definitions. Basically, this data is being carried on to the next network settings because the pointer is not being cleaned up/initialized properly. This serie add a new test case to cover this scenario too. It will be so important to network index implemented on LXC 3.X. v1-v2: Fixing tabs inside the code. Julio Faracco (2): lxc: Initializing IPv6 and IPv4 gateway to overwrite old settings. tests: Adding test case to include multiple network definitions. src/lxc/lxc_native.c | 3 ++ .../lxcconf2xml-miscnetwork-v3.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.xml | 45 +++++++++++++++++++ tests/lxcconf2xmltest.c | 2 + 5 files changed, 96 insertions(+) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml -- 2.19.1

2 4

[libvirt] [RFC v2 1/3] nvdimm: introduce more config elements into xml for NVDIMM memory
by Luyao Zhong 28 Nov '18

28 Nov '18

1.alignsize The 'alignsize' option allows users to specify the proper alignment. 2.pmem The 'pmem' option allows users to specify whether the backend storage of memory-backend-file is a real persistent memory. 3.persistence The 'persistence' option allows users to set guest platform supported features. It has two values, 'mem-ctrl' and 'cpu'. 4.unarmed The 'unarmed' option allows users to mark vNVDIMM read-only. These options can be configured respectively or simultaneously in domain xml file, here is an example: <devices> ... <memory model='nvdimm' access='shared'> <source> <path>/dev/dax0.0</path> <alignsize unit='MiB'>2</alignsize> <pmem/> </source> <target> <size unit='MiB'>4094</size> <node>0</node> <label> <size unit='MiB'>2</size> </label> <persistence>cpu</persistence> <unarmed/> </target> </memory> ... </devices> Signed-off-by: Luyao Zhong <luyao.zhong(a)intel.com> --- docs/schemas/domaincommon.rng | 31 +++++- src/conf/domain_conf.c | 94 +++++++++++++++++-- src/conf/domain_conf.h | 14 +++ src/libvirt_private.syms | 2 + .../memory-hotplug-nvdimm-align.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-persistence.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-pmem.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-unarmed.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-align.xml | 1 + .../memory-hotplug-nvdimm-persistence.xml | 1 + .../memory-hotplug-nvdimm-pmem.xml | 1 + .../memory-hotplug-nvdimm-unarmed.xml | 1 + tests/qemuxml2xmltest.c | 4 + 13 files changed, 371 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-persistence.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-unarmed.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index cb2ca5a20a..78bb25364f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5373,9 +5373,21 @@ </interleave> </group> <group> - <element name="path"> - <ref name="absFilePath"/> - </element> + <interleave> + <element name="path"> + <ref name="absFilePath"/> + </element> + <optional> + <element name="alignsize"> + <ref name="scaledInteger"/> + </element> + </optional> + <optional> + <element name="pmem"> + <empty/> + </element> + </optional> + </interleave> </group> </choice> </element> @@ -5399,6 +5411,19 @@ </element> </element> </optional> + <optional> + <element name="persistence"> + <choice> + <value>mem-ctrl</value> + <value>cpu</value> + </choice> + </element> + </optional> + <optional> + <element name="unarmed"> + <empty/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a7ab3e26f1..4fc0e93bb8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -939,6 +939,12 @@ VIR_ENUM_IMPL(virDomainMemoryModel, "dimm", "nvdimm") +VIR_ENUM_IMPL(virDomainMemoryPersistence, + VIR_DOMAIN_MEMORY_PERSISTENCE_LAST, + "", + "mem-ctrl", + "cpu") + VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST, "ivshmem", "ivshmem-plain", @@ -15736,6 +15742,16 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, _("path is required for model 'nvdimm'")); goto cleanup; } + + if (virDomainParseMemory("./alignsize", "./alignsize/@unit", ctxt, + &def->alignsize, false, false) < 0) + goto cleanup; + + if (virXPathBoolean("boolean(./pmem)", ctxt)) + def->nvdimmPmem = true; + else + def->nvdimmPmem = false; + break; case VIR_DOMAIN_MEMORY_MODEL_NONE: @@ -15761,6 +15777,8 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlNodePtr save = ctxt->node; ctxt->node = node; int rv; + int val; + char *ndPrst = NULL; /* initialize to value which marks that the user didn't specify it */ def->targetNode = -1; @@ -15792,11 +15810,28 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, _("label size must be smaller than NVDIMM size")); goto cleanup; } + + if ((ndPrst = virXPathString("string(./persistence)", ctxt))) { + if ((val = virDomainMemoryPersistenceTypeFromString(ndPrst)) < 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid value of nvdimm 'persistence': %s"), + ndPrst); + goto cleanup; + } + def->nvdimmPersistence = val; + } + VIR_FREE(ndPrst); + + if (virXPathBoolean("boolean(./unarmed)", ctxt)) + def->nvdimmUnarmed = true; + else + def->nvdimmUnarmed = false; } ret = 0; cleanup: + VIR_FREE(ndPrst); ctxt->node = save; return ret; } @@ -22691,13 +22726,45 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDefPtr src, return false; } - if (src->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM && - src->labelsize != dst->labelsize) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target NVDIMM label size '%llu' doesn't match " - "source NVDIMM label size '%llu'"), - src->labelsize, dst->labelsize); - return false; + if (src->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { + if (src->labelsize != dst->labelsize) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NVDIMM label size '%llu' doesn't match " + "source NVDIMM label size '%llu'"), + src->labelsize, dst->labelsize); + return false; + } + + if (src->alignsize != dst->alignsize) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NVDIMM alignment '%llu' doesn't match " + "source NVDIMM alignment '%llu'"), + src->alignsize, dst->alignsize); + return false; + } + + if (src->nvdimmPmem != dst->nvdimmPmem) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NVDIMM pmem flag doesn't match " + "source NVDIMM pmem flag ")); + return false; + } + + if (src->nvdimmPersistence != dst->nvdimmPersistence) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NVDIMM persistence value '%s' doesn't match " + "source NVDIMM persistence value '%s'"), + virDomainMemoryPersistenceTypeToString(src->nvdimmPersistence), + virDomainMemoryPersistenceTypeToString(dst->nvdimmPersistence)); + return false; + } + + if (src->nvdimmUnarmed != dst->nvdimmUnarmed) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NVDIMM unarmed flag doesn't match " + "source NVDIMM unarmed flag ")); + return false; + } } return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); @@ -26242,6 +26309,13 @@ virDomainMemorySourceDefFormat(virBufferPtr buf, case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: virBufferEscapeString(buf, "<path>%s</path>\n", def->nvdimmPath); + + if (def->alignsize) + virBufferAsprintf(buf, "<alignsize unit='KiB'>%llu</alignsize>\n", + def->alignsize); + + if (def->nvdimmPmem) + virBufferAddLit(buf, "<pmem/>\n"); break; case VIR_DOMAIN_MEMORY_MODEL_NONE: @@ -26277,6 +26351,12 @@ virDomainMemoryTargetDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</label>\n"); } + if (def->nvdimmPersistence) + virBufferEscapeString(buf, "<persistence>%s</persistence>\n", + virDomainMemoryPersistenceTypeToString(def->nvdimmPersistence)); + + if (def->nvdimmUnarmed) + virBufferAddLit(buf, "<unarmed/>\n"); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</target>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7a724fbc6f..11c6265162 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2138,6 +2138,14 @@ typedef enum { VIR_DOMAIN_MEMORY_MODEL_LAST } virDomainMemoryModel; +typedef enum { + VIR_DOMAIN_MEMORY_PERSISTENCE_NONE, + VIR_DOMAIN_MEMORY_PERSISTENCE_MEMCTRL, + VIR_DOMAIN_MEMORY_PERSISTENCE_CPU, + + VIR_DOMAIN_MEMORY_PERSISTENCE_LAST, +} virDomainMemoryPersistence; + struct _virDomainMemoryDef { virDomainMemoryAccess access; virTristateBool discard; @@ -2146,12 +2154,17 @@ struct _virDomainMemoryDef { virBitmapPtr sourceNodes; unsigned long long pagesize; /* kibibytes */ char *nvdimmPath; + unsigned long long alignsize; /* kibibytes; valid only for NVDIMM */ + bool nvdimmPmem; /* valid only for NVDIMM */ /* target */ int model; /* virDomainMemoryModel */ int targetNode; unsigned long long size; /* kibibytes */ unsigned long long labelsize; /* kibibytes; valid only for NVDIMM */ + int nvdimmPersistence; /* enum virDomainMemoryPersistence; + valid only for NVDIMM*/ + bool nvdimmUnarmed; /* valid only for NVDIMM */ virDomainDeviceInfo info; }; @@ -3464,6 +3477,7 @@ VIR_ENUM_DECL(virDomainTPMVersion) VIR_ENUM_DECL(virDomainMemoryModel) VIR_ENUM_DECL(virDomainMemoryBackingModel) VIR_ENUM_DECL(virDomainMemorySource) +VIR_ENUM_DECL(virDomainMemoryPersistence) VIR_ENUM_DECL(virDomainMemoryAllocation) VIR_ENUM_DECL(virDomainIOMMUModel) VIR_ENUM_DECL(virDomainVsockModel) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5018a13e9c..4ca54bdd20 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -441,6 +441,8 @@ virDomainMemoryFindByDef; virDomainMemoryFindInactiveByDef; virDomainMemoryInsert; virDomainMemoryModelTypeToString; +virDomainMemoryPersistenceTypeFromString; +virDomainMemoryPersistenceTypeToString; virDomainMemoryRemove; virDomainMemorySourceTypeFromString; virDomainMemorySourceTypeToString; diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml new file mode 100644 index 0000000000..a8c5198e9e --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> + </idmap> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm' access='private'> + <source> + <path>/tmp/nvdimm</path> + <alignsize unit='KiB'>2048</alignsize> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml new file mode 100644 index 0000000000..28f2b7fb53 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> + </idmap> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm' access='private'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + <persistence>mem-ctrl</persistence> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml new file mode 100644 index 0000000000..060d75c541 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> + </idmap> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm' access='private'> + <source> + <path>/tmp/nvdimm</path> + <pmem/> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml new file mode 100644 index 0000000000..7ddbb01560 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> + </idmap> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm' access='private'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + <unarmed/> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml new file mode 120000 index 0000000000..9fc600126c --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-nvdimm-align.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-persistence.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-persistence.xml new file mode 120000 index 0000000000..0c0de1bc7f --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-persistence.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml new file mode 120000 index 0000000000..3e57c1ec97 --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-unarmed.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-unarmed.xml new file mode 120000 index 0000000000..179334769f --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-unarmed.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2527497675..1a97ec8e02 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1107,6 +1107,10 @@ mymain(void) DO_TEST("memory-hotplug-nvdimm", NONE); DO_TEST("memory-hotplug-nvdimm-access", NONE); DO_TEST("memory-hotplug-nvdimm-label", NONE); + DO_TEST("memory-hotplug-nvdimm-align", NONE); + DO_TEST("memory-hotplug-nvdimm-pmem", NONE); + DO_TEST("memory-hotplug-nvdimm-persistence", NONE); + DO_TEST("memory-hotplug-nvdimm-unarmed", NONE); DO_TEST("net-udp", NONE); DO_TEST("video-virtio-gpu-device", NONE); -- 2.17.1

1 0

[libvirt] [RFC v2 0/3] update NVDIMM support
by Luyao Zhong 28 Nov '18

28 Nov '18

Hi libvirt experts, This is the RFC v2 for updating NVDIMM support in libvirt. There are some gaps between qemu and libvirt, libvirt has not supported several config options about NVDIMM memory while qemu is ready now, including 'align', 'pmem', 'unarmed' and 'persistence'. I have already reworded and recoded my patches according to some feedback comments from community. Besides I keep all testcases divided, since every option is independent. Before you experts review, please let me clarify one point: 'persistence' option I investigated this option, it is used to add platform-supported features about NVDIMM data persistence to guest. I did not change this part in this RFC v2, because I'm not sure where I should put it in domain config xml file. What about in <features> elements? Or kick it out of this patch set, because it seems like another type option which is different from other three options here. I'd like you give some suggestions. Thank you in advance. Regards, Luyao Zhong Luyao Zhong (3): nvdimm: introduce more config elements into xml for NVDIMM memory nvdimm: update qemu command-line generating for NVDIMM memory nvdimm: update docs for introducing more NVDIMM configurations docs/formatdomain.html.in | 94 ++++++++++++++++--- docs/news.xml | 9 ++ docs/schemas/domaincommon.rng | 31 +++++- src/conf/domain_conf.c | 94 +++++++++++++++++-- src/conf/domain_conf.h | 14 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 17 ++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 50 +++++++++- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 2 +- .../memory-hotplug-nvdimm-align.args | 31 ++++++ .../memory-hotplug-nvdimm-align.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-persistence.args | 31 ++++++ .../memory-hotplug-nvdimm-persistence.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-pmem.args | 31 ++++++ .../memory-hotplug-nvdimm-pmem.xml | 58 ++++++++++++ .../memory-hotplug-nvdimm-unarmed.args | 31 ++++++ .../memory-hotplug-nvdimm-unarmed.xml | 58 ++++++++++++ tests/qemuxml2argvtest.c | 15 +++ .../memory-hotplug-nvdimm-align.xml | 1 + .../memory-hotplug-nvdimm-persistence.xml | 1 + .../memory-hotplug-nvdimm-pmem.xml | 1 + .../memory-hotplug-nvdimm-unarmed.xml | 1 + tests/qemuxml2xmltest.c | 4 + 25 files changed, 671 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-persistence.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-unarmed.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-persistence.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-unarmed.xml -- 2.17.1

1 0

[libvirt] [PATCH] openvswitch: Add new port VLAN mode "dot1q-tunnel"
by luzhipeng＠uniudc.com 28 Nov '18

28 Nov '18

From: ZhiPeng Lu <luzhipeng(a)uniudc.com> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- docs/formatnetwork.html.in | 13 +++++++------ docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 5 +++++ src/util/virnetdevvlan.h | 1 + 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 363a72b..de223e6 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -688,16 +688,17 @@ </p> <p> For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes + to configure 'native-tagged' and 'native-untagged' and + 'dot1q-tunnel' VLAN modes <span class="since">Since 1.1.0.</span> This is done with the optional <code>nativeMode</code> attribute on the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and + may be set to 'tagged' or 'untagged' or 'dot1q-tunnel'. + The <code>id</code> attribute of the <code><tag></code> + subelement containing <code>nativeMode</code> sets which VLAN is + considered to be the "native" VLAN for this interface, and the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + traffic for that VLAN will be tagged or QinQ. </p> <p> <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..11c48ff 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>dot1q-tunnel</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index dff49c6..79710d9 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -29,7 +29,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged") + "default", "tagged", "untagged", "dot1q-tunnel") int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 8fe06fd..ba5e333 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -91,6 +91,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index be85f59..0667f9d 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -29,6 +29,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] vsh-table: Remove trailing spaces
by Simon Kobyda 28 Nov '18

28 Nov '18

Right now, each line in last column of our table leaves trailing spaces. Let's get rid of it. Simon Kobyda (2): vsh-table: Get rid of trailing spaces tests: Remove trailing spaces in test cases tests/virshtest.c | 10 ++++---- tests/vshtabletest.c | 58 ++++++++++++++++++++++---------------------- tools/vsh-table.c | 6 +++-- 3 files changed, 38 insertions(+), 36 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH v2] qemu: Add check for whether KVM nesting is enabled
by John Ferlan 28 Nov '18

28 Nov '18

Support for nested KVM is handled via a kernel module configuration adjustment which if done after libvirtd is started and/or the last QEMU capabilities adjustment can result in the inability to start a guest and use nested KVM until the capabilities cache is invalidated. This is because without knowing, the CPU settings for a guest may not add the vmx=on to/for the guest config. Thus, let's fetch and save the setting during initialization and then when the capabilities are checked for various host related adjustments that could affect whether the capabilities cache is updated add a check whether the nested value was set for Intel, AMD, or s390 to force a refetch of the capabilities. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1 was part of an RFC: https://www.redhat.com/archives/libvir-list/2018-November/msg00494.html This patch alters that code slightly to add the check Marc Hartmayer requested for S390 and to use "kvm" in the API names and variables to make it clearer that it's not CapsIsNested but CapsKVMIsNested. If it's felt the new check should slide down further in virQEMUCapsIsValid then that's fine - just let me know what it should follow. src/qemu/qemu_capabilities.c | 45 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_capspriv.h | 2 ++ tests/qemucapabilitiestest.c | 3 +++ 3 files changed, 50 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fde27010e4..c377733fe6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -40,6 +40,7 @@ #include "virnodesuspend.h" #include "virnuma.h" #include "virhostcpu.h" +#include "virkmod.h" #include "qemu_monitor.h" #include "virstring.h" #include "qemu_hostdev.h" @@ -557,6 +558,7 @@ struct _virQEMUCaps { virObject parent; bool usedQMP; + bool kvmIsNested; char *binary; time_t ctime; @@ -1528,6 +1530,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) return NULL; ret->usedQMP = qemuCaps->usedQMP; + ret->kvmIsNested = qemuCaps->kvmIsNested; if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0) goto error; @@ -3587,6 +3590,9 @@ virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU); + qemuCaps->kvmIsNested = virXPathBoolean("count(./kvmIsNested) > 0", + ctxt) > 0; + ret = 0; cleanup: VIR_FREE(str); @@ -3806,6 +3812,9 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) if (qemuCaps->sevCapabilities) virQEMUCapsFormatSEVInfo(qemuCaps, &buf); + if (qemuCaps->kvmIsNested) + virBufferAddLit(&buf, "<kvmIsNested/>\n"); + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</qemuCaps>\n"); @@ -3846,6 +3855,30 @@ virQEMUCapsSaveFile(void *data, } +static bool +virQEMUCapsKVMIsNested(void) +{ + VIR_AUTOFREE(char *) kConfig = NULL; + + /* Intel, AMD, and s390 related checks */ + if ((kConfig = virKModConfig()) && + (strstr(kConfig, "kvm_intel nested=1") || + strstr(kConfig, "kvm_amd nested=1") || + strstr(kConfig, "kvm nested=1"))) + return true; + return false; +} + + +void +virQEMUCapsClearKVMIsNested(virQEMUCapsPtr qemuCaps) +{ + /* For qemucapabilitiestest to avoid printing the </kvmIsNested> on + * hosts with nested set in the kernel */ + qemuCaps->kvmIsNested = false; +} + + static bool virQEMUCapsIsValid(void *data, void *privData) @@ -3854,6 +3887,7 @@ virQEMUCapsIsValid(void *data, virQEMUCapsCachePrivPtr priv = privData; bool kvmUsable; struct stat sb; + bool kvmIsNested; if (!qemuCaps->binary) return true; @@ -3886,6 +3920,15 @@ virQEMUCapsIsValid(void *data, return false; } + /* Check if someone changed the nested={0|1} value for the kernel from + * the previous time we checked. If so, then refresh the capabilities. */ + kvmIsNested = virQEMUCapsKVMIsNested(); + if (kvmIsNested != qemuCaps->kvmIsNested) { + VIR_WARN("changed kernel nested kvm value was %d", qemuCaps->kvmIsNested); + qemuCaps->kvmIsNested = kvmIsNested; + return false; + } + if (!virQEMUCapsGuestIsNative(priv->hostArch, qemuCaps->arch)) { VIR_DEBUG("Guest arch (%s) is not native to host arch (%s), " "skipping KVM-related checks", @@ -4472,6 +4515,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, if (virQEMUCapsInitQMPMonitor(qemuCaps, cmd->mon) < 0) goto cleanup; + qemuCaps->kvmIsNested = virQEMUCapsKVMIsNested(); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { virQEMUCapsInitQMPCommandAbort(cmd); if ((rc = virQEMUCapsInitQMPCommandRun(cmd, true)) != 0) { diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 8d1a40fe74..edfe2cd6f6 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -48,6 +48,8 @@ int virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); +void virQEMUCapsClearKVMIsNested(virQEMUCapsPtr qemuCaps); + int virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 8fe5a55e1d..90942c6fce 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -63,6 +63,9 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* Don't apply what the host has... force clear for testing purposes */ + virQEMUCapsClearKVMIsNested(capsActual); + if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) { qemuMonitorResetCommandID(qemuMonitorTestGetMonitor(mon)); if (virQEMUCapsInitQMPMonitorTCG(capsActual, -- 2.17.2

4 7

[libvirt] [PATCH] qemu: Fix post-copy migration on the source
by Jiri Denemark 28 Nov '18

28 Nov '18

Post-copy migration has been broken on the source since commit v3.8.0-245-g32c29f10db which implemented support for pause-before-switchover QEMU migration capability. Even though the migration itself went well, the source did not really know when it switched to the post-copy mode despite the messages logged by MIGRATION event handler. As a result of this, the events emitted by source libvirtd were not accurate and statistics of the completed migration would cover only the pre-copy part of migration. Moreover, if migration failed during the post-copy phase for some reason, the source libvirtd would just happily resume the domain, which could lead to disk corruption. With the pause-before-switchover capability enabled, the order of events emitted by QEMU changed: pause-before-switchover disabled enabled MIGRATION, potcopy-active STOP STOP MIGRATION, pre-switchover MIGRATION, postcopy-active The STOP even handler checks the migration status (postcopy-active) and sets the domain state accordingly. Which is sufficient when pause-before-switchover is disabled, but once we enable it, the migration status is still active when we get STOP from QEMU. Thus the domain state set in the STOP handler has to be corrected once we are notified that migration changed to postcopy-active. This results in two SUSPENDED events to be emitted by the source libvirtd during post-copy migration. The first one with VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED detail, while the second one reports the corrected VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY detail. This is inevitable because we don't know whether migration will eventually switch to post-copy at the time we emit the first event. https://bugzilla.redhat.com/show_bug.cgi?id=1647365 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 622341b8a4..2c89978996 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1543,9 +1543,13 @@ static int qemuProcessHandleMigrationStatus(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, int status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque) { qemuDomainObjPrivatePtr priv; + virQEMUDriverPtr driver = opaque; + virObjectEventPtr event = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int reason; virObjectLock(vm); @@ -1562,8 +1566,28 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv->job.current->stats.mig.status = status; virDomainObjBroadcast(vm); + if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY && + virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED && + reason == VIR_DOMAIN_PAUSED_MIGRATION) { + VIR_DEBUG("Correcting paused state reason for domain %s to %s", + vm->def->name, + virDomainPausedReasonTypeToString(VIR_DOMAIN_PAUSED_POSTCOPY)); + + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_POSTCOPY); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY); + + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + } + cleanup: virObjectUnlock(vm); + virObjectEventStateQueue(driver->domainEventState, event); + virObjectUnref(cfg); return 0; } -- 2.19.1

2 1

[libvirt] [PATCH 00/18] Implement original label remembering
by Michal Privoznik 28 Nov '18

28 Nov '18

Dear list, there were several attempts in the past to implement this feature, but none of them was successful. The problem is that we change security labels when starting a domain but never record the original labels therefore when restoring the labels back in domain shutdown phase we have to go with root:root or restorecon. This is not user friendly. Now that we have metadata locking implemented we have exclusive access to the files we are touching and therefore can call functions to record the original owner. Since this database needs to be distributed (consider multiple daemons and an network file system) it can't be stored inside a daemon (libvirtd knows nothing about other daemons running on distant hosts). Therefore the next option is to store it with the files themselves - in XATTRs. There is one caveat though. A file can be passed to multiple domains at the same time (for instance an installation ISO), therefore we need a reference counter so that the only the last label restore call actually restores the original owner. A picture is worth more than a thousand words: # chown 5:6 /var/lib/libvirt/images/fd.img # ls -ln /var/lib/libvirt/images/fd.img -rw-r--r-- 1 5 6 2097152 Mar 17 2018 /var/lib/libvirt/images/fd.img # getfattr -d -m - /var/lib/libvirt/images/fd.img (no output) # virsh domblklist fedora Target Source ------------------------------------------------ sda /var/lib/libvirt/images/fedora.qcow2 sdb /var/lib/libvirt/images/fd.img # virsh domblklist gentoo Target Source ---------------------------------------------------------------------- fda /var/lib/libvirt/images/fd.img sda /var/lib/libvirt/images/gentoo.qcow2 # virsh start fedora Domain fedora started # getfattr -d -m - /var/lib/libvirt/images/fd.img trusted.libvirt.security.dac="+5:+6" trusted.libvirt.security.ref_dac="1" # virsh start gentoo Domain gentoo started # getfattr -d -m - /var/lib/libvirt/images/fd.img trusted.libvirt.security.dac="+5:+6" trusted.libvirt.security.ref_dac="2" # virsh shutdown --domain fedora Domain fedora is being shutdown # ls -ln /var/lib/libvirt/images/fd.img -rw-r--r-- 1 0 0 2097152 Mar 17 2018 /var/lib/libvirt/images/fd.img # getfattr -d -m - /var/lib/libvirt/images/fd.img trusted.libvirt.security.dac="+5:+6" trusted.libvirt.security.ref_dac="1" # virsh shutdown --domain gentoo Domain gentoo is being shutdown # getfattr -d -m - /var/lib/libvirt/images/fd.img (no output) # ls -ln /var/lib/libvirt/images/fd.img -rw-r--r-- 1 5 6 2097152 Mar 17 2018 /var/lib/libvirt/images/fd.img Even though I'm showing DAC only in my example, it's the same story with SELinux. Of course, this plays nicely with filesystems that don't support XATTRs, which there are not that much, but unfortunately NFS is one of them :( Michal Prívozník (18): security: Unify header conditionals util: Introduce xattr getter/setter/remover security: Include security_util security_dac: Restore label on failed chown() attempt virSecurityDACTransactionRun: Implement rollback virSecurityDACRestoreAllLabel: Reorder device relabeling virSecurityDACRestoreAllLabel: Restore more labels security_dac: Allow callers to enable/disable label remembering/recall security_dac: Remember old labels virSecurityDACRestoreImageLabelInt: Restore even shared/RO disks security_selinux: Track if transaction is restore security_selinux: Remember old labels security_selinux: Restore label on failed setfilecon() attempt virSecuritySELinuxTransactionRun: Implement rollback virSecuritySELinuxRestoreAllLabel: Reorder device relabeling virSecuritySELinuxRestoreAllLabel: Restore more labels tools: Provide a script to recover fubar'ed XATTRs setup qemu.conf: Allow users to enable/disable label remembering src/libvirt_private.syms | 3 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 + src/qemu/qemu_conf.c | 4 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/Makefile.inc.am | 2 + src/security/security_apparmor.h | 6 +- src/security/security_dac.c | 212 +++++++++++++++++------- src/security/security_dac.h | 6 +- src/security/security_driver.h | 6 +- src/security/security_manager.h | 6 +- src/security/security_nop.h | 6 +- src/security/security_selinux.c | 256 +++++++++++++++++++++-------- src/security/security_selinux.h | 6 +- src/security/security_stack.h | 6 +- src/security/security_util.c | 198 ++++++++++++++++++++++ src/security/security_util.h | 32 ++++ src/util/virfile.c | 121 ++++++++++++++ src/util/virfile.h | 11 ++ tools/Makefile.am | 1 + tools/libvirt_recover_xattrs.sh | 89 ++++++++++ 21 files changed, 829 insertions(+), 150 deletions(-) create mode 100644 src/security/security_util.c create mode 100644 src/security/security_util.h create mode 100755 tools/libvirt_recover_xattrs.sh -- 2.18.1

2 22

[libvirt] [PATCH 0/2] lxc: Fix a bug related to IPv{4, 6} gateway persistent setting.
by Julio Faracco 28 Nov '18

28 Nov '18

This serie fixes a bug related to IPv{4,6} gateway settings when it is defined and used with multiple network definitions. Basically, this data is being carried on to the next network settings because the pointer is not being cleaned up/initialized properly. This serie add a new test case to cover this scenario too. It will be so important to network index implemented on LXC 3.X. Julio Faracco (2): lxc: Initializing IPv6 and IPv4 gateway to overwrite old settings. tests: Adding test case to include multiple network definitions. src/lxc/lxc_native.c | 3 ++ .../lxcconf2xml-miscnetwork-v3.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.xml | 45 +++++++++++++++++++ tests/lxcconf2xmltest.c | 2 + 5 files changed, 96 insertions(+) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml -- 2.19.1

2 3