ddf19c
From 77eb3258e76a1ac240503572d4f41d45cb832ba2 Mon Sep 17 00:00:00 2001
ddf19c
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
ddf19c
Date: Mon, 27 Jan 2020 19:01:09 +0100
ddf19c
Subject: [PATCH 038/116] virtiofsd: add vhost-user.json file
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-35-dgilbert@redhat.com>
ddf19c
Patchwork-id: 93490
ddf19c
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 034/112] virtiofsd: add vhost-user.json file
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: Stefan Hajnoczi <stefanha@redhat.com>
ddf19c
ddf19c
Install a vhost-user.json file describing virtiofsd.  This allows
ddf19c
libvirt and other management tools to enumerate vhost-user backend
ddf19c
programs.
ddf19c
ddf19c
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
ddf19c
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
ddf19c
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
ddf19c
(cherry picked from commit 315616ed50ba15a5d7236ade8a402a93898202de)
ddf19c
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
---
ddf19c
 .gitignore                                | 1 +
ddf19c
 Makefile                                  | 1 +
ddf19c
 tools/virtiofsd/50-qemu-virtiofsd.json.in | 5 +++++
ddf19c
 3 files changed, 7 insertions(+)
ddf19c
 create mode 100644 tools/virtiofsd/50-qemu-virtiofsd.json.in
ddf19c
ddf19c
diff --git a/.gitignore b/.gitignore
ddf19c
index aefad32..d7a4f99 100644
ddf19c
--- a/.gitignore
ddf19c
+++ b/.gitignore
ddf19c
@@ -6,6 +6,7 @@
ddf19c
 /config-target.*
ddf19c
 /config.status
ddf19c
 /config-temp
ddf19c
+/tools/virtiofsd/50-qemu-virtiofsd.json
ddf19c
 /elf2dmp
ddf19c
 /trace-events-all
ddf19c
 /trace/generated-events.h
ddf19c
diff --git a/Makefile b/Makefile
ddf19c
index 1526775..0e9755d 100644
ddf19c
--- a/Makefile
ddf19c
+++ b/Makefile
ddf19c
@@ -332,6 +332,7 @@ endif
ddf19c
 
ddf19c
 ifdef CONFIG_LINUX
ddf19c
 HELPERS-y += virtiofsd$(EXESUF)
ddf19c
+vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
ddf19c
 endif
ddf19c
 
ddf19c
 # Sphinx does not allow building manuals into the same directory as
ddf19c
diff --git a/tools/virtiofsd/50-qemu-virtiofsd.json.in b/tools/virtiofsd/50-qemu-virtiofsd.json.in
ddf19c
new file mode 100644
ddf19c
index 0000000..9bcd86f
ddf19c
--- /dev/null
ddf19c
+++ b/tools/virtiofsd/50-qemu-virtiofsd.json.in
ddf19c
@@ -0,0 +1,5 @@
ddf19c
+{
ddf19c
+  "description": "QEMU virtiofsd vhost-user-fs",
ddf19c
+  "type": "fs",
ddf19c
+  "binary": "@libexecdir@/virtiofsd"
ddf19c
+}
ddf19c
-- 
ddf19c
1.8.3.1
ddf19c