Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-12-21 04:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] client is now opens shared memory from ivshmem passed fd

Browse Source
This commit is contained in:
Geoffrey McRae
2017-10-19 17:06:42 +11:00
parent 48facb3746
commit 3dd061b895
4 changed files with 162 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/main.c
View File

@@ -1,8 +1,6 @@
#include <SDL2/SDL.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
@@ -16,6 +14,7 @@
#define DEBUG
#include "debug.h"
#include "KVMGFXHeader.h"
#include "ivshmem/ivshmem.h"
#include "spice/spice.h"
#include "kb.h"
@@ -470,21 +469,16 @@ int main(int argc, char * argv[])
while(1)
{
umask(0);
const mode_t mode =
S_IRUSR | S_IWUSR |
S_IRGRP | S_IWGRP |
S_IROTH | S_IWOTH;
if ((shm_fd = shm_open("ivshmem", O_CREAT | O_RDWR, mode)) < 0)
if (!ivshmem_connect("/tmp/ivshmem_socket"))
{
DEBUG_ERROR("failed to open shared memory: %d %s", errno, strerror(errno));
DEBUG_ERROR("failed to connect to the ivshmem server");
break;
}
if (ftruncate(shm_fd, MAP_SIZE) != 0)
state.shm = (struct KVMGFXHeader *)ivshmem_get_map();
if (!state.shm)
{
DEBUG_ERROR("failed to truncate memory region");
DEBUG_ERROR("Failed to map memory");
break;
}
@@ -508,13 +502,6 @@ int main(int argc, char * argv[])
break;
}
state.shm = (struct KVMGFXHeader *)mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);
if (!state.shm)
{
DEBUG_ERROR("Failed to map memory");
break;
}
if (!(t_event = SDL_CreateThread(eventThread, "eventThread", NULL)))
{
DEBUG_ERROR("gpu create thread failed");
@@ -541,12 +528,8 @@ int main(int argc, char * argv[])
if (state.window)
SDL_DestroyWindow(state.window);
if (state.shm)
munmap(state.shm, MAP_SIZE);
if (shm_fd)
close(shm_fd);
//shm_unlink("kvm-windows");
SDL_Quit();
return 0;