cryptospore / rpms / qemu-kvm

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