Merge lp:~afrantzis/mir/remove-set-gbm-device-nested into lp:mir

[Alexandros Frantzis]

nested: Replace drm_set_gbm_device calls with platform_operation calls

nested: Replace drm_set_gbm_device calls with platform_operation calls

This MP removes the last instance of a platform-dependent API from the nested server.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2283
http://jenkins.qa.ubuntu.com/job/mir-ci/2871/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/868
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1110
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4163
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17664

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Targeting the wrong branch now. Somehow!?

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2283
http://jenkins.qa.ubuntu.com/job/mir-ci/2878/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1161
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1160/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/875
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1120
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4173
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17701

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

244 + auto request_ptr = reinterpret_cast<MirMesaSetGBMDeviceRequest*>(
245 + request_msg.data.data());

Here and elsewhere you're reinterpret_casting data allocated with a uint8_t alignment to structure that needs stricter alignment (e.g. int or type*). That isn't safe (and even on processors where it is "safe" can be very inefficient.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

Failure seems unrelated. Rebuilding.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2283
http://jenkins.qa.ubuntu.com/job/mir-ci/2884/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/881
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1127
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4178
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17709

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

> 244 + auto request_ptr = reinterpret_cast<MirMesaSetGBMDeviceRequest*>(
> 245 + request_msg.data.data());
>
> Here and elsewhere you're reinterpret_casting data allocated with a uint8_t alignment to structure > that needs stricter alignment (e.g. int or type*). That isn't safe (and even on processors where it > is "safe" can be very inefficient.

Fixed. I also fixed instances of this issue introduced by earlier branches.

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2284
http://jenkins.qa.ubuntu.com/job/mir-ci/2886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/883
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/883/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1130
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4181
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17713

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm too

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1103/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1155/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2285
http://jenkins.qa.ubuntu.com/job/mir-ci/2913/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/910
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/910/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1166
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4210
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17764

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/client/mir_connection_api.cpp'
--- src/client/mir_connection_api.cpp	2015-02-03 18:51:02 +0000
+++ src/client/mir_connection_api.cpp	2015-02-04 15:02:31 +0000
@@ -346,9 +346,12 @@
             static_cast<AuthMagicPlatformOperationContext*>(context)};
 
     auto response_data = mir_platform_message_get_data(response_msg.get());
-    auto auth_response = reinterpret_cast<MirMesaAuthMagicResponse const*>(response_data.data);
-
-    auth_magic_context->callback(auth_response->status, auth_magic_context->context);
+    MirMesaAuthMagicResponse auth_response{-1};
+
+    if (response_data.size == sizeof(auth_response))
+        std::memcpy(&auth_response, response_data.data, response_data.size);
+
+    auth_magic_context->callback(auth_response.status, auth_magic_context->context);
 }
 
 void assign_set_gbm_device_status(
@@ -359,11 +362,13 @@
         &mir_platform_message_release);
 
     auto const response_data = mir_platform_message_get_data(response_msg.get());
-    auto const set_gbm_device_response_ptr =
-        reinterpret_cast<MirMesaSetGBMDeviceResponse const*>(response_data.data);
+    MirMesaSetGBMDeviceResponse set_gbm_device_response{-1};
+
+    if (response_data.size == sizeof(set_gbm_device_response))
+        std::memcpy(&set_gbm_device_response, response_data.data, response_data.size);
 
     auto status_ptr = static_cast<int*>(context);
-    *status_ptr = set_gbm_device_response_ptr->status;
+    *status_ptr = set_gbm_device_response.status;
 }
 
 }

=== modified file 'src/include/platform/mir/graphics/nested_context.h'
--- src/include/platform/mir/graphics/nested_context.h	2015-02-02 12:18:18 +0000
+++ src/include/platform/mir/graphics/nested_context.h	2015-02-04 15:02:31 +0000
@@ -35,7 +35,6 @@
     virtual ~NestedContext() = default;
 
     virtual std::vector<int> platform_fd_items() = 0;
-    virtual void drm_set_gbm_device(struct gbm_device* dev) = 0;
     virtual PlatformOperationMessage platform_operation(
         unsigned int op, PlatformOperationMessage const& request) = 0;
 

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2015-02-03 15:07:44 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2015-02-04 15:02:31 +0000
@@ -136,14 +136,15 @@
     MirPlatformMessage const* msg)
 {
     auto const op = mir_platform_message_get_opcode(msg);
+    auto const msg_data = mir_platform_message_get_data(msg);
 
-    if (op == MirMesaPlatformOperation::set_gbm_device)
+    if (op == MirMesaPlatformOperation::set_gbm_device &&
+        msg_data.size == sizeof(MirMesaSetGBMDeviceRequest))
     {
-        auto const msg_data = mir_platform_message_get_data(msg);
-        auto const set_gbm_device_request_ptr =
-            reinterpret_cast<MirMesaSetGBMDeviceRequest const*>(msg_data.data);
+        MirMesaSetGBMDeviceRequest set_gbm_device_request{nullptr};
+        std::memcpy(&set_gbm_device_request, msg_data.data, msg_data.size);
 
-        gbm_dev = set_gbm_device_request_ptr->device;
+        gbm_dev = set_gbm_device_request.device;
 
         static int const success{0};
         MirMesaSetGBMDeviceResponse const response{success};

=== modified file 'src/platforms/mesa/server/guest_platform.cpp'
--- src/platforms/mesa/server/guest_platform.cpp	2015-01-22 09:00:14 +0000
+++ src/platforms/mesa/server/guest_platform.cpp	2015-02-04 15:02:31 +0000
@@ -19,32 +19,67 @@
  */
 
 #include "guest_platform.h"
-
+#include "nested_authentication.h"
+#include "ipc_operations.h"
 #include "buffer_allocator.h"
-#include "mir/graphics/buffer_ipc_message.h"
-#include "mir/graphics/platform_ipc_package.h"
+
 #include "mir/graphics/nested_context.h"
-
-#include "nested_authentication.h"
-
-#include "ipc_operations.h"
+#include "mir/graphics/platform_operation_message.h"
+#include "mir_toolkit/mesa/platform_operation.h"
 
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <mutex>
 #include <stdexcept>
+#include <cstring>
 
 namespace mg = mir::graphics;
 namespace mgm = mg::mesa;
 
-mgm::GuestPlatform::GuestPlatform(std::shared_ptr<NestedContext> const& nested_context_arg)
-{
-    //TODO: a bit of round-about initialization to clean up here
-    nested_context = nested_context_arg;
-    auto fds = nested_context->platform_fd_items();
+namespace
+{
+
+void set_guest_gbm_device(mg::NestedContext& nested_context, gbm_device* gbm_dev)
+{
+    MirMesaSetGBMDeviceRequest const request{gbm_dev};
+    mg::PlatformOperationMessage request_msg;
+    request_msg.data.resize(sizeof(MirMesaSetGBMDeviceRequest));
+    std::memcpy(request_msg.data.data(), &request, sizeof(request));
+
+    auto const response_msg = nested_context.platform_operation(
+        MirMesaPlatformOperation::set_gbm_device,
+        request_msg);
+
+    if (response_msg.data.size() == sizeof(MirMesaSetGBMDeviceResponse))
+    {
+        static int const success{0};
+        MirMesaSetGBMDeviceResponse response{-1};
+        std::memcpy(&response, response_msg.data.data(), response_msg.data.size());
+        if (response.status != success)
+        {
+            std::string const msg{"Nested Mir failed to set the gbm device."};
+            BOOST_THROW_EXCEPTION(
+                boost::enable_error_info(std::runtime_error(msg))
+                    << boost::errinfo_errno(response.status));
+        }
+    }
+    else
+    {
+        std::string const msg{"Nested Mir failed to set the gbm device: Invalid response."};
+        BOOST_THROW_EXCEPTION(std::runtime_error(msg));
+    }
+}
+
+}
+
+mgm::GuestPlatform::GuestPlatform(
+    std::shared_ptr<NestedContext> const& nested_context)
+    : nested_context{nested_context}
+{
+    auto const fds = nested_context->platform_fd_items();
     gbm.setup(fds.at(0));
-    nested_context->drm_set_gbm_device(gbm.device);
+    set_guest_gbm_device(*nested_context, gbm.device);
     ipc_ops = std::make_shared<mgm::IpcOperations>(
         std::make_shared<mgm::NestedAuthentication>(nested_context)); 
 }
@@ -61,12 +96,6 @@
     return std::make_shared<mgm::GuestPlatform>(nested_context);
 }
 
-namespace
-{
-std::shared_ptr<mgm::InternalNativeDisplay> native_display = nullptr;
-std::mutex native_display_guard;
-}
-
 std::shared_ptr<mg::PlatformIpcOperations> mgm::GuestPlatform::make_ipc_operations() const
 {
     return ipc_ops;

=== modified file 'src/platforms/mesa/server/guest_platform.h'
--- src/platforms/mesa/server/guest_platform.h	2015-01-22 09:00:14 +0000
+++ src/platforms/mesa/server/guest_platform.h	2015-02-04 15:02:31 +0000
@@ -48,7 +48,7 @@
     EGLNativeDisplayType egl_native_display() const override;
 
 private:
-    std::shared_ptr<NestedContext> nested_context;
+    std::shared_ptr<NestedContext> const nested_context;
     helpers::GBMHelper gbm;
     std::shared_ptr<PlatformIpcOperations> ipc_ops;
 };

=== modified file 'src/platforms/mesa/server/ipc_operations.cpp'
--- src/platforms/mesa/server/ipc_operations.cpp	2015-02-02 12:18:18 +0000
+++ src/platforms/mesa/server/ipc_operations.cpp	2015-02-04 15:02:31 +0000
@@ -31,6 +31,8 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/errinfo_errno.hpp>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mgm = mir::graphics::mesa;
 
@@ -89,8 +91,7 @@
         MirMesaAuthMagicRequest auth_magic_request;
         if (request.data.size() == sizeof(auth_magic_request))
         {
-            auth_magic_request =
-                *reinterpret_cast<decltype(auth_magic_request) const*>(request.data.data());
+            std::memcpy(&auth_magic_request, request.data.data(), request.data.size());
         }
         else
         {
@@ -98,27 +99,27 @@
                 std::runtime_error("Invalid request message for auth_magic platform operation"));
         }
 
-        mg::PlatformOperationMessage response;
-        response.data.resize(sizeof(MirMesaAuthMagicResponse));
-        auto const auth_magic_response_ptr =
-            reinterpret_cast<MirMesaAuthMagicResponse*>(response.data.data());
+        MirMesaAuthMagicResponse auth_magic_response{-1};
 
         try
         {
             drm_auth->auth_magic(auth_magic_request.magic);
-            auth_magic_response_ptr->status = 0;
+            auth_magic_response.status = 0;
         }
         catch (std::exception const& e)
         {
             auto errno_ptr = boost::get_error_info<boost::errinfo_errno>(e);
 
             if (errno_ptr != nullptr)
-                auth_magic_response_ptr->status = *errno_ptr;
+                auth_magic_response.status = *errno_ptr;
             else
                 throw;
         }
 
-        return response;
+        mg::PlatformOperationMessage response_msg;
+        response_msg.data.resize(sizeof(auth_magic_response));
+        std::memcpy(response_msg.data.data(), &auth_magic_response, sizeof(auth_magic_response));
+        return response_msg;
     }
     else if (op == MirMesaPlatformOperation::auth_fd)
     {

=== modified file 'src/platforms/mesa/server/nested_authentication.cpp'
--- src/platforms/mesa/server/nested_authentication.cpp	2015-02-02 12:18:18 +0000
+++ src/platforms/mesa/server/nested_authentication.cpp	2015-02-04 15:02:31 +0000
@@ -25,6 +25,8 @@
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mgm = mir::graphics::mesa;
 
@@ -33,12 +35,11 @@
 
 mg::PlatformOperationMessage make_auth_magic_request_message(drm_magic_t magic)
 {
-    mg::PlatformOperationMessage request;
-    request.data.resize(sizeof(MirMesaAuthMagicRequest));
-    auto auth_magic_request_ptr =
-        reinterpret_cast<MirMesaAuthMagicRequest*>(request.data.data());
-    auth_magic_request_ptr->magic = magic;
-    return request;
+    MirMesaAuthMagicRequest const request{magic};
+    mg::PlatformOperationMessage request_msg;
+    request_msg.data.resize(sizeof(request));
+    std::memcpy(request_msg.data.data(), &request, sizeof(request));
+    return request_msg;
 }
 
 MirMesaAuthMagicResponse auth_magic_response_from_message(
@@ -46,10 +47,10 @@
 {
     if (msg.data.size() == sizeof(MirMesaAuthMagicResponse))
     {
-        auto auth_magic_response_ptr =
-            reinterpret_cast<MirMesaAuthMagicResponse const*>(msg.data.data());
+        MirMesaAuthMagicResponse response{-1};
+        std::memcpy(&response, msg.data.data(), msg.data.size());
 
-        return *auth_magic_response_ptr;
+        return response;
     }
 
     BOOST_THROW_EXCEPTION(

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2015-02-02 12:18:18 +0000
+++ src/server/frontend/session_mediator.cpp	2015-02-04 15:02:31 +0000
@@ -61,6 +61,7 @@
 
 #include <mutex>
 #include <functional>
+#include <cstring>
 
 namespace ms = mir::scene;
 namespace mf = mir::frontend;
@@ -636,18 +637,18 @@
 
     auto const magic = request->magic();
 
+    MirMesaAuthMagicRequest const auth_magic_request{magic};
     mg::PlatformOperationMessage platform_request;
-    platform_request.data.resize(sizeof(MirMesaAuthMagicRequest));
-    auto const auth_magic_request_ptr =
-        reinterpret_cast<MirMesaAuthMagicRequest*>(platform_request.data.data());
-    *auth_magic_request_ptr = MirMesaAuthMagicRequest{magic};
+    platform_request.data.resize(sizeof(auth_magic_request));
+    std::memcpy(platform_request.data.data(), &auth_magic_request, sizeof(auth_magic_request));
 
     auto const platform_response = ipc_operations->platform_operation(
         MirMesaPlatformOperation::auth_magic, platform_request);
 
-    auto const auth_magic_response_ptr =
-        reinterpret_cast<MirMesaAuthMagicResponse const*>(platform_response.data.data());
-    response->set_status_code(auth_magic_response_ptr->status);
+    MirMesaAuthMagicResponse auth_magic_response{-1};
+    std::memcpy(&auth_magic_response, platform_response.data.data(),
+                platform_response.data.size());
+    response->set_status_code(auth_magic_response.status);
 
     done->Run();
 }

=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2015-02-03 18:51:02 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2015-02-04 15:02:31 +0000
@@ -18,7 +18,6 @@
 
 #include "mir_client_host_connection.h"
 #include "mir_toolkit/mir_client_library.h"
-#include "mir_toolkit/mir_client_library_drm.h"
 #include "mir/raii.h"
 #include "mir/graphics/platform_operation_message.h"
 
@@ -163,15 +162,6 @@
         mir_connection, surface_parameters);
 }
 
-void mgn::MirClientHostConnection::drm_set_gbm_device(struct gbm_device* dev)
-{
-    if (!mir_connection_drm_set_gbm_device(mir_connection, dev))
-    {
-        std::string const msg("Nested Mir failed to set the gbm device");
-        BOOST_THROW_EXCEPTION(std::runtime_error(msg));
-    }
-}
-
 mg::PlatformOperationMessage mgn::MirClientHostConnection::platform_operation(
     unsigned int op, mg::PlatformOperationMessage const& request)
 {

=== modified file 'src/server/graphics/nested/mir_client_host_connection.h'
--- src/server/graphics/nested/mir_client_host_connection.h	2015-02-02 12:18:18 +0000
+++ src/server/graphics/nested/mir_client_host_connection.h	2015-02-04 15:02:31 +0000
@@ -48,7 +48,6 @@
     void set_display_config_change_callback(std::function<void()> const& cb) override;
     void apply_display_config(MirDisplayConfiguration&) override;
 
-    void drm_set_gbm_device(struct gbm_device* dev) override;
     virtual PlatformOperationMessage platform_operation(
         unsigned int op, PlatformOperationMessage const& request) override;
 

=== modified file 'tests/include/mir_test_doubles/mock_nested_context.h'
--- tests/include/mir_test_doubles/mock_nested_context.h	2015-01-26 15:53:18 +0000
+++ tests/include/mir_test_doubles/mock_nested_context.h	2015-02-04 15:02:31 +0000
@@ -24,6 +24,21 @@
 
 namespace mir
 {
+namespace graphics
+{
+inline bool operator==(PlatformOperationMessage const& msg1,
+                       PlatformOperationMessage const& msg2)
+{
+    return msg1.data == msg2.data && msg1.fds == msg2.fds;
+}
+
+inline bool operator!=(PlatformOperationMessage const& msg1,
+                       PlatformOperationMessage const& msg2)
+{
+    return !(msg1 == msg2);
+}
+}
+
 namespace test
 {
 namespace doubles
@@ -33,7 +48,6 @@
 {
     MOCK_METHOD0(platform_fd_items, std::vector<int>());
     MOCK_METHOD1(drm_auth_magic, void(int magic));
-    MOCK_METHOD1(drm_set_gbm_device, void(struct gbm_device* dev));
     MOCK_METHOD2(platform_operation, graphics::PlatformOperationMessage(
         unsigned int, graphics::PlatformOperationMessage const&));
 };

=== modified file 'tests/include/mir_test_doubles/stub_host_connection.h'
--- tests/include/mir_test_doubles/stub_host_connection.h	2015-01-26 15:53:18 +0000
+++ tests/include/mir_test_doubles/stub_host_connection.h	2015-02-04 15:02:31 +0000
@@ -61,7 +61,6 @@
         return std::make_shared<NullHostSurface>();
     }
 
-    void drm_set_gbm_device(struct gbm_device*) override {}
     graphics::PlatformOperationMessage platform_operation(
         unsigned int, graphics::PlatformOperationMessage const&) override
     {

=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2015-02-02 12:18:18 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2015-02-04 15:02:31 +0000
@@ -35,6 +35,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mc = mir::compositor;
 namespace geom = mir::geometry;
@@ -102,9 +104,9 @@
             if (!platform)
             {
                 mg::PlatformOperationMessage pkg;
-                pkg.data.resize(sizeof(MirMesaAuthMagicResponse));
-                *(reinterpret_cast<MirMesaAuthMagicResponse*>(pkg.data.data())) =
-                    auth_magic_response;
+                pkg.data.resize(sizeof(auth_magic_response));
+                std::memcpy(pkg.data.data(), &auth_magic_response,
+                            sizeof(auth_magic_response));
 
                 auto ipc_ops = std::make_shared<NiceMock<MockAuthenticatingIpcOps>>();
                 EXPECT_CALL(*ipc_ops, platform_operation(_,_))

=== modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp'
--- tests/unit-tests/client/mesa/test_client_platform.cpp	2015-02-03 15:07:44 +0000
+++ tests/unit-tests/client/mesa/test_client_platform.cpp	2015-02-04 15:02:31 +0000
@@ -29,6 +29,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <cstring>
+
 namespace mcl = mir::client;
 namespace mclm = mir::client::mesa;
 namespace mtf = mir_test_framework;
@@ -95,9 +97,10 @@
     ASSERT_THAT(response_msg, NotNull());
     auto const response_data = mir_platform_message_get_data(response_msg.get());
     ASSERT_THAT(response_data.size, Eq(sizeof(MirMesaSetGBMDeviceResponse)));
-    auto const response_ptr =
-        reinterpret_cast<MirMesaSetGBMDeviceResponse const*>(response_data.data);
-    EXPECT_THAT(response_ptr->status, Eq(success));
+
+    MirMesaSetGBMDeviceResponse response{-1};
+    std::memcpy(&response, response_data.data, response_data.size);
+    EXPECT_THAT(response.status, Eq(success));
 }
 
 TEST_F(MesaClientPlatformTest, appends_gbm_device_to_platform_package)
@@ -115,6 +118,10 @@
 
     platform->populate(pkg);
     EXPECT_THAT(pkg.data_items, Eq(previous_data_count + (sizeof(gbm_dev_dummy) / sizeof(int))));
-    EXPECT_THAT(reinterpret_cast<struct gbm_device*>(pkg.data[previous_data_count]),
-                Eq(gbm_dev_dummy));
+
+    gbm_device* device_in_package{nullptr};
+    std::memcpy(&device_in_package, &pkg.data[previous_data_count],
+                sizeof(device_in_package));
+
+    EXPECT_THAT(device_in_package, Eq(gbm_dev_dummy));
 }

=== modified file 'tests/unit-tests/graphics/mesa/test_guest_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_guest_platform.cpp	2015-02-02 12:18:18 +0000
+++ tests/unit-tests/graphics/mesa/test_guest_platform.cpp	2015-02-04 15:02:31 +0000
@@ -33,6 +33,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mgm = mir::graphics::mesa;
 namespace mt = mir::test;
@@ -49,8 +51,17 @@
     {
         using namespace testing;
 
+        MirMesaSetGBMDeviceResponse const response_success{0};
+        mg::PlatformOperationMessage set_gbm_device_success_msg;
+        set_gbm_device_success_msg.data.resize(sizeof(response_success));
+        std::memcpy(set_gbm_device_success_msg.data.data(),
+                    &response_success, sizeof(response_success));
+
         ON_CALL(mock_nested_context, platform_fd_items())
             .WillByDefault(Return(std::vector<int>{mock_drm.fake_drm.fd()}));
+        ON_CALL(mock_nested_context,
+                platform_operation(MirMesaPlatformOperation::set_gbm_device, _))
+            .WillByDefault(Return(set_gbm_device_success_msg));
     }
 
 protected:
@@ -69,6 +80,8 @@
     mg::PlatformOperationMessage auth_fd_response{{},{auth_fd}};
 
     EXPECT_CALL(mock_nested_context,
+                platform_operation(MirMesaPlatformOperation::set_gbm_device, _));
+    EXPECT_CALL(mock_nested_context,
                 platform_operation(MirMesaPlatformOperation::auth_fd, _))
         .WillOnce(Return(auth_fd_response));
 
@@ -79,6 +92,14 @@
 
 TEST_F(MesaGuestPlatformTest, sets_gbm_device_during_initialization)
 {
-    EXPECT_CALL(mock_nested_context, drm_set_gbm_device(mock_gbm.fake_gbm.device));
+    MirMesaSetGBMDeviceRequest const request{mock_gbm.fake_gbm.device};
+    mg::PlatformOperationMessage request_msg;
+    request_msg.data.resize(sizeof(request));
+    std::memcpy(request_msg.data.data(), &request, sizeof(request));
+
+    EXPECT_CALL(mock_nested_context,
+                platform_operation(MirMesaPlatformOperation::set_gbm_device,
+                                   request_msg));
+
     mgm::GuestPlatform native(mt::fake_shared(mock_nested_context));
 }

=== modified file 'tests/unit-tests/graphics/mesa/test_ipc_operations.cpp'
--- tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2015-02-02 12:18:18 +0000
+++ tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2015-02-04 15:02:31 +0000
@@ -29,6 +29,8 @@
 #include "mir_test_doubles/mock_drm.h"
 #include <gtest/gtest.h>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
@@ -101,14 +103,14 @@
 
     mg::PlatformOperationMessage request_msg;
     request_msg.data.resize(sizeof(request));
-    *(reinterpret_cast<decltype(request)*>(request_msg.data.data())) = request;
+    std::memcpy(request_msg.data.data(), &request, sizeof(request));
 
     auto response_msg = ipc_ops.platform_operation(
         MirMesaPlatformOperation::auth_magic, request_msg);
 
-    MirMesaAuthMagicResponse response;
+    MirMesaAuthMagicResponse response{-1};
     ASSERT_THAT(response_msg.data.size(), Eq(sizeof(response)));
-    response = *(reinterpret_cast<decltype(response)*>(response_msg.data.data()));
+    std::memcpy(&response, response_msg.data.data(), response_msg.data.size());
     EXPECT_THAT(response.status, Eq(0));
 }
 

=== modified file 'tests/unit-tests/graphics/mesa/test_nested_authentication.cpp'
--- tests/unit-tests/graphics/mesa/test_nested_authentication.cpp	2015-02-02 12:18:18 +0000
+++ tests/unit-tests/graphics/mesa/test_nested_authentication.cpp	2015-02-04 15:02:31 +0000
@@ -25,6 +25,8 @@
 #include "mir_test/fake_shared.h"
 #include <gtest/gtest.h>
 
+#include <cstring>
+
 namespace mg = mir::graphics;
 namespace mgm = mir::graphics::mesa;
 namespace mt = mir::test;
@@ -40,38 +42,22 @@
 };
 }
 
-namespace mir
-{
-namespace graphics
-{
-
-bool operator==(mg::PlatformOperationMessage const& msg1,
-                mg::PlatformOperationMessage const& msg2)
-{
-    return msg1.data == msg2.data &&
-           msg1.fds == msg1.fds;
-}
-}
-
-}
-
 TEST_F(NestedAuthentication, uses_nested_context_for_auth_magic)
 {
     using namespace testing;
 
     unsigned int const magic{332211};
 
+    MirMesaAuthMagicRequest const request{magic};
     mg::PlatformOperationMessage msg;
-    msg.data.resize(sizeof(MirMesaAuthMagicRequest));
-    *reinterpret_cast<MirMesaAuthMagicRequest*>(msg.data.data()) =
-        MirMesaAuthMagicRequest{magic};
+    msg.data.resize(sizeof(request));
+    std::memcpy(msg.data.data(), &request, sizeof(request));
 
-    int const success{0};
+    MirMesaAuthMagicResponse const success_response{0};
     mg::PlatformOperationMessage auth_magic_success_response;
-    auth_magic_success_response.data.resize(sizeof(MirMesaAuthMagicResponse));
-    *reinterpret_cast<MirMesaAuthMagicResponse*>(
-        auth_magic_success_response.data.data()) =
-            MirMesaAuthMagicResponse{success};
+    auth_magic_success_response.data.resize(sizeof(success_response));
+    std::memcpy(auth_magic_success_response.data.data(), &success_response,
+                sizeof(success_response));
 
     EXPECT_CALL(mock_nested_context,
                 platform_operation(MirMesaPlatformOperation::auth_magic, msg))