External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved qemu sockets/configs

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-02-14 17:35:38 +00:00
parent a1432a5215
commit f9b263118f
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Feb 14 12:19:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_internal.c, qemud/qemud.c: Move configs into
/etc/libvirt/qemu or $HOME/.libvirt/qemu and the socket into
$HOME/.libvirt/qemud-sock or /var/run/libvirt/qemud-sock
Tue Feb 14 12:19:24 EST 2007 Daniel P. Berrange <berrange@redhat.com> Tue Feb 14 12:19:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* python/generator.py: blacklist vshRunConsole method from * python/generator.py: blacklist vshRunConsole method from

14
qemud/qemud.c
View File

@ -201,7 +201,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
char sockname[PATH_MAX]; char sockname[PATH_MAX];
if (sys) { if (sys) {
if (snprintf(sockname, sizeof(sockname), "%s/run/qemud/sock", LOCAL_STATE_DIR) >= (int)sizeof(sockname)) { if (snprintf(sockname, sizeof(sockname), "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= (int)sizeof(sockname)) {
return -1; return -1;
} }
unlink(sockname); unlink(sockname);
@ -209,7 +209,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
return -1; return -1;
if (snprintf(sockname, sizeof(sockname), "%s/run/qemud/sock-ro", LOCAL_STATE_DIR) >= (int)sizeof(sockname)) { if (snprintf(sockname, sizeof(sockname), "%s/run/libvirt/qemud-sock-ro", LOCAL_STATE_DIR) >= (int)sizeof(sockname)) {
return -1; return -1;
} }
unlink(sockname); unlink(sockname);
@ -226,7 +226,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
if (!(pw = getpwuid(uid))) if (!(pw = getpwuid(uid)))
return -1; return -1;
if (snprintf(sockname, sizeof(sockname), "@%s/.qemud/sock", pw->pw_dir) >= (int)sizeof(sockname)) { if (snprintf(sockname, sizeof(sockname), "@%s/.libvirt/qemud-sock", pw->pw_dir) >= (int)sizeof(sockname)) {
return -1; return -1;
} }
@ -249,10 +249,10 @@ static struct qemud_server *qemudInitialize(int sys) {
server->nextvmid = 1; server->nextvmid = 1;
if (sys) { if (sys) {
if (snprintf(server->configDir, sizeof(server->configDir), "%s/qemud", SYSCONF_DIR) >= (int)sizeof(server->configDir)) { if (snprintf(server->configDir, sizeof(server->configDir), "%s/libvirt/qemu", SYSCONF_DIR) >= (int)sizeof(server->configDir)) {
goto cleanup; goto cleanup;
} }
if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/qemud/networks", SYSCONF_DIR) >= (int)sizeof(server->networkConfigDir)) { if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/libvirt/qemu/networks", SYSCONF_DIR) >= (int)sizeof(server->networkConfigDir)) {
goto cleanup; goto cleanup;
} }
} else { } else {
@ -265,11 +265,11 @@ static struct qemud_server *qemudInitialize(int sys) {
goto cleanup; goto cleanup;
} }
if (snprintf(server->configDir, sizeof(server->configDir), "%s/.qemud", pw->pw_dir) >= (int)sizeof(server->configDir)) { if (snprintf(server->configDir, sizeof(server->configDir), "%s/.libvirt/qemu", pw->pw_dir) >= (int)sizeof(server->configDir)) {
goto cleanup; goto cleanup;
} }
if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/.qemud.d/networks", pw->pw_dir) >= (int)sizeof(server->networkConfigDir)) { if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/.libvirt/qemu/networks", pw->pw_dir) >= (int)sizeof(server->networkConfigDir)) {
goto cleanup; goto cleanup;
} }
} }

6
src/qemu_internal.c
View File

@ -336,11 +336,11 @@ static int qemuOpenConnection(virConnectPtr conn, xmlURIPtr uri, int readonly AT
if (!strcmp(uri->path, "/system")) { if (!strcmp(uri->path, "/system")) {
if (readonly) { if (readonly) {
if (snprintf(path, sizeof(path), "%s/run/qemud/sock-ro", LOCAL_STATE_DIR) >= (int)sizeof(path)) { if (snprintf(path, sizeof(path), "%s/run/libvirt/qemud-sock-ro", LOCAL_STATE_DIR) >= (int)sizeof(path)) {
return -1; return -1;
} }
} else { } else {
if (snprintf(path, sizeof(path), "%s/run/qemud/sock", LOCAL_STATE_DIR) >= (int)sizeof(path)) { if (snprintf(path, sizeof(path), "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= (int)sizeof(path)) {
return -1; return -1;
} }
} }
@ -355,7 +355,7 @@ static int qemuOpenConnection(virConnectPtr conn, xmlURIPtr uri, int readonly AT
if (!(pw = getpwuid(uid))) if (!(pw = getpwuid(uid)))
return -1; return -1;
if (snprintf(path, sizeof(path), "@%s/.qemud/sock", pw->pw_dir) == sizeof(path)) { if (snprintf(path, sizeof(path), "@%s/.libvirt/qemud-sock", pw->pw_dir) == sizeof(path)) {
return -1; return -1;
} }
} }