open-edge-platform · rshanm8x · Jan 8, 2026
@@ -1,49 +1,36 @@
-From 34acc8e0028bf059c9c4e725c653df56eac7c296 Mon Sep 17 00:00:00 2001
-Message-ID: <34acc8e0028bf059c9c4e725c653df56eac7c296.1724767601.git.crobinso@redhat.com>
+From 22e852dae425014c4bc511ab4dc7c7f9c0752eb3 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <[email protected]>
 Date: Mon, 26 Aug 2024 14:06:14 -0400
-Subject: [PATCH] Disable 9p `local` tests that fail on copr aarch64
-Content-type: text/plain
+Subject: [PATCH 1/8] Disable 9p `local` tests that fail on copr aarch64
 
 Upstream issue:
 https://gitlab.com/qemu-project/qemu/-/issues/2541
 
 Signed-off-by: Cole Robinson <[email protected]>
 ---
- tests/qtest/virtio-9p-test.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ tests/qtest/virtio-9p-test.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
-index 3c8cd235cf..1d550eafb1 100644
+index ab3a12c816..261b0c17f1 100644
 --- a/tests/qtest/virtio-9p-test.c
 +++ b/tests/qtest/virtio-9p-test.c
-@@ -748,16 +748,16 @@ static void register_virtio_9p_test(void)
+@@ -792,6 +792,7 @@ static void register_virtio_9p_test(void)
      /* 9pfs test cases using the 'local' filesystem driver */
      opts.before = assign_9p_local_driver;
      qos_add_test("local/config", "virtio-9p", pci_config,  &opts);
--    qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);
--    qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts);
--    qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts);
--    qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts);
--    qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts);
--    qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink,
--                 &opts);
--    qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, &opts);
--    qos_add_test("local/unlinkat_hardlink", "virtio-9p", fs_unlinkat_hardlink,
--                 &opts);
-+    /* qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts); */
-+    /* qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts); */
-+    /* qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts); */
-+    /* qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts); */
-+    /* qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts); */
-+    /* qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink, */
-+    /*              &opts); */
-+    /* qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, &opts); */
-+    /* qos_add_test("local/unlinkat_hardlink", "virtio-9p", fs_unlinkat_hardlink, */
-+    /*              &opts); */
++#if 0
+     qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);
+     qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts);
+     qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts);
+@@ -804,6 +805,7 @@ static void register_virtio_9p_test(void)
+                  &opts);
+     qos_add_test("local/use_after_unlink", "virtio-9p", fs_use_after_unlink,
+                  &opts);
++#endif
  }
 
  libqos_init(register_virtio_9p_test);
 -- 
-2.46.0
+2.48.1
 
@@ -0,0 +1,26 @@
+From fe43f40a7acfd93493ac587a74e147732a39c782 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <[email protected]>
+Date: Tue, 15 Jul 2025 18:06:55 +0100
+Subject: [PATCH 2/2] TEMPORARY: increase test timeout
+
+https://gitlab.com/qemu-project/qemu/-/issues/3035
+---
+ tests/unit/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/unit/meson.build b/tests/unit/meson.build
+index d5248ae51d..a490fe0316 100644
+--- a/tests/unit/meson.build
++++ b/tests/unit/meson.build
+@@ -176,7 +176,7 @@ slow_tests = {
+   'test-crypto-block' : 300,
+   'test-crypto-tlscredsx509': 90,
+   'test-crypto-tlssession': 90,
+-  'test-replication': 60,
++  'test-replication': 6000,
+ }
+
+ foreach test_name, extra: tests
+-- 
+2.50.1
+
@@ -0,0 +1,53 @@
+From 379565f41b2b2ddf50c162a917405244d2f992f2 Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <[email protected]>
+Date: Sun, 26 Jan 2025 12:59:45 +1000
+Subject: [PATCH 2/8] nfs: Add support for libnfs v2 api
+
+Signed-off-by: Ronnie Sahlberg <[email protected]>
+---
+ block/nfs.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/block/nfs.c b/block/nfs.c
+index 0500f60c08..f768ee0c4b 100644
+--- a/block/nfs.c
++++ b/block/nfs.c
+@@ -268,11 +268,18 @@ static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, int64_t offset,
+     NFSRPC task;
+
+     nfs_co_init_task(bs, &task);
+-    task.iov = iov;
+
+     WITH_QEMU_LOCK_GUARD(&client->mutex) {
++#ifdef LIBNFS_API_V2
++        if (nfs_pread_async(client->context, client->fh,
++                            iov->iov[0].iov_base,
++                            bytes > iov->iov[0].iov_len ? iov->iov[0].iov_len : bytes,
++                            offset, nfs_co_generic_cb, &task) != 0) {
++#else
++        task.iov = iov;
+         if (nfs_pread_async(client->context, client->fh,
+                             offset, bytes, nfs_co_generic_cb, &task) != 0) {
++#endif            
+             return -ENOMEM;
+         }
+
+@@ -317,9 +324,15 @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, int64_t offset,
+     }
+
+     WITH_QEMU_LOCK_GUARD(&client->mutex) {
++#ifdef LIBNFS_API_V2
++        if (nfs_pwrite_async(client->context, client->fh,
++                             buf, bytes, offset,
++                             nfs_co_generic_cb, &task) != 0) {
++#else
+         if (nfs_pwrite_async(client->context, client->fh,
+                              offset, bytes, buf,
+                              nfs_co_generic_cb, &task) != 0) {
++#endif            
+             if (my_buffer) {
+                 g_free(buf);
+             }
+-- 
+2.48.1
+