3 files changed, 16 insertions, 2 deletions

diff --git a/domain.c b/domain.c
index 4f090a5..2170e88 100644
--- a/domain.c
+++ b/domain.c
@@ -282,7 +282,7 @@ static void domain_update_info(struct vconsole_domain *dom, virDomainPtr d)
     dom->last_ts   = dom->ts;
 
     if (dom->name)
-        g_free(dom->name);
+        g_free((gpointer)dom->name);
 
     gettimeofday(&dom->ts, NULL);
     dom->name = g_strdup(virDomainGetName(d));
@@ -305,7 +305,7 @@ static void domain_update_tree_store(struct vconsole_domain *dom,
                                      GtkTreeIter *guest)
 {
     const char *foreground;
-    char load[16];
+    char load[16], mem[16];
     PangoWeight weight;
 
     switch (dom->info.state) {
@@ -319,6 +319,7 @@ static void domain_update_tree_store(struct vconsole_domain *dom,
         break;
     }
     snprintf(load, sizeof(load), "%d%%", dom->load);
+    snprintf(mem, sizeof(mem), "%ld M", dom->info.memory / 1024);
 
     gtk_tree_store_set(dom->conn->win->store, guest,
                        NAME_COL,       dom->name,
@@ -328,6 +329,7 @@ static void domain_update_tree_store(struct vconsole_domain *dom,
                        NR_CPUS_COL,    dom->info.nrVirtCpu,
                        LOAD_STR_COL,   load,
                        LOAD_INT_COL,   MIN(dom->load / dom->info.nrVirtCpu, 100),
+                       MEMORY_COL,     mem,
                        FOREGROUND_COL, foreground,
                        WEIGHT_COL,     weight,
                        -1);
diff --git a/vconsole.c b/vconsole.c
index 3660dc7..752784c 100644
--- a/vconsole.c
+++ b/vconsole.c
@@ -799,6 +799,7 @@ static void vconsole_tab_list_create(struct vconsole_window *win)
                                     G_TYPE_INT,      // NR_CPUS_COL
                                     G_TYPE_STRING,   // LOAD_STR_COL
                                     G_TYPE_INT,      // LOAD_INT_COL
+                                    G_TYPE_STRING,   // MEMORY_COL
                                     G_TYPE_STRING,   // FOREGROUND_COL
                                     G_TYPE_INT);     // WEIGHT_COL
     sortable = GTK_TREE_SORTABLE(win->store);
@@ -840,6 +841,16 @@ static void vconsole_tab_list_create(struct vconsole_window *win)
                                                       NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(win->tree), column);
 
+    /* memory */
+    renderer = gtk_cell_renderer_text_new();
+    g_object_set(renderer, "xalign", 1.0, NULL);
+    column = gtk_tree_view_column_new_with_attributes("memory",
+                                                      renderer,
+                                                      "text", MEMORY_COL,
+                                                      "visible", RUNNING_COL,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(win->tree), column);
+
     /* cpu count */
     renderer = gtk_cell_renderer_text_new();
     g_object_set(renderer, "xalign", 0.5, NULL);
diff --git a/vconsole.h b/vconsole.h
index d676b39..6d7c518 100644
--- a/vconsole.h
+++ b/vconsole.h
@@ -33,6 +33,7 @@ enum vconsole_cols {
     NR_CPUS_COL,
     LOAD_STR_COL,
     LOAD_INT_COL,
+    MEMORY_COL,
 
     /* beautify */
     FOREGROUND_COL,