libblkio/0002-virtio-driver-upgrade-to-memfd-0.6.1.patch

   1 From 2ad24655a51cbbc630cc9eece8b294627275e3f8 Mon Sep 17 00:00:00 2001
   2 From: Stefan Hajnoczi <stefanha@redhat.com>
   3 Date: Mon, 7 Nov 2022 09:41:59 -0500
   4 Subject: [PATCH 2/2] virtio-driver: upgrade to memfd 0.6.1
   5
   6 The memfd crate is outdated. Fedora would like to package the latest
   7 crate. Upgrade to the latest memfd version.
   8
   9 Suggested-by: Fabio Valentini <decathorpe@gmail.com>
  10 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  11 ---
  12  Cargo.lock               | 110 +++++++++++++++++++++++++++++++++++++--
  13  virtio-driver/Cargo.toml |   2 +-
  14  2 files changed, 108 insertions(+), 4 deletions(-)
  15
  16 diff --git a/Cargo.lock b/Cargo.lock
  17 index 241ae86..20f0714 100644
  18 --- a/Cargo.lock
  19 +++ b/Cargo.lock
  20 @@ -57,6 +57,33 @@ version = "0.3.0"
  21  source = "registry+https://github.com/rust-lang/crates.io-index"
  22  checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
  23
  24 +[[package]]
  25 +name = "errno"
  26 +version = "0.2.8"
  27 +source = "registry+https://github.com/rust-lang/crates.io-index"
  28 +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
  29 +dependencies = [
  30 + "errno-dragonfly",
  31 + "libc",
  32 + "winapi",
  33 +]
  34 +
  35 +[[package]]
  36 +name = "errno-dragonfly"
  37 +version = "0.1.2"
  38 +source = "registry+https://github.com/rust-lang/crates.io-index"
  39 +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
  40 +dependencies = [
  41 + "cc",
  42 + "libc",
  43 +]
  44 +
  45 +[[package]]
  46 +name = "io-lifetimes"
  47 +version = "0.7.5"
  48 +source = "registry+https://github.com/rust-lang/crates.io-index"
  49 +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
  50 +
  51  [[package]]
  52  name = "io-uring"
  53  version = "0.5.8"
  54 @@ -89,13 +116,19 @@ version = "0.2.137"
  55  source = "registry+https://github.com/rust-lang/crates.io-index"
  56  checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
  57
  58 +[[package]]
  59 +name = "linux-raw-sys"
  60 +version = "0.0.46"
  61 +source = "registry+https://github.com/rust-lang/crates.io-index"
  62 +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
  63 +
  64  [[package]]
  65  name = "memfd"
  66 -version = "0.4.1"
  67 +version = "0.6.1"
  68  source = "registry+https://github.com/rust-lang/crates.io-index"
  69 -checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a"
  70 +checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80"
  71  dependencies = [
  72 - "libc",
  73 + "rustix",
  74  ]
  75
  76  [[package]]
  77 @@ -166,6 +199,20 @@ dependencies = [
  78   "proc-macro2",
  79  ]
  80
  81 +[[package]]
  82 +name = "rustix"
  83 +version = "0.35.13"
  84 +source = "registry+https://github.com/rust-lang/crates.io-index"
  85 +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
  86 +dependencies = [
  87 + "bitflags",
  88 + "errno",
  89 + "io-lifetimes",
  90 + "libc",
  91 + "linux-raw-sys",
  92 + "windows-sys",
  93 +]
  94 +
  95  [[package]]
  96  name = "syn"
  97  version = "1.0.103"
  98 @@ -223,3 +270,60 @@ name = "winapi-x86_64-pc-windows-gnu"
  99  version = "0.4.0"
 100  source = "registry+https://github.com/rust-lang/crates.io-index"
 101  checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 102 +
 103 +[[package]]
 104 +name = "windows-sys"
 105 +version = "0.42.0"
 106 +source = "registry+https://github.com/rust-lang/crates.io-index"
 107 +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 108 +dependencies = [
 109 + "windows_aarch64_gnullvm",
 110 + "windows_aarch64_msvc",
 111 + "windows_i686_gnu",
 112 + "windows_i686_msvc",
 113 + "windows_x86_64_gnu",
 114 + "windows_x86_64_gnullvm",
 115 + "windows_x86_64_msvc",
 116 +]
 117 +
 118 +[[package]]
 119 +name = "windows_aarch64_gnullvm"
 120 +version = "0.42.0"
 121 +source = "registry+https://github.com/rust-lang/crates.io-index"
 122 +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 123 +
 124 +[[package]]
 125 +name = "windows_aarch64_msvc"
 126 +version = "0.42.0"
 127 +source = "registry+https://github.com/rust-lang/crates.io-index"
 128 +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 129 +
 130 +[[package]]
 131 +name = "windows_i686_gnu"
 132 +version = "0.42.0"
 133 +source = "registry+https://github.com/rust-lang/crates.io-index"
 134 +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 135 +
 136 +[[package]]
 137 +name = "windows_i686_msvc"
 138 +version = "0.42.0"
 139 +source = "registry+https://github.com/rust-lang/crates.io-index"
 140 +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 141 +
 142 +[[package]]
 143 +name = "windows_x86_64_gnu"
 144 +version = "0.42.0"
 145 +source = "registry+https://github.com/rust-lang/crates.io-index"
 146 +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 147 +
 148 +[[package]]
 149 +name = "windows_x86_64_gnullvm"
 150 +version = "0.42.0"
 151 +source = "registry+https://github.com/rust-lang/crates.io-index"
 152 +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 153 +
 154 +[[package]]
 155 +name = "windows_x86_64_msvc"
 156 +version = "0.42.0"
 157 +source = "registry+https://github.com/rust-lang/crates.io-index"
 158 +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 159 diff --git a/virtio-driver/Cargo.toml b/virtio-driver/Cargo.toml
 160 index d66aba1..2e754eb 100644
 161 --- a/virtio-driver/Cargo.toml
 162 +++ b/virtio-driver/Cargo.toml
 163 @@ -19,7 +19,7 @@ _unsafe-op-in-unsafe-fn = []
 164  bitflags = "1.3"
 165  libc = "0.2.87"
 166  nix = "0.24.1"
 167 -memfd = { version = "0.4.1", optional = true }
 168 +memfd = { version = "0.6.1", optional = true }
 169  memmap = { version = "0.7.0", optional = true }
 170  pci-driver = { version = "0.1.2", default-features = false, optional = true }
 171  virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"], optional = true }
 172 --
 173 2.37.0.rc2
 174