lib: s/free-page-reporting/freePageReporting/

In fee8a61d29 a new attribute to <memballoon/> was introduced:
free-page-reporting. We don't really like hyphens in attribute
names. Use camelCase instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 83dec62f30356eea8b1fb6f11ded169b99c0a6c4..a18222662faed4132ae2fffaff43dcd7a03c2732 100644 (file)
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -6755,8 +6755,8 @@ Example: manually added device with static PCI slot 2 requested
    release some memory at the last moment before a guest's process get killed by
    Out of Memory killer. :since:`Since 1.3.1, QEMU and KVM only`
 
-``free-page-reporting``
-   The optional ``free-page-reporting`` attribute allows to enable/disable
+``freePageReporting``
+   The optional ``freePageReporting`` attribute allows to enable/disable
    ("on"/"off", respectively) the ability of the QEMU virtio memory balloon to
    return unused pages back to the hypervisor to be used by other guests or
    processes. :since:`Since 6.9.0, QEMU and KVM only`

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 0a0f0ed8a811b2a00e5898e86f50400546eca427..c26408c4007182daa1ecca09e22392099d7093ef 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4540,7 +4540,7 @@
         </attribute>
       </optional>
       <optional>
-         <attribute name="free-page-reporting">
+         <attribute name="freePageReporting">
            <ref name="virOnOff"/>
          </attribute>
        </optional>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1d3661c21f10edc14820579a95cc3abcc94d6699..bbe59f61d08f28938424a4a73599b8ecd6ae69e4 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15361,10 +15361,10 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt,
         goto error;
     }
 
-    if ((freepage_reporting = virXMLPropString(node, "free-page-reporting")) &&
+    if ((freepage_reporting = virXMLPropString(node, "freePageReporting")) &&
         (def->free_page_reporting = virTristateSwitchTypeFromString(freepage_reporting)) <= 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("invalid free-page-reporting attribute value '%s'"), freepage_reporting);
+                       _("invalid freePageReporting attribute value '%s'"), freepage_reporting);
         goto error;
     }
 
@@ -23548,7 +23548,7 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src,
 
     if (src->free_page_reporting != dst->free_page_reporting) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Target balloon free-page-reporting attribute value "
+                       _("Target balloon freePageReporting attribute value "
                          "'%s' does not match source '%s'"),
                        virTristateSwitchTypeToString(dst->free_page_reporting),
                        virTristateSwitchTypeToString(src->free_page_reporting));
@@ -27662,7 +27662,7 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
                           virTristateSwitchTypeToString(def->autodeflate));
 
     if (def->free_page_reporting != VIR_TRISTATE_SWITCH_ABSENT)
-        virBufferAsprintf(&attrBuf, " free-page-reporting='%s'",
+        virBufferAsprintf(&attrBuf, " freePageReporting='%s'",
                           virTristateSwitchTypeToString(def->free_page_reporting));
 
     if (def->period)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index bc3043bb3f0d81f282674c573fd4df7ec09a9715..28eae76cca88deec507476b13657d6ded14fe327 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -3934,7 +3934,7 @@ qemuValidateDomainDeviceDefMemballoon(const virDomainMemballoonDef *memballoon,
     if (memballoon->free_page_reporting != VIR_TRISTATE_SWITCH_ABSENT &&
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("free-page-reporting is not supported by this QEMU binary"));
+                       _("freePageReporting is not supported by this QEMU binary"));
         return -1;
     }
 

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err
index de06de0a85925e298cbfbb17a8db9766009f406d..81cb56e968514de76f0d30e1bde061b6c9169089 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err
@@ -1 +1 @@
-unsupported configuration: free-page-reporting is not supported by this QEMU binary
+unsupported configuration: freePageReporting is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml
index ff7549a78988357b7d9f8683ad45d2adf1398085..acec5529dd8930fc18e707b48b221f79cb2a2093 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml
@@ -15,7 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='pci' index='0' model='pci-root'/>
-    <memballoon model='virtio' free-page-reporting='on'>
+    <memballoon model='virtio' freePageReporting='on'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
   </devices>