cryptospore / rpms / qemu-kvm

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