cryptospore / rpms / qemu-kvm

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