vmmemctl: do not store driver name in "state"

It is quite silly to pass and maintain name of the driver in global
"state", let's simply use proper "defines" where needed.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/freebsd/vmmemctl/os.c b/open-vm-tools/modules/freebsd/vmmemctl/os.c
index 0bf8bf6a6b0838bad015d7b7e8b02d0b28092783..1779d67f976c505d2ff318feed4135a8345c83ff 100644 (file)
--- a/open-vm-tools/modules/freebsd/vmmemctl/os.c
+++ b/open-vm-tools/modules/freebsd/vmmemctl/os.c
@@ -73,12 +73,6 @@ typedef struct {
    int period;
 } os_timer;
 
-typedef struct {
-   /* registered state */
-   const char *name_verbose;
-   const char *name;
-} os_status;
-
 typedef struct {
    unsigned long size;       /* bitmap size in bytes */
    unsigned long *bitmap;    /* bitmap words */
@@ -86,13 +80,12 @@ typedef struct {
 } os_pmap;
 
 typedef struct {
-   os_status   status;
    os_timer    timer;
    os_pmap     pmap;
    vm_object_t vmobject;     /* vm backing object */
 } os_state;
 
-MALLOC_DEFINE(M_VMMEMCTL, "vmmemctl", "vmmemctl metadata");
+MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl metadata");
 
 /*
  * Globals
@@ -614,8 +607,7 @@ OS_Yield(void)
  */
 
 Bool
-OS_Init(const char *name,         // IN
-        const char *nameVerbose)  // IN
+OS_Init(void)
 {
    os_state *state = &global_state;
    os_pmap *pmap = &state->pmap;
@@ -626,23 +618,16 @@ OS_Init(const char *name,         // IN
       return FALSE;
    }
 
-   /* zero global state */
-   bzero(state, sizeof(global_state));
-
    /* initialize timer state */
    callout_handle_init(&state->timer.callout_handle);
 
-   /* initialize status state */
-   state->status.name = name;
-   state->status.name_verbose = nameVerbose;
-
    os_pmap_init(pmap);
    os_balloonobject_create();
 
    vmmemctl_init_sysctl();
 
    /* log device load */
-   printf("%s initialized\n", state->status.name_verbose);
+   printf(BALLOON_NAME_VERBOSE " initialized\n");
    return TRUE;
 }
 
@@ -668,7 +653,6 @@ OS_Cleanup(void)
 {
    os_state *state = &global_state;
    os_pmap *pmap = &state->pmap;
-   os_status *status = &state->status;
 
    vmmemctl_deinit_sysctl();
 
@@ -676,7 +660,7 @@ OS_Cleanup(void)
    os_pmap_free(pmap);
 
    /* log device unload */
-   printf("%s unloaded\n", status->name_verbose);
+   printf(BALLOON_NAME_VERBOSE " unloaded\n");
 }
 
 
@@ -809,9 +793,9 @@ static void
 vmmemctl_init_sysctl(void)
 {
    oid =  sysctl_add_oid(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO,
-                         global_state.status.name, CTLTYPE_STRING | CTLFLAG_RD,
+                         BALLOON_NAME, CTLTYPE_STRING | CTLFLAG_RD,
                          0, 0, vmmemctl_sysctl, "A",
-                         global_state.status.name_verbose);
+                         BALLOON_NAME_VERBOSE);
 }
 
 

diff --git a/open-vm-tools/modules/shared/vmmemctl/os.h b/open-vm-tools/modules/shared/vmmemctl/os.h
index 43a89d28ea91e22f1c780147d14d4d013522c3c0..6e3d042bd5fc0fb155ccc35a3937dcc1e64238ae 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/os.h
+++ b/open-vm-tools/modules/shared/vmmemctl/os.h
@@ -84,8 +84,7 @@ typedef uintptr_t PageHandle;
  * Operations
  */
 
-extern Bool OS_Init(const char *name,
-                    const char *nameVerbose);
+extern Bool OS_Init(void);
 extern void OS_Cleanup(void);
 extern BalloonGuest OS_Identity(void);
 

diff --git a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
index 35206e8b15c45df9426a51de4698660364f26fbb..47e7cef2341a3783378d9acc7cbbc40de2457b76 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
+++ b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
@@ -105,9 +105,6 @@ extern "C" {
 #define NULL 0
 #endif
 
-#define BALLOON_NAME                    "vmmemctl"
-#define BALLOON_NAME_VERBOSE            "VMware memory control driver"
-
 #define BALLOON_PROTOCOL_VERSION        2
 
 #define BALLOON_CHUNK_PAGES             1000
@@ -1320,7 +1317,7 @@ Balloon_ModuleInit(void)
    Balloon *b = &globalBalloon;
 
    /* os-specific initialization */
-   if (!OS_Init(BALLOON_NAME, BALLOON_NAME_VERBOSE)) {
+   if (!OS_Init()) {
       return BALLOON_FAILURE;
    }
 

diff --git a/open-vm-tools/modules/shared/vmmemctl/vmballoon.h b/open-vm-tools/modules/shared/vmmemctl/vmballoon.h
index 6917c73b913612d9b79ba61fadec257768143d23..e57c8851ea90b65b737adbc47e00db41077eda13 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/vmballoon.h
+++ b/open-vm-tools/modules/shared/vmmemctl/vmballoon.h
@@ -67,6 +67,9 @@
 
 #include "vm_basic_types.h"
 
+#define BALLOON_NAME                    "vmmemctl"
+#define BALLOON_NAME_VERBOSE            "VMware memory control driver"
+
 /*
  * Page allocation flags
  */

diff --git a/open-vm-tools/modules/solaris/vmmemctl/os.c b/open-vm-tools/modules/solaris/vmmemctl/os.c
index 6236bc67626e4344486dd2e9bbe45495f17fd1fd..43c390b926c007afecf2887b9a9c65fc8a1de41e 100644 (file)
--- a/open-vm-tools/modules/solaris/vmmemctl/os.c
+++ b/open-vm-tools/modules/solaris/vmmemctl/os.c
@@ -87,8 +87,6 @@ typedef struct {
 } os_page;
 
 typedef struct {
-   const char  *name;
-   const char  *name_verbose;
    os_timer    timer;
    kstat_t     *kstats;
    id_space_t  *id_space;
@@ -576,8 +574,7 @@ OS_Yield(void)
  */
 
 Bool
-OS_Init(const char *name,         // IN
-        const char *nameVerbose)  // IN
+OS_Init(void)
 {
    os_state *state = &global_state;
    static int initialized = 0;
@@ -587,13 +584,8 @@ OS_Init(const char *name,         // IN
       return FALSE;
    }
 
-   /* zero global state */
-   bzero(state, sizeof(global_state));
-
    state->kstats = BalloonKstatCreate();
-   state->id_space = id_space_create("vmmemctl", 0, INT_MAX);
-   state->name = name;
-   state->name_verbose = nameVerbose;
+   state->id_space = id_space_create(BALLOON_NAME, 0, INT_MAX);
 
    /* disable memscrubber */
 #if defined(SOL9)
@@ -603,7 +595,7 @@ OS_Init(const char *name,         // IN
 #endif
 
    /* log device load */
-   cmn_err(CE_CONT, "!%s initialized\n", nameVerbose);
+   cmn_err(CE_CONT, "!%s initialized\n", BALLOON_NAME_VERBOSE);
    return TRUE;
 }
 
@@ -634,7 +626,7 @@ OS_Cleanup(void)
    id_space_destroy(state->id_space);
 
    /* log device unload */
-   cmn_err(CE_CONT, "!%s unloaded\n", state->name_verbose);
+   cmn_err(CE_CONT, "!%s unloaded\n", BALLOON_NAME_VERBOSE);
 }