Mir

examples/basic.c (+12/-0)
include/client/mir_toolkit/client_types.h (+15/-0)
include/client/mir_toolkit/mir_connection.h (+11/-0)
include/common/mir/libname.h (+35/-0)
include/platform/mir/graphics/platform_ipc_package.h (+7/-0)
include/platform/mir/module_properties.h (+7/-1)
src/client/mir_connection.cpp (+26/-0)
src/client/mir_connection.h (+1/-0)
src/client/mir_connection_api.cpp (+14/-0)
src/client/symbols.map (+7/-1)
src/common/CMakeLists.txt (+2/-1)
src/common/libname.cpp (+29/-0)
src/common/symbols.map (+3/-2)
src/platforms/android/server/ipc_operations.cpp (+17/-2)
src/platforms/android/server/platform.cpp (+7/-2)
src/platforms/evdev/platform_factory.cpp (+6/-2)
src/platforms/mesa/server/common/ipc_operations.cpp (+12/-1)
src/platforms/mesa/server/kms/platform_symbols.cpp (+7/-2)
src/platforms/mesa/server/x11/graphics/graphics.cpp (+9/-3)
src/platforms/mesa/server/x11/input/input.cpp (+4/-2)
src/protobuf/mir_protobuf.proto (+11/-0)
src/protobuf/symbols.map (+27/-0)
src/server/frontend/session_mediator.cpp (+12/-0)
src/server/graphics/default_configuration.cpp (+16/-10)
src/server/graphics/nested/host_connection.h (+1/-0)
src/server/graphics/nested/mir_client_host_connection.cpp (+14/-0)
src/server/graphics/nested/mir_client_host_connection.h (+1/-0)
tests/include/mir/test/doubles/stub_host_connection.h (+2/-0)
tests/mir_test_framework/platform_graphics_dummy.cpp (+2/-1)
tests/mir_test_framework/stub_input.cpp (+5/-2)
tests/mir_test_framework/stubbed_graphics_platform.cpp (+13/-1)

To merge this branch:

bzr merge lp:~alan-griffiths/mir/nested-server-uses-host-graphics-platform

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2016-01-14
Brandon Schaefer (community)			Approve on 2016-01-14
Alberto Aguirre			Approve on 2016-01-14
Kevin DuBois (community)			Approve on 2016-01-14
Mir CI Bot	continuous-integration		Approve on 2016-01-14
Alexandros Frantzis (community)			Approve on 2016-01-13
Cemil Azizoglu (community)		2016-01-07	Approve on 2016-01-11
Review via email: mp+281886@code.launchpad.net

Commit Message

Provide information on the selected graphics platform through the client API and use it in nested servers to select the same module. (LP:1515558)

Description of the Change

Provide information on the selected graphics platform through the client API and use it in nested servers to select the same module.

PS Jenkins bot (ps-jenkins) wrote on 2016-01-07:

FAILED: Continuous integration, rev:3236
http://jenkins.qa.ubuntu.com/job/mir-ci/5951/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/275/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/275/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5405/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5951/rebuild

review: Needs Fixing (continuous-integration)

lp:~alan-griffiths/mir/nested-server-uses-host-graphics-platform updated on 2016-01-07

3237. By Alan Griffiths on 2016-01-07: Fix MIR_COMMON_SOURCES

PS Jenkins bot (ps-jenkins) wrote on 2016-01-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5952/rebuild

review: Approve (continuous-integration)

lp:~alan-griffiths/mir/nested-server-uses-host-graphics-platform updated on 2016-01-08

3238. By Alan Griffiths on 2016-01-08: merge lp:~alan-griffiths/mir/merge-0.18
3239. By Alan Griffiths on 2016-01-08: Fix stanza name
3240. By Alan Griffiths on 2016-01-08: MIR_COMMON_unreleased should depend on MIR_COMMON_5.1

PS Jenkins bot (ps-jenkins) wrote on 2016-01-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5959/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:3240
https://mir-jenkins.ubuntu.com/job/mir-ci/6/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/6/console

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5968/rebuild

review: Approve (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2016-01-11:

I'm liking the implication of the branch name. Haven't got to a review yet.

PS Jenkins bot (ps-jenkins) wrote on 2016-01-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5974/rebuild

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:3241
https://mir-jenkins.ubuntu.com/job/mir-ci/26/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/26/console

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

review: Needs Fixing (continuous-integration)

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-01-11:

lgtm

review: Approve

Alexandros Frantzis (afrantzis) wrote on 2016-01-12:

+#if 0
+ printf("Graphics module: %s (%d.%d%d) - file: %s\n",
+ properties.name,
+ properties.major_version,
+ properties.minor_version,
+ properties.micro_version,
+ properties.file);
+#endif

Not needed.

+ "mir:android"

Does the "mir:..." prefix denote that the module is provided by the mir team, or does it have some other meaning?

Looks good otherwise.

Needs fixing/info

review: Needs Fixing

lp:~alan-griffiths/mir/nested-server-uses-host-graphics-platform updated on 2016-01-13

3241. By Alan Griffiths on 2016-01-12: merge lp:mir
3242. By Alan Griffiths on 2016-01-12: Remove debug code, expand documentation
3243. By Alan Griffiths on 2016-01-13: merge lp:mir

Alexandros Frantzis (afrantzis) wrote on 2016-01-13:

Looks good.

review: Approve

Mir CI Bot (mir-ci-bot) wrote on 2016-01-13:

PASSED: Continuous integration, rev:3243
https://mir-jenkins.ubuntu.com/job/mir-ci/39/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/40/console

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

review: Approve (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-01-13:

44: + char const *file;

I guess a minor needs fixing, its not immediately obvious what the contents of 'file' are. (maybe rename to "library_filename" ?)

A followup (nonblocking) question (and maybe a followup MP) would be: would it be helpful to send both the server and client module names for the graphics platform? Perhaps by having:
mir_connection_get_server_graphics_module (this MP)
mir_connection_get_client_graphics_module (future MP, if needed)
mir_connection_get_input_module (future MP, if needed)

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2016-01-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6003/rebuild

review: Approve (continuous-integration)

lp:~alan-griffiths/mir/nested-server-uses-host-graphics-platform updated on 2016-01-14

3244. By Alan Griffiths on 2016-01-14: s/file/filename/

Alan Griffiths (alan-griffiths) wrote on 2016-01-14:

> 44: + char const *file;
>
> I guess a minor needs fixing, its not immediately obvious what the contents of
> 'file' are. (maybe rename to "library_filename" ?)

It ought to be "module" rather than "library", but that is somewhat redundant in a struct called MirModuleProperties.

I guess "filename" is a little clearer than "file" though.

Mir CI Bot (mir-ci-bot) wrote on 2016-01-14:

PASSED: Continuous integration, rev:3244
https://mir-jenkins.ubuntu.com/job/mir-ci/53/
Executed test runs:
None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/53/console

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

review: Approve (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-01-14:

alright, lgtm

review: Approve

Alberto Aguirre (albaguirre) wrote on 2016-01-14:

LGTM

review: Approve

Brandon Schaefer (brandontschaefer) wrote on 2016-01-14:

lgtm

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6018/rebuild

review: Approve (continuous-integration)

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:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'examples/basic.c'
 --- examples/basic.c	2015-09-17 20:32:32 +0000
 +++ examples/basic.c	2016-01-14 15:13:04 +0000
@@ -117,6 +117,18 @@
          assert(0 <= platform_package.fd_items);
+     }
++    {
++        MirModuleProperties properties = { NULL, -1, -1, -1, NULL };
++
++        mir_connection_get_graphics_module(mcd.connection, &properties);
++
++        assert(NULL != properties.name);
++        assert(0 <= properties.major_version);
++        assert(0 <= properties.minor_version);
++        assert(0 <= properties.micro_version);
++        assert(NULL != properties.filename);
++    }
++
      // Identify a supported pixel format
      MirPixelFormat pixel_format = mir_pixel_format_invalid;
      unsigned int valid_formats;
 === modified file 'include/client/mir_toolkit/client_types.h'
 --- include/client/mir_toolkit/client_types.h	2015-09-02 16:33:14 +0000
 +++ include/client/mir_toolkit/client_types.h	2016-01-14 15:13:04 +0000
@@ -192,6 +192,21 @@
      int fd[mir_platform_package_max];
  } MirPlatformPackage;
++/**
++ * Retrieved information about a loadable module. This allows clients to
++ * identify the underlying platform. E.g. whether the graphics are
++ * "mir:android" or "mir:mesa".
++ * Third party graphics platforms do not currently exist but should be
++ * named according to the vendor and platform. Vis: "<vendor>:<platform>"
++ */
++typedef struct MirModuleProperties
++{
++    char const *name;
++    int major_version;
++    int minor_version;
++    int micro_version;
++    char const *filename;
++} MirModuleProperties;
  /**
   * Retrieved information about a MirSurface. This is most useful for learning
 === modified file 'include/client/mir_toolkit/mir_connection.h'
 --- include/client/mir_toolkit/mir_connection.h	2015-11-17 12:46:14 +0000
 +++ include/client/mir_toolkit/mir_connection.h	2016-01-14 15:13:04 +0000
@@ -95,6 +95,17 @@
  void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package);
  /**
++ * Query graphics platform module.
++ *
++ * \note The char pointers in MirModuleProperties are owned by the connection and should not be
++ * freed. They remain valid until the connection is released.
++ *
++ *   \param [in]  connection    The connection
++ *   \param [out] properties    Structure to be populated
++ */
++void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties);
++
++/**
   * Register a callback to be called when a Lifecycle state change occurs.
   *   \param [in] connection     The connection
   *   \param [in] callback       The function to be called when the state change occurs
 === added file 'include/common/mir/libname.h'
 --- include/common/mir/libname.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir/libname.h	2016-01-14 15:13:04 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * 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 Lesser General Public License for more details.
++ *
++ * 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: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIR_LIBNAME_H
++#define MIR_LIBNAME_H
++
++namespace mir
++{
++namespace detail { char const* libname_impl(void* libname); }
++
++namespace
++{
++inline char const* libname()
++{
++    return detail::libname_impl(reinterpret_cast<void*>(&libname));
++}
++}
++}
++
++#endif //MIR_LIBNAME_H_H
 === modified file 'include/platform/mir/graphics/platform_ipc_package.h'
 --- include/platform/mir/graphics/platform_ipc_package.h	2015-02-22 07:46:25 +0000
 +++ include/platform/mir/graphics/platform_ipc_package.h	2016-01-14 15:13:04 +0000
@@ -24,6 +24,8 @@
  namespace mir
+ {
++struct ModuleProperties;
++
  namespace graphics
+ {
@@ -32,8 +34,13 @@
   */
  struct PlatformIPCPackage
+ {
++    PlatformIPCPackage() : graphics_module(nullptr) {}
++    explicit PlatformIPCPackage(ModuleProperties const* graphics_module) : graphics_module(graphics_module) {}
++
      std::vector<int32_t> ipc_data;
      std::vector<int32_t> ipc_fds;
++
++    ModuleProperties const* graphics_module;
  };
+ }
 === modified file 'include/platform/mir/module_properties.h'
 --- include/platform/mir/module_properties.h	2015-04-28 07:54:10 +0000
 +++ include/platform/mir/module_properties.h	2016-01-14 15:13:04 +0000
@@ -23,7 +23,12 @@
+ {
  /**
-- * Describes a platform module
++ * Describes a platform module. Mir provides the following graphics platforms:
++ * "mir:mesa-kms", "mir:mesa-x11" and "mir:android".
++ * Mir provides "mir:evdev-input" input platform.
++ *
++ * Third party platforms should be named according to the vendor and platform:
++ *  "<vendor>:<platform>"
   */
  struct ModuleProperties
+ {
@@ -31,6 +36,7 @@
      int major_version;
      int minor_version;
      int micro_version;
++    char const* file;
  };
+ }
 === modified file 'src/client/mir_connection.cpp'
 --- src/client/mir_connection.cpp	2016-01-13 19:08:38 +0000
 +++ src/client/mir_connection.cpp	2016-01-14 15:13:04 +0000
@@ -643,6 +643,32 @@
+     }
+ }
++void MirConnection::populate_graphics_module(MirModuleProperties& properties)
++{
++    // connect_result is write-once: once it's valid, we don't need to lock
++    // to use it.
++    if (connect_done &&
++        !connect_result->has_error() &&
++        connect_result->has_platform() &&
++        connect_result->platform().has_graphics_module())
++    {
++        auto const& graphics_module = connect_result->platform().graphics_module();
++        properties.name = graphics_module.name().c_str();
++        properties.major_version = graphics_module.major_version();
++        properties.minor_version = graphics_module.minor_version();
++        properties.micro_version = graphics_module.micro_version();
++        properties.filename = graphics_module.file().c_str();
++    }
++    else
++    {
++        properties.name = "(unknown)";
++        properties.major_version = 0;
++        properties.minor_version = 0;
++        properties.micro_version = 0;
++        properties.filename = nullptr;
++    }
++}
++
  MirDisplayConfiguration* MirConnection::create_copy_of_display_config()
+ {
      std::lock_guard<decltype(mutex)> lock(mutex);
 === modified file 'src/client/mir_connection.h'
 --- src/client/mir_connection.h	2016-01-11 14:27:36 +0000
 +++ src/client/mir_connection.h	2016-01-14 15:13:04 +0000
@@ -129,6 +129,7 @@
      void register_display_change_callback(mir_display_config_callback callback, void* context);
      void populate(MirPlatformPackage& platform_package);
++    void populate_graphics_module(MirModuleProperties& properties);
      MirDisplayConfiguration* create_copy_of_display_config();
      void available_surface_formats(MirPixelFormat* formats,
                                     unsigned int formats_size, unsigned int& valid_formats);
 === modified file 'src/client/mir_connection_api.cpp'
 --- src/client/mir_connection_api.cpp	2015-11-11 11:50:42 +0000
 +++ src/client/mir_connection_api.cpp	2016-01-14 15:13:04 +0000
@@ -22,6 +22,7 @@
  #include "mir_toolkit/mir_connection.h"
  #include "mir/default_configuration.h"
  #include "mir/raii.h"
++#include "mir/require.h"
  #include "mir_connection.h"
  #include "default_connection_configuration.h"
@@ -186,6 +187,19 @@
      connection->populate(*platform_package);
+ }
++void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties)
++try
++{
++    mir::require(mir_connection_is_valid(connection));
++    mir::require(properties != nullptr);
++
++    connection->populate_graphics_module(*properties);
++}
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
++
  void mir_connection_set_lifecycle_event_callback(
      MirConnection* connection,
      mir_lifecycle_event_callback callback,
 === modified file 'src/client/symbols.map'
 --- src/client/symbols.map	2016-01-08 09:23:17 +0000
 +++ src/client/symbols.map	2016-01-14 15:13:04 +0000
@@ -207,6 +207,13 @@
      *;
  } MIR_CLIENT_9v17;
++MIR_CLIENT_unreleased {
++  global:
++    mir_connection_get_graphics_module;
++  local:
++    *;
++} MIR_CLIENT_9v18;
++
  MIR_CLIENT_DETAIL_9 {
    global:
      extern "C++" {
@@ -261,4 +268,3 @@
    local:
      *;
  } MIR_CLIENT_DETAIL_9v18;
--
 === modified file 'src/common/CMakeLists.txt'
 --- src/common/CMakeLists.txt	2015-11-13 20:48:52 +0000
 +++ src/common/CMakeLists.txt	2016-01-14 15:13:04 +0000
@@ -20,7 +20,8 @@
    $<TARGET_OBJECTS:mirfatal>
    $<TARGET_OBJECTS:android-input-common>
    ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
--  )
++  ${CMAKE_CURRENT_SOURCE_DIR}/libname.cpp ${PROJECT_SOURCE_DIR}/include/common/mir/libname.h
++)
  set(PREFIX "${CMAKE_INSTALL_PREFIX}")
  set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 === added file 'src/common/libname.cpp'
 --- src/common/libname.cpp	1970-01-01 00:00:00 +0000
 +++ src/common/libname.cpp	2016-01-14 15:13:04 +0000
@@ -0,0 +1,29 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * 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 Lesser General Public License for more details.
++ *
++ * 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: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#include "mir/libname.h"
++
++#include <dlfcn.h>
++
++char const* mir::detail::libname_impl(void* libname)
++{
++    Dl_info info;
++
++    dladdr(libname, &info);
++    return  info.dli_fname;
++}
 === modified file 'src/common/symbols.map'
 --- src/common/symbols.map	2015-12-17 12:25:31 +0000
 +++ src/common/symbols.map	2016-01-14 15:13:04 +0000
@@ -201,12 +201,13 @@
    local: *;
  } MIR_COMMON_5;
--MIR_COMMON_unreleased {
++MIR_COMMON_unreleased { # New functions in Mir 0.19
    global:
      extern "C++" {
        typeinfo?for?mir::logging::SharedLibraryProberReport;
        typeinfo?for?mir::time::SteadyClock;
        typeinfo?for?android::InputChannel;
        typeinfo?for?mir::logging::DumbConsoleLogger;
++      mir::detail::libname_impl*;
      };
--} MIR_COMMON_5;
++} MIR_COMMON_5.1;
 === modified file 'src/platforms/android/server/ipc_operations.cpp'
 --- src/platforms/android/server/ipc_operations.cpp	2016-01-07 11:55:03 +0000
 +++ src/platforms/android/server/ipc_operations.cpp	2016-01-14 15:13:04 +0000
@@ -17,13 +17,17 @@
   */
  #include "mir/graphics/platform_ipc_package.h"
++#include "mir/module_properties.h"
  #include "mir/graphics/buffer.h"
  #include "mir/graphics/buffer_ipc_message.h"
  #include "mir/graphics/platform_operation_message.h"
++#include "mir/libname.h"
  #include "android_native_buffer.h"
  #include "ipc_operations.h"
++
++#include <boost/throw_exception.hpp>
++
  #include <stdexcept>
--#include <boost/throw_exception.hpp>
  namespace mg = mir::graphics;
  namespace mga = mir::graphics::android;
@@ -66,9 +70,20 @@
+ {
+ }
++namespace
++{
++mir::ModuleProperties const properties = {
++    "mir:android",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO,
++    mir::libname()
++};
++}
++
  std::shared_ptr<mg::PlatformIPCPackage> mga::IpcOperations::connection_ipc_package()
+ {
--    return std::make_shared<mg::PlatformIPCPackage>();
++    return std::make_shared<mg::PlatformIPCPackage>(&properties);
+ }
  mg::PlatformOperationMessage mga::IpcOperations::platform_operation(
 === modified file 'src/platforms/android/server/platform.cpp'
 --- src/platforms/android/server/platform.cpp	2016-01-07 11:55:03 +0000
 +++ src/platforms/android/server/platform.cpp	2016-01-14 15:13:04 +0000
@@ -37,6 +37,7 @@
  #include "mir/options/configuration.h"
  #include "mir/abnormal_exit.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
  #include <boost/throw_exception.hpp>
  #include <stdexcept>
@@ -197,12 +198,16 @@
      return err < 0 ? mg::PlatformPriority::unsupported : mg::PlatformPriority::best;
+ }
++namespace
++{
  mir::ModuleProperties const description = {
--    "android",
++    "mir:android",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
++}
  mir::ModuleProperties const* describe_graphics_module()
+ {
 === modified file 'src/platforms/evdev/platform_factory.cpp'
 --- src/platforms/evdev/platform_factory.cpp	2015-11-25 20:26:59 +0000
 +++ src/platforms/evdev/platform_factory.cpp	2016-01-14 15:13:04 +0000
@@ -20,6 +20,7 @@
  #include "mir/udev/wrapper.h"
  #include "mir/fd.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -37,12 +38,15 @@
  namespace
+ {
  char const* const host_socket_opt = "host-socket";
++
  mir::ModuleProperties const description = {
--    "evdev-input",
++    "mir:evdev-input",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
++
  bool can_open_input_devices()
+ {
      mu::Enumerator input_enumerator{std::make_shared<mu::Context>()};
 === modified file 'src/platforms/mesa/server/common/ipc_operations.cpp'
 --- src/platforms/mesa/server/common/ipc_operations.cpp	2015-07-23 02:39:20 +0000
 +++ src/platforms/mesa/server/common/ipc_operations.cpp	2016-01-14 15:13:04 +0000
@@ -19,8 +19,10 @@
  #include "mir/graphics/buffer.h"
  #include "mir/graphics/buffer_ipc_message.h"
  #include "mir/graphics/platform_ipc_package.h"
++#include "mir/graphics/platform.h"
  #include "mir/graphics/nested_context.h"
  #include "mir/graphics/platform_operation_message.h"
++#include "mir/libname.h"
  #include "display_helpers.h"
  #include "drm_authentication.h"
  #include "drm_close_threadsafe.h"
@@ -38,9 +40,18 @@
  namespace
+ {
++mir::ModuleProperties const description = {
++    "mir:mesa",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO,
++    mir::libname()
++};
++
  struct MesaPlatformIPCPackage : public mg::PlatformIPCPackage
+ {
--    MesaPlatformIPCPackage(int drm_auth_fd)
++    MesaPlatformIPCPackage(int drm_auth_fd) :
++        mg::PlatformIPCPackage(&description)
+     {
          ipc_fds.push_back(drm_auth_fd);
+     }
 === modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
 --- src/platforms/mesa/server/kms/platform_symbols.cpp	2016-01-07 11:55:03 +0000
 +++ src/platforms/mesa/server/kms/platform_symbols.cpp	2016-01-14 15:13:04 +0000
@@ -24,6 +24,7 @@
  #include "mir/udev/wrapper.h"
  #include "mir/module_deleter.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
  #include <fcntl.h>
  #include <sys/ioctl.h>
@@ -211,12 +212,16 @@
          mg::PlatformPriority::supported - 1);
+ }
++namespace
++{
  mir::ModuleProperties const description = {
--    "mesa-kms",
++    "mir:mesa-kms",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
++}
  mir::ModuleProperties const* describe_graphics_module()
+ {
 === modified file 'src/platforms/mesa/server/x11/graphics/graphics.cpp'
 --- src/platforms/mesa/server/x11/graphics/graphics.cpp	2016-01-07 11:55:03 +0000
 +++ src/platforms/mesa/server/x11/graphics/graphics.cpp	2016-01-14 15:13:04 +0000
@@ -20,9 +20,11 @@
  #include "platform.h"
  #include "guest_platform.h"
  #include "../X11_resources.h"
--#include <boost/throw_exception.hpp>
  #include "mir/module_deleter.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
++
++#include <boost/throw_exception.hpp>
  namespace mo = mir::options;
  namespace mg = mir::graphics;
@@ -96,12 +98,16 @@
      return mg::PlatformPriority::unsupported;
+ }
++namespace
++{
  mir::ModuleProperties const description = {
--    "mesa-x11",
++    "mir:mesa-x11",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
++}
  mir::ModuleProperties const* describe_graphics_module()
+ {
 === modified file 'src/platforms/mesa/server/x11/input/input.cpp'
 --- src/platforms/mesa/server/x11/input/input.cpp	2015-12-02 13:06:44 +0000
 +++ src/platforms/mesa/server/x11/input/input.cpp	2016-01-14 15:13:04 +0000
@@ -20,6 +20,7 @@
  #include "../X11_resources.h"
  #include "mir/module_properties.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
  namespace mo = mir::options;
  namespace mi = mir::input;
@@ -61,10 +62,11 @@
  namespace
+ {
  mir::ModuleProperties const description = {
--    "x11-input",
++    "mir:x11-input",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
+ }
 === modified file 'src/protobuf/mir_protobuf.proto'
 --- src/protobuf/mir_protobuf.proto	2015-10-16 17:34:48 +0000
 +++ src/protobuf/mir_protobuf.proto	2016-01-14 15:13:04 +0000
@@ -142,10 +142,21 @@
    optional string error = 127;
+ }
++message ModuleProperties
++{
++    required string name = 1;
++    required uint32 major_version = 2;
++    required uint32 minor_version = 3;
++    required uint32 micro_version = 4;
++    required string file = 5;
++};
++
++
  message Platform {
    repeated sint32 fd = 1;
    repeated int32  data = 2;
    optional int32  fds_on_side_channel = 3;
++  optional ModuleProperties graphics_module = 4;
    optional string error = 127;
+ }
 === modified file 'src/protobuf/symbols.map'
 --- src/protobuf/symbols.map	2015-11-02 17:40:57 +0000
 +++ src/protobuf/symbols.map	2016-01-14 15:13:04 +0000
@@ -975,3 +975,30 @@
    };
   local: *;
  };
++
++MIR_PROTOBUF_3_unreleased {
++ global:
++  extern "C++" {
++    mir::protobuf::ModuleProperties::ByteSize*;
++    mir::protobuf::ModuleProperties::CheckTypeAndMergeFrom*;
++    mir::protobuf::ModuleProperties::Clear*;
++    mir::protobuf::ModuleProperties::?ModuleProperties*;
++    mir::protobuf::ModuleProperties::ModuleProperties*;
++    mir::protobuf::ModuleProperties::CopyFrom*;
++    mir::protobuf::ModuleProperties::default_instance*;
++    mir::protobuf::ModuleProperties::DiscardUnknownFields*;
++    mir::protobuf::ModuleProperties::GetTypeName*;
++    mir::protobuf::ModuleProperties::IsInitialized*;
++    mir::protobuf::ModuleProperties::kDisplayConfigurationFieldNumber*;
++    mir::protobuf::ModuleProperties::kDisplayOutputFieldNumber*;
++    mir::protobuf::ModuleProperties::kErrorFieldNumber*;
++    mir::protobuf::ModuleProperties::kPlatformFieldNumber*;
++    mir::protobuf::ModuleProperties::kSurfacePixelFormatFieldNumber*;
++    mir::protobuf::ModuleProperties::MergeFrom*;
++    mir::protobuf::ModuleProperties::MergePartialFromCodedStream*;
++    mir::protobuf::ModuleProperties::New*;
++    mir::protobuf::ModuleProperties::SerializeWithCachedSizes*;
++    mir::protobuf::ModuleProperties::Swap*;
++    typeinfo?for?mir::protobuf::ModuleProperties;
++  };
++} MIR_PROTOBUF_3;
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2015-12-16 11:57:27 +0000
 +++ src/server/frontend/session_mediator.cpp	2016-01-14 15:13:04 +0000
@@ -50,6 +50,7 @@
  #include "mir/scene/prompt_session_creation_parameters.h"
  #include "mir/fd.h"
  #include "mir/cookie_factory.h"
++#include "mir/module_properties.h"
  #include "mir/geometry/rectangles.h"
  #include "buffer_stream_tracker.h"
@@ -144,6 +145,17 @@
      for (auto& ipc_fds : ipc_package->ipc_fds)
          platform->add_fd(ipc_fds);
++    if (auto const graphics_module = ipc_package->graphics_module)
++    {
++        auto const module = platform->mutable_graphics_module();
++
++        module->set_name(graphics_module->name);
++        module->set_major_version(graphics_module->major_version);
++        module->set_minor_version(graphics_module->minor_version);
++        module->set_micro_version(graphics_module->micro_version);
++        module->set_file(graphics_module->file);
++    }
++
      auto display_config = display_changer->base_configuration();
      auto protobuf_config = response->mutable_display_configuration();
      mfd::pack_protobuf_display_configuration(*protobuf_config, *display_config);
 === modified file 'src/server/graphics/default_configuration.cpp'
 --- src/server/graphics/default_configuration.cpp	2015-11-05 18:24:29 +0000
 +++ src/server/graphics/default_configuration.cpp	2016-01-14 15:13:04 +0000
@@ -73,6 +73,21 @@
          [this]()->std::shared_ptr<mg::Platform>
+         {
              std::shared_ptr<mir::SharedLibrary> platform_library;
++
++            // 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());
++
++                auto create_guest_platform = platform_library->load_function<mg::CreateGuestPlatform>(
++                    "create_guest_platform",
++                    MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
++
++                return create_guest_platform(the_display_report(), host_connection);
++            }
++
              // fallback to standalone if host socket is unset
              if (the_options()->is_set(options::platform_graphics_lib))
+             {
@@ -92,9 +107,6 @@
              auto create_host_platform = platform_library->load_function<mg::CreateHostPlatform>(
                  "create_host_platform",
                  MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
--            auto create_guest_platform = platform_library->load_function<mg::CreateGuestPlatform>(
--                "create_guest_platform",
--                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
              auto describe_module = platform_library->load_function<mg::DescribeModule>(
                  "describe_graphics_module",
                  MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
@@ -105,13 +117,7 @@
                            description->minor_version,
                            description->micro_version);
--            if (!the_options()->is_set(options::host_socket_opt))
--                return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
--            else
--                return create_guest_platform(
--                    the_display_report(),
--                    the_host_connection());
--
++            return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
          });
+ }
 === modified file 'src/server/graphics/nested/host_connection.h'
 --- src/server/graphics/nested/host_connection.h	2015-06-17 05:20:42 +0000
 +++ src/server/graphics/nested/host_connection.h	2016-01-14 15:13:04 +0000
@@ -52,6 +52,7 @@
      virtual void set_cursor_image(CursorImage const& image) = 0;
      virtual void hide_cursor() = 0;
++    virtual auto graphics_platform_library() -> std::string = 0;
  protected:
      HostConnection() = default;
 === modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
 --- src/server/graphics/nested/mir_client_host_connection.cpp	2015-10-07 19:22:52 +0000
 +++ src/server/graphics/nested/mir_client_host_connection.cpp	2016-01-14 15:13:04 +0000
@@ -317,3 +317,17 @@
          surface->hide_cursor();
+     }
+ }
++
++auto mgn::MirClientHostConnection::graphics_platform_library() -> std::string
++{
++    MirModuleProperties properties = { nullptr, 0, 0, 0, nullptr };
++
++    mir_connection_get_graphics_module(mir_connection, &properties);
++
++    if (properties.filename == nullptr)
++    {
++        BOOST_THROW_EXCEPTION(std::runtime_error("Cannot identify host graphics platform"));
++    }
++
++    return properties.filename;
++}
 \ No newline at end of file
 === modified file 'src/server/graphics/nested/mir_client_host_connection.h'
 --- src/server/graphics/nested/mir_client_host_connection.h	2015-06-17 05:20:42 +0000
 +++ src/server/graphics/nested/mir_client_host_connection.h	2016-01-14 15:13:04 +0000
@@ -53,6 +53,7 @@
      void set_cursor_image(CursorImage const& image) override;
      void hide_cursor() override;
++    auto graphics_platform_library() -> std::string override;
      virtual PlatformOperationMessage platform_operation(
          unsigned int op, PlatformOperationMessage const& request) override;
 === modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
 --- tests/include/mir/test/doubles/stub_host_connection.h	2015-06-17 05:20:42 +0000
 +++ tests/include/mir/test/doubles/stub_host_connection.h	2016-01-14 15:13:04 +0000
@@ -76,6 +76,8 @@
      void hide_cursor()
+     {
+     }
++
++    auto graphics_platform_library() -> std::string { return {}; }
  };
 === modified file 'tests/mir_test_framework/platform_graphics_dummy.cpp'
 --- tests/mir_test_framework/platform_graphics_dummy.cpp	2015-11-12 14:21:39 +0000
 +++ tests/mir_test_framework/platform_graphics_dummy.cpp	2016-01-14 15:13:04 +0000
@@ -37,7 +37,8 @@
      "dummy",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    "dummy"
  };
  mir::ModuleProperties const* describe_graphics_module()
 === modified file 'tests/mir_test_framework/stub_input.cpp'
 --- tests/mir_test_framework/stub_input.cpp	2015-11-25 20:26:59 +0000
 +++ tests/mir_test_framework/stub_input.cpp	2016-01-14 15:13:04 +0000
@@ -20,6 +20,8 @@
  #include "fake_input_device_impl.h"
  #include "mir/module_properties.h"
  #include "mir/assert_module_entry_point.h"
++#include "mir/libname.h"
++
  namespace mtf = mir_test_framework;
  namespace mo = mir::options;
@@ -52,10 +54,11 @@
  namespace
+ {
  mir::ModuleProperties const description = {
--    "stub-input",
++    "mir:stub-input",
      MIR_VERSION_MAJOR,
      MIR_VERSION_MINOR,
--    MIR_VERSION_MICRO
++    MIR_VERSION_MICRO,
++    mir::libname()
  };
+ }
 === modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
 --- tests/mir_test_framework/stubbed_graphics_platform.cpp	2015-11-12 14:21:39 +0000
 +++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2016-01-14 15:13:04 +0000
@@ -28,6 +28,7 @@
  #include "mir/fd.h"
  #include "mir/assert_module_entry_point.h"
  #include "mir/test/pipe.h"
++#include "mir/libname.h"
  #ifdef ANDROID
  #include "mir/test/doubles/stub_android_native_buffer.h"
@@ -50,6 +51,17 @@
  namespace
+ {
++namespace
++{
++mir::ModuleProperties const module_properties = {
++    "mir:stub-graphics",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO,
++    mir::libname()
++};
++}
++
  class StubFDBuffer : public mtd::StubBuffer
+ {
  public:
@@ -203,7 +215,7 @@
      std::shared_ptr<mg::PlatformIPCPackage> connection_ipc_package() override
+     {
--        auto package = std::make_shared<mg::PlatformIPCPackage>();
++        auto package = std::make_shared<mg::PlatformIPCPackage>(&module_properties);
          mtf::pack_stub_ipc_package(*package);
          return package;
+     }