From f9b263118f96ab6a325764fbbe1e7108d5b81c48 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 14 Feb 2007 17:35:38 +0000
Subject: [PATCH] Moved qemu sockets/configs

---
 ChangeLog           |  6 ++++++
 qemud/qemud.c       | 14 +++++++-------
 src/qemu_internal.c |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7599f50478..154cd0ec3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* python/generator.py: blacklist  vshRunConsole method from
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 628c07c310..5cc89b9c93 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -201,7 +201,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
     char sockname[PATH_MAX];
 
     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;
         }
         unlink(sockname);
@@ -209,7 +209,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
             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;
         }
         unlink(sockname);
@@ -226,7 +226,7 @@ static int qemudListen(struct qemud_server *server, int sys) {
         if (!(pw = getpwuid(uid)))
             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;
         }
 
@@ -249,10 +249,10 @@ static struct qemud_server *qemudInitialize(int sys) {
     server->nextvmid = 1;
 
     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;
         }
-        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;
         }
     } else {
@@ -265,11 +265,11 @@ static struct qemud_server *qemudInitialize(int sys) {
             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;
         }
 
-        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;
         }
     }
diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index 1a7cc6c28a..be4c247637 100644
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -336,11 +336,11 @@ static int qemuOpenConnection(virConnectPtr conn, xmlURIPtr uri, int readonly AT
 
     if (!strcmp(uri->path, "/system")) {
         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;
             }
         } 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;
             }
         }
@@ -355,7 +355,7 @@ static int qemuOpenConnection(virConnectPtr conn, xmlURIPtr uri, int readonly AT
         if (!(pw = getpwuid(uid)))
             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;
         }
     }