Skip to contentSkip to conversation

hw/remote: update libvfio-user subproject

PATCH In review John Levon 4 participants 5 messages Apr 22 – May 4

lore
Share & tools
lore

John Levon

author
#0 lore raw

PATCH 1/1 hw/remote: update libvfio-user subproject

The currently wrapped version of libvfio-user has compilation issues on newer compilers; bump the library version.

---
 hw/remote/vfio-user-obj.c     | 3 ++-
 subprojects/libvfio-user.wrap | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
hw/remote/vfio-user-obj.c +2 -1
index 12ecdab6de..3c89e7a741 100644
@@ -798,7 +798,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
         goto fail;
     }
 
-    ret = vfu_setup_device_dma(o->vfu_ctx, &dma_register, &dma_unregister);
+    ret = vfu_setup_device_dma(o->vfu_ctx, LIBVFIO_USER_MAX_DMA_REGIONS,
+                               &dma_register, &dma_unregister);
     if (ret < 0) {
         error_setg(errp, "vfu: Failed to setup DMA handlers for %s",
                    o->device);
subprojects/libvfio-user.wrap +1 -1
index 416955ca45..11db795f8a 100644
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://gitlab.com/qemu-project/libvfio-user.git
-revision = 0b28d205572c80b568a1003db2c8f37ca333e4d7
+revision = 4d9f663450fa80ff375612dbbafe073700e3d3d8
 depth = 1
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · John Levon

The currently wrapped version of libvfio-user has compilation issues on newer compilers; bump the library version.

I'd expect the subject to be "subprojects: update libvfio-user subproject" since that's really what the patch is doing. The hw/remote/vfio-user-obj.c update seems to be due to an API change in the updated library, so I'd add a sentence mentioning this in the commit message.

Otherwise the patch itself seems okay to me, so:

Quoted 30 lines
---
  hw/remote/vfio-user-obj.c     | 3 ++-
  subprojects/libvfio-user.wrap | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
hw/remote/vfio-user-obj.c +2 -1
index 12ecdab6de..3c89e7a741 100644
@@ -798,7 +798,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
          goto fail;
      }
 
-    ret = vfu_setup_device_dma(o->vfu_ctx, &dma_register, &dma_unregister);
+    ret = vfu_setup_device_dma(o->vfu_ctx, LIBVFIO_USER_MAX_DMA_REGIONS,
+                               &dma_register, &dma_unregister);
      if (ret < 0) {
          error_setg(errp, "vfu: Failed to setup DMA handlers for %s",
                     o->device);
subprojects/libvfio-user.wrap +1 -1
index 416955ca45..11db795f8a 100644
@@ -1,4 +1,4 @@
  [wrap-git]
  url = https://urldefense.proofpoint.com/v2/url?u=https-3A__gitlab.com_qemu-2Dproject_libvfio-2Duser.git&d=DwIDAg&c=s883GpUCOChKOHiocYtGcg&r=c23RpsaH4D2MKyD3EPJTDa0BAxz6tV8aUJqVSoytEiY&m=ISwI5jNoODKCfAhvIggfxoM8rCBQTgD-TrxSMkw8aq533QGLfHtgCaNaf41km6lt&s=CPF5JE7hn0XRJAOBEvH_Eajaj4chiPVUN6hCJS9bEpw&e=
-revision = 0b28d205572c80b568a1003db2c8f37ca333e4d7
+revision = 4d9f663450fa80ff375612dbbafe073700e3d3d8
  depth = 1
author
#2 lore raw
Quoted 5 lines · Mark Cave-Ayland
Quoted 2 lines

The currently wrapped version of libvfio-user has compilation issues on newer compilers; bump the library version.

I'd expect the subject to be "subprojects: update libvfio-user subproject" since that's really what the patch is doing. The hw/remote/vfio-user-obj.c

hw/remote is the only consumer of the subproject though...

regards
john

Reviewed-by on v1 1/1
#3 lore raw
In reply to John Levon
Quoted 4 lines · John Levon

The currently wrapped version of libvfio-user has compilation issues on newer compilers; bump the library version.

Looks good to me. Thanks for the patch!

Quoted 29 lines
---
  hw/remote/vfio-user-obj.c     | 3 ++-
  subprojects/libvfio-user.wrap | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
hw/remote/vfio-user-obj.c +2 -1
index 12ecdab6de..3c89e7a741 100644
@@ -798,7 +798,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
          goto fail;
      }
 
-    ret = vfu_setup_device_dma(o->vfu_ctx, &dma_register, &dma_unregister);
+    ret = vfu_setup_device_dma(o->vfu_ctx, LIBVFIO_USER_MAX_DMA_REGIONS,
+                               &dma_register, &dma_unregister);
      if (ret < 0) {
          error_setg(errp, "vfu: Failed to setup DMA handlers for %s",
                     o->device);
subprojects/libvfio-user.wrap +1 -1
index 416955ca45..11db795f8a 100644
@@ -1,4 +1,4 @@
  [wrap-git]
  url = https://gitlab.com/qemu-project/libvfio-user.git
-revision = 0b28d205572c80b568a1003db2c8f37ca333e4d7
+revision = 4d9f663450fa80ff375612dbbafe073700e3d3d8
  depth = 1
#4 lore raw
In reply to John Levon
Quoted 28 lines · John Levon

The currently wrapped version of libvfio-user has compilation issues on newer compilers; bump the library version.

---
  hw/remote/vfio-user-obj.c     | 3 ++-
  subprojects/libvfio-user.wrap | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
hw/remote/vfio-user-obj.c +2 -1
index 12ecdab6de..3c89e7a741 100644
@@ -798,7 +798,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
          goto fail;
      }
 
-    ret = vfu_setup_device_dma(o->vfu_ctx, &dma_register, &dma_unregister);
+    ret = vfu_setup_device_dma(o->vfu_ctx, LIBVFIO_USER_MAX_DMA_REGIONS,
+                               &dma_register, &dma_unregister);
      if (ret < 0) {
          error_setg(errp, "vfu: Failed to setup DMA handlers for %s",
                     o->device);
subprojects/libvfio-user.wrap +0 -0
index 416955ca45..11db795f8a 100644

subprojects/libvfio-user.wrap line 4

Quoted 5 lines
subprojects/libvfio-user.wrap +1 -1
@@ -1,4 +1,4 @@
  [wrap-git]
  url = https://gitlab.com/qemu-project/libvfio-user.git
-revision = 0b28d205572c80b568a1003db2c8f37ca333e4d7
+revision = 4d9f663450fa80ff375612dbbafe073700e3d3d8
  depth = 1

Applied to

https://github.com/legoater/qemu vfio-next

Please base future contributions on this branch.

Thanks,

C.