From f1c80e0962c36b3e7e3d304ec7abec0c69f5523b Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Fri, 14 Jan 2022 22:11:17 +0100

Subject: [PATCH 1/9] test/utils: Add helper to set custom monitors config

Make the existing implementation a wrapper to avoid changing monitor

config tests.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2237>

Cherry-picked from 57d1d82ead6392a104a9e9d6c7f1f4f14ad54e48

---

 src/tests/monitor-test-utils.c | 18 +-----------------

 src/tests/test-utils.c         | 23 +++++++++++++++++++++++

 src/tests/test-utils.h         |  3 +++

 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/tests/monitor-test-utils.c b/src/tests/monitor-test-utils.c

index 705201810abc..98958a5042ee 100644

--- a/src/tests/monitor-test-utils.c

+++ b/src/tests/monitor-test-utils.c

@@ -39,23 +39,7 @@ test_get_gpu (void)

 void

 set_custom_monitor_config (const char *filename)

 {

-  MetaBackend *backend = meta_get_backend ();

-  MetaMonitorManager *monitor_manager =

-    meta_backend_get_monitor_manager (backend);

-  MetaMonitorConfigManager *config_manager = monitor_manager->config_manager;

-  MetaMonitorConfigStore *config_store;

-  GError *error = NULL;

-  const char *path;

-

-  g_assert_nonnull (config_manager);

-

-  config_store = meta_monitor_config_manager_get_store (config_manager);

-

-  path = g_test_get_filename (G_TEST_DIST, "tests", "monitor-configs",

-                              filename, NULL);

-  if (!meta_monitor_config_store_set_custom (config_store, path, NULL,

-                                             &error))

-    g_error ("Failed to set custom config: %s", error->message);

+  meta_set_custom_monitor_config (meta_get_backend (), filename);

 }

 char *

diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c

index ca332a0b918e..bf326ef27105 100644

--- a/src/tests/test-utils.c

+++ b/src/tests/test-utils.c

@@ -24,6 +24,7 @@

 #include <gio/gio.h>

 #include <string.h>

+#include "backends/meta-monitor-config-store.h"

 #include "core/display-private.h"

 #include "core/window-private.h"

 #include "wayland/meta-wayland.h"

@@ -575,3 +576,25 @@ test_wait_for_x11_display (void)

   g_assert_nonnull (display->x11_display);

 }

+

+void

+meta_set_custom_monitor_config (MetaBackend *backend,

+                                const char  *filename)

+{

+  MetaMonitorManager *monitor_manager =

+    meta_backend_get_monitor_manager (backend);

+  MetaMonitorConfigManager *config_manager = monitor_manager->config_manager;

+  MetaMonitorConfigStore *config_store;

+  GError *error = NULL;

+  const char *path;

+

+  g_assert_nonnull (config_manager);

+

+  config_store = meta_monitor_config_manager_get_store (config_manager);

+

+  path = g_test_get_filename (G_TEST_DIST, "tests", "monitor-configs",

+                              filename, NULL);

+  if (!meta_monitor_config_store_set_custom (config_store, path, NULL,

+                                             &error))

+    g_error ("Failed to set custom config: %s", error->message);

+}

diff --git a/src/tests/test-utils.h b/src/tests/test-utils.h

index 1710b98e0e80..c8a0d16aebec 100644

--- a/src/tests/test-utils.h

+++ b/src/tests/test-utils.h

@@ -86,4 +86,7 @@ const char * test_get_plugin_name (void);

 void test_wait_for_x11_display (void);

+void meta_set_custom_monitor_config (MetaBackend *backend,

+                                     const char  *filename);

+

 #endif /* TEST_UTILS_H */

-- 

2.33.1

From 9fdf146e7bf04b71dafd67388345b694e8bfac77 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Fri, 14 Jan 2022 22:12:36 +0100

Subject: [PATCH 2/9] tests/utils: Add meta_wait_for_paint() helper

This function queues a full stage redraw, then waits for every view to

receive the "presented" signal before returning.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2237>

(cherry picked from commit d84f7971e476a1e2d727310d9a33ac4080137f58)

---

 src/tests/test-utils.c | 27 +++++++++++++++++++++++++++

 src/tests/test-utils.h |  2 ++

 2 files changed, 29 insertions(+)

diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c

index bf326ef27105..bee6aa102c0e 100644

--- a/src/tests/test-utils.c

+++ b/src/tests/test-utils.c

@@ -598,3 +598,30 @@ meta_set_custom_monitor_config (MetaBackend *backend,

                                              &error))

     g_error ("Failed to set custom config: %s", error->message);

 }

+

+static void

+on_view_presented (ClutterStage      *stage,

+                   ClutterStageView  *view,

+                   ClutterFrameInfo  *frame_info,

+                   GList            **presented_views)

+{

+  *presented_views = g_list_remove (*presented_views, view);

+}

+

+void

+meta_wait_for_paint (MetaBackend *backend)

+{

+  ClutterActor *stage = meta_backend_get_stage (backend);

+  MetaRenderer *renderer = meta_backend_get_renderer (backend);

+  GList *views;

+  gulong handler_id;

+

+  clutter_actor_queue_redraw (stage);

+

+  views = g_list_copy (meta_renderer_get_views (renderer));

+  handler_id = g_signal_connect (stage, "presented",

+                                 G_CALLBACK (on_view_presented), &views);

+  while (views)

+    g_main_context_iteration (NULL, TRUE);

+  g_signal_handler_disconnect (stage, handler_id);

+}

diff --git a/src/tests/test-utils.h b/src/tests/test-utils.h

index c8a0d16aebec..4b6aa34e8998 100644

--- a/src/tests/test-utils.h

+++ b/src/tests/test-utils.h

@@ -89,4 +89,6 @@ void test_wait_for_x11_display (void);

 void meta_set_custom_monitor_config (MetaBackend *backend,

                                      const char  *filename);

+void meta_wait_for_paint (MetaBackend *backend);

+

 #endif /* TEST_UTILS_H */

-- 

2.33.1

From 570c234f6e4cab567cd329d45347565100d5494d Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Thu, 30 Sep 2021 08:59:03 +0200

Subject: [PATCH 3/9] monitor-config-store: Make parsing a bit more forgiving

Allow unknown XML elements inside <monitors>. This makes extending in

the future easier.

(cherry picked from commit 3cd666c657fa716f06dee69df59356b53b6c5d72)

---

 src/backends/meta-monitor-config-store.c      | 54 +++++++++++++++---

 .../monitor-configs/unknown-elements.xml      | 31 ++++++++++

 src/tests/monitor-store-unit-tests.c          | 56 +++++++++++++++++++

 3 files changed, 133 insertions(+), 8 deletions(-)

 create mode 100644 src/tests/monitor-configs/unknown-elements.xml

diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c

index 4dd357a15164..3c69157eae40 100644

--- a/src/backends/meta-monitor-config-store.c

+++ b/src/backends/meta-monitor-config-store.c

@@ -136,6 +136,7 @@ G_DEFINE_QUARK (meta-monitor-config-store-error-quark,

 typedef enum

 {

   STATE_INITIAL,

+  STATE_UNKNOWN,

   STATE_MONITORS,

   STATE_CONFIGURATION,

   STATE_MIGRATED,

@@ -180,12 +181,28 @@ typedef struct

   MetaLogicalMonitorConfig *current_logical_monitor_config;

   GList *current_disabled_monitor_specs;

+  ParserState unknown_state_root;

+  int unknown_level;

+

   MetaMonitorsConfigFlag extra_config_flags;

 } ConfigParser;

 G_DEFINE_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,

                G_TYPE_OBJECT)

+static void

+enter_unknown_element (ConfigParser *parser,

+                       const char   *element_name,

+                       const char   *root_element_name,

+                       ParserState   root_state)

+{

+  parser->state = STATE_UNKNOWN;

+  parser->unknown_level = 1;

+  parser->unknown_state_root = root_state;

+  g_warning ("Unknown element <%s> under <%s>, ignoring",

+             element_name, root_element_name);

+}

+

 static void

 handle_start_element (GMarkupParseContext  *context,

                       const char           *element_name,

@@ -242,8 +259,8 @@ handle_start_element (GMarkupParseContext  *context,

       {

         if (!g_str_equal (element_name, "configuration"))

           {

-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,

-                         "Invalid toplevel element '%s'", element_name);

+            enter_unknown_element (parser, element_name,

+                                   "monitors", STATE_MONITORS);

             return;

           }

@@ -253,6 +270,13 @@ handle_start_element (GMarkupParseContext  *context,

         return;

       }

+    case STATE_UNKNOWN:

+      {

+        parser->unknown_level++;

+

+        return;

+      }

+

     case STATE_CONFIGURATION:

       {

         if (g_str_equal (element_name, "logicalmonitor"))

@@ -274,9 +298,8 @@ handle_start_element (GMarkupParseContext  *context,

           }

         else

           {

-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,

-                         "Invalid configuration element '%s'", element_name);

-            return;

+            enter_unknown_element (parser, element_name,

+                                   "configuration", STATE_CONFIGURATION);

           }

         return;

@@ -323,9 +346,8 @@ handle_start_element (GMarkupParseContext  *context,

           }

         else

           {

-            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,

-                         "Invalid monitor logicalmonitor element '%s'", element_name);

-            return;

+            enter_unknown_element (parser, element_name,

+                                   "logicalmonitor", STATE_LOGICAL_MONITOR);

           }

         return;

@@ -793,6 +815,18 @@ handle_end_element (GMarkupParseContext  *context,

         return;

       }

+    case STATE_UNKNOWN:

+      {

+        parser->unknown_level--;

+        if (parser->unknown_level == 0)

+          {

+            g_assert (parser->unknown_state_root >= 0);

+            parser->state = parser->unknown_state_root;

+            parser->unknown_state_root = -1;

+          }

+        return;

+      }

+

     case STATE_MONITORS:

       {

         g_assert (g_str_equal (element_name, "monitors"));

@@ -912,6 +946,9 @@ handle_text (GMarkupParseContext *context,

   switch (parser->state)

     {

+    case STATE_UNKNOWN:

+      return;

+

     case STATE_INITIAL:

     case STATE_MONITORS:

     case STATE_CONFIGURATION:

@@ -1099,6 +1136,7 @@ read_config_file (MetaMonitorConfigStore  *config_store,

     .state = STATE_INITIAL,

     .config_store = config_store,

     .extra_config_flags = extra_config_flags,

+    .unknown_state_root = -1,

   };

   parse_context = g_markup_parse_context_new (&config_parser,

diff --git a/src/tests/monitor-configs/unknown-elements.xml b/src/tests/monitor-configs/unknown-elements.xml

new file mode 100644

index 000000000000..f81be95dd9df

--- /dev/null

+++ b/src/tests/monitor-configs/unknown-elements.xml

@@ -0,0 +1,31 @@

+<monitors version="2">

+  <unknownundermonitors>

+    <anotherlevel>text</anotherlevel>

+  </unknownundermonitors>

+  <configuration>

+    <unknownunderconfiguration>

+      <anotherlevel>text</anotherlevel>

+    </unknownunderconfiguration>

+    <logicalmonitor>

+      <unknownunderlogicalmonitor>

+	<anotherlevel>text</anotherlevel>

+      </unknownunderlogicalmonitor>

+      <x>0</x>

+      <y>0</y>

+      <primary>yes</primary>

+      <monitor>

+	<monitorspec>

+	  <connector>DP-1</connector>

+	  <vendor>MetaProduct's Inc.</vendor>

+	  <product>MetaMonitor</product>

+	  <serial>0x123456</serial>

+	</monitorspec>

+	<mode>

+	  <width>1920</width>

+	  <height>1080</height>

+	  <rate>60.000495910644531</rate>

+	</mode>

+      </monitor>

+    </logicalmonitor>

+  </configuration>

+</monitors>

diff --git a/src/tests/monitor-store-unit-tests.c b/src/tests/monitor-store-unit-tests.c

index b9d5622b7ae3..64618174f4b3 100644

--- a/src/tests/monitor-store-unit-tests.c

+++ b/src/tests/monitor-store-unit-tests.c

@@ -836,6 +836,60 @@ meta_test_monitor_store_interlaced (void)

   check_monitor_store_configurations (&expect);

 }

+static void

+meta_test_monitor_store_unknown_elements (void)

+{

+  MonitorStoreTestExpect expect = {

+    .configurations = {

+      {

+        .logical_monitors = {

+          {

+            .layout = {

+              .x = 0,

+              .y = 0,

+              .width = 1920,

+              .height = 1080

+            },

+            .scale = 1,

+            .is_primary = TRUE,

+            .is_presentation = FALSE,

+            .monitors = {

+              {

+                .connector = "DP-1",

+                .vendor = "MetaProduct's Inc.",

+                .product = "MetaMonitor",

+                .serial = "0x123456",

+                .mode = {

+                  .width = 1920,

+                  .height = 1080,

+                  .refresh_rate = 60.000495910644531

+                }

+              }

+            },

+            .n_monitors = 1,

+          }

+        },

+        .n_logical_monitors = 1

+      }

+    },

+    .n_configurations = 1

+  };

+

+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,

+                         "Unknown element <unknownundermonitors> "

+                         "under <monitors>, ignoring");

+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,

+                         "Unknown element <unknownunderconfiguration> "

+                         "under <configuration>, ignoring");

+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,

+                         "Unknown element <unknownunderlogicalmonitor> "

+                         "under <logicalmonitor>, ignoring");

+  set_custom_monitor_config ("unknown-elements.xml");

+  g_test_assert_expected_messages ();

+

+  check_monitor_store_configurations (&expect);

+}

+

 void

 init_monitor_store_tests (void)

 {

@@ -861,4 +915,6 @@ init_monitor_store_tests (void)

                    meta_test_monitor_store_second_rotated);

   g_test_add_func ("/backends/monitor-store/interlaced",

                    meta_test_monitor_store_interlaced);

+  g_test_add_func ("/backends/monitor-store/unknown-elements",

+                   meta_test_monitor_store_unknown_elements);

 }

-- 

2.33.1

From 48a259017f0f59abb80fa6fe7c9d6b864f129267 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Fri, 24 Sep 2021 16:29:47 +0200

Subject: [PATCH 4/9] monitor-config-store: Fix incorrect string comparison

 with empty string

strncmp() always return 0 if the passed length is 0. What this means is

that whatever the first string check happens to be, if the parsed XML

cdata was empty (e.g. if we got <element></element>), the first

condition would evaluate to true, which is rather unexpected.

Fix this by making sure the string length is correct first. Also move it

into a helper so we don't need to repeat the same strlen() check every

time.

(cherry picked from commit f798e49502313dd3e7dd67143513a7a6a91b49f8)

---

 src/backends/meta-monitor-config-store.c | 25 +++++++++++++++++-------

 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c

index 3c69157eae40..d2572fa06ab0 100644

--- a/src/backends/meta-monitor-config-store.c

+++ b/src/backends/meta-monitor-config-store.c

@@ -190,6 +190,17 @@ typedef struct

 G_DEFINE_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,

                G_TYPE_OBJECT)

+static gboolean

+text_equals (const char *text,

+             int         len,

+             const char *expect)

+{

+  if (strlen (expect) != len)

+    return FALSE;

+

+  return strncmp (text, expect, len) == 0;

+}

+

 static void

 enter_unknown_element (ConfigParser *parser,

                        const char   *element_name,

@@ -904,12 +915,12 @@ read_bool (const char  *text,

            gboolean    *out_value,

            GError     **error)

 {

-  if (strncmp (text, "no", text_len) == 0)

+  if (text_equals (text, text_len, "no"))

     {

       *out_value = FALSE;

       return TRUE;

     }

-  else if (strncmp (text, "yes", text_len) == 0)

+  else if (text_equals (text, text_len, "yes"))

     {

       *out_value = TRUE;

       return TRUE;

@@ -1039,13 +1050,13 @@ handle_text (GMarkupParseContext *context,

     case STATE_TRANSFORM_ROTATION:

       {

-        if (strncmp (text, "normal", text_len) == 0)

+        if (text_equals (text, text_len, "normal"))

           parser->current_transform = META_MONITOR_TRANSFORM_NORMAL;

-        else if (strncmp (text, "left", text_len) == 0)

+        else if (text_equals (text, text_len, "left"))

           parser->current_transform = META_MONITOR_TRANSFORM_90;

-        else if (strncmp (text, "upside_down", text_len) == 0)

+        else if (text_equals (text, text_len, "upside_down"))

           parser->current_transform = META_MONITOR_TRANSFORM_180;

-        else if (strncmp (text, "right", text_len) == 0)

+        else if (text_equals (text, text_len, "right"))

           parser->current_transform = META_MONITOR_TRANSFORM_270;

         else

           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,

@@ -1088,7 +1099,7 @@ handle_text (GMarkupParseContext *context,

     case STATE_MONITOR_MODE_FLAG:

       {

-        if (strncmp (text, "interlace", text_len) == 0)

+        if (text_equals (text, text_len, "interlace"))

           {

             parser->current_monitor_mode_spec->flags |=

               META_CRTC_MODE_FLAG_INTERLACE;

-- 

2.33.1

From a67835d2a9f41194d29089e8b4deb0d2af05203a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Mon, 17 Jan 2022 11:45:53 +0100

Subject: [PATCH 5/9] monitor-config-store: Add way to define config store

 loading policy

This adds a way to define a way, at the system level, to define a policy

of how monitor configuration files are loaded.

The intended use case is to e.g. either prefer system level monitor

configurations before user levels, or only allow system level

configurations.

Examples:

Prefer system over user level configurations:

    <monitors version="2">

      <policy>

        <stores>

          <store>system</store>

          <store>user</store>

        </stores>

      </policy>

      <configuration>

        ...

      </configuration>

    </monitors>

Only allow system level configurations:

    <monitors version="2">

      <policy>

        <stores>

          <store>system</store>

        </stores>

      </policy>

      <configuration>

        ...

      </configuration>

    </monitors>

(cherry picked from commit b747884c1eaf309bb2d9395a655c85c968bd1829)

---

 src/backends/meta-backend-types.h             |   2 +

 src/backends/meta-monitor-config-manager.h    |   4 +-

 src/backends/meta-monitor-config-store.c      | 421 ++++++++++++++----

 src/backends/meta-monitor-config-store.h      |  21 +-

 .../monitor-config-migration-unit-tests.c     |   1 +

 src/tests/monitor-configs/policy.xml          |  27 ++

 src/tests/monitor-store-unit-tests.c          |  33 ++

 src/tests/monitor-test-utils.c                |  16 +-

 src/tests/monitor-test-utils.h                |   2 +

 src/tests/monitor-unit-tests.c                |   3 +

 src/tests/test-utils.c                        |   8 +-

 src/tests/test-utils.h                        |   6 +-

 12 files changed, 450 insertions(+), 94 deletions(-)

 create mode 100644 src/tests/monitor-configs/policy.xml

diff --git a/src/backends/meta-backend-types.h b/src/backends/meta-backend-types.h

index eae62c02f244..5133ccb6131d 100644

--- a/src/backends/meta-backend-types.h

+++ b/src/backends/meta-backend-types.h

@@ -29,6 +29,8 @@ typedef struct _MetaMonitorConfigManager MetaMonitorConfigManager;

 typedef struct _MetaMonitorConfigStore MetaMonitorConfigStore;

 typedef struct _MetaMonitorsConfig MetaMonitorsConfig;

+typedef enum _MetaMonitorsConfigFlag MetaMonitorsConfigFlag;

+

 typedef struct _MetaMonitor MetaMonitor;

 typedef struct _MetaMonitorNormal MetaMonitorNormal;

 typedef struct _MetaMonitorTiled MetaMonitorTiled;

diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h

index 641ed1bc1afb..a35b3e2e1f95 100644

--- a/src/backends/meta-monitor-config-manager.h

+++ b/src/backends/meta-monitor-config-manager.h

@@ -51,12 +51,12 @@ typedef struct _MetaMonitorsConfigKey

   GList *monitor_specs;

 } MetaMonitorsConfigKey;

-typedef enum _MetaMonitorsConfigFlag

+enum _MetaMonitorsConfigFlag

 {

   META_MONITORS_CONFIG_FLAG_NONE = 0,

   META_MONITORS_CONFIG_FLAG_MIGRATED = (1 << 0),

   META_MONITORS_CONFIG_FLAG_SYSTEM_CONFIG = (1 << 1),

-} MetaMonitorsConfigFlag;

+};

 struct _MetaMonitorsConfig

 {

diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c

index d2572fa06ab0..93a494c79b80 100644

--- a/src/backends/meta-monitor-config-store.c

+++ b/src/backends/meta-monitor-config-store.c

@@ -120,6 +120,9 @@ struct _MetaMonitorConfigStore

   GFile *user_file;

   GFile *custom_read_file;

   GFile *custom_write_file;

+

+  gboolean has_stores_policy;

+  GList *stores_policy;

 };

 #define META_MONITOR_CONFIG_STORE_ERROR (meta_monitor_config_store_error_quark ())

@@ -162,12 +165,18 @@ typedef enum

   STATE_MONITOR_MODE_FLAG,

   STATE_MONITOR_UNDERSCANNING,

   STATE_DISABLED,

+  STATE_POLICY,

+  STATE_STORES,

+  STATE_STORE,

 } ParserState;

 typedef struct

 {

   ParserState state;

   MetaMonitorConfigStore *config_store;

+  GFile *file;

+

+  GHashTable *pending_configs;

   ParserState monitor_spec_parent_state;

@@ -180,6 +189,10 @@ typedef struct

   MetaMonitorConfig *current_monitor_config;

   MetaLogicalMonitorConfig *current_logical_monitor_config;

   GList *current_disabled_monitor_specs;

+  gboolean seen_policy;

+  gboolean seen_stores;

+  MetaConfigStore pending_store;

+  GList *stores;

   ParserState unknown_state_root;

   int unknown_level;

@@ -268,16 +281,31 @@ handle_start_element (GMarkupParseContext  *context,

     case STATE_MONITORS:

       {

-        if (!g_str_equal (element_name, "configuration"))

+        if (g_str_equal (element_name, "configuration"))

+          {

+            parser->state = STATE_CONFIGURATION;

+            parser->current_was_migrated = FALSE;

+          }

+        else if (g_str_equal (element_name, "policy"))

+          {

+            if (parser->seen_policy)

+              {

+                g_set_error (error,

+                             G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,

+                             "Multiple policy definitions");

+                return;

+              }

+

+            parser->seen_policy = TRUE;

+            parser->state = STATE_POLICY;

+          }

+        else

           {

             enter_unknown_element (parser, element_name,

                                    "monitors", STATE_MONITORS);

             return;

           }

-        parser->state = STATE_CONFIGURATION;

-        parser->current_was_migrated = FALSE;

-

         return;

       }

@@ -523,6 +551,59 @@ handle_start_element (GMarkupParseContext  *context,

         return;

       }

+

+    case STATE_POLICY:

+      {

+        if (!(parser->extra_config_flags &

+              META_MONITORS_CONFIG_FLAG_SYSTEM_CONFIG))

+          {

+            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,

+                         "Policy can only be defined in system level configurations");

+            return;

+          }

+

+        if (g_str_equal (element_name, "stores"))

+          {

+            if (parser->seen_stores)

+              {

+                g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,

+                             "Multiple stores elements under policy");

+                return;

+              }

+

+            parser->seen_stores = TRUE;

+            parser->state = STATE_STORES;

+          }

+        else

+          {

+            enter_unknown_element (parser, element_name,

+                                   "policy", STATE_POLICY);

+          }

+

+        return;

+      }

+

+    case STATE_STORES:

+      {

+        if (g_str_equal (element_name, "store"))