[PATCH 0/4] Rework <tpm/> formatting

Michal Privoznik posted 4 patches 2 years, 3 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/cover.1641283978.git.mprivozn@redhat.com
There is a newer version of this series
src/conf/domain_conf.c                        | 65 +++++++---------
tests/qemuxml2argvdata/tpm-emulator-spapr.xml | 74 +++++++++++--------
.../tpm-emulator-tpm2-enc.xml                 | 12 ++-
.../tpm-emulator-tpm2-pstate.xml              | 12 ++-
tests/qemuxml2argvdata/tpm-emulator-tpm2.xml  | 13 +++-
tests/qemuxml2argvdata/tpm-emulator.xml       | 12 ++-
.../qemuxml2argvdata/tpm-passthrough-crb.xml  | 12 ++-
tests/qemuxml2argvdata/tpm-passthrough.xml    | 12 ++-
.../tpm-emulator-spapr.ppc64-latest.xml       |  1 +
.../tpm-emulator-tpm2-enc.x86_64-latest.xml   | 41 +---------
...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 39 +---------
.../tpm-emulator-tpm2.x86_64-latest.xml       | 44 +----------
.../tpm-emulator.x86_64-latest.xml            | 39 +---------
.../tpm-passthrough-crb.x86_64-latest.xml     | 41 +---------
.../tpm-passthrough.x86_64-latest.xml         | 41 +---------
tests/qemuxml2xmltest.c                       |  1 +
16 files changed, 138 insertions(+), 321 deletions(-)
create mode 120000 tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
[PATCH 0/4] Rework <tpm/> formatting
Posted by Michal Privoznik 2 years, 3 months ago
Please note that the test suite is temporarily broken after 2/4 but
fixed in 3/4. This could be resolved be swapping those two patches, but
I figured I keep the order to demonstrate the bug. However, I can do the
swap if desired.

Michal Prívozník (4):
  qemuxml2xmltest: Introduce tpm-emulator-spapr test
  qemuxml2xmloutdata: Turn tpm-*.xml files into symlinks
  conf: Rework <tpm/> formatting
  conf: Make virDomainTPMDefFormat() return void

 src/conf/domain_conf.c                        | 65 +++++++---------
 tests/qemuxml2argvdata/tpm-emulator-spapr.xml | 74 +++++++++++--------
 .../tpm-emulator-tpm2-enc.xml                 | 12 ++-
 .../tpm-emulator-tpm2-pstate.xml              | 12 ++-
 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml  | 13 +++-
 tests/qemuxml2argvdata/tpm-emulator.xml       | 12 ++-
 .../qemuxml2argvdata/tpm-passthrough-crb.xml  | 12 ++-
 tests/qemuxml2argvdata/tpm-passthrough.xml    | 12 ++-
 .../tpm-emulator-spapr.ppc64-latest.xml       |  1 +
 .../tpm-emulator-tpm2-enc.x86_64-latest.xml   | 41 +---------
 ...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 39 +---------
 .../tpm-emulator-tpm2.x86_64-latest.xml       | 44 +----------
 .../tpm-emulator.x86_64-latest.xml            | 39 +---------
 .../tpm-passthrough-crb.x86_64-latest.xml     | 41 +---------
 .../tpm-passthrough.x86_64-latest.xml         | 41 +---------
 tests/qemuxml2xmltest.c                       |  1 +
 16 files changed, 138 insertions(+), 321 deletions(-)
 create mode 120000 tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
 mode change 100644 => 120000 tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml

-- 
2.34.1

Re: [PATCH 0/4] Rework <tpm/> formatting
Posted by Daniel P. Berrangé 2 years, 3 months ago
On Tue, Jan 04, 2022 at 09:14:26AM +0100, Michal Privoznik wrote:
> Please note that the test suite is temporarily broken after 2/4 but
> fixed in 3/4. This could be resolved be swapping those two patches, but
> I figured I keep the order to demonstrate the bug. However, I can do the
> swap if desired.

They certainly must be swapped before this is pushed, otherwise it
breaks 'git bisect' for anyone using 'meson test' as their validator
for the bisect.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|