11:24 a.m.
v3 of:
https://www.redhat.com/archives/libvir-list/2020-March/msg01112.html
diff to v2:
- Patch 2/10 is new; after discussion to v2 we can access
driver->privileged and driver->embeddedRoot directly
- Patch 3/10 is slightly reworked; it still drops unnecessary layers of
nesting in the default case (/var/lib/libvirt/qemu/ram) but it doesn't
do that if user provides a path via qemu.conf
Michal Prívozník (10):
tests: Fix virQEMUDriverConfigNew() calling with respect to @root
qemu: Drop virQEMUDriverIsPrivileged()
qemu: Drop two layers of nesting of memoryBackingDir
conf: Move virDomainGenerateMachineName to hypervisor/
virDomainDriverGenerateMachineName: Factor out embed path hashing
qemuDomainGetMachineName: Access embeddedRoot from driver rather than
cfg
Revert "qemu_conf: Track embed root dir"
qemu: Make hugepages path generation embed driver aware
qemu: Make memory path generation embed driver aware
qemu: Make auto dump path generation embed driver aware
src/conf/domain_conf.c | 72 ---------------
src/conf/domain_conf.h | 7 --
src/hypervisor/domain_driver.c | 88 +++++++++++++++++++
src/hypervisor/domain_driver.h | 11 +++
src/libvirt_private.syms | 3 +-
src/lxc/lxc_domain.c | 3 +-
src/qemu/qemu_cgroup.c | 4 +-
src/qemu/qemu_command.c | 23 +++--
src/qemu/qemu_conf.c | 76 +++++++++-------
src/qemu/qemu_conf.h | 23 +++--
src/qemu/qemu_domain.c | 19 ++--
src/qemu/qemu_driver.c | 42 ++++-----
src/qemu/qemu_interface.c | 6 +-
src/qemu/qemu_process.c | 7 +-
tests/domaincapstest.c | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 8 +-
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-numa-topology.args | 4 +-
.../fd-memory-numa-topology2.args | 8 +-
.../fd-memory-numa-topology3.args | 12 +--
.../hugepages-memaccess2.args | 12 +--
.../qemuxml2argvdata/pages-dimm-discard.args | 4 +-
...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +-
tests/testutilsqemu.c | 2 +-
tests/virsystemdtest.c | 5 +-
25 files changed, 235 insertions(+), 210 deletions(-)
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 01/10] tests: Fix virQEMUDriverConfigNew() calling with respect to @root
The virQEMUDriverConfigNew() accepts path to root directory for
embed mode as an argument. If the argument is not NULL it uses
the passed value as prefix for some internal paths (e.g.
cfg->libDir). If it is NULL though, it looks if the other
argument, @privileged is true or false and generates internal
paths accordingly. But when calling the function from the test
suite, instead of passing NULL for @root, an empty string is
passed. Fortunately, this doesn't create a problem because in
both problematic cases the generated paths are "fixed" to point
somewhere into build dir or the code which is tested doesn't
access them.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
tests/domaincapstest.c | 2 +-
tests/testutilsqemu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index fb803eaa47..c3a9f4ef91 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -369,7 +369,7 @@ mymain(void)
#endif
#if WITH_QEMU
- virQEMUDriverConfigPtr cfg = virQEMUDriverConfigNew(false, "");
+ virQEMUDriverConfigPtr cfg = virQEMUDriverConfigNew(false, NULL);
if (!cfg)
return EXIT_FAILURE;
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index f3b4e2b3b2..cb68ac0488 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -390,7 +390,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
return -1;
driver->hostarch = virArchFromHost();
- driver->config = virQEMUDriverConfigNew(false, "");
+ driver->config = virQEMUDriverConfigNew(false, NULL);
if (!driver->config)
goto error;
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 02/10] qemu: Drop virQEMUDriverIsPrivileged()
Introduced in v1.2.17-rc1~121, the assumption was that the
driver->privileged is immutable at the time but it might change
in the future. Well, it did not ever since. It is still immutable
variable. Drop the needless accessor then.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_cgroup.c | 4 ++--
src/qemu/qemu_command.c | 4 ++--
src/qemu/qemu_conf.c | 6 ------
src/qemu/qemu_conf.h | 1 -
src/qemu/qemu_domain.c | 12 ++++++------
src/qemu/qemu_driver.c | 22 +++++++++++-----------
src/qemu/qemu_interface.c | 6 +++---
7 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index c0e30f6152..f1564141b6 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -926,7 +926,7 @@ qemuInitCgroup(virDomainObjPtr vm,
qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver);
- if (!virQEMUDriverIsPrivileged(priv->driver))
+ if (!priv->driver->privileged)
goto done;
if (!virCgroupAvailable())
@@ -1061,7 +1061,7 @@ qemuConnectCgroup(virDomainObjPtr vm)
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver);
int ret = -1;
- if (!virQEMUDriverIsPrivileged(priv->driver))
+ if (!priv->driver->privileged)
goto done;
if (!virCgroupAvailable())
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d1b689dfd3..9a0a96bdea 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8102,7 +8102,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
/* network and bridge use a tap device, and direct uses a
* macvtap device
*/
- if (virQEMUDriverIsPrivileged(driver) && nicindexes &&
nnicindexes &&
+ if (driver->privileged && nicindexes && nnicindexes
&&
net->ifname) {
if (virNetDevGetIndex(net->ifname, &nicindex) < 0 ||
VIR_APPEND_ELEMENT(*nicindexes, *nnicindexes, nicindex) < 0)
@@ -9642,7 +9642,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver,
int spice = 0;
int egl_headless = 0;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
/* If we have no cgroups then we can have no tunings that
* require them */
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 15837cece4..5ac316ec77 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1224,12 +1224,6 @@ virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr
driver)
return conf;
}
-bool
-virQEMUDriverIsPrivileged(virQEMUDriverPtr driver)
-{
- return driver->privileged;
-}
-
virDomainXMLOptionPtr
virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver,
const char *defsecmodel)
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 14f9b9e81e..10bc7e4a52 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -333,7 +333,6 @@ int
virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPtr cfg);
virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver);
-bool virQEMUDriverIsPrivileged(virQEMUDriverPtr driver);
virCapsHostNUMAPtr virQEMUDriverGetHostNUMACaps(virQEMUDriverPtr driver);
virCPUDefPtr virQEMUDriverGetHostCPU(virQEMUDriverPtr driver);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index dd48b6fff3..e54eeae58f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8600,7 +8600,7 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs,
return -1;
case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("virtiofs is not yet supported in session
mode"));
return -1;
@@ -10718,7 +10718,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = obj->privateData;
bool custom_hypervisor_feat = false;
- if (virQEMUDriverIsPrivileged(driver) &&
+ if (driver->privileged &&
(cfg->user == 0 ||
cfg->group == 0))
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, logCtxt);
@@ -10817,7 +10817,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr
driver,
ctxt->path = g_strdup_printf("%s/%s.log", cfg->logDir,
vm->def->name);
if (cfg->stdioLogD) {
- ctxt->manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver));
+ ctxt->manager = virLogManagerNew(driver->privileged);
if (!ctxt->manager)
goto error;
@@ -10847,7 +10847,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr
driver,
* we can't rely on logrotate. We don't use O_TRUNC since
* it is better for SELinux policy if we truncate afterwards */
if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START &&
- !virQEMUDriverIsPrivileged(driver) &&
+ !driver->privileged &&
ftruncate(ctxt->writefd, 0) < 0) {
virReportSystemError(errno, _("failed to truncate %s"),
ctxt->path);
@@ -10991,7 +10991,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver,
path = g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name);
if (cfg->stdioLogD) {
- if (!(manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver))))
+ if (!(manager = virLogManagerNew(driver->privileged)))
goto cleanup;
if (virLogManagerDomainAppendMessage(manager, "qemu",
vm->def->uuid,
@@ -16546,7 +16546,7 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
if (!ret)
ret = virDomainGenerateMachineName("qemu", cfg->root,
vm->def->id, vm->def->name,
- virQEMUDriverIsPrivileged(driver));
+ driver->privileged);
return ret;
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 78024614cf..49dcd0e82d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -307,7 +307,7 @@ qemuSecurityInit(virQEMUDriverPtr driver)
flags |= VIR_SECURITY_MANAGER_DEFAULT_CONFINED;
if (cfg->securityRequireConfined)
flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED;
- if (virQEMUDriverIsPrivileged(driver))
+ if (driver->privileged)
flags |= VIR_SECURITY_MANAGER_PRIVILEGED;
if (cfg->securityDriverNames &&
@@ -338,7 +338,7 @@ qemuSecurityInit(virQEMUDriverPtr driver)
mgr = NULL;
}
- if (virQEMUDriverIsPrivileged(driver)) {
+ if (driver->privileged) {
if (cfg->dynamicOwnership)
flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP;
if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT))
@@ -1204,7 +1204,7 @@ static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn,
} else {
if (!virConnectValidateURIPath(conn->uri->path,
"qemu",
- virQEMUDriverIsPrivileged(qemu_driver)))
+ qemu_driver->privileged))
return VIR_DRV_OPEN_ERROR;
}
@@ -9279,7 +9279,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom,
if (virDomainGetSchedulerTypeEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("CPU tuning is not available in session mode"));
goto cleanup;
@@ -9355,7 +9355,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
if (virDomainSetBlkioParametersEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Block I/O tuning is not available in session
mode"));
goto cleanup;
@@ -9435,7 +9435,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom,
if (virDomainGetBlkioParametersEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Block I/O tuning is not available in session
mode"));
goto cleanup;
@@ -9531,7 +9531,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Memory tuning is not available in session mode"));
goto cleanup;
@@ -9607,7 +9607,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom,
if (virDomainGetMemoryParametersEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Memory tuning is not available in session mode"));
goto cleanup;
@@ -9794,7 +9794,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
goto endjob;
if (def) {
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("NUMA tuning is not available in session mode"));
goto endjob;
@@ -10268,7 +10268,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags)
< 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("CPU tuning is not available in session mode"));
goto cleanup;
@@ -10675,7 +10675,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("CPU tuning is not available in session mode"));
goto cleanup;
diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index 2b24c73d65..ffec992596 100644
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -410,7 +410,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def,
if (net->backend.tap) {
tunpath = net->backend.tap;
- if (!virQEMUDriverIsPrivileged(driver)) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cannot use custom tap device in session mode"));
goto cleanup;
@@ -538,7 +538,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
if (net->backend.tap) {
tunpath = net->backend.tap;
- if (!(virQEMUDriverIsPrivileged(driver))) {
+ if (!driver->privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cannot use custom tap device in session mode"));
goto cleanup;
@@ -562,7 +562,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
if (virDomainNetIsVirtioModel(net))
tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR;
- if (virQEMUDriverIsPrivileged(driver)) {
+ if (driver->privileged) {
if (virNetDevTapCreateInBridgePort(brname, &net->ifname,
&net->mac,
def->uuid, tunpath, tapfd, *tapfdSize,
virDomainNetGetActualVirtPortProfile(net),
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 03/10] qemu: Drop two layers of nesting of memoryBackingDir
Initially introduced in v3.10.0-rc1~172.
When generating a path for memory-backend-file or -mem-path, qemu
driver will use the following pattern:
$memoryBackingDir/libvirt/qemu/$id-$shortName
where $memoryBackingDir defaults to /var/lib/libvirt/qemu/ram but
can be overridden in qemu.conf. Anyway, the "/libvirt/qemu/" part
looks redundant, because it's already contained in the default,
or creates unnecessary nesting if overridden in qemu.conf.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_conf.c | 25 ++++++++++---------
src/qemu/qemu_conf.h | 2 --
src/qemu/qemu_driver.c | 12 +--------
.../qemuxml2argvdata/cpu-numa-memshared.args | 8 +++---
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-numa-topology.args | 4 +--
.../fd-memory-numa-topology2.args | 8 +++---
.../fd-memory-numa-topology3.args | 12 ++++-----
.../hugepages-memaccess2.args | 12 ++++-----
.../qemuxml2argvdata/pages-dimm-discard.args | 4 +--
...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +-
11 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 5ac316ec77..5339c5fc04 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -970,7 +970,18 @@ static int
virQEMUDriverConfigLoadMemoryEntry(virQEMUDriverConfigPtr cfg,
virConfPtr conf)
{
- return virConfGetValueString(conf, "memory_backing_dir",
&cfg->memoryBackingDir);
+ char *dir = NULL;
+ int rc;
+
+ if ((rc = virConfGetValueString(conf, "memory_backing_dir", &dir)) <
0) {
+ return -1;
+ } else if (rc > 0) {
+ VIR_FREE(cfg->memoryBackingDir);
+ cfg->memoryBackingDir = g_strdup_printf("%s/libvirt/qemu", dir);
+ return 1;
+ }
+
+ return 0;
}
@@ -1945,27 +1956,17 @@ qemuGetDomainHupageMemPath(const virDomainDef *def,
}
-void
-qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg,
- char **path)
-{
- *path = g_strdup_printf("%s/libvirt/qemu", cfg->memoryBackingDir);
-}
-
-
int
qemuGetMemoryBackingDomainPath(const virDomainDef *def,
virQEMUDriverConfigPtr cfg,
char **path)
{
g_autofree char *shortName = NULL;
- g_autofree char *base = NULL;
if (!(shortName = virDomainDefGetShortName(def)))
return -1;
- qemuGetMemoryBackingBasePath(cfg, &base);
- *path = g_strdup_printf("%s/%s", base, shortName);
+ *path = g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortName);
return 0;
}
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 10bc7e4a52..89332eeb73 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -397,8 +397,6 @@ int qemuGetDomainHupageMemPath(const virDomainDef *def,
unsigned long long pagesize,
char **memPath);
-void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg,
- char **path);
int qemuGetMemoryBackingDomainPath(const virDomainDef *def,
virQEMUDriverConfigPtr cfg,
char **path);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 49dcd0e82d..716b82f8f2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -640,7 +640,6 @@ qemuStateInitialize(bool privileged,
virQEMUDriverConfigPtr cfg;
uid_t run_uid = -1;
gid_t run_gid = -1;
- g_autofree char *memoryBackingPath = NULL;
bool autostart = true;
size_t i;
const char *defsecmodel = NULL;
@@ -935,17 +934,8 @@ qemuStateInitialize(bool privileged,
goto error;
}
- qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath);
-
- if (virFileMakePath(memoryBackingPath) < 0) {
- virReportSystemError(errno,
- _("unable to create memory backing path %s"),
- memoryBackingPath);
- goto error;
- }
-
if (privileged &&
- virFileUpdatePerm(memoryBackingPath,
+ virFileUpdatePerm(cfg->memoryBackingDir,
0, S_IXGRP | S_IXOTH) < 0)
goto error;
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 752eed8d13..8e214189db 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -15,12 +15,12 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node0,\
-share=yes,size=112197632 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=yes,\
+size=112197632 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node1,\
-share=no,size=112197632 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=no,\
+size=112197632 \
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index d23c575553..dec35cc10a 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 14336 \
-mem-prealloc \
--mem-path /var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram \
+-mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \
-realtime mlock=off \
-smp 8,sockets=8,cores=1,threads=1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index 4fbbc8185b..2d3e90ff7a 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 8,sockets=1,cores=8,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node0,\
-share=yes,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=yes,\
+size=15032385536 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 1eeeaec0ce..6b1695feb1 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -16,12 +16,12 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 20,sockets=1,cores=8,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node0,\
-share=no,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=no,\
+size=15032385536 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node1,\
-share=yes,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=yes,\
+size=15032385536 \
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index d75b67916c..205d14a7db 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -16,16 +16,16 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 32,sockets=1,cores=24,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node0,\
-share=yes,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=yes,\
+size=15032385536 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node1,\
-share=yes,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=yes,\
+size=15032385536 \
-numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram-node2,\
-share=no,size=15032385536 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=no,\
+size=15032385536 \
-numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 654baebf9f..c1560e63c3 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -15,20 +15,20 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node0,\
-share=no,size=1073741824,host-nodes=0-3,policy=bind \
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=no,\
+size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\
host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node2,\
-share=no,size=1073741824,host-nodes=0-3,policy=bind \
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=no,\
+size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node3,\
-share=no,size=1073741824,host-nodes=3,policy=bind \
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=no,\
+size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=536870912,\
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index fefa205597..96e9ffdec3 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -20,8 +20,8 @@ mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-file,id=memdimm1,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-fedora/dimm1,\
-discard-data=yes,share=no,size=536870912 \
+mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=yes,share=no,\
+size=536870912 \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-display none \
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
index a7df45a7f0..dd5f68abc5 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
@@ -18,7 +18,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-guest/ram-node0,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=yes,\
size=15032385536 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 04/10] conf: Move virDomainGenerateMachineName to hypervisor/
The virDomainGenerateMachineName() function doesn't belong in
src/conf/ really, because it has nothing to do with domain XML
parsing. It landed there because of lack of better place in the
past. But now that we have src/hypervisor/ the function should
live there. At the same time, the function name is changed to
match new location.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/conf/domain_conf.c | 72 ---------------------------------
src/conf/domain_conf.h | 7 ----
src/hypervisor/domain_driver.c | 74 ++++++++++++++++++++++++++++++++++
src/hypervisor/domain_driver.h | 7 ++++
src/libvirt_private.syms | 2 +-
src/lxc/lxc_domain.c | 3 +-
src/qemu/qemu_domain.c | 7 ++--
tests/virsystemdtest.c | 5 ++-
8 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 914e03c705..efb9a61243 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -62,7 +62,6 @@
#include "virdomainsnapshotobjlist.h"
#include "virdomaincheckpointobjlist.h"
#include "virutil.h"
-#include "vircrypto.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN
@@ -31037,77 +31036,6 @@ virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
return 0;
}
-#define HOSTNAME_CHARS \
- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
-
-static void
-virDomainMachineNameAppendValid(virBufferPtr buf,
- const char *name)
-{
- bool skip = true;
-
- for (; *name; name++) {
- if (strlen(virBufferCurrentContent(buf)) >= 64)
- break;
-
- if (*name == '.' || *name == '-') {
- if (!skip)
- virBufferAddChar(buf, *name);
- skip = true;
- continue;
- }
-
- skip = false;
-
- if (!strchr(HOSTNAME_CHARS, *name))
- continue;
-
- virBufferAddChar(buf, *name);
- }
-
- /* trailing dashes or dots are not allowed */
- virBufferTrimChars(buf, "-.");
-}
-
-#undef HOSTNAME_CHARS
-
-char *
-virDomainGenerateMachineName(const char *drivername,
- const char *root,
- int id,
- const char *name,
- bool privileged)
-{
- virBuffer buf = VIR_BUFFER_INITIALIZER;
-
- virBufferAsprintf(&buf, "%s-", drivername);
-
- if (root) {
- g_autofree char *hash = NULL;
-
- /* When two embed drivers start two domains with the same @name and @id
- * we would generate a non-unique name. Include parts of hashed @root
- * which guarantees uniqueness. The first 8 characters of SHA256 ought
- * to be enough for anybody. */
- if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, root, &hash) < 0)
- return NULL;
-
- virBufferAsprintf(&buf, "embed-%.8s-", hash);
- } else if (!privileged) {
- g_autofree char *username = NULL;
- if (!(username = virGetUserName(geteuid()))) {
- virBufferFreeAndReset(&buf);
- return NULL;
- }
- virBufferAsprintf(&buf, "%s-", username);
- }
-
- virBufferAsprintf(&buf, "%d-", id);
- virDomainMachineNameAppendValid(&buf, name);
-
- return virBufferContentAndReset(&buf);
-}
-
/**
* virDomainNetTypeSharesHostView:
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 33875d942f..575290a6ac 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3649,13 +3649,6 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
int virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
virDomainBlockIoTuneInfo *info);
-char *
-virDomainGenerateMachineName(const char *drivername,
- const char *root,
- int id,
- const char *name,
- bool privileged);
-
bool
virDomainNetTypeSharesHostView(const virDomainNetDef *net);
diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index fc5b6eeefe..7bf0fb3f98 100644
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -23,10 +23,84 @@
#include "domain_driver.h"
#include "viralloc.h"
#include "virstring.h"
+#include "vircrypto.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN
+#define HOSTNAME_CHARS \
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
+
+static void
+virDomainMachineNameAppendValid(virBufferPtr buf,
+ const char *name)
+{
+ bool skip = true;
+
+ for (; *name; name++) {
+ if (strlen(virBufferCurrentContent(buf)) >= 64)
+ break;
+
+ if (*name == '.' || *name == '-') {
+ if (!skip)
+ virBufferAddChar(buf, *name);
+ skip = true;
+ continue;
+ }
+
+ skip = false;
+
+ if (!strchr(HOSTNAME_CHARS, *name))
+ continue;
+
+ virBufferAddChar(buf, *name);
+ }
+
+ /* trailing dashes or dots are not allowed */
+ virBufferTrimChars(buf, "-.");
+}
+
+#undef HOSTNAME_CHARS
+
+char *
+virDomainDriverGenerateMachineName(const char *drivername,
+ const char *root,
+ int id,
+ const char *name,
+ bool privileged)
+{
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+ virBufferAsprintf(&buf, "%s-", drivername);
+
+ if (root) {
+ g_autofree char *hash = NULL;
+
+ /* When two embed drivers start two domains with the same @name and @id
+ * we would generate a non-unique name. Include parts of hashed @root
+ * which guarantees uniqueness. The first 8 characters of SHA256 ought
+ * to be enough for anybody. */
+ if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, root, &hash) < 0)
+ return NULL;
+
+ virBufferAsprintf(&buf, "embed-%.8s-", hash);
+ } else if (!privileged) {
+ g_autofree char *username = NULL;
+ if (!(username = virGetUserName(geteuid()))) {
+ virBufferFreeAndReset(&buf);
+ return NULL;
+ }
+ virBufferAsprintf(&buf, "%s-", username);
+ }
+
+ virBufferAsprintf(&buf, "%d-", id);
+ virDomainMachineNameAppendValid(&buf, name);
+
+ return virBufferContentAndReset(&buf);
+}
+
+
/* Modify dest_array to reflect all blkio device changes described in
* src_array. */
int
diff --git a/src/hypervisor/domain_driver.h b/src/hypervisor/domain_driver.h
index b6d5e66bba..c52e37f038 100644
--- a/src/hypervisor/domain_driver.h
+++ b/src/hypervisor/domain_driver.h
@@ -22,6 +22,13 @@
#include "domain_conf.h"
+char *
+virDomainDriverGenerateMachineName(const char *drivername,
+ const char *root,
+ int id,
+ const char *name,
+ bool privileged);
+
int virDomainDriverMergeBlkioDevice(virBlkioDevicePtr *dest_array,
size_t *dest_size,
virBlkioDevicePtr src_array,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index e276f55bb1..b02b6380ed 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -406,7 +406,6 @@ virDomainFSTypeFromString;
virDomainFSTypeToString;
virDomainFSWrpolicyTypeFromString;
virDomainFSWrpolicyTypeToString;
-virDomainGenerateMachineName;
virDomainGetBlkioParametersAssignFromDef;
virDomainGetFilesystemForTarget;
virDomainGraphicsAuthConnectedTypeFromString;
@@ -1403,6 +1402,7 @@ virDomainCgroupSetupMemtune;
# hypervisor/domain_driver.h
+virDomainDriverGenerateMachineName;
virDomainDriverMergeBlkioDevice;
virDomainDriverParseBlkioDeviceStr;
virDomainDriverSetupPersistentDefBlkioParams;
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index ebd2c2b56e..59f803837a 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -31,6 +31,7 @@
#include "virtime.h"
#include "virsystemd.h"
#include "virinitctl.h"
+#include "domain_driver.h"
#define VIR_FROM_THIS VIR_FROM_LXC
@@ -406,7 +407,7 @@ virLXCDomainGetMachineName(virDomainDefPtr def, pid_t pid)
}
if (!ret)
- ret = virDomainGenerateMachineName("lxc", NULL, def->id,
def->name, true);
+ ret = virDomainDriverGenerateMachineName("lxc", NULL, def->id,
def->name, true);
return ret;
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e54eeae58f..25ee46fe34 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -44,6 +44,7 @@
#include "virfile.h"
#include "domain_addr.h"
#include "domain_capabilities.h"
+#include "domain_driver.h"
#include "domain_event.h"
#include "virtime.h"
#include "virnetdevopenvswitch.h"
@@ -16544,9 +16545,9 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
}
if (!ret)
- ret = virDomainGenerateMachineName("qemu", cfg->root,
- vm->def->id, vm->def->name,
- driver->privileged);
+ ret = virDomainDriverGenerateMachineName("qemu", cfg->root,
+ vm->def->id, vm->def->name,
+ driver->privileged);
return ret;
}
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index 050941dce8..e7dcdea8e9 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -34,6 +34,7 @@
# include "virlog.h"
# include "virmock.h"
# include "rpc/virnetsocket.h"
+# include "domain_driver.h"
# define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("tests.systemdtest");
@@ -414,8 +415,8 @@ testMachineName(const void *opaque)
int ret = -1;
char *actual = NULL;
- if (!(actual = virDomainGenerateMachineName("qemu", data->root,
- data->id, data->name, true)))
+ if (!(actual = virDomainDriverGenerateMachineName("qemu", data->root,
+ data->id, data->name,
true)))
goto cleanup;
if (STRNEQ(actual, data->expected)) {
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 05/10] virDomainDriverGenerateMachineName: Factor out embed path hashing
The code that generates "qemu-embed-$hash" is going to be useful
in more places. Separate it out into a function.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/hypervisor/domain_driver.c | 42 ++++++++++++++++++++++------------
src/hypervisor/domain_driver.h | 4 ++++
src/libvirt_private.syms | 1 +
3 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index 7bf0fb3f98..31821fc712 100644
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -28,6 +28,22 @@
#define VIR_FROM_THIS VIR_FROM_DOMAIN
+char *
+virDomainDriverGenerateRootHash(const char *drivername,
+ const char *root)
+{
+ g_autofree char *hash = NULL;
+
+ if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, root, &hash) < 0)
+ return NULL;
+
+ /* When two embed drivers start two domains with the same @name and @id
+ * we would generate a non-unique name. Include parts of hashed @root
+ * which guarantees uniqueness. The first 8 characters of SHA256 ought
+ * to be enough for anybody. */
+ return g_strdup_printf("%s-embed-%.8s", drivername, hash);
+}
+
#define HOSTNAME_CHARS \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
@@ -72,26 +88,24 @@ virDomainDriverGenerateMachineName(const char *drivername,
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
- virBufferAsprintf(&buf, "%s-", drivername);
-
if (root) {
g_autofree char *hash = NULL;
- /* When two embed drivers start two domains with the same @name and @id
- * we would generate a non-unique name. Include parts of hashed @root
- * which guarantees uniqueness. The first 8 characters of SHA256 ought
- * to be enough for anybody. */
- if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, root, &hash) < 0)
+ if (!(hash = virDomainDriverGenerateRootHash(drivername, root)))
return NULL;
- virBufferAsprintf(&buf, "embed-%.8s-", hash);
- } else if (!privileged) {
- g_autofree char *username = NULL;
- if (!(username = virGetUserName(geteuid()))) {
- virBufferFreeAndReset(&buf);
- return NULL;
+ virBufferAsprintf(&buf, "%s-", hash);
+ } else {
+ virBufferAsprintf(&buf, "%s-", drivername);
+ if (!privileged) {
+
+ g_autofree char *username = NULL;
+ if (!(username = virGetUserName(geteuid()))) {
+ virBufferFreeAndReset(&buf);
+ return NULL;
+ }
+ virBufferAsprintf(&buf, "%s-", username);
}
- virBufferAsprintf(&buf, "%s-", username);
}
virBufferAsprintf(&buf, "%d-", id);
diff --git a/src/hypervisor/domain_driver.h b/src/hypervisor/domain_driver.h
index c52e37f038..b66ae2d421 100644
--- a/src/hypervisor/domain_driver.h
+++ b/src/hypervisor/domain_driver.h
@@ -22,6 +22,10 @@
#include "domain_conf.h"
+char *
+virDomainDriverGenerateRootHash(const char *drivername,
+ const char *root);
+
char *
virDomainDriverGenerateMachineName(const char *drivername,
const char *root,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b02b6380ed..ec367653d5 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1403,6 +1403,7 @@ virDomainCgroupSetupMemtune;
# hypervisor/domain_driver.h
virDomainDriverGenerateMachineName;
+virDomainDriverGenerateRootHash;
virDomainDriverMergeBlkioDevice;
virDomainDriverParseBlkioDeviceStr;
virDomainDriverSetupPersistentDefBlkioParams;
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 06/10] qemuDomainGetMachineName: Access embeddedRoot from driver rather than cfg
The cfg->root is going away, therefore get the info right from
the driver structure.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_domain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 25ee46fe34..cba11b9e1e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -16535,7 +16535,6 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverPtr driver = priv->driver;
- g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
char *ret = NULL;
if (vm->pid > 0) {
@@ -16545,7 +16544,8 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
}
if (!ret)
- ret = virDomainDriverGenerateMachineName("qemu", cfg->root,
+ ret = virDomainDriverGenerateMachineName("qemu",
+ driver->embeddedRoot,
vm->def->id, vm->def->name,
driver->privileged);
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 07/10] Revert "qemu_conf: Track embed root dir"
This reverts commit 06a19921b6a522cd7b4d352c9320909752947de3.
What I haven't realized when writing this ^^ commit is that the
virQEMUDriver structure already stores the root directory path.
And since the pointer is immutable it can be accessed right from
the structure and thus there is no need to duplicate it in the
driver config.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_conf.c | 2 --
src/qemu/qemu_conf.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 5339c5fc04..da2abb6188 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -115,7 +115,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged,
if (root) {
cfg->uri = g_strdup_printf("qemu:///embed?root=%s", root);
- cfg->root = g_strdup(root);
} else {
cfg->uri = g_strdup(privileged ? "qemu:///system" :
"qemu:///session");
}
@@ -302,7 +301,6 @@ static void virQEMUDriverConfigDispose(void *obj)
virStringListFree(cfg->cgroupDeviceACL);
VIR_FREE(cfg->uri);
- VIR_FREE(cfg->root);
VIR_FREE(cfg->configBaseDir);
VIR_FREE(cfg->configDir);
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 89332eeb73..8a0d220ce7 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -76,8 +76,6 @@ struct _virQEMUDriverConfig {
virObject parent;
char *uri;
- char *root; /* The root directory for embed driver,
- NULL for system/session connections */
uid_t user;
gid_t group;
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 08/10] qemu: Make hugepages path generation embed driver aware
So far, libvirt generates the following path for hugepages:
$mnt/libvirt/qemu/$id-$shortName
where $mnt is the mount point of hugetlbfs corresponding to
hugepages of desired size (e.g. /dev/hugepages), $id is domain ID
and $shortName is shortened version of domain name. So for
instance, the generated path may look something like this:
/dev/hugepages/libvirt/qemu/1-QEMUGuest
But this won't work with embed driver really, because if there
are two instances of embed driver, and they both want to start a
domain with the same name and with hugepages, both drivers will
generate the same path which is not desired. Fortunately, we can
reuse the approach for machined name generation
(v6.1.0-178-gc9bd08ee35) and include part of hash of the root in
the generated path.
Note, the important change is in qemuGetBaseHugepagePath(). The
rest is needed to pass driver around.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_command.c | 4 ++--
src/qemu/qemu_conf.c | 24 +++++++++++++++++-------
src/qemu/qemu_conf.h | 10 ++++++----
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_process.c | 2 +-
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9a0a96bdea..689796a92b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3465,7 +3465,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
if (!priv->memPrealloc)
prealloc = true;
} else if (useHugepage) {
- if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0)
+ if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath)
< 0)
return -1;
if (!priv->memPrealloc)
prealloc = true;
@@ -7251,7 +7251,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
if (!pagesize &&
qemuBuildMemoryGetDefaultPagesize(cfg, &pagesize) < 0)
return -1;
- if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &mem_path) < 0)
+ if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &mem_path)
< 0)
return -1;
} else if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {
if (qemuGetMemoryBackingPath(def, cfg, "ram", &mem_path) < 0)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index da2abb6188..713542f8cd 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -40,6 +40,7 @@
#include "virxml.h"
#include "virlog.h"
#include "cpu/cpu.h"
+#include "domain_driver.h"
#include "domain_nwfilter.h"
#include "virfile.h"
#include "virsocket.h"
@@ -1887,21 +1888,29 @@ qemuTranslateSnapshotDiskSourcePool(virDomainSnapshotDiskDefPtr
def)
}
char *
-qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage)
+qemuGetBaseHugepagePath(virQEMUDriverPtr driver,
+ virHugeTLBFSPtr hugepage)
{
+ const char *root = driver->embeddedRoot;
char *ret;
- ret = g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir);
+ if (root && !STRPREFIX(hugepage->mnt_dir, root)) {
+ g_autofree char * hash = virDomainDriverGenerateRootHash("qemu",
root);
+ ret = g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash);
+ } else {
+ ret = g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir);
+ }
return ret;
}
char *
-qemuGetDomainHugepagePath(const virDomainDef *def,
+qemuGetDomainHugepagePath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
virHugeTLBFSPtr hugepage)
{
- g_autofree char *base = qemuGetBaseHugepagePath(hugepage);
+ g_autofree char *base = qemuGetBaseHugepagePath(driver, hugepage);
g_autofree char *domPath = virDomainDefGetShortName(def);
char *ret = NULL;
@@ -1920,11 +1929,12 @@ qemuGetDomainHugepagePath(const virDomainDef *def,
* -1 otherwise.
*/
int
-qemuGetDomainHupageMemPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+qemuGetDomainHupageMemPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
unsigned long long pagesize,
char **memPath)
{
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
size_t i = 0;
if (!cfg->nhugetlbfs) {
@@ -1947,7 +1957,7 @@ qemuGetDomainHupageMemPath(const virDomainDef *def,
return -1;
}
- if (!(*memPath = qemuGetDomainHugepagePath(def, &cfg->hugetlbfs[i])))
+ if (!(*memPath = qemuGetDomainHugepagePath(driver, def, &cfg->hugetlbfs[i])))
return -1;
return 0;
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 8a0d220ce7..b85a9497b7 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -386,12 +386,14 @@ virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQEMUDriverPtr
driver,
int qemuTranslateSnapshotDiskSourcePool(virDomainSnapshotDiskDefPtr def);
-char * qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage);
-char * qemuGetDomainHugepagePath(const virDomainDef *def,
+char * qemuGetBaseHugepagePath(virQEMUDriverPtr driver,
+ virHugeTLBFSPtr hugepage);
+char * qemuGetDomainHugepagePath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
virHugeTLBFSPtr hugepage);
-int qemuGetDomainHupageMemPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+int qemuGetDomainHupageMemPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
unsigned long long pagesize,
char **memPath);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 716b82f8f2..33f177adbd 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -917,7 +917,7 @@ qemuStateInitialize(bool privileged,
for (i = 0; i < cfg->nhugetlbfs; i++) {
g_autofree char *hugepagePath = NULL;
- hugepagePath = qemuGetBaseHugepagePath(&cfg->hugetlbfs[i]);
+ hugepagePath = qemuGetBaseHugepagePath(qemu_driver, &cfg->hugetlbfs[i]);
if (!hugepagePath)
goto error;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6b9f6fb860..f9c400059f 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3881,7 +3881,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
if (!build || shouldBuildHP) {
for (i = 0; i < cfg->nhugetlbfs; i++) {
g_autofree char *path = NULL;
- path = qemuGetDomainHugepagePath(vm->def, &cfg->hugetlbfs[i]);
+ path = qemuGetDomainHugepagePath(driver, vm->def,
&cfg->hugetlbfs[i]);
if (!path)
return -1;
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 09/10] qemu: Make memory path generation embed driver aware
So far, libvirt generates the following path for memory:
$memoryBackingDir/$id-$shortName/ram-nodeN
where $memoryBackingDir is the path where QEMU mmaps() memory for
the guest (e.g. /var/lib/libvirt/qemu/ram), $id is domain ID
and $shortName is shortened version of domain name. So for
instance, the generated path may look something like this:
/var/lib/libvirt/qemu/ram/1-QEMUGuest/ram-node0
While in case of embed driver the following path would be
generated by default:
$root/lib/qemu/ram/1-QEMUGuest/ram-node0
which is not clashing with other embed drivers, we allow users to
override the default and have all embed drivers use the same
prefix. This can create clashing paths. Fortunately, we can reuse
the approach for machined name generation
(v6.1.0-178-gc9bd08ee35) and include part of hash of the root in
the generated path.
Note, the important change is in qemuGetMemoryBackingBasePath().
The rest is needed to pass driver around.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_command.c | 15 +++++++--------
src/qemu/qemu_conf.c | 21 ++++++++++++++-------
src/qemu/qemu_conf.h | 8 ++++----
src/qemu/qemu_process.c | 5 ++---
4 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 689796a92b..7ffe59643b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3472,7 +3472,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
} else {
/* We can have both pagesize and mem source. If that's the case,
* prefer hugepages as those are more specific. */
- if (qemuGetMemoryBackingPath(def, cfg, mem->info.alias, &memPath) <
0)
+ if (qemuGetMemoryBackingPath(priv->driver, def, mem->info.alias,
&memPath) < 0)
return -1;
}
@@ -7233,11 +7233,11 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
static int
-qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
- const virDomainDef *def,
+qemuBuildMemPathStr(const virDomainDef *def,
virCommandPtr cmd,
qemuDomainObjPrivatePtr priv)
{
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
const long system_page_size = virGetSystemPageSizeKB();
g_autofree char *mem_path = NULL;
@@ -7254,7 +7254,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &mem_path)
< 0)
return -1;
} else if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {
- if (qemuGetMemoryBackingPath(def, cfg, "ram", &mem_path) < 0)
+ if (qemuGetMemoryBackingPath(priv->driver, def, "ram",
&mem_path) < 0)
return -1;
} else {
return 0;
@@ -7273,7 +7273,6 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
static int
qemuBuildMemCommandLine(virCommandPtr cmd,
- virQEMUDriverConfigPtr cfg,
const virDomainDef *def,
virQEMUCapsPtr qemuCaps,
qemuDomainObjPrivatePtr priv)
@@ -7305,7 +7304,7 @@ qemuBuildMemCommandLine(virCommandPtr cmd,
* the hugepages and no numa node is specified.
*/
if (!virDomainNumaGetNodeCount(def->numa) &&
- qemuBuildMemPathStr(cfg, def, cmd, priv) < 0)
+ qemuBuildMemPathStr(def, cmd, priv) < 0)
return -1;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OVERCOMMIT)) {
@@ -7386,7 +7385,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
}
if (!needBackend &&
- qemuBuildMemPathStr(cfg, def, cmd, priv) < 0)
+ qemuBuildMemPathStr(def, cmd, priv) < 0)
goto cleanup;
for (i = 0; i < ncells; i++) {
@@ -9879,7 +9878,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (!migrateURI && !snapshot && qemuDomainAlignMemorySizes(def) <
0)
return NULL;
- if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps, priv) < 0)
+ if (qemuBuildMemCommandLine(cmd, def, qemuCaps, priv) < 0)
return NULL;
if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 713542f8cd..c59824006c 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1965,16 +1965,23 @@ qemuGetDomainHupageMemPath(virQEMUDriverPtr driver,
int
-qemuGetMemoryBackingDomainPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+qemuGetMemoryBackingDomainPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
char **path)
{
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+ const char *root = driver->embeddedRoot;
g_autofree char *shortName = NULL;
if (!(shortName = virDomainDefGetShortName(def)))
return -1;
- *path = g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortName);
+ if (root && !STRPREFIX(cfg->memoryBackingDir, root)) {
+ g_autofree char * hash = virDomainDriverGenerateRootHash("qemu",
root);
+ *path = g_strdup_printf("%s/%s-%s", cfg->memoryBackingDir, hash,
shortName);
+ } else {
+ *path = g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortName);
+ }
return 0;
}
@@ -1982,8 +1989,8 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *def,
/**
* qemuGetMemoryBackingPath:
+ * @driver: the qemu driver
* @def: domain definition
- * @cfg: the driver config
* @alias: memory object alias
* @memPath: constructed path
*
@@ -1993,8 +2000,8 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *def,
* -1 otherwise (with error reported).
*/
int
-qemuGetMemoryBackingPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+qemuGetMemoryBackingPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
const char *alias,
char **memPath)
{
@@ -2007,7 +2014,7 @@ qemuGetMemoryBackingPath(const virDomainDef *def,
return -1;
}
- if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0)
+ if (qemuGetMemoryBackingDomainPath(driver, def, &domainPath) < 0)
return -1;
*memPath = g_strdup_printf("%s/%s", domainPath, alias);
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index b85a9497b7..b9ef4551a3 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -397,10 +397,10 @@ int qemuGetDomainHupageMemPath(virQEMUDriverPtr driver,
unsigned long long pagesize,
char **memPath);
-int qemuGetMemoryBackingDomainPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+int qemuGetMemoryBackingDomainPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
char **path);
-int qemuGetMemoryBackingPath(const virDomainDef *def,
- virQEMUDriverConfigPtr cfg,
+int qemuGetMemoryBackingPath(virQEMUDriverPtr driver,
+ const virDomainDef *def,
const char *alias,
char **memPath);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f9c400059f..8ea470f75f 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3894,7 +3894,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
if (!build || shouldBuildMB) {
g_autofree char *path = NULL;
- if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0)
+ if (qemuGetMemoryBackingDomainPath(driver, vm->def, &path) < 0)
return -1;
if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm,
@@ -3911,10 +3911,9 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainMemoryDefPtr mem)
{
- g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autofree char *path = NULL;
- if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0)
+ if (qemuGetMemoryBackingPath(driver, vm->def, mem->info.alias, &path) <
0)
return -1;
if (unlink(path) < 0 &&
--
2.24.1
11:24 a.m.
New subject: [PATCH v3 10/10] qemu: Make auto dump path generation embed driver aware
So far, libvirt generates the following path for automatic dumps:
$autoDumpPath/$id-$shortName-$timestamp
where $autoDumpPath is where libvirt stores dumps of guests (e.g.
/var/lib/libvirt/qemu/dump), $id is domain ID and $shortName is
shortened version of domain name. So for instance, the generated
path may look something like this:
/var/lib/libvirt/qemu/dump/1-QEMUGuest-2020-03-25-10:40:50
While in case of embed driver the following path would be
generated by default:
$root/lib/libvirt/qemu/dump/1-QEMUGuest-2020-03-25-10:40:50
which is not clashing with other embed drivers, we allow users to
override the default and have all embed drivers use the same
prefix. This can create clashing paths. Fortunately, we can reuse
the approach for machined name generation
(v6.1.0-178-gc9bd08ee35) and include part of hash of the root in
the generated path.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 33f177adbd..1746c85be4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4104,6 +4104,7 @@ static char *
getAutoDumpPath(virQEMUDriverPtr driver,
virDomainObjPtr vm)
{
+ const char *root = driver->embeddedRoot;
g_autofree char *domname = virDomainDefGetShortName(vm->def);
g_autoptr(GDateTime) now = g_date_time_new_now_local();
g_autofree char *nowstr = NULL;
@@ -4116,6 +4117,11 @@ getAutoDumpPath(virQEMUDriverPtr driver,
nowstr = g_date_time_format(now, "%Y-%m-%d-%H:%M:%S");
+ if (root && !STRPREFIX(cfg->autoDumpPath, root)) {
+ g_autofree char * hash = virDomainDriverGenerateRootHash(QEMU_DRIVER_NAME,
root);
+ return g_strdup_printf("%s/%s-%s-%s", cfg->autoDumpPath, hash,
domname, nowstr);
+ }
+
return g_strdup_printf("%s/%s-%s", cfg->autoDumpPath, domname, nowstr);
}
--
2.24.1
12:20 p.m.
On Tue, 2020-03-31 at 18:24 +0200, Michal Privoznik wrote:
v3 of:
https://www.redhat.com/archives/libvir-list/2020-March/msg01112.html
diff to v2:
- Patch 2/10 is new; after discussion to v2 we can access
driver->privileged and driver->embeddedRoot directly
- Patch 3/10 is slightly reworked; it still drops unnecessary layers of
nesting in the default case (/var/lib/libvirt/qemu/ram) but it doesn't
do that if user provides a path via qemu.conf
Michal Prívozník (10):
tests: Fix virQEMUDriverConfigNew() calling with respect to @root
qemu: Drop virQEMUDriverIsPrivileged()
qemu: Drop two layers of nesting of memoryBackingDir
conf: Move virDomainGenerateMachineName to hypervisor/
virDomainDriverGenerateMachineName: Factor out embed path hashing
qemuDomainGetMachineName: Access embeddedRoot from driver rather than
cfg
Revert "qemu_conf: Track embed root dir"
qemu: Make hugepages path generation embed driver aware
qemu: Make memory path generation embed driver aware
qemu: Make auto dump path generation embed driver aware
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
1691
days inactive
1697
days old
11 comments
2 participants
participants (2)
-
Andrea Bolognani -
Michal Privoznik