mirror of https://gitee.com/openkylin/libvirt.git
Revert "qemu_conf: Track embed root dir"
This reverts commit 06a19921b6
.
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@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
be0e311572
commit
6297560761
src/qemu
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue