Re: [libvirt] [PATCHv5 7/9] Allow multiple panic devices
On Tue, Nov 24, 2015 at 15:26:36 +0300, Dmitry Andreev wrote:
'model' attribute was added to a panic device but only one
panic
device is allowed. This patch changes panic device presence
from 'optional' to 'zeroOrMore'.
---
v5: part of the code was moved out from this commit
docs/formatdomain.html.in | 1 +
docs/schemas/domaincommon.rng | 4 ++--
src/conf/domain_conf.c | 53 ++++++++++++++++++++-----------------------
src/conf/domain_conf.h | 4 +++-
src/qemu/qemu_command.c | 50 ++++++++++++++++++++++++----------------
src/qemu/qemu_domain.c | 21 +++++++++++++----
6 files changed, 77 insertions(+), 56 deletions(-)
ACK with the following patch squashed in. And I think the next patch
which tests this new functionality is small enough that it would be nice
to have it squashed in this one.
Jirka
diff --git i/src/conf/domain_conf.c w/src/conf/domain_conf.c
index d6977f2..2bddb67 100644
--- i/src/conf/domain_conf.c
+++ w/src/conf/domain_conf.c
@@ -18126,9 +18126,10 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
goto error;
}
- for (i = 0; i < src->npanics; i++)
+ for (i = 0; i < src->npanics; i++) {
if (!virDomainPanicDefCheckABIStability(src->panics[i], dst->panics[i]))
goto error;
+ }
if (src->nshmems != dst->nshmems) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,