Mir

Merge lp:~kdub/mir/real-nested-platform into lp:mir

real-nested-platform
Merge into development-branch

Proposed by Kevin DuBois on 2016-08-29

Status:	Work in progress
Proposed branch:	lp:~kdub/mir/real-nested-platform
Merge into:	lp:mir
Diff against target:	1096 lines (+312/-160) 42 files modified debian/control (+16/-0) debian/mir-platform-graphics-nested11.install (+1/-0) include/platform/mir/graphics/gl_extensions_base.h (+3/-3) include/platform/mir/graphics/platform.h (+14/-12) include/platform/mir/graphics/surfaceless_egl_context.h (+3/-3) src/include/server/mir/default_server_configuration.h (+0/-1) src/platform/graphics/CMakeLists.txt (+5/-1) src/platform/graphics/gl_extensions_base.cpp (+3/-3) src/platform/graphics/surfaceless_egl_context.cpp (+3/-3) src/platform/symbols.map (+1/-0) src/platforms/CMakeLists.txt (+1/-0) src/platforms/android/server/platform.cpp (+2/-1) src/platforms/android/utils/render_overlays.cpp (+1/-1) src/platforms/eglstream-kms/server/platform_symbols.cpp (+2/-1) src/platforms/mesa/server/kms/platform_symbols.cpp (+2/-1) src/platforms/mesa/server/x11/graphics/graphics.cpp (+2/-1) src/platforms/nested/CMakeLists.txt (+42/-0) src/platforms/nested/display.cpp (+3/-3) src/platforms/nested/platform.cpp (+140/-0) src/platforms/nested/symbols.map.in (+20/-0) src/server/CMakeLists.txt (+0/-1) src/server/graphics/CMakeLists.txt (+0/-4) src/server/graphics/default_configuration.cpp (+7/-74) src/server/input/default_configuration.cpp (+0/-12) src/server/symbols.map (+0/-1) tests/acceptance-tests/test_nested_mir.cpp (+1/-0) tests/include/mir/test/doubles/stub_host_connection.h (+7/-5) tests/mir_test_framework/headless_nested_server_runner.cpp (+1/-1) tests/mir_test_framework/platform_graphics_throw.cpp (+3/-2) tests/mir_test_framework/stubbed_graphics_platform.cpp (+2/-1) tests/unit-tests/input/CMakeLists.txt (+0/-1) tests/unit-tests/platforms/android/server/test_display_generic.cpp (+4/-8) tests/unit-tests/platforms/android/server/test_graphics_platform.cpp (+2/-1) tests/unit-tests/platforms/nested/CMakeLists.txt (+2/-0) tests/unit-tests/platforms/nested/test_buffer.cpp (+5/-2) tests/unit-tests/platforms/nested/test_ipc_operations.cpp (+2/-2) tests/unit-tests/platforms/nested/test_nested_cursor.cpp (+1/-1) tests/unit-tests/platforms/nested/test_nested_display.cpp (+3/-3) tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp (+5/-5) tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1) tests/unit-tests/platforms/nested/test_nested_input_platform.cpp (+1/-1) tools/update_package_abis.sh (+1/-0)
To merge this branch:	bzr merge lp:~kdub/mir/real-nested-platform
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-11-23
Cemil Azizoglu (community)			Needs Fixing on 2016-09-07
Andreas Pokorny (community)		2016-08-29	Needs Fixing on 2016-08-31
Review via email: mp+304261@code.launchpad.net

Commit message

Make the nested platform into a proper platform that's loaded via the standard platform loading interfaces. Split the nested code into its own platform and package.

Description of the change

Make the nested platform into a proper platform that's loaded via the standard platform loading interfaces. Split the nested code into its own platform and package.

Tested package building, installation, and running on yakkety.

Future cleanups that we can do as a result of this:
1) remove libmirclient dependency from mirserver
2) remove the concept of 'guest platforms' from the platform interface

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2016-08-29:

381 + OUTPUT_NAME graphics-nested

Shouldn't that be server-nested? I.e like server-mesa-x11. Otherwise looks good. Will try later.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-08-29:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1564/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-08-29:

^could be problem with the MP, investigating further

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-08-29:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1568/rebuild

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/real-nested-platform updated on 2016-08-31

3683. By Kevin DuBois on 2016-08-31: merge in mir
3684. By Kevin DuBois on 2016-08-31: increase timeouts for lp:#1523621 for some tests that were still set to a low value

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-08-31:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1588/rebuild

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/real-nested-platform updated on 2016-08-31

3685. By Kevin DuBois on 2016-08-31: correct silent or undetected merge errors with new files

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2016-08-31:

tests/mir_test_framework/headless_nested_server_runner.cpp

No need to append the ABI counter to the call, mtf::server_platform will do that for you

Please rename the server module to be server-nested instead of graphics-nested, as it also contains the input platform ABI.

Mild needs fixing - as apart from that it works fine here.

review: Needs Fixing

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-08-31:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1589/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-09-07:

I know it's legacy but I don't think 'nested' is the right name. It should be named 'mir' as that's the platform it's running under. 'nested' as a generic term applies to others also like mir running under X11 is also "nested".
--------------------
+1 on the name change that Andreas has mentioned

review: Needs Fixing

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-09-09:

not actively working on this, wip

lp:~kdub/mir/real-nested-platform updated on 2016-09-27

3686. By Kevin DuBois on 2016-08-31: remove timeout increases, they didnt help with CI
3687. By Kevin DuBois on 2016-09-27: merge in mir

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-27:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1826/rebuild

review: Needs Fixing (continuous-integration)

lp:~kdub/mir/real-nested-platform updated on 2016-11-23

3688. By Kevin DuBois on 2016-11-23: merge in base, fix many conflicts

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-23:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2256/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

3688. By Kevin DuBois on 2016-11-23: merge in base, fix many conflicts
3687. By Kevin DuBois on 2016-09-27: merge in mir
3686. By Kevin DuBois on 2016-08-31: remove timeout increases, they didnt help with CI
3685. By Kevin DuBois on 2016-08-31: correct silent or undetected merge errors with new files
3684. By Kevin DuBois on 2016-08-31: increase timeouts for lp:#1523621 for some tests that were still set to a low value
3683. By Kevin DuBois on 2016-08-31: merge in mir
3682. By Kevin DuBois on 2016-08-29: fix up test
3681. By Kevin DuBois on 2016-08-29: merge in mir
3680. By Kevin DuBois on 2016-08-29: merge in mir
3679. By Kevin DuBois on 2016-08-29: clean up probing a bit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Kevin DuBois

Mir development team

 === modified file 'debian/control'
 --- debian/control	2016-11-11 07:56:09 +0000
 +++ debian/control	2016-11-23 13:17:56 +0000
@@ -375,6 +375,20 @@
   Contains the shared libraries required for the Mir server to interact with
   the hardware platform using the Android drivers.
++Package: mir-platform-graphics-nested11
++Section: libs
++Architecture: linux-any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Description: Display server for Ubuntu - platform library for Nested servers
++ Mir is a display server running on linux systems, with a focus on efficiency,
++ robust operation and a well-defined driver model.
++ .
++ Contains the shared libraries required for the Mir server to connect to
++ another Mir server.
++
  Package: mir-platform-input-evdev6
  Section: libs
  Architecture: linux-any
@@ -441,6 +455,7 @@
           mir-platform-graphics-mesa-x11,
           mir-client-platform-mesa5,
           mir-platform-input-evdev6,
++         mir-platform-graphics-nested11,
  Description: Display server for Ubuntu - desktop driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
@@ -457,6 +472,7 @@
           mir-platform-graphics-android11,
           mir-client-platform-android5,
           mir-platform-input-evdev6,
++         mir-platform-graphics-nested11,
  Description: Display server for Ubuntu - android driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
 === added file 'debian/mir-platform-graphics-nested11.install'
 --- debian/mir-platform-graphics-nested11.install	1970-01-01 00:00:00 +0000
 +++ debian/mir-platform-graphics-nested11.install	2016-11-23 13:17:56 +0000
@@ -0,0 +1,1 @@
++usr/lib/*/mir/server-platform/graphics-nested.so.11
 === renamed file 'src/include/server/mir/graphics/gl_extensions_base.h' => 'include/platform/mir/graphics/gl_extensions_base.h'
 --- src/include/server/mir/graphics/gl_extensions_base.h	2015-02-22 07:46:25 +0000
 +++ include/platform/mir/graphics/gl_extensions_base.h	2016-11-23 13:17:56 +0000
@@ -2,15 +2,15 @@
   * Copyright © 2013 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
++ * under the terms of the GNU Lesser General Public License version 3,
   * as published by the Free Software Foundation.
+  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
++ * GNU Lesser General Public License for more details.
+  *
-- * You should have received a copy of the GNU General Public License
++ * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
 === modified file 'include/platform/mir/graphics/platform.h'
 --- include/platform/mir/graphics/platform.h	2016-10-21 07:53:23 +0000
 +++ include/platform/mir/graphics/platform.h	2016-11-23 13:17:56 +0000
@@ -28,6 +28,7 @@
  namespace mir
+ {
  class EmergencyCleanupRegistry;
++namespace shell { class HostLifecycleEventListener; }
  namespace logging { class Logger; }
@@ -95,29 +96,28 @@
  /**
   * A measure of how well a platform supports a device
+  *
-- * \note This is compared as an integer; best + 1 is a valid PlatformPriority that
-- *       will be used in preference to a module that reports best.
++ * \note This is compared as an integer; request + 1 is a valid PlatformPriority that
++ *       will be used in preference to a module that reports request.
   *       Platform modules distributed with Mir will never use a priority higher
-- *       than best.
++ *       than request.
   */
  enum PlatformPriority : uint32_t
+ {
      unsupported = 0,    /**< Unable to function at all on this device */
--    dummy = 1,          /**< Used only for dummy or stub platforms.
--                         */
++    dummy = 1,          /**< Used only for dummy or stub platforms. */
      supported = 128,    /**< Capable of providing a functioning Platform on this device,
--                         *    possibly with degraded performance or features.
--                         */
--    best = 256          /**< Capable of providing a Platform with the best features and
--                         *   performance this device is capable of.
--                         */
++                        *    possibly with degraded performance or features. */
++    best = 192,         /**< Capable of providing a Platform with the best features and
++                        *   performance this device is capable of.*/
++    requested = 256     /**< Provides a Platform that satisfies a user request. */
  };
  typedef mir::UniqueModulePtr<mir::graphics::Platform>(*CreateHostPlatform)(
      std::shared_ptr<mir::options::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
      std::shared_ptr<mir::graphics::DisplayReport> const& report,
--    std::shared_ptr<mir::logging::Logger> const& logger);
++    std::shared_ptr<mir::logging::Logger> const& logger,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const& host_lifecycle_event_listener);
  typedef mir::UniqueModulePtr<mir::graphics::Platform>(*CreateGuestPlatform)(
      std::shared_ptr<mir::graphics::DisplayReport> const& report,
@@ -149,6 +149,7 @@
   * \param [in] options options to use for this platform
   * \param [in] emergency_cleanup_registry object to register emergency shutdown handlers with
   * \param [in] report the object to use to report interesting events from the display subsystem
++ * \param [in] host_lifecycle_event_listener the object to use to listen to events from a host server
+  *
   * This factory function needs to be implemented by each platform.
+  *
@@ -158,7 +159,8 @@
      std::shared_ptr<mir::options::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
      std::shared_ptr<mir::graphics::DisplayReport> const& report,
--    std::shared_ptr<mir::logging::Logger> const& logger);
++    std::shared_ptr<mir::logging::Logger> const& logger,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const& host_lifecycle_event_listener);
  /**
   * Function prototype used to return a new guest graphics platform. The guest graphics platform
 === renamed file 'src/include/server/mir/graphics/surfaceless_egl_context.h' => 'include/platform/mir/graphics/surfaceless_egl_context.h'
 --- src/include/server/mir/graphics/surfaceless_egl_context.h	2016-07-28 09:10:43 +0000
 +++ include/platform/mir/graphics/surfaceless_egl_context.h	2016-11-23 13:17:56 +0000
@@ -2,15 +2,15 @@
   * Copyright © 2013 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
++ * under the terms of the GNU Lesser General Public License version 3,
   * as published by the Free Software Foundation.
+  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
++ * GNU Lesser General Public License for more details.
+  *
-- * You should have received a copy of the GNU General Public License
++ * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
 === modified file 'src/include/server/mir/default_server_configuration.h'
 --- src/include/server/mir/default_server_configuration.h	2016-11-02 05:07:18 +0000
 +++ src/include/server/mir/default_server_configuration.h	2016-11-23 13:17:56 +0000
@@ -210,7 +210,6 @@
      virtual std::shared_ptr<renderer::RendererFactory>   the_renderer_factory();
      virtual std::shared_ptr<shell::DisplayConfigurationController> the_display_configuration_controller();
      virtual std::shared_ptr<graphics::DisplayConfigurationPolicy> the_display_configuration_policy();
--    virtual std::shared_ptr<graphics::nested::HostConnection> the_host_connection();
      virtual std::shared_ptr<graphics::GLConfig> the_gl_config();
      /** @} */
 === modified file 'src/platform/graphics/CMakeLists.txt'
 --- src/platform/graphics/CMakeLists.txt	2016-11-09 02:30:14 +0000
 +++ src/platform/graphics/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -1,4 +1,6 @@
--include_directories(${GL_INCLUDE_DIRS})
++include_directories(
++    ${GL_INCLUDE_DIRS}
++    ${PROJECT_SOURCE_DIR}/include/renderers/gl)
  set(
    GRAPHICS_SOURCES
@@ -6,6 +8,8 @@
    egl_extensions.cpp
    egl_resources.cpp
    egl_error.cpp
++  surfaceless_egl_context.cpp
++  gl_extensions_base.cpp
    display_configuration.cpp
    gamma_curves.cpp
    buffer_basic.cpp
 === renamed file 'src/server/graphics/gl_extensions_base.cpp' => 'src/platform/graphics/gl_extensions_base.cpp'
 --- src/server/graphics/gl_extensions_base.cpp	2013-12-13 05:24:22 +0000
 +++ src/platform/graphics/gl_extensions_base.cpp	2016-11-23 13:17:56 +0000
@@ -2,15 +2,15 @@
   * Copyright © 2013 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
++ * under the terms of the GNU Lesser General Public License version 3,
   * as published by the Free Software Foundation.
+  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
++ * GNU Lesser General Public License for more details.
+  *
-- * You should have received a copy of the GNU General Public License
++ * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
 === renamed file 'src/server/graphics/surfaceless_egl_context.cpp' => 'src/platform/graphics/surfaceless_egl_context.cpp'
 --- src/server/graphics/surfaceless_egl_context.cpp	2016-05-27 07:54:00 +0000
 +++ src/platform/graphics/surfaceless_egl_context.cpp	2016-11-23 13:17:56 +0000
@@ -2,15 +2,15 @@
   * Copyright © 2013 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
++ * under the terms of the GNU Lesser General Public License version 3,
   * as published by the Free Software Foundation.
+  *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
++ * GNU Lesser General Public License for more details.
+  *
-- * You should have received a copy of the GNU General Public License
++ * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
 === modified file 'src/platform/symbols.map'
 --- src/platform/symbols.map	2016-11-16 13:24:41 +0000
 +++ src/platform/symbols.map	2016-11-23 13:17:56 +0000
@@ -90,6 +90,7 @@
      mir::graphics::Renderable::screen_position*;
      mir::graphics::Renderable::shaped*;
      mir::graphics::Renderable::transformation*;
++    mir::graphics::SurfacelessEGLContext::SurfacelessEGLContext*;
      mir::graphics::Renderable::swap_interval*;
      mir::graphics::UserDisplayConfigurationOutput::extents*;
      mir::graphics::UserDisplayConfigurationOutput::UserDisplayConfigurationOutput*;
 === modified file 'src/platforms/CMakeLists.txt'
 --- src/platforms/CMakeLists.txt	2016-11-09 02:30:14 +0000
 +++ src/platforms/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -74,4 +74,5 @@
    add_subdirectory(eglstream-kms)
  endif()
++add_subdirectory(nested/)
  add_subdirectory(evdev/)
 === modified file 'src/platforms/android/server/platform.cpp'
 --- src/platforms/android/server/platform.cpp	2016-11-09 02:30:14 +0000
 +++ src/platforms/android/server/platform.cpp	2016-11-23 13:17:56 +0000
@@ -155,7 +155,8 @@
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
      std::shared_ptr<mg::DisplayReport> const& display_report,
--    std::shared_ptr<mir::logging::Logger> const& logger)
++    std::shared_ptr<mir::logging::Logger> const& logger,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
      auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}, *options);
 === modified file 'src/platforms/android/utils/render_overlays.cpp'
 --- src/platforms/android/utils/render_overlays.cpp	2016-11-16 13:24:41 +0000
 +++ src/platforms/android/utils/render_overlays.cpp	2016-11-23 13:17:56 +0000
@@ -272,7 +272,7 @@
      auto platform_fn = platform_library->load_function<mg::CreateHostPlatform>(
          "create_host_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
--    auto platform = platform_fn(options, nullptr, std::make_shared<DisplayReport>(), logger);
++    auto platform = platform_fn(options, nullptr, std::make_shared<DisplayReport>(), logger, nullptr);
      //Strange issues going on here with dlopen() + hybris (which uses gnu_indirect_functions)
      //https://github.com/libhybris/libhybris/issues/315
 === modified file 'src/platforms/eglstream-kms/server/platform_symbols.cpp'
 --- src/platforms/eglstream-kms/server/platform_symbols.cpp	2016-10-20 14:35:09 +0000
 +++ src/platforms/eglstream-kms/server/platform_symbols.cpp	2016-11-23 13:17:56 +0000
@@ -42,7 +42,8 @@
      std::shared_ptr<mo::Option> const&,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
      std::shared_ptr<mg::DisplayReport> const& report,
--    std::shared_ptr<mir::logging::Logger> const& /*logger*/)
++    std::shared_ptr<mir::logging::Logger> const& /*logger*/,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
 === modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
 --- src/platforms/mesa/server/kms/platform_symbols.cpp	2016-10-20 14:35:09 +0000
 +++ src/platforms/mesa/server/kms/platform_symbols.cpp	2016-11-23 13:17:56 +0000
@@ -106,7 +106,8 @@
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
      std::shared_ptr<mg::DisplayReport> const& report,
--    std::shared_ptr<mir::logging::Logger> const& /*logger*/)
++    std::shared_ptr<mir::logging::Logger> const& /*logger*/,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
      // ensure mesa finds the mesa mir-platform symbols
 === modified file 'src/platforms/mesa/server/x11/graphics/graphics.cpp'
 --- src/platforms/mesa/server/x11/graphics/graphics.cpp	2016-10-20 14:35:09 +0000
 +++ src/platforms/mesa/server/x11/graphics/graphics.cpp	2016-11-23 13:17:56 +0000
@@ -44,7 +44,8 @@
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
      std::shared_ptr<mg::DisplayReport> const& report,
--    std::shared_ptr<mir::logging::Logger> const& /*logger*/)
++    std::shared_ptr<mir::logging::Logger> const& /*logger*/,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
      if (!x11_resources.get_conn())
 === renamed directory 'src/server/graphics/nested' => 'src/platforms/nested'
 === modified file 'src/platforms/nested/CMakeLists.txt'
 --- src/server/graphics/nested/CMakeLists.txt	2016-10-12 10:29:45 +0000
 +++ src/platforms/nested/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -1,5 +1,16 @@
++add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
++
  include_directories(
    ${PROJECT_SOURCE_DIR}/include/renderers/gl
++  ${PROJECT_SOURCE_DIR}/include/renderers/sw
++  ${PROJECT_SOURCE_DIR}/include/platform
++  ${PROJECT_SOURCE_DIR}/include/client
++  ${PROJECT_SOURCE_DIR}/include/server
++  ${PROJECT_SOURCE_DIR}/src/include/platform
++  ${PROJECT_SOURCE_DIR}/src/include/server
++  ${PROJECT_SOURCE_DIR}/src/include/common
++  ${PROJECT_SOURCE_DIR}/src/include/cookie
++  ${PROJECT_SOURCE_DIR}/src/include/client
+ )
  add_library(
@@ -15,3 +26,34 @@
    buffer.cpp
    ipc_operations.cpp
+ )
++
++add_library(mirplatformgraphicsnested SHARED
++  $<TARGET_OBJECTS:mirnestedgraphics>
++  $<TARGET_OBJECTS:mirgl>
++)
++
++target_link_libraries(
++  mirplatformgraphicsnested
++
++  mirplatform
++  mirclient
++  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
++  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
++  ${Boost_PROGRAM_OPTIONS_LIBRARY}
++)
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/symbols.map.in
++    ${CMAKE_CURRENT_BINARY_DIR}/symbols.map)
++set(symbol_map ${CMAKE_CURRENT_BINARY_DIR}/symbols.map)
++
++set_target_properties(
++  mirplatformgraphicsnested PROPERTIES
++  OUTPUT_NAME graphics-nested
++  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
++  PREFIX ""
++  SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
++  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
++  LINK_DEPENDS ${symbol_map}
++)
++
++install(TARGETS mirplatformgraphicsnested LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
 === modified file 'src/platforms/nested/display.cpp'
 --- src/server/graphics/nested/display.cpp	2016-11-11 07:56:09 +0000
 +++ src/platforms/nested/display.cpp	2016-11-23 13:17:56 +0000
@@ -17,6 +17,7 @@
   */
  #include "display.h"
++#include "cursor.h"
  #include "nested_display_configuration.h"
  #include "display_buffer.h"
  #include "host_connection.h"
@@ -349,10 +350,9 @@
      // No need to do anything
+ }
--auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /*initial_image*/) -> std::shared_ptr<mg::Cursor>
++auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& initial_image) -> std::shared_ptr<mg::Cursor>
+ {
--    BOOST_THROW_EXCEPTION(std::logic_error("Initialization loop: we already need the Cursor when creating the Display"));
--    // So we can't do this: return std::make_shared<Cursor>(connection, initial_image);
++    return std::make_shared<Cursor>(connection, initial_image);
+ }
  std::unique_ptr<mg::VirtualOutput> mgn::Display::create_virtual_output(int /*width*/, int /*height*/)
 === modified file 'src/platforms/nested/platform.cpp'
 --- src/server/graphics/nested/platform.cpp	2016-10-11 17:04:43 +0000
 +++ src/platforms/nested/platform.cpp	2016-11-23 13:17:56 +0000
@@ -19,19 +19,31 @@
  #include "platform.h"
  #include "host_connection.h"
  #include "display.h"
++#include "mir_client_host_connection.h"
  #include "buffer.h"
  #include "native_buffer.h"
  #include "ipc_operations.h"
  #include "mir/shared_library.h"
++#include "mir/module_deleter.h"
++#include "mir/options/option.h"
++#include "mir/options/configuration.h"
++#include "mir/options/program_option.h"
++#include "mir/options/default_configuration.h"
  #include "mir/graphics/graphic_buffer_allocator.h"
  #include "mir/graphics/display.h"
  #include "mir/graphics/platform_ipc_operations.h"
++#include "mir/input/platform.h"
++#include "input_platform.h"
++#include "mir/libname.h"
++#include "mir/assert_module_entry_point.h"
++#include "mir/abnormal_exit.h"
  #include "mir/options/option.h"
  #include "mir/options/configuration.h"
  #include "mir/graphics/buffer_ipc_message.h"
  #include "mir/graphics/platform_ipc_operations.h"
  #include "mir/graphics/platform_operation_message.h"
++namespace mi = mir::input;
  namespace mg = mir::graphics;
  namespace mgn = mir::graphics::nested;
  namespace mo = mir::options;
@@ -126,3 +138,131 @@
+ {
      return mir::make_module_ptr<mgn::IpcOperations>(guest_platform->make_ipc_operations());
+ }
++
++namespace
++{
++std::shared_ptr<mgn::MirClientHostConnection> global_conn = nullptr;
++
++mir::ModuleProperties const graphics_description = {
++    "mir:nested",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO,
++    mir::libname()
++};
++
++mir::ModuleProperties const input_description = {
++    "mir:nested-input",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO,
++    mir::libname()
++};
++}
++
++mir::UniqueModulePtr<mg::Platform> create_host_platform(
++    std::shared_ptr<mo::Option> const& options,
++    std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
++    std::shared_ptr<mir::graphics::DisplayReport> const& display_report,
++    std::shared_ptr<mir::logging::Logger> const&,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const& host_lifecycle_event_listener)
++{
++    mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
++
++    if (!options->is_set(mo::host_socket_opt))
++        BOOST_THROW_EXCEPTION(mir::AbnormalExit(
++            std::string("Exiting Mir! Reason: Nested Mir needs either $MIR_SOCKET or --") +
++            mo::host_socket_opt));
++
++    auto host_socket = options->get<std::string>(mo::host_socket_opt);
++
++    std::string server_socket{"none"};
++
++    if (!options->is_set(mir::options::no_server_socket_opt))
++    {
++        server_socket = options->get<std::string>(mo::server_socket_opt);
++
++        if (server_socket == host_socket)
++            BOOST_THROW_EXCEPTION(mir::AbnormalExit(
++                "Exiting Mir! Reason: Nested Mir and Host Mir cannot use "
++                "the same socket file to accept connections!"));
++    }
++
++    auto const my_name = options->is_set(mo::name_opt) ?
++        options->get<std::string>(mo::name_opt) :
++        "nested-mir@:" + server_socket;
++
++    auto connection = std::make_shared<mgn::MirClientHostConnection>(
++        host_socket,
++        my_name,
++        host_lifecycle_event_listener);
++
++    global_conn = connection;
++    return mir::make_module_ptr<mgn::Platform>(
++        std::make_shared<mir::SharedLibrary>(connection->graphics_platform_library()),
++        connection,
++        display_report,
++        *options);
++}
++
++mir::UniqueModulePtr<mg::Platform> create_guest_platform(
++    std::shared_ptr<mg::DisplayReport> const&,
++    std::shared_ptr<mg::NestedContext> const&)
++{
++    mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
++    BOOST_THROW_EXCEPTION(mir::AbnormalExit(
++        std::string("Exiting Mir! Cannot load nested platform")));
++}
++
++void add_graphics_platform_options(boost::program_options::options_description&)
++{
++    mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);
++}
++
++mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& options)
++{
++    mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);
++
++    bool option_present = false;
++    for (auto &s : options.unparsed_command_line())
++        option_present |= (s.find(mo::host_socket_opt) != std::string::npos);
++    option_present |= options.is_set(mo::host_socket_opt);
++    option_present |= (nullptr != getenv("MIR_SERVER_HOST_SOCKET"));
++
++    if (option_present)
++        return mg::PlatformPriority::requested;
++    else
++        return mg::PlatformPriority::unsupported;
++}
++
++mir::ModuleProperties const* describe_graphics_module()
++{
++    mir::assert_entry_point_signature<mg::DescribeModule>(&describe_graphics_module);
++    return &graphics_description;
++}
++
++mi::PlatformPriority probe_input_platform(
++    mo::Option const& options)
++{
++    mir::assert_entry_point_signature<mi::ProbePlatform>(&probe_input_platform);
++    if (options.is_set("host-socket"))
++        return mi::PlatformPriority::best;
++    return mi::PlatformPriority::unsupported;
++}
++
++mir::UniqueModulePtr<mi::Platform> create_input_platform(
++    mo::Option const& /*options*/,
++    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
++    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
++    std::shared_ptr<mi::InputReport> const& input_report)
++{
++    mir::assert_entry_point_signature<mi::CreatePlatform>(&create_input_platform);
++    return mir::make_module_ptr<mgn::InputPlatform>(global_conn, input_device_registry, input_report);
++}
++
++mir::ModuleProperties const* describe_input_module()
++{
++    mir::assert_entry_point_signature<mi::DescribeModule>(&describe_input_module);
++    return &input_description;
++}
++
 === added file 'src/platforms/nested/symbols.map.in'
 --- src/platforms/nested/symbols.map.in	1970-01-01 00:00:00 +0000
 +++ src/platforms/nested/symbols.map.in	2016-11-23 13:17:56 +0000
@@ -0,0 +1,20 @@
++@MIR_SERVER_GRAPHICS_PLATFORM_VERSION@ {
++  global:
++    add_graphics_platform_options;
++    create_host_platform;
++    create_guest_platform;
++    probe_graphics_platform;
++    describe_graphics_module;
++  local:
++    *;
++};
++
++@MIR_SERVER_INPUT_PLATFORM_VERSION@ {
++  global:
++    add_input_platform_options;
++    create_input_platform;
++    probe_input_platform;
++    describe_input_module;
++  local:
++    *;
++};
 === modified file 'src/server/CMakeLists.txt'
 --- src/server/CMakeLists.txt	2016-11-15 23:48:01 +0000
 +++ src/server/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -80,7 +80,6 @@
    $<TARGET_OBJECTS:mirreport>
    $<TARGET_OBJECTS:mirlogging>
    $<TARGET_OBJECTS:mirnullreport>
--  $<TARGET_OBJECTS:mirnestedgraphics>
    $<TARGET_OBJECTS:mirthread>
    $<TARGET_OBJECTS:mirrenderergl>
 === modified file 'src/server/graphics/CMakeLists.txt'
 --- src/server/graphics/CMakeLists.txt	2016-11-02 05:07:18 +0000
 +++ src/server/graphics/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -8,12 +8,8 @@
    default_configuration.cpp
    default_display_configuration_policy.cpp
--  gl_extensions_base.cpp
--  surfaceless_egl_context.cpp
    software_cursor.cpp
    ${PROJECT_SOURCE_DIR}/include/server/mir/graphics/display_configuration_observer.h
    display_configuration_observer_multiplexer.cpp
    display_configuration_observer_multiplexer.h
+ )
--
--add_subdirectory(nested/)
 === modified file 'src/server/graphics/default_configuration.cpp'
 --- src/server/graphics/default_configuration.cpp	2016-11-02 05:07:18 +0000
 +++ src/server/graphics/default_configuration.cpp	2016-11-23 13:17:56 +0000
@@ -22,15 +22,12 @@
  #include "mir/graphics/default_display_configuration_policy.h"
  #include "mir/graphics/graphic_buffer_allocator.h"
--#include "nested/mir_client_host_connection.h"
--#include "nested/cursor.h"
--#include "nested/display.h"
--#include "nested/platform.h"
  #include "software_cursor.h"
  #include "mir/graphics/gl_config.h"
  #include "mir/graphics/platform.h"
  #include "mir/graphics/cursor.h"
++#include "mir/graphics/display.h"
  #include "mir/graphics/platform_probe.h"
  #include "display_configuration_observer_multiplexer.h"
@@ -51,7 +48,6 @@
  namespace mg = mir::graphics;
  namespace ml = mir::logging;
--namespace mgn = mir::graphics::nested;
  std::shared_ptr<mg::DisplayConfigurationPolicy>
  mir::DefaultServerConfiguration::the_display_configuration_policy()
@@ -80,20 +76,6 @@
              std::stringstream error_report;
              try
+             {
--                // if a host socket is set we should use the host graphics module to create a "guest" platform
--                if (the_options()->is_set(options::host_socket_opt))
--                {
--                    auto const host_connection = the_host_connection();
--
--                    platform_library = std::make_shared<mir::SharedLibrary>(host_connection->graphics_platform_library());
--                    return std::make_shared<mgn::Platform>(
--                        platform_library,
--                        host_connection,
--                        the_display_report(),
--                        *the_options());
--                }
--
--                // fallback to standalone if host socket is unset
                  if (the_options()->is_set(options::platform_graphics_lib))
+                 {
                      platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
@@ -122,7 +104,12 @@
                                description->minor_version,
                                description->micro_version);
--                return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report(), the_logger());
++                return create_host_platform(
++                    the_options(),
++                    the_emergency_cleanup(),
++                    the_display_report(),
++                    the_logger(),
++                    the_host_lifecycle_event_listener());
+             }
              catch(...)
+             {
@@ -162,21 +149,12 @@
      return cursor(
          [this]() -> std::shared_ptr<mg::Cursor>
+         {
--            // In nested mode we delegate cursor presentation to the host
--            if (the_options()->is_set(options::host_socket_opt))
--            {
--                mir::log_info("Using nested cursor");
--                return wrap_cursor(std::make_shared<mgn::Cursor>(the_host_connection(), the_default_cursor_image()));
--            }
--
--            // Otherwise we try to create a hardware cursor
              if (auto hardware_cursor = the_display()->create_hardware_cursor(the_default_cursor_image()))
+             {
                  mir::log_info("Using hardware cursor");
                  return wrap_cursor(hardware_cursor);
+             }
--            // If other options fail we use a software cursor
              mir::log_info("Using software cursor");
              auto const cursor = wrap_cursor(std::make_shared<mg::SoftwareCursor>(
                  the_buffer_allocator(),
@@ -194,51 +172,6 @@
      return wrapped;
+ }
--auto mir::DefaultServerConfiguration::the_host_connection()
---> std::shared_ptr<graphics::nested::HostConnection>
--{
--    return the_mir_client_host_connection();
--}
--
--auto mir::DefaultServerConfiguration::the_mir_client_host_connection()
---> std::shared_ptr<graphics::nested::MirClientHostConnection>
--{
--    return host_connection(
--        [this]()
--        {
--            auto const options = the_options();
--
--            if (!options->is_set(options::host_socket_opt))
--                BOOST_THROW_EXCEPTION(mir::AbnormalExit(
--                    std::string("Exiting Mir! Reason: Nested Mir needs either $MIR_SOCKET or --") +
--                    options::host_socket_opt));
--
--            auto host_socket = options->get<std::string>(options::host_socket_opt);
--
--            std::string server_socket{"none"};
--
--            if (!the_options()->is_set(options::no_server_socket_opt))
--            {
--                server_socket = the_socket_file();
--
--                if (server_socket == host_socket)
--                    BOOST_THROW_EXCEPTION(mir::AbnormalExit(
--                        "Exiting Mir! Reason: Nested Mir and Host Mir cannot use "
--                        "the same socket file to accept connections!"));
--            }
--
--            auto const my_name = options->is_set(options::name_opt) ?
--                options->get<std::string>(options::name_opt) :
--                "nested-mir@:" + server_socket;
--
--            return std::make_shared<graphics::nested::MirClientHostConnection>(
--                host_socket,
--                my_name,
--                the_host_lifecycle_event_listener()
--                );
--        });
--}
--
  std::shared_ptr<mg::GLConfig>
  mir::DefaultServerConfiguration::the_gl_config()
+ {
 === modified file 'src/server/input/default_configuration.cpp'
 --- src/server/input/default_configuration.cpp	2016-11-15 23:48:01 +0000
 +++ src/server/input/default_configuration.cpp	2016-11-23 13:17:56 +0000
@@ -35,7 +35,6 @@
  #include "surface_input_dispatcher.h"
  #include "basic_seat.h"
  #include "seat_observer_multiplexer.h"
--#include "../graphics/nested/input_platform.h"
  #include "mir/input/touch_visualizer.h"
  #include "mir/input/input_probe.h"
@@ -60,7 +59,6 @@
  namespace mr = mir::report;
  namespace ms = mir::scene;
  namespace mg = mir::graphics;
--namespace mgn = mg::nested;
  namespace msh = mir::shell;
  namespace md = mir::dispatch;
@@ -278,16 +276,6 @@
+             {
                  return std::make_shared<mi::NullInputManager>();
+             }
--            else if (options->is_set(options::host_socket_opt))
--            {
--                auto const device_registry = the_input_device_registry();
--                auto const input_report = the_input_report();
--
--                // TODO: move this into a nested graphics platform
--                auto platform = std::make_shared<mgn::InputPlatform>(the_host_connection(), device_registry, input_report);
--
--                return std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(), std::move(platform));
--            }
              else
+             {
                  auto const emergency_cleanup = the_emergency_cleanup();
 === modified file 'src/server/symbols.map'
 --- src/server/symbols.map	2016-11-15 23:48:01 +0000
 +++ src/server/symbols.map	2016-11-23 13:17:56 +0000
@@ -749,7 +749,6 @@
      mir::DefaultServerConfiguration::the_gl_config*;
      mir::DefaultServerConfiguration::the_global_event_sink*;
      mir::DefaultServerConfiguration::the_graphics_platform*;
--    mir::DefaultServerConfiguration::the_host_connection*;
      mir::DefaultServerConfiguration::the_host_lifecycle_event_listener*;
      mir::DefaultServerConfiguration::the_input_channel_factory*;
      mir::DefaultServerConfiguration::the_input_device_hub*;
 === modified file 'tests/acceptance-tests/test_nested_mir.cpp'
 --- tests/acceptance-tests/test_nested_mir.cpp	2016-11-15 23:48:01 +0000
 +++ tests/acceptance-tests/test_nested_mir.cpp	2016-11-23 13:17:56 +0000
@@ -398,6 +398,7 @@
      virtual ~NestedMirRunner()
+     {
++        cursor_wrapper.reset();
          stop_server();
+     }
 === modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
 --- tests/include/mir/test/doubles/stub_host_connection.h	2016-11-18 15:53:29 +0000
 +++ tests/include/mir/test/doubles/stub_host_connection.h	2016-11-23 13:17:56 +0000
@@ -19,11 +19,13 @@
  #ifndef MIR_TEST_DOUBLES_STUB_HOST_CONNECTION_H_
  #define MIR_TEST_DOUBLES_STUB_HOST_CONNECTION_H_
--#include "src/server/graphics/nested/host_connection.h"
--#include "src/server/graphics/nested/host_surface.h"
--#include "src/server/graphics/nested/host_stream.h"
--#include "src/server/graphics/nested/host_chain.h"
--#include "src/server/graphics/nested/host_surface_spec.h"
++#include "src/platforms/nested/host_connection.h"
++#include "src/platforms/nested/host_surface.h"
++#include "src/platforms/nested/host_connection.h"
++#include "src/platforms/nested/host_surface.h"
++#include "src/platforms/nested/host_stream.h"
++#include "src/platforms/nested/host_chain.h"
++#include "src/platforms/nested/host_surface_spec.h"
  #include "src/include/client/mir/input/input_devices.h"
  #include "mir/graphics/platform_operation_message.h"
 === modified file 'tests/mir_test_framework/headless_nested_server_runner.cpp'
 --- tests/mir_test_framework/headless_nested_server_runner.cpp	2016-10-31 02:37:31 +0000
 +++ tests/mir_test_framework/headless_nested_server_runner.cpp	2016-11-23 13:17:56 +0000
@@ -25,7 +25,7 @@
  mtf::HeadlessNestedServerRunner::HeadlessNestedServerRunner(std::string const& connect_string) :
      passthrough_tracker(std::make_shared<mtf::PassthroughTracker>())
+ {
--    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", mtf::server_platform("graphics-dummy.so").c_str());
++    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", mtf::server_platform("graphics-nested.so.11").c_str());
      add_to_environment("MIR_SERVER_HOST_SOCKET", connect_string.c_str());
      server.override_the_display_buffer_compositor_factory([this]
+     {
 === modified file 'tests/mir_test_framework/platform_graphics_throw.cpp'
 --- tests/mir_test_framework/platform_graphics_throw.cpp	2016-10-20 14:35:09 +0000
 +++ tests/mir_test_framework/platform_graphics_throw.cpp	2016-11-23 13:17:56 +0000
@@ -55,7 +55,7 @@
          mir::SharedLibrary stub_platform_library{std::string(platform_path) + "/graphics-dummy.so"};
          auto create_stub_platform = stub_platform_library.load_function<mg::CreateHostPlatform>("create_host_platform");
--        stub_platform = create_stub_platform(nullptr, nullptr, nullptr, nullptr);
++        stub_platform = create_stub_platform(nullptr, nullptr, nullptr, nullptr, nullptr);
+     }
      mir::UniqueModulePtr<mg::GraphicBufferAllocator> create_buffer_allocator() override
@@ -143,7 +143,8 @@
      std::shared_ptr<mo::Option> const&,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
      std::shared_ptr<mg::DisplayReport> const&,
--    std::shared_ptr<mir::logging::Logger> const&)
++    std::shared_ptr<mir::logging::Logger> const&,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
      return mir::make_module_ptr<ExceptionThrowingPlatform>();
 === modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
 --- tests/mir_test_framework/stubbed_graphics_platform.cpp	2016-11-15 02:23:00 +0000
 +++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2016-11-23 13:17:56 +0000
@@ -316,7 +316,8 @@
      std::shared_ptr<mo::Option> const&,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
      std::shared_ptr<mg::DisplayReport> const&,
--    std::shared_ptr<mir::logging::Logger> const&)
++    std::shared_ptr<mir::logging::Logger> const&,
++    std::shared_ptr<mir::shell::HostLifecycleEventListener> const&)
+ {
      mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
      std::shared_ptr<mg::Platform> result{};
 === modified file 'tests/unit-tests/input/CMakeLists.txt'
 --- tests/unit-tests/input/CMakeLists.txt	2016-07-18 07:38:38 +0000
 +++ tests/unit-tests/input/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -17,7 +17,6 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/test_seat_input_device_tracker.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_key_repeat_dispatcher.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_validator.cpp
--  ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_input_platform.cpp
+ )
  list(APPEND UMOCK_UNIT_TEST_SOURCES
 === modified file 'tests/unit-tests/platforms/android/server/test_display_generic.cpp'
 --- tests/unit-tests/platforms/android/server/test_display_generic.cpp	2016-10-20 14:35:09 +0000
 +++ tests/unit-tests/platforms/android/server/test_display_generic.cpp	2016-11-23 13:17:56 +0000
@@ -44,14 +44,10 @@
  public:
      DisplayTestGeneric() :
          logger{std::make_shared<mir::logging::DumbConsoleLogger>()},
--        platform{
--            create_host_platform(
--                std::make_shared<mir::options::ProgramOption>(),
--                std::make_shared<mtd::NullEmergencyCleanup>(),
--                mir::report::null_display_report(),
--                logger)
--        }
--
++        platform{create_host_platform(
++            std::make_shared<mir::options::ProgramOption>(),
++            std::make_shared<mtd::NullEmergencyCleanup>(),
++            mir::report::null_display_report(), logger, nullptr)}
+     {
          using namespace testing;
 === modified file 'tests/unit-tests/platforms/android/server/test_graphics_platform.cpp'
 --- tests/unit-tests/platforms/android/server/test_graphics_platform.cpp	2016-10-20 14:35:09 +0000
 +++ tests/unit-tests/platforms/android/server/test_graphics_platform.cpp	2016-11-23 13:17:56 +0000
@@ -54,7 +54,8 @@
            std::make_shared<mir::options::ProgramOption>(),
            std::make_shared<mtd::NullEmergencyCleanup>(),
            mir::report::null_display_report(),
--          logger);
++          logger,
++          nullptr);
+     }
      std::shared_ptr<ml::Logger> logger;
 === modified file 'tests/unit-tests/platforms/nested/CMakeLists.txt'
 --- tests/unit-tests/platforms/nested/CMakeLists.txt	2016-11-09 02:30:14 +0000
 +++ tests/unit-tests/platforms/nested/CMakeLists.txt	2016-11-23 13:17:56 +0000
@@ -5,10 +5,12 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_cursor.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_display_buffer.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_input_platform.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_ipc_operations.cpp
    $<TARGET_OBJECTS:mir-test-doubles-udev>
    ${MIR_PLATFORM_OBJECTS}
    ${MIR_SERVER_OBJECTS}
++  $<TARGET_OBJECTS:mirnestedgraphics>
+ )
  target_link_libraries(
 === modified file 'tests/unit-tests/platforms/nested/test_buffer.cpp'
 --- tests/unit-tests/platforms/nested/test_buffer.cpp	2016-10-31 02:37:31 +0000
 +++ tests/unit-tests/platforms/nested/test_buffer.cpp	2016-11-23 13:17:56 +0000
@@ -16,8 +16,11 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
--#include "src/server/graphics/nested/native_buffer.h"
--#include "src/server/graphics/nested/buffer.h"
++#include "src/platforms/nested/buffer.h"
++#include "src/platforms/nested/native_buffer.h"
++#include "src/platforms/nested/buffer.h"
++#include "src/platforms/nested/native_buffer.h"
++#include "src/platforms/nested/buffer.h"
  #include "src/client/buffer.h"
  #include "mir/graphics/buffer_properties.h"
  #include "mir/test/doubles/stub_host_connection.h"
 === modified file 'tests/unit-tests/platforms/nested/test_ipc_operations.cpp'
 --- tests/unit-tests/platforms/nested/test_ipc_operations.cpp	2016-10-11 17:04:43 +0000
 +++ tests/unit-tests/platforms/nested/test_ipc_operations.cpp	2016-11-23 13:17:56 +0000
@@ -16,8 +16,8 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
--#include "src/server/graphics/nested/ipc_operations.h"
--#include "src/server/graphics/nested/native_buffer.h"
++#include "src/platforms/nested/ipc_operations.h"
++#include "src/platforms/nested/native_buffer.h"
  #include "mir/test/doubles/stub_buffer.h"
  #include "mir/test/doubles/mock_buffer_ipc_message.h"
  #include "mir/test/fake_shared.h"
 === modified file 'tests/unit-tests/platforms/nested/test_nested_cursor.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_cursor.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_cursor.cpp	2016-11-23 13:17:56 +0000
@@ -16,7 +16,7 @@
   * Authored by: Robert Carr <robert.carr@canonical.com>
   */
--#include "src/server/graphics/nested/cursor.h"
++#include "src/platforms/nested/cursor.h"
  #include "mir/graphics/cursor_image.h"
  #include "mir/test/fake_shared.h"
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display.cpp	2016-08-24 14:03:18 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display.cpp	2016-11-23 13:17:56 +0000
@@ -16,9 +16,9 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#include "src/server/graphics/nested/display.h"
--#include "src/server/graphics/nested/host_connection.h"
--#include "src/server/graphics/nested/host_surface.h"
++#include "src/platforms/nested/display.h"
++#include "src/platforms/nested/host_connection.h"
++#include "src/platforms/nested/host_surface.h"
  #include "src/server/report/null/display_report.h"
  #include "mir/graphics/default_display_configuration_policy.h"
  #include "src/server/input/null_input_dispatcher.h"
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp	2016-11-16 13:24:41 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp	2016-11-23 13:17:56 +0000
@@ -16,11 +16,11 @@
   * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#include "src/server/graphics/nested/display_buffer.h"
--#include "src/server/graphics/nested/native_buffer.h"
--#include "src/server/graphics/nested/host_stream.h"
--#include "src/server/graphics/nested/host_chain.h"
--#include "src/server/graphics/nested/host_surface_spec.h"
++#include "src/platforms/nested/display_buffer.h"
++#include "src/platforms/nested/native_buffer.h"
++#include "src/platforms/nested/host_stream.h"
++#include "src/platforms/nested/host_chain.h"
++#include "src/platforms/nested/host_surface_spec.h"
  #include "mir/events/event_builders.h"
 === modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
 --- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2016-11-23 13:17:56 +0000
@@ -16,7 +16,7 @@
   * Authored by: Alan Griffiths <alan@octopull.co.uk>
   */
--#include "src/server/graphics/nested/nested_display_configuration.h"
++#include "src/platforms/nested/nested_display_configuration.h"
  #include "mir_display_configuration_builder.h"
  #include "mir/test/display_config_matchers.h"
 === renamed file 'tests/unit-tests/input/test_nested_input_platform.cpp' => 'tests/unit-tests/platforms/nested/test_nested_input_platform.cpp'
 --- tests/unit-tests/input/test_nested_input_platform.cpp	2016-10-27 14:31:48 +0000
 +++ tests/unit-tests/platforms/nested/test_nested_input_platform.cpp	2016-11-23 13:17:56 +0000
@@ -16,7 +16,7 @@
   * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
   */
--#include "src/server/graphics/nested/input_platform.h"
++#include "src/platforms/nested/input_platform.h"
  #include "src/server/report/null_report_factory.h"
  #include "src/include/client/mir/input/input_devices.h"
  #include "src/server/input/default_event_builder.h"
 === modified file 'tools/update_package_abis.sh'
 --- tools/update_package_abis.sh	2016-10-07 14:24:28 +0000
 +++ tools/update_package_abis.sh	2016-11-23 13:17:56 +0000
@@ -23,6 +23,7 @@
      mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
      mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
      mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
++    mir-platform-graphics-nested:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
      mir-platform-input-evdev:MIR_SERVER_INPUT_PLATFORM_ABI"
  package_name()