[for-2.8,2/2] vhost-vsock: add virtio sockets device

Commit Message

Claudio Imbrenda Sept. 12, 2016, 2:56 p.m. UTC

On 09/09/16 23:07, Michael S. Tsirkin wrote:
[...]
> Seems to fail build:
>
> /scm/qemu/hw/s390x/virtio-ccw.c:1664:4: error: ‘VirtioCcwDevice {aka
> struct VirtioCcwDevice}’ has no member named ‘bus_id’
>      DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
>     ^
> /scm/qemu/hw/s390x/virtio-ccw.c:1664:49: error: ‘VirtioCcwDevice {aka
> struct VirtioCcwDevice}’ has no member named ‘bus_id’
>      DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
>

Yeah, I had noticed that too; I sent this one-liner to correct that
issue on August 23rd; since it's small, I'll copypaste it here (modulo
automatic linewraps):



hope it helps,

Claudio

Patch

--- virtio-ccw.c~       2016-08-23 16:37:14.000000000 +0200
+++ virtio-ccw.c        2016-08-23 16:41:10.587853314 +0200
@@ -1661,7 +1661,7 @@ 
 #ifdef CONFIG_VHOST_VSOCK

 static Property vhost_vsock_ccw_properties[] = {
-    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
+    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),
     DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
                        VIRTIO_CCW_MAX_REV),
     DEFINE_PROP_END_OF_LIST(),