From e5c9e032858e599e1c92f0cc3e77b6f1449d8bcc Mon Sep 17 00:00:00 2001
From: Dmitry Andreev <dandreev@virtuozzo.com>
Date: Tue, 24 Nov 2015 15:26:30 +0300
Subject: [PATCH] conf: refactor code for checking ABI stability of panic
 device

---
 src/conf/domain_conf.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 616bf80acd..7f4c643a8a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17613,8 +17613,8 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
 }
 
 static bool
-virDomainPanicCheckABIStability(virDomainPanicDefPtr src,
-                                virDomainPanicDefPtr dst)
+virDomainPanicDefCheckABIStability(virDomainPanicDefPtr src,
+                                   virDomainPanicDefPtr dst)
 {
     if (!src && !dst)
         return true;
@@ -17688,13 +17688,6 @@ virDomainTPMDefCheckABIStability(virDomainTPMDefPtr src,
     return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info);
 }
 
-static bool
-virDomainPanicDefCheckABIStability(virDomainPanicDefPtr src,
-                                   virDomainPanicDefPtr dst)
-{
-    return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info);
-}
-
 static bool
 virDomainMemoryDefCheckABIStability(virDomainMemoryDefPtr src,
                                     virDomainMemoryDefPtr dst)
@@ -18112,7 +18105,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
         if (!virDomainRNGDefCheckABIStability(src->rngs[i], dst->rngs[i]))
             goto error;
 
-    if (!virDomainPanicCheckABIStability(src->panic, dst->panic))
+    if (!virDomainPanicDefCheckABIStability(src->panic, dst->panic))
         goto error;
 
     if (src->nshmems != dst->nshmems) {
@@ -18137,16 +18130,6 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
         goto error;
     }
 
-    if (src->panic && dst->panic) {
-        if (!virDomainPanicDefCheckABIStability(src->panic, dst->panic))
-            goto error;
-    } else if (src->panic || dst->panic) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("Either both target and source domains or none of "
-                         "them must have PANIC device present"));
-        goto error;
-    }
-
     if (src->nmems != dst->nmems) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target domain memory device count %zu "
-- 
2.39.5