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 901de7c3bb63d03e3d756c0247219a1ee40423de..b7a55675d8cab85e2be8678dae8d6a580aec515d 100644 (file)
--- 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 33ea44d5c4b0b31c5e1224ba4bbccdd9b8cc5a14..7ec7e0b7a3577b0460598078569bf0cd5f114af2 100644 (file)
--- 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 b6d6576c8ecf865f9e5a27eb7a17a1f7ce8f231e..40ee6cd598b84313cedc3e6cb0ba7160fc35ec31 100644 (file)
--- 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 e15a257f01a03b3a6c63f8c73e74429eb274bb95..f3775fdd0c71a3b518a42dc7bc183f40924911d9 100644 (file)
--- 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 bc6ecfb126e9a4b51c2024539562de88298773cc..bbf0948123ad71ee68dc10c45dfa883234dfcd7b 100644 (file)
--- 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