After a review from Jano I set out to fix also the test invocations to
use real capabilities. This has shown that there was a bug in the
validation logic which was pointed out by Jano in the output error file
change.

This version fixes the bug, improves testing and then removes the
useless capability.

Peter Krempa (7):
  qemuValidateDomainDefPCIFeature: un-break error messages
  qemuValidateDomainDefPCIFeature: Fix validation logic
  qemuxml2argvtest: Use real-caps testing for
    'pc-i440fx-acpi-root-hotplug-disable'
  qemuxml2argvtest: Use real-caps testing for
    'acpi-hotplug-bridge-disable'
  qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related
    cases
  qemuxml2xmltest: Convert all acpi-hotplug control related tests to
    DO_TEST_CAPS_LATEST
  qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE

 src/qemu/qemu_capabilities.c                  |  2 -
 src/qemu/qemu_capabilities.h                  |  1 -
 src/qemu/qemu_command.c                       |  3 +-
 src/qemu/qemu_validate.c                      | 15 ++----
 .../caps_2.11.0.x86_64.xml                    |  1 -
 .../caps_2.12.0.x86_64.xml                    |  1 -
 .../caps_3.0.0.x86_64.xml                     |  1 -
 .../caps_3.1.0.x86_64.xml                     |  1 -
 .../caps_4.0.0.x86_64.xml                     |  1 -
 .../caps_4.1.0.x86_64.xml                     |  1 -
 .../caps_4.2.0.x86_64.xml                     |  1 -
 .../caps_5.0.0.x86_64.xml                     |  1 -
 .../caps_5.1.0.x86_64.xml                     |  1 -
 .../caps_5.2.0.x86_64.xml                     |  1 -
 .../caps_6.0.0.x86_64.xml                     |  1 -
 .../caps_6.1.0.x86_64.xml                     |  1 -
 ...-hotplug-bridge-disable.aarch64-latest.err |  1 +
 .../aarch64-acpi-hotplug-bridge-disable.err   |  1 -
 ...hotplug-bridge-disable.x86_64-latest.args} | 15 +++---
 ...i-hotplug-bridge-enable.x86_64-latest.args | 34 ++++++++++++
 ...cpi-root-hotplug-disable.x86_64-5.1.0.err} |  0
 ...i-root-hotplug-disable.x86_64-latest.args} | 15 +++---
 ...-acpi-root-hotplug-enable.x86_64-5.1.0.err |  1 +
 ...cpi-root-hotplug-enable.x86_64-latest.args | 34 ++++++++++++
 ...i-hotplug-bridge-disable.x86_64-6.0.0.err} |  0
 ...hotplug-bridge-disable.x86_64-latest.args} | 14 +++--
 ...pi-hotplug-bridge-enable.x86_64-6.0.0.err} |  0
 ...i-hotplug-bridge-enable.x86_64-latest.args | 37 +++++++++++++
 tests/qemuxml2argvtest.c                      | 27 ++++------
 ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 +++++++++++++
 .../pc-i440fx-acpi-hotplug-bridge-disable.xml |  1 -
 ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 +++++++++++++
 .../pc-i440fx-acpi-hotplug-bridge-enable.xml  |  1 -
 ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ++++++++++++
 .../pc-i440fx-acpi-root-hotplug-disable.xml   |  1 -
 ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ++++++++++++
 .../pc-i440fx-acpi-root-hotplug-enable.xml    |  1 -
 ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 +++++++++++++++++++
 .../q35-acpi-hotplug-bridge-disable.xml       |  1 -
 ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 +++++++++++++++++++
 .../q35-acpi-hotplug-bridge-enable.xml        |  1 -
 tests/qemuxml2xmltest.c                       | 24 +++------
 42 files changed, 401 insertions(+), 85 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
 delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.args => pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args} (55%)
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.err => pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} (100%)
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.args => pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args} (55%)
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.err => q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err} (100%)
 rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.args => q35-acpi-hotplug-bridge-disable.x86_64-latest.args} (61%)
 rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.err => q35-acpi-hotplug-bridge-enable.x86_64-6.0.0.err} (100%)
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml

-- 
2.31.1

On a Monday in 2021, Peter Krempa wrote:
>After a review from Jano I set out to fix also the test invocations to
>use real capabilities. This has shown that there was a bug in the
>validation logic which was pointed out by Jano in the output error file
>change.
>

The cover letter mentions my name twice. Are these my 15 minutes of fame?

>This version fixes the bug, improves testing and then removes the
>useless capability.
>
>Peter Krempa (7):
>  qemuValidateDomainDefPCIFeature: un-break error messages
>  qemuValidateDomainDefPCIFeature: Fix validation logic
>  qemuxml2argvtest: Use real-caps testing for
>    'pc-i440fx-acpi-root-hotplug-disable'
>  qemuxml2argvtest: Use real-caps testing for
>    'acpi-hotplug-bridge-disable'
>  qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related
>    cases
>  qemuxml2xmltest: Convert all acpi-hotplug control related tests to
>    DO_TEST_CAPS_LATEST
>  qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE
>
> src/qemu/qemu_capabilities.c                  |  2 -
> src/qemu/qemu_capabilities.h                  |  1 -
> src/qemu/qemu_command.c                       |  3 +-
> src/qemu/qemu_validate.c                      | 15 ++----
> .../caps_2.11.0.x86_64.xml                    |  1 -
> .../caps_2.12.0.x86_64.xml                    |  1 -

[...]

> ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 +++++++++++++++++++
> .../q35-acpi-hotplug-bridge-enable.xml        |  1 -
> tests/qemuxml2xmltest.c                       | 24 +++------
> 42 files changed, 401 insertions(+), 85 deletions(-)
> create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
> delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano