virtcontainers: Allow s390x appendVhostUserDevice

Remove the prohibition of vhost-user devices on s390x, which are by now
supported (e.g. vhost-user-fs-ccw). As a consequence,
appendVhostUserDevice no longer needs an error in its signature.
This enables virtio-fs support on s390x.

Fixes: #1469

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
This commit is contained in:
Jakob Naucke
2021-03-31 13:22:35 +02:00
parent 67ac4f4585
commit 7f60911333
5 changed files with 6 additions and 26 deletions

View File

@@ -224,7 +224,7 @@ func testQemuArchBaseAppend(t *testing.T, structure interface{}, expected []govm
case config.VFIODev:
devices = qemuArchBase.appendVFIODevice(devices, s)
case config.VhostUserDeviceAttrs:
devices, err = qemuArchBase.appendVhostUserDevice(devices, s)
devices = qemuArchBase.appendVhostUserDevice(devices, s)
}
assert.NoError(err)