From a28014305f033c48169dc76c42a0787c17e559de Mon Sep 17 00:00:00 2001 From: Zakarya Date: Wed, 6 Nov 2019 13:16:04 +0100 Subject: [PATCH 1/4] Merge branch 'dev' of /home/zakarya/CLionProjects/vkvm/shared-memory with conflicts. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ad5a2dd..961aac1 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,3 @@ Use the installation script provided in the Scripts repository to install the full package. Installing a single component is currently not supported. - From e99eaa8a255f3b12c08468e106cd3f017427441f Mon Sep 17 00:00:00 2001 From: zakarya Date: Wed, 13 Nov 2019 12:54:31 +0100 Subject: [PATCH 2/4] Update README --- README.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d4f2712..acfbdec 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@ # vKVM Shared Memory -Shared memory is a kernel-managed memory area that can be read and written by the graphical user interface , Text Renderer and the Library. +Shared memory is a kernel-managed memory area that can be read and written by the Library. ## Features -- set shared memory keys - Manage the shared memory - + - Create new key for the shared memory. + - Ask the user if he want to change the key of shared memory. + - Create shared memory and make it available to use it + - Delete the shared memory. ## Installation @@ -15,17 +17,10 @@ to install the full package. Installing a single component is currently not supported. -## Usage +## Usage mkdir build cd build cmake .. make -## Description - -changedKey(): create new Key for the Shared Memory. -getAnswerFromUser(): ask the User if he want to chgange the Key of Shared Memory. -initSharedMemory(): create Shared Memory and make it available t o use it -deleteSharedMemory(int s): delete the Shared memory. -deleteSharedMemory(): delete the Shared memory. From dc30cc142b1e52f53edff006fe32390f18051f6f Mon Sep 17 00:00:00 2001 From: zakarya Date: Wed, 13 Nov 2019 12:56:24 +0100 Subject: [PATCH 3/4] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acfbdec..d692491 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Shared memory is a kernel-managed memory area that can be read and written by the Library. -## Features +## Featuress - Manage the shared memory - Create new key for the shared memory. From 7483627e59d8fd4d5b076c630a6ac8853662b804 Mon Sep 17 00:00:00 2001 From: zakarya Date: Wed, 13 Nov 2019 12:57:08 +0100 Subject: [PATCH 4/4] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d692491..acfbdec 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Shared memory is a kernel-managed memory area that can be read and written by the Library. -## Featuress +## Features - Manage the shared memory - Create new key for the shared memory.