|
 |
acda74 |
From 9271efe525e9cfaf1aad931ffccf61d6d17e5273 Mon Sep 17 00:00:00 2001
|
|
|
acda74 |
Message-Id: <9271efe525e9cfaf1aad931ffccf61d6d17e5273@dist-git>
|
|
|
acda74 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
acda74 |
Date: Thu, 19 Jan 2023 15:16:58 +0100
|
|
|
acda74 |
Subject: [PATCH] qemu: alias: Remove 'oldAlias' argument of
|
|
|
acda74 |
qemuAssignDeviceMemoryAlias
|
|
|
acda74 |
|
|
|
acda74 |
All callers pass 'false' so we no longer need it.
|
|
|
acda74 |
|
|
|
acda74 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
acda74 |
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
acda74 |
(cherry picked from commit 6d3f0b11b2b056313b123510c96f2924689341f9)
|
|
|
acda74 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2158701
|
|
|
acda74 |
---
|
|
|
acda74 |
src/qemu/qemu_alias.c | 13 ++++---------
|
|
|
acda74 |
src/qemu/qemu_alias.h | 3 +--
|
|
|
acda74 |
src/qemu/qemu_hotplug.c | 2 +-
|
|
|
acda74 |
3 files changed, 6 insertions(+), 12 deletions(-)
|
|
|
acda74 |
|
|
|
acda74 |
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
|
|
|
acda74 |
index ef8e87ab58..0f1310a0e5 100644
|
|
|
acda74 |
--- a/src/qemu/qemu_alias.c
|
|
|
acda74 |
+++ b/src/qemu/qemu_alias.c
|
|
|
acda74 |
@@ -454,7 +454,6 @@ qemuAssignDeviceRNGAlias(virDomainDef *def,
|
|
|
acda74 |
static int
|
|
|
acda74 |
qemuDeviceMemoryGetAliasID(virDomainDef *def,
|
|
|
acda74 |
virDomainMemoryDef *mem,
|
|
|
acda74 |
- bool oldAlias,
|
|
|
acda74 |
const char *prefix)
|
|
|
acda74 |
{
|
|
|
acda74 |
size_t i;
|
|
|
acda74 |
@@ -462,8 +461,7 @@ qemuDeviceMemoryGetAliasID(virDomainDef *def,
|
|
|
acda74 |
|
|
|
acda74 |
/* virtio-pmem and virtio-mem go onto PCI bus and thus DIMM address is not
|
|
|
acda74 |
* valid */
|
|
|
acda74 |
- if (!oldAlias &&
|
|
|
acda74 |
- mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM &&
|
|
|
acda74 |
+ if (mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM &&
|
|
|
acda74 |
mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM &&
|
|
|
acda74 |
mem->model != VIR_DOMAIN_MEMORY_MODEL_SGX_EPC)
|
|
|
acda74 |
return mem->info.addr.dimm.slot;
|
|
|
acda74 |
@@ -482,8 +480,6 @@ qemuDeviceMemoryGetAliasID(virDomainDef *def,
|
|
|
acda74 |
* qemuAssignDeviceMemoryAlias:
|
|
|
acda74 |
* @def: domain definition. Necessary only if @oldAlias is true.
|
|
|
acda74 |
* @mem: memory device definition
|
|
|
acda74 |
- * @oldAlias: Generate the alias according to the order of the device in @def
|
|
|
acda74 |
- * rather than according to the slot number for legacy reasons.
|
|
|
acda74 |
*
|
|
|
acda74 |
* Generates alias for a memory device according to slot number if @oldAlias is
|
|
|
acda74 |
* false or according to order in @def->mems otherwise.
|
|
|
acda74 |
@@ -492,8 +488,7 @@ qemuDeviceMemoryGetAliasID(virDomainDef *def,
|
|
|
acda74 |
*/
|
|
|
acda74 |
int
|
|
|
acda74 |
qemuAssignDeviceMemoryAlias(virDomainDef *def,
|
|
|
acda74 |
- virDomainMemoryDef *mem,
|
|
|
acda74 |
- bool oldAlias)
|
|
|
acda74 |
+ virDomainMemoryDef *mem)
|
|
|
acda74 |
{
|
|
|
acda74 |
const char *prefix = NULL;
|
|
|
acda74 |
int idx = 0;
|
|
|
acda74 |
@@ -525,7 +520,7 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def,
|
|
|
acda74 |
break;
|
|
|
acda74 |
}
|
|
|
acda74 |
|
|
|
acda74 |
- idx = qemuDeviceMemoryGetAliasID(def, mem, oldAlias, prefix);
|
|
|
acda74 |
+ idx = qemuDeviceMemoryGetAliasID(def, mem, prefix);
|
|
|
acda74 |
mem->info.alias = g_strdup_printf("%s%d", prefix, idx);
|
|
|
acda74 |
|
|
|
acda74 |
return 0;
|
|
|
acda74 |
@@ -685,7 +680,7 @@ qemuAssignDeviceAliases(virDomainDef *def)
|
|
|
acda74 |
qemuAssignDeviceTPMAlias(def->tpms[i], i);
|
|
|
acda74 |
}
|
|
|
acda74 |
for (i = 0; i < def->nmems; i++) {
|
|
|
acda74 |
- if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0)
|
|
|
acda74 |
+ if (qemuAssignDeviceMemoryAlias(def, def->mems[i]) < 0)
|
|
|
acda74 |
return -1;
|
|
|
acda74 |
}
|
|
|
acda74 |
if (def->vsock) {
|
|
|
acda74 |
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
|
|
|
acda74 |
index 6433ae4cec..af9c3f62d3 100644
|
|
|
acda74 |
--- a/src/qemu/qemu_alias.h
|
|
|
acda74 |
+++ b/src/qemu/qemu_alias.h
|
|
|
acda74 |
@@ -55,8 +55,7 @@ void qemuAssignDeviceRNGAlias(virDomainDef *def,
|
|
|
acda74 |
virDomainRNGDef *rng);
|
|
|
acda74 |
|
|
|
acda74 |
int qemuAssignDeviceMemoryAlias(virDomainDef *def,
|
|
|
acda74 |
- virDomainMemoryDef *mems,
|
|
|
acda74 |
- bool oldAlias);
|
|
|
acda74 |
+ virDomainMemoryDef *mems);
|
|
|
acda74 |
|
|
|
acda74 |
void qemuAssignDeviceShmemAlias(virDomainDef *def,
|
|
|
acda74 |
virDomainShmemDef *shmem,
|
|
|
acda74 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
acda74 |
index 5840504d13..2df59873db 100644
|
|
|
acda74 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
acda74 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
acda74 |
@@ -2275,7 +2275,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver,
|
|
|
acda74 |
goto cleanup;
|
|
|
acda74 |
releaseaddr = true;
|
|
|
acda74 |
|
|
|
acda74 |
- if (qemuAssignDeviceMemoryAlias(vm->def, mem, false) < 0)
|
|
|
acda74 |
+ if (qemuAssignDeviceMemoryAlias(vm->def, mem) < 0)
|
|
|
acda74 |
goto cleanup;
|
|
|
acda74 |
|
|
|
acda74 |
objalias = g_strdup_printf("mem%s", mem->info.alias);
|
|
|
acda74 |
--
|
|
|
acda74 |
2.39.1
|
|
|
acda74 |
|