diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2016-08-14 21:28:12 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2016-08-14 22:05:51 -0400 |
commit | 446374d7c7f89603d8151b56824e2cac85ed8e0d (patch) | |
tree | a19140640151526f268aa381f23f1ebe0e9064ec | |
parent | 21bc54fc0cdc31de72b57d2b3c79cf9c2b83cf39 (diff) |
vhost/test: fix after swiotlb changes
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | drivers/vhost/test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 388eec4e1a90..97fb2f8fa930 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c | |||
@@ -220,20 +220,20 @@ static long vhost_test_reset_owner(struct vhost_test *n) | |||
220 | { | 220 | { |
221 | void *priv = NULL; | 221 | void *priv = NULL; |
222 | long err; | 222 | long err; |
223 | struct vhost_memory *memory; | 223 | struct vhost_umem *umem; |
224 | 224 | ||
225 | mutex_lock(&n->dev.mutex); | 225 | mutex_lock(&n->dev.mutex); |
226 | err = vhost_dev_check_owner(&n->dev); | 226 | err = vhost_dev_check_owner(&n->dev); |
227 | if (err) | 227 | if (err) |
228 | goto done; | 228 | goto done; |
229 | memory = vhost_dev_reset_owner_prepare(); | 229 | umem = vhost_dev_reset_owner_prepare(); |
230 | if (!memory) { | 230 | if (!umem) { |
231 | err = -ENOMEM; | 231 | err = -ENOMEM; |
232 | goto done; | 232 | goto done; |
233 | } | 233 | } |
234 | vhost_test_stop(n, &priv); | 234 | vhost_test_stop(n, &priv); |
235 | vhost_test_flush(n); | 235 | vhost_test_flush(n); |
236 | vhost_dev_reset_owner(&n->dev, memory); | 236 | vhost_dev_reset_owner(&n->dev, umem); |
237 | done: | 237 | done: |
238 | mutex_unlock(&n->dev.mutex); | 238 | mutex_unlock(&n->dev.mutex); |
239 | return err; | 239 | return err; |