From a95ded8ae9655f351b8de822ef049c0ce4fbac94 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:25:10 +0100 Subject: [PATCH 1/7] Add topkg-jbuilder Signed-off-by: David Scott --- pkg/pkg.ml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pkg/pkg.ml diff --git a/pkg/pkg.ml b/pkg/pkg.ml new file mode 100644 index 0000000..4d12667 --- /dev/null +++ b/pkg/pkg.ml @@ -0,0 +1,3 @@ +#!/usr/bin/env ocaml +#use "topfind" +#require "topkg-jbuilder.auto" From 358a19c33e104a76657c007965802bfc5d6000c2 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:25:40 +0100 Subject: [PATCH 2/7] Add Mirage standard license (ISC) Signed-off-by: David Scott --- LICENSE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..71c4fa2 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,14 @@ +Copyright (c) 2015, MirageOS + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + From 24a5b82136f408355c0a40addf4a3e281c70be0a Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:26:33 +0100 Subject: [PATCH 3/7] Remove old boilerplate Signed-off-by: David Scott --- lib/META | 35 ------------------------------ lib/mirage_block_xen.mldylib | 5 ----- lib/mirage_block_xen.mllib | 5 ----- lib/mirage_block_xen_back.mldylib | 5 ----- lib/mirage_block_xen_back.mllib | 5 ----- lib/mirage_block_xen_front.mldylib | 5 ----- lib/mirage_block_xen_front.mllib | 5 ----- 7 files changed, 65 deletions(-) delete mode 100644 lib/META delete mode 100644 lib/mirage_block_xen.mldylib delete mode 100644 lib/mirage_block_xen.mllib delete mode 100644 lib/mirage_block_xen_back.mldylib delete mode 100644 lib/mirage_block_xen_back.mllib delete mode 100644 lib/mirage_block_xen_front.mldylib delete mode 100644 lib/mirage_block_xen_front.mllib diff --git a/lib/META b/lib/META deleted file mode 100644 index 37f850f..0000000 --- a/lib/META +++ /dev/null @@ -1,35 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: 267b6498d742e0e8456926142eecbbf0) -version = "1.5.0" -description = "Xen block frontend and backend driver implementation" -requires = "cstruct cstruct.ppx" -archive(byte) = "mirage_block_xen.cma" -archive(byte, plugin) = "mirage_block_xen.cma" -archive(native) = "mirage_block_xen.cmxa" -archive(native, plugin) = "mirage_block_xen.cmxs" -exists_if = "mirage_block_xen.cma" -package "front" ( - version = "1.5.0" - description = "Xen block frontend and backend driver implementation" - requires = - "logs stringext lwt cstruct cstruct.ppx mirage-block-lwt io-page shared-memory-ring shared-memory-ring.lwt mirage-block-xen xen-evtchn xen-gnt mirage-xen" - archive(byte) = "mirage_block_xen_front.cma" - archive(byte, plugin) = "mirage_block_xen_front.cma" - archive(native) = "mirage_block_xen_front.cmxa" - archive(native, plugin) = "mirage_block_xen_front.cmxs" - exists_if = "mirage_block_xen_front.cma" -) - -package "back" ( - version = "1.5.0" - description = "Xen block frontend and backend driver implementation" - requires = - "logs lwt cstruct cstruct.ppx io-page shared-memory-ring shared-memory-ring.lwt mirage-block-xen xen-evtchn xen-gnt xenstore mirage-block-lwt rresult" - archive(byte) = "mirage_block_xen_back.cma" - archive(byte, plugin) = "mirage_block_xen_back.cma" - archive(native) = "mirage_block_xen_back.cmxa" - archive(native, plugin) = "mirage_block_xen_back.cmxs" - exists_if = "mirage_block_xen_back.cma" -) -# OASIS_STOP - diff --git a/lib/mirage_block_xen.mldylib b/lib/mirage_block_xen.mldylib deleted file mode 100644 index 5994866..0000000 --- a/lib/mirage_block_xen.mldylib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: f5917e73e0f394c5663700e03468ff1b) -Blkproto -Device_number -# OASIS_STOP diff --git a/lib/mirage_block_xen.mllib b/lib/mirage_block_xen.mllib deleted file mode 100644 index 5994866..0000000 --- a/lib/mirage_block_xen.mllib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: f5917e73e0f394c5663700e03468ff1b) -Blkproto -Device_number -# OASIS_STOP diff --git a/lib/mirage_block_xen_back.mldylib b/lib/mirage_block_xen_back.mldylib deleted file mode 100644 index d315af7..0000000 --- a/lib/mirage_block_xen_back.mldylib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: 60009a0d2e33b1b08a67635f9cf6ee81) -Blkback -Block_request -# OASIS_STOP diff --git a/lib/mirage_block_xen_back.mllib b/lib/mirage_block_xen_back.mllib deleted file mode 100644 index d315af7..0000000 --- a/lib/mirage_block_xen_back.mllib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: 60009a0d2e33b1b08a67635f9cf6ee81) -Blkback -Block_request -# OASIS_STOP diff --git a/lib/mirage_block_xen_front.mldylib b/lib/mirage_block_xen_front.mldylib deleted file mode 100644 index 66589c1..0000000 --- a/lib/mirage_block_xen_front.mldylib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: 107f6e4120747abbdecbbf87d3539115) -Blkfront -Block -# OASIS_STOP diff --git a/lib/mirage_block_xen_front.mllib b/lib/mirage_block_xen_front.mllib deleted file mode 100644 index 66589c1..0000000 --- a/lib/mirage_block_xen_front.mllib +++ /dev/null @@ -1,5 +0,0 @@ -# OASIS_START -# DO NOT EDIT (digest: 107f6e4120747abbdecbbf87d3539115) -Blkfront -Block -# OASIS_STOP From fda90b2e0ea09630f11a1b5599e8fdeaa6f62146 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:31:18 +0100 Subject: [PATCH 4/7] Reformat CHANGES.md to be more topkg friendly Signed-off-by: David Scott --- CHANGES => CHANGES.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) rename CHANGES => CHANGES.md (86%) diff --git a/CHANGES b/CHANGES.md similarity index 86% rename from CHANGES rename to CHANGES.md index b25e143..4a1ed25 100644 --- a/CHANGES +++ b/CHANGES.md @@ -1,24 +1,24 @@ -1.5.0 (unreleased) +## 1.5.0 (unreleased) * Build with MirageOS 3, and don't build against earlier versions * support and test compiler versions 4.03 and 4.04 * remove unused `id` type -1.4.0 (13-Mar-2016) +## 1.4.0 (2016-03-13): * Remove dependency on camlp4; use ppx instead * opam: now pass lint check * use logs rather than printf * blkfront: serialise calls to `connect` * blkfront: strip deprecated prefixes like aio: from params keys -1.3.1 (07-Mar-2015) +## 1.3.1 (2015-03-07): * Add an explicit `connect` to the interface signature (#35) -1.3.0 (29-Jan-2015) +## 1.3.0 (2015-01-29): * Update to `io-page.1.4.0` interface. * Add an `opam` 1.2 file for more convenient development. * Simplify travis configuration via centralised scripts. -1.2.0 (3-Oct-2014) +## 1.2.0 (2014-10-03): * blkback: add 'force_close' to more forcibly tear down the device * blkback: make 'destroy' idempotent * blkback: measure ring utilisation; segments per request; total @@ -28,7 +28,7 @@ than risk using the wrong disk * blkfront: use indirect segments if available -1.1.0 (30-Jan-2014): +## 1.1.0 (2014-01-30): * blkback: functorise over Activations. * Depend on `xen-grant` and `xen-event` libraries rather than `xenctrl`. * Remove `OS` module, depend on `io-page` (no `-unix` or `-xen`). @@ -38,42 +38,42 @@ * blkback: functorise over Activations, xenstore and backing store * blkback: add the toolstack-level device create/destroy functions -1.0.0 (10-Dec-2013): +## 1.0.0 (2013-12-10): * Add ISC copyrights everywhere. * Indent code with `ocp-indent`. -0.5.0 (8-Dec-2013) +## 0.5.0 (2013-12-08): * Block.connect: if we don't recognise the id, default to the first available disk. -0.4.0 (8-Dec-2013) +## 0.4.0 (2013-12-08): * implement new mirage-types BLOCK interface -0.2.5 (10-Nov-2013) +## 0.2.5 (2013-11-10): * fix build against cstruct.0.8.0 * blkfront write_page only needs to grant read access to the backend driver -0.2.4 (13-Oct-2013) +## 0.2.4 (2013-10-13): * fix reading non-page aligned sectors -0.2.3 (5-Oct-2013): +## 0.2.3 (2013-10-05): * add Travis continuous integration scripts. * use new Activations.after interface -0.2.2 (8-Aug-2013): +## 0.2.2 (2013-08-08): * update to mirage-platform 0.9.4 -0.2.0 (17-Jul-2013): +## 0.2.0 (2013-07-17): * blkback has significantly increased performance through mapping all requests on the ring simultaneously -0.1.3 (14-Jul-2013): +## 0.1.3 (2013-07-14): * 32-bit guest support fixed * fixed critical bug in previous version which caused pages to be mapped with the wrong protection flags, leading to immediate segfaults on write -0.1.2 (4-Jul-2013): +## 0.1.2 (2013-07-04): * updated following mirage-xen Gnttab API change From c73a0b1b9872e3a512a5d82037ec3929d269700d Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:31:54 +0100 Subject: [PATCH 5/7] CHANGES.md: v1.5.0 was released on 2017-01-24 (From the github releases page) Signed-off-by: David Scott --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4a1ed25..9f5ee52 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -## 1.5.0 (unreleased) +## 1.5.0 (2017-01-24) * Build with MirageOS 3, and don't build against earlier versions * support and test compiler versions 4.03 and 4.04 * remove unused `id` type From c512234c75a1a42960cb02e5b67f0a74ab79c360 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:33:36 +0100 Subject: [PATCH 6/7] Prepare to release v1.5.1 Signed-off-by: David Scott --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 9f5ee52..2930e51 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## 1.5.1 (2017-05-30): +* Switch to jbuilder and topkg +* Update to shared-memory-ring-lwt + ## 1.5.0 (2017-01-24) * Build with MirageOS 3, and don't build against earlier versions * support and test compiler versions 4.03 and 4.04 From f595dc6aa3e5911b2993a90a30955cda0eb3e211 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 30 May 2017 15:45:58 +0100 Subject: [PATCH 7/7] opam: add a doc url Signed-off-by: David Scott --- mirage-block-xen.opam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam index 728ec50..c809a3e 100644 --- a/mirage-block-xen.opam +++ b/mirage-block-xen.opam @@ -3,6 +3,8 @@ maintainer: "dave@recoil.org" homepage: "https://github.com/mirage/mirage-block-xen" dev-repo: "https://github.com/mirage/mirage-block-xen.git" bug-reports: "https://github.com/mirage/mirage-block-xen/issues" +doc: "https://mirage.github.io/mirage-block-xen" + authors: [ "Anil Madhavapeddy" "David Scott"