]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Remove 'memAliasOrderMismatch' field from VM private data
authorPeter Krempa <pkrempa@redhat.com>
Thu, 19 Jan 2023 14:18:45 +0000 (15:18 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 24 Jan 2023 12:14:12 +0000 (13:14 +0100)
The field is no longer used so we can remove it and the code filling it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
src/qemu/qemu_domain.h
src/qemu/qemu_process.c

index 08430b67b90d6df352ad174feb7c8151535085e9..eca5404cdcc376abb96c393b8fe2980b5e2655b0 100644 (file)
@@ -177,9 +177,6 @@ struct _qemuDomainObjPrivate {
     uint8_t *masterKey;
     size_t masterKeyLen;
 
-    /* note whether memory device alias does not correspond to slot number */
-    bool memAliasOrderMismatch;
-
     /* for migrations using TLS with a secret (not to be saved in our */
     /* private XML). */
     qemuDomainSecretInfo *migSecinfo;
index 83b553418068b1c7d44e701c1b65f11c8fc13294..9ac6b45e75ed9e434f7c8e274b821ce4c54c1df8 100644 (file)
@@ -3896,28 +3896,6 @@ qemuDomainPerfRestart(virDomainObj *vm)
 }
 
 
-static void
-qemuProcessReconnectCheckMemAliasOrderMismatch(virDomainObj *vm)
-{
-    size_t i;
-    int aliasidx;
-    virDomainDef *def = vm->def;
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (!virDomainDefHasMemoryHotplug(def) || def->nmems == 0)
-        return;
-
-    for (i = 0; i < def->nmems; i++) {
-        aliasidx = qemuDomainDeviceAliasIndex(&def->mems[i]->info, "dimm");
-
-        if (def->mems[i]->info.addr.dimm.slot != aliasidx) {
-            priv->memAliasOrderMismatch = true;
-            break;
-        }
-    }
-}
-
-
 static bool
 qemuProcessDomainMemoryDefNeedHugepagesPath(const virDomainMemoryDef *mem,
                                             const long system_pagesize)
@@ -9091,8 +9069,6 @@ qemuProcessReconnect(void *opaque)
     if (qemuProcessRefreshFdsetIndex(obj) < 0)
         goto error;
 
-    qemuProcessReconnectCheckMemAliasOrderMismatch(obj);
-
     if (qemuConnectAgent(driver, obj) < 0)
         goto error;