On 05/28/2015 10:39 AM, Andrea Bolognani wrote:
Currently, having the <panic> element in a domain XML prevents it from starting on pSeries. The error message in this case is not very accurate, and the first commit improves it.
Since the guest firmware provides the same features as the pvpanic device for pSeries guests, the element should be allowed. The second commit implements this change.
It being part of the firmware, the <panic> element should actually always be present in the domain XML: the third commit makes sure this is the case.
Andrea Bolognani (3): qemu: Improve error message for missing QEMU_CAPS_DEVICE_PANIC. qemu: Allow panic device for pSeries guests qemu: Automatically add <panic> element for pSeries guests.
docs/formatdomain.html.in | 8 ++++- src/qemu/qemu_command.c | 34 ++++++++++++++++------ src/qemu/qemu_domain.c | 14 +++++++++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 1 + .../qemuxml2argv-pseries-nvram.xml | 1 + .../qemuxml2argv-pseries-panic-address.xml | 32 ++++++++++++++++++++ .../qemuxml2argv-pseries-panic-missing.args | 7 +++++ .../qemuxml2argv-pseries-panic-missing.xml | 29 ++++++++++++++++++ .../qemuxml2argv-pseries-panic-no-address.args | 7 +++++ .../qemuxml2argv-pseries-panic-no-address.xml | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++ .../qemuxml2xmlout-pseries-panic-missing.xml | 30 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 13 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
Other than minor adjustment to error message in 1/3 (use 'the QEMU binary' like other similar error messages not just 'QEMU') and a tweak to formatdomain.html.in in 3/3: - For pSeries guests, this feature is always enabled because it's - implemented by the guest firmware. libvirt will automatically add the - <code>panic</code> element to the domain XML to reflect this fact. + For pSeries guests, this feature is always enabled since it's + implemented by the guest firmware, thus libvirt automatically + adds the <code>panic</code> element to the domain XML. ACK series... I'll push soon. John