On Fri, 2018-03-09 at 16:07 +0100, Andrea Bolognani wrote:
> We're going to use the same test case to exercise all optional
> pSeries features, so a more generic name is needed.
>
> Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
> ---
> .../{pseries-features-hpt.args => pseries-features.args} | 0
> .../{pseries-features-hpt.xml => pseries-features.xml} | 0
> tests/qemuxml2argvtest.c | 4
> ++--
> tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 -
> tests/qemuxml2xmloutdata/pseries-features.xml | 1 +
> tests/qemuxml2xmltest.c | 2 +-
> 6 files changed, 4 insertions(+), 4 deletions(-)
> rename tests/qemuxml2argvdata/{pseries-features-hpt.args =>
> pseries-features.args} (100%)
> rename tests/qemuxml2argvdata/{pseries-features-hpt.xml =>
> pseries-features.xml} (100%)
> delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml
> create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml
This does no longer apply cleanly now that 07160b65db94 has been
pushed, but the conflict is trivial.
At any rate, I've updated the GitHub branch so that it's based on
b9b9195f15c9 instead of 90d7262552e8, which means anyone fetching
from there won't have to deal with the conflict at all.
--
Andrea Bolognani / Red Hat / Virtualization
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
