From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 7 Oct 2020 08:07:09 +0000 (+0200)
Subject: pmxcfs: add some removal reminders for openvz
X-Git-Url: https://git.proxmox.com/?p=pve-cluster.git;a=commitdiff_plain;h=c63b596f75ac45ae59ec7abedbbc5c582e7046c5

pmxcfs: add some removal reminders for openvz

Removing them now could count as compat breakage, for users which
still depend on some of this weird behavior it's nicer if we do this
more explicitly with 7.0

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/data/src/cfs-plug-memdb.c b/data/src/cfs-plug-memdb.c
index 901de7c..b7a5567 100644
--- a/data/src/cfs-plug-memdb.c
+++ b/data/src/cfs-plug-memdb.c
@@ -42,6 +42,7 @@
 
 static struct cfs_operations cfs_ops;
 
+// FIXME: remove openvz stuff for 7.x
 static gboolean 
 name_is_openvz_script(
 	const char *name, 
@@ -101,6 +102,7 @@ static void tree_entry_stat(memdb_tree_entry_t *te, struct stat *stbuf, gboolean
 	} else {
 		stbuf->st_mode = S_IFREG | (quorate ? 0666 : 0444);
 		stbuf->st_nlink = 1;
+		// FIXME: remove openvz stuff for 7.x
 		if (name_is_openvz_script(te->name, NULL)) {
 			stbuf->st_mode |= S_IXUSR;
 		}
diff --git a/data/src/memdb.c b/data/src/memdb.c
index 33ea44d..7ec7e0b 100644
--- a/data/src/memdb.c
+++ b/data/src/memdb.c
@@ -275,6 +275,7 @@ dir_contain_vm_config(
 			*vmtype_ret = VMTYPE_QEMU;
 			nodename = g_strdup(sa[0]);
 		} else if (strcmp(sa[1], "openvz") == 0) {
+			// FIXME: remove openvz stuff for 7.x
 			*vmtype_ret = VMTYPE_OPENVZ;
 			nodename = g_strdup(sa[0]);
 		} else if (strcmp(sa[1], "lxc") == 0) {
@@ -480,6 +481,7 @@ memdb_recreate_vmlist(
 			if (!vmlist_add_dir(memdb, vmlist, node_te->name, VMTYPE_QEMU, te))
 				ret = FALSE;
 		}
+		// FIXME: remove openvz stuff for 7.x
 		if ((te = g_hash_table_lookup(node_te->data.entries, "openvz"))) {
 			if (!vmlist_add_dir(memdb, vmlist, node_te->name, VMTYPE_OPENVZ, te))
 				ret = FALSE;
diff --git a/data/src/pmxcfs.c b/data/src/pmxcfs.c
index b6d6576..40ee6cd 100644
--- a/data/src/pmxcfs.c
+++ b/data/src/pmxcfs.c
@@ -694,6 +694,7 @@ create_symlinks(cfs_plug_base_t *bplug, const char *nodename)
 	g_free(lnktarget);
 	cfs_plug_base_insert(bplug, (cfs_plug_t*)lnk);
 
+	// FIXME: remove openvz stuff for 7.x
 	lnktarget = g_strdup_printf("nodes/%s/openvz", nodename);
 	lnk = cfs_plug_link_new("openvz", lnktarget);
 	g_free(lnktarget);
diff --git a/data/src/status.c b/data/src/status.c
index e15a257..f3775fd 100644
--- a/data/src/status.c
+++ b/data/src/status.c
@@ -173,6 +173,7 @@ static const char *vminfo_type_to_string(vminfo_t *vminfo)
 	if (vminfo->vmtype == VMTYPE_QEMU) {
 		return "qemu";
 	} else if (vminfo->vmtype == VMTYPE_OPENVZ) {
+		// FIXME: remove openvz stuff for 7.x
 		return "openvz";
 	} else if (vminfo->vmtype == VMTYPE_LXC) {
 		return "lxc";
@@ -632,6 +633,7 @@ vmlist_hash_insert_vm(
 	g_return_val_if_fail(vmlist != NULL, FALSE);
 	g_return_val_if_fail(nodename != NULL, FALSE);
 	g_return_val_if_fail(vmid != 0, FALSE);
+	// FIXME: remove openvz stuff for 7.x
 	g_return_val_if_fail(vmtype == VMTYPE_QEMU || vmtype == VMTYPE_OPENVZ ||
 			     vmtype == VMTYPE_LXC, FALSE);
 
@@ -662,6 +664,7 @@ vmlist_register_vm(
 	g_return_if_fail(cfs_status.vmlist != NULL);
 	g_return_if_fail(nodename != NULL);
 	g_return_if_fail(vmid != 0);
+	// FIXME: remove openvz stuff for 7.x
 	g_return_if_fail(vmtype == VMTYPE_QEMU || vmtype == VMTYPE_OPENVZ ||
 			 vmtype == VMTYPE_LXC);
 
diff --git a/data/src/status.h b/data/src/status.h
index bc6ecfb..bbf0948 100644
--- a/data/src/status.h
+++ b/data/src/status.h
@@ -28,6 +28,7 @@
 #include "memdb.h"
 
 #define VMTYPE_QEMU 1
+// FIXME: remove openvz stuff for 7.x
 #define VMTYPE_OPENVZ 2
 #define VMTYPE_LXC 3