|
 |
22c213 |
From 912af6f7c270e2939a91c9b3f62b6ba1202edc43 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
Date: Mon, 27 Jan 2020 19:00:37 +0100
|
|
|
22c213 |
Subject: [PATCH 006/116] vhost-user-fs: remove "vhostfd" property
|
|
|
22c213 |
MIME-Version: 1.0
|
|
|
22c213 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c213 |
Content-Transfer-Encoding: 8bit
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Message-id: <20200127190227.40942-3-dgilbert@redhat.com>
|
|
|
22c213 |
Patchwork-id: 93458
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 002/112] vhost-user-fs: remove "vhostfd" property
|
|
|
22c213 |
Bugzilla: 1694164
|
|
|
22c213 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
The property doesn't make much sense for a vhost-user device.
|
|
|
22c213 |
|
|
|
22c213 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
22c213 |
Message-Id: <20191116112016.14872-1-marcandre.lureau@redhat.com>
|
|
|
22c213 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
(cherry picked from commit 703857348724319735d9be7b5b996e6445c6e6b9)
|
|
|
22c213 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
hw/virtio/vhost-user-fs.c | 1 -
|
|
|
22c213 |
include/hw/virtio/vhost-user-fs.h | 1 -
|
|
|
22c213 |
2 files changed, 2 deletions(-)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
|
|
|
22c213 |
index f0df7f4..ca0b7fc 100644
|
|
|
22c213 |
--- a/hw/virtio/vhost-user-fs.c
|
|
|
22c213 |
+++ b/hw/virtio/vhost-user-fs.c
|
|
|
22c213 |
@@ -263,7 +263,6 @@ static Property vuf_properties[] = {
|
|
|
22c213 |
DEFINE_PROP_UINT16("num-request-queues", VHostUserFS,
|
|
|
22c213 |
conf.num_request_queues, 1),
|
|
|
22c213 |
DEFINE_PROP_UINT16("queue-size", VHostUserFS, conf.queue_size, 128),
|
|
|
22c213 |
- DEFINE_PROP_STRING("vhostfd", VHostUserFS, conf.vhostfd),
|
|
|
22c213 |
DEFINE_PROP_END_OF_LIST(),
|
|
|
22c213 |
};
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h
|
|
|
22c213 |
index 539885b..9ff1bdb 100644
|
|
|
22c213 |
--- a/include/hw/virtio/vhost-user-fs.h
|
|
|
22c213 |
+++ b/include/hw/virtio/vhost-user-fs.h
|
|
|
22c213 |
@@ -28,7 +28,6 @@ typedef struct {
|
|
|
22c213 |
char *tag;
|
|
|
22c213 |
uint16_t num_request_queues;
|
|
|
22c213 |
uint16_t queue_size;
|
|
|
22c213 |
- char *vhostfd;
|
|
|
22c213 |
} VHostUserFSConf;
|
|
|
22c213 |
|
|
|
22c213 |
typedef struct {
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|