External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 12:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Allow omitting 'slots' attribute of <maxMemory>

Browse Source 
Memory slots are required only for DIMM-like devices, but the maximum
memory address space is relevant also for other non-DIMM memory devices
such as virtio-mem. Allow configurations where no slots are added.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-06-21 16:01:26 +02:00
parent e3ce39195c
commit e4b4765f4f
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conf/domain_conf.c
View File

@ -27416,9 +27416,16 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
return -1; return -1;
if (virDomainDefHasMemoryHotplug(def)) { if (virDomainDefHasMemoryHotplug(def)) {
virBufferAsprintf(buf, g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
"<maxMemory slots='%u' unit='KiB'>%llu</maxMemory>\n", g_auto(virBuffer) contentBuf = VIR_BUFFER_INITIALIZER;
def->mem.memory_slots, def->mem.max_memory);
if (def->mem.memory_slots > 0)
virBufferAsprintf(&attrBuf, " slots='%u'", def->mem.memory_slots);
virBufferAddLit(&attrBuf, " unit='KiB'");
virBufferAsprintf(&contentBuf, "%llu", def->mem.max_memory);
virXMLFormatElementInternal(buf, "maxMemory", &attrBuf, &contentBuf, false, false);
} }
virBufferAddLit(buf, "<memory"); virBufferAddLit(buf, "<memory");

5
src/conf/domain_postparse.c
View File

@ -72,10 +72,9 @@ virDomainDefPostParseMemory(virDomainDef *def,
def->mem.cur_balloon == 0) def->mem.cur_balloon == 0)
def->mem.cur_balloon = virDomainDefGetMemoryTotal(def); def->mem.cur_balloon = virDomainDefGetMemoryTotal(def);
if ((def->mem.max_memory || def->mem.memory_slots) && if (def->mem.max_memory == 0 && def->mem.memory_slots > 0) {
!(def->mem.max_memory && def->mem.memory_slots)) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("both maximum memory size and memory slot count must be specified")); _("maximum memory size must be specified when specifying number of memory slots"));
return -1; return -1;
} }

8
src/conf/schemas/domaincommon.rng
View File

@ -721,9 +721,11 @@
<optional> <optional>
<element name="maxMemory"> <element name="maxMemory">
<ref name="scaledInteger"/> <ref name="scaledInteger"/>
<attribute name="slots"> <optional>
<ref name="unsignedInt"/> <attribute name="slots">
</attribute> <ref name="unsignedInt"/>
</attribute>
</optional>
</element> </element>
</optional> </optional>
<optional> <optional>

2
tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args
View File

@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-machine pc,usb=off,dump-guest-core=off,acpi=off \ -machine pc,usb=off,dump-guest-core=off,acpi=off \
-accel kvm \ -accel kvm \
-cpu qemu64 \ -cpu qemu64 \
-m size=2095104k,slots=1,maxmem=1099511627776k \ -m size=2095104k,maxmem=1099511627776k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \

2
tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml
View File

@ -1,7 +1,7 @@
<domain type='kvm'> <domain type='kvm'>
<name>QEMUGuest1</name> <name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<maxMemory slots='1' unit='KiB'>1099511627776</maxMemory> <maxMemory unit='KiB'>1099511627776</maxMemory>
<memory unit='KiB'>8388608</memory> <memory unit='KiB'>8388608</memory>
<currentMemory unit='KiB'>8388608</currentMemory> <currentMemory unit='KiB'>8388608</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>

2
tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args
View File

@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-machine pc-i440fx-5.2,usb=off,dump-guest-core=off \ -machine pc-i440fx-5.2,usb=off,dump-guest-core=off \
-accel kvm \ -accel kvm \
-cpu qemu64 \ -cpu qemu64 \
-m size=2095104k,slots=16,maxmem=1099511627776k \ -m size=2095104k,maxmem=1099511627776k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=2145386496 \ -object memory-backend-ram,id=ram-node0,size=2145386496 \

2
tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
View File

@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-machine pc,usb=off,dump-guest-core=off,acpi=off \ -machine pc,usb=off,dump-guest-core=off,acpi=off \
-accel kvm \ -accel kvm \
-cpu qemu64 \ -cpu qemu64 \
-m size=2095104k,slots=16,maxmem=1099511627776k \ -m size=2095104k,maxmem=1099511627776k \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \

2
tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
View File

@ -1,7 +1,7 @@
<domain type='kvm'> <domain type='kvm'>
<name>QEMUGuest1</name> <name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> <maxMemory unit='KiB'>1099511627776</maxMemory>
<memory unit='KiB'>2095104</memory> <memory unit='KiB'>2095104</memory>
<currentMemory unit='KiB'>2095104</currentMemory> <currentMemory unit='KiB'>2095104</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu> <vcpu placement='static' cpuset='0-1'>2</vcpu>