NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Change parameters of qemuGetMemoryBackingDomainPath()

Browse Source 
This way it does not use driver, since it will be later reworked and the
following patches cleaner, hopefully.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Martin Kletzander 2024-09-18 09:29:43 +02:00
parent edcf14be9c
commit c9a35eb255
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -3222,7 +3222,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
} else { } else {
/* We can have both pagesize and mem source. If that's the case, /* We can have both pagesize and mem source. If that's the case,
* prefer hugepages as those are more specific. */ * prefer hugepages as those are more specific. */
if (qemuGetMemoryBackingPath(priv->driver, def, mem->info.alias, &memPath) < 0) if (qemuGetMemoryBackingPath(priv, def, mem->info.alias, &memPath) < 0)
return -1; return -1;
} }
@ -7116,7 +7116,7 @@ qemuBuildMemPathStr(const virDomainDef *def,
return -1; return -1;
prealloc = true; prealloc = true;
} else if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { } else if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {
if (qemuGetMemoryBackingPath(priv->driver, def, "ram", &mem_path) < 0) if (qemuGetMemoryBackingPath(priv, def, "ram", &mem_path) < 0)
return -1; return -1;
} }

9
src/qemu/qemu_domain.c
View File

@ -1736,10 +1736,11 @@ qemuDomainSecretPrepare(virQEMUDriver *driver,
int int
qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, qemuGetMemoryBackingDomainPath(qemuDomainObjPrivate *priv,
const virDomainDef *def, const virDomainDef *def,
char **path) char **path)
{ {
virQEMUDriver *driver = priv->driver;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
const char *root = driver->embeddedRoot; const char *root = driver->embeddedRoot;
g_autofree char *shortName = NULL; g_autofree char *shortName = NULL;
@ -1760,7 +1761,7 @@ qemuGetMemoryBackingDomainPath(virQEMUDriver *driver,
/** /**
* qemuGetMemoryBackingPath: * qemuGetMemoryBackingPath:
* @driver: the qemu driver * @priv: domain private data
* @def: domain definition * @def: domain definition
* @alias: memory object alias * @alias: memory object alias
* @memPath: constructed path * @memPath: constructed path
@ -1771,7 +1772,7 @@ qemuGetMemoryBackingDomainPath(virQEMUDriver *driver,
* -1 otherwise (with error reported). * -1 otherwise (with error reported).
*/ */
int int
qemuGetMemoryBackingPath(virQEMUDriver *driver, qemuGetMemoryBackingPath(qemuDomainObjPrivate *priv,
const virDomainDef *def, const virDomainDef *def,
const char *alias, const char *alias,
char **memPath) char **memPath)
@ -1785,7 +1786,7 @@ qemuGetMemoryBackingPath(virQEMUDriver *driver,
return -1; return -1;
} }
if (qemuGetMemoryBackingDomainPath(driver, def, &domainPath) < 0) if (qemuGetMemoryBackingDomainPath(priv, def, &domainPath) < 0)
return -1; return -1;
*memPath = g_strdup_printf("%s/%s", domainPath, alias); *memPath = g_strdup_printf("%s/%s", domainPath, alias);

5
src/qemu/qemu_domain.h
View File

@ -936,11 +936,12 @@ void qemuDomainCleanupStorageSourceFD(virStorageSource *src);
void qemuDomainStartupCleanup(virDomainObj *vm); void qemuDomainStartupCleanup(virDomainObj *vm);
int qemuGetMemoryBackingDomainPath(virQEMUDriver *driver,
int qemuGetMemoryBackingDomainPath(qemuDomainObjPrivate *priv,
const virDomainDef *def, const virDomainDef *def,
char **path); char **path);
int qemuGetMemoryBackingPath(virQEMUDriver *driver, int qemuGetMemoryBackingPath(qemuDomainObjPrivate *priv,
const virDomainDef *def, const virDomainDef *def,
const char *alias, const char *alias,
char **memPath); char **memPath);

4
src/qemu/qemu_hotplug.c
View File

@ -2404,7 +2404,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver,
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
if (objAdded && mem) if (objAdded && mem)
ignore_value(qemuProcessDestroyMemoryBackingPath(driver, vm, mem)); ignore_value(qemuProcessDestroyMemoryBackingPath(vm, mem));
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
if (!mem) if (!mem)
@ -4761,7 +4761,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriver *driver,
if (qemuDomainNamespaceTeardownMemory(vm, mem) < 0) if (qemuDomainNamespaceTeardownMemory(vm, mem) < 0)
VIR_WARN("Unable to remove memory device from /dev"); VIR_WARN("Unable to remove memory device from /dev");
if (qemuProcessDestroyMemoryBackingPath(driver, vm, mem) < 0) if (qemuProcessDestroyMemoryBackingPath(vm, mem) < 0)
VIR_WARN("Unable to destroy memory backing path"); VIR_WARN("Unable to destroy memory backing path");
qemuDomainReleaseMemoryDeviceSlot(vm, mem); qemuDomainReleaseMemoryDeviceSlot(vm, mem);

7
src/qemu/qemu_process.c
View File

@ -4095,7 +4095,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriver *driver,
if (!build || shouldBuildMB) { if (!build || shouldBuildMB) {
g_autofree char *path = NULL; g_autofree char *path = NULL;
if (qemuGetMemoryBackingDomainPath(driver, vm->def, &path) < 0) if (qemuGetMemoryBackingDomainPath(QEMU_DOMAIN_PRIVATE(vm), vm->def, &path) < 0)
return -1; return -1;
if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm,
@ -4108,13 +4108,12 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriver *driver,
int int
qemuProcessDestroyMemoryBackingPath(virQEMUDriver *driver, qemuProcessDestroyMemoryBackingPath(virDomainObj *vm,
virDomainObj *vm,
virDomainMemoryDef *mem) virDomainMemoryDef *mem)
{ {
g_autofree char *path = NULL; g_autofree char *path = NULL;
if (qemuGetMemoryBackingPath(driver, vm->def, mem->info.alias, &path) < 0) if (qemuGetMemoryBackingPath(QEMU_DOMAIN_PRIVATE(vm), vm->def, mem->info.alias, &path) < 0)
return -1; return -1;
if (unlink(path) < 0 && if (unlink(path) < 0 &&

3
src/qemu/qemu_process.h
View File

@ -43,8 +43,7 @@ int qemuProcessBuildDestroyMemoryPaths(virQEMUDriver *driver,
virDomainMemoryDef *mem, virDomainMemoryDef *mem,
bool build); bool build);
int qemuProcessDestroyMemoryBackingPath(virQEMUDriver *driver, int qemuProcessDestroyMemoryBackingPath(virDomainObj *vm,
virDomainObj *vm,
virDomainMemoryDef *mem); virDomainMemoryDef *mem);
void qemuProcessReconnectAll(virQEMUDriver *driver); void qemuProcessReconnectAll(virQEMUDriver *driver);