Re: [PATCH v5 09/18] vfio-user: define vfio-user-server object

2022-01-25 Thread Stefan Hajnoczi
On Wed, Jan 19, 2022 at 04:41:58PM -0500, Jagannathan Raman wrote:
> +/**
> + * VFU_OBJECT_ERROR - reports an error message. If auto_shutdown
> + * is set, it abort the machine on error. Otherwise, it logs an

s/abort/aborts/

Reviewed-by: Stefan Hajnoczi 


signature.asc
Description: PGP signature


[PATCH v5 09/18] vfio-user: define vfio-user-server object

2022-01-19 Thread Jagannathan Raman
Define vfio-user object which is remote process server for QEMU. Setup
object initialization functions and properties necessary to instantiate
the object

Signed-off-by: Elena Ufimtseva 
Signed-off-by: John G Johnson 
Signed-off-by: Jagannathan Raman 
---
 qapi/qom.json |  20 +++-
 hw/remote/vfio-user-obj.c | 194 ++
 MAINTAINERS   |   1 +
 hw/remote/meson.build |   1 +
 hw/remote/trace-events|   3 +
 5 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 hw/remote/vfio-user-obj.c

diff --git a/qapi/qom.json b/qapi/qom.json
index eeb5395ff3..ff266e4732 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -703,6 +703,20 @@
 { 'struct': 'RemoteObjectProperties',
   'data': { 'fd': 'str', 'devid': 'str' } }
 
+##
+# @VfioUserServerProperties:
+#
+# Properties for x-vfio-user-server objects.
+#
+# @socket: socket to be used by the libvfiouser library
+#
+# @device: the id of the device to be emulated at the server
+#
+# Since: 6.3
+##
+{ 'struct': 'VfioUserServerProperties',
+  'data': { 'socket': 'SocketAddress', 'device': 'str' } }
+
 ##
 # @RngProperties:
 #
@@ -842,7 +856,8 @@
 'tls-creds-psk',
 'tls-creds-x509',
 'tls-cipher-suites',
-{ 'name': 'x-remote-object', 'features': [ 'unstable' ] }
+{ 'name': 'x-remote-object', 'features': [ 'unstable' ] },
+{ 'name': 'x-vfio-user-server', 'features': [ 'unstable' ] }
   ] }
 
 ##
@@ -905,7 +920,8 @@
   'tls-creds-psk':  'TlsCredsPskProperties',
   'tls-creds-x509': 'TlsCredsX509Properties',
   'tls-cipher-suites':  'TlsCredsProperties',
-  'x-remote-object':'RemoteObjectProperties'
+  'x-remote-object':'RemoteObjectProperties',
+  'x-vfio-user-server': 'VfioUserServerProperties'
   } }
 
 ##
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
new file mode 100644
index 00..80757b0029
--- /dev/null
+++ b/hw/remote/vfio-user-obj.c
@@ -0,0 +1,194 @@
+/**
+ * QEMU vfio-user-server server object
+ *
+ * Copyright © 2022 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL-v2, version 2 or later.
+ *
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+/**
+ * Usage: add options:
+ * -machine x-remote
+ * -device ,id=
+ * -object x-vfio-user-server,id=,type=unix,path=,
+ * device=
+ *
+ * Note that x-vfio-user-server object must be used with x-remote machine only.
+ * This server could only support PCI devices for now.
+ *
+ * type - SocketAddress type - presently "unix" alone is supported. Required
+ *option
+ *
+ * path - named unix socket, it will be created by the server. It is
+ *a required option
+ *
+ * device - id of a device on the server, a required option. PCI devices
+ *  alone are supported presently.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "qom/object.h"
+#include "qom/object_interfaces.h"
+#include "qemu/error-report.h"
+#include "trace.h"
+#include "sysemu/runstate.h"
+#include "hw/boards.h"
+#include "hw/remote/machine.h"
+#include "qapi/error.h"
+#include "qapi/qapi-visit-sockets.h"
+
+#define TYPE_VFU_OBJECT "x-vfio-user-server"
+OBJECT_DECLARE_TYPE(VfuObject, VfuObjectClass, VFU_OBJECT)
+
+/**
+ * VFU_OBJECT_ERROR - reports an error message. If auto_shutdown
+ * is set, it abort the machine on error. Otherwise, it logs an
+ * error message without aborting.
+ */
+#define VFU_OBJECT_ERROR(o, fmt, ...) \
+{ \
+VfuObjectClass *oc = VFU_OBJECT_GET_CLASS(OBJECT(o)); \
+  \
+if (oc->auto_shutdown) {  \
+error_setg(_abort, (fmt), ## __VA_ARGS__);  \
+} else {  \
+error_report((fmt), ## __VA_ARGS__);  \
+} \
+} \
+
+struct VfuObjectClass {
+ObjectClass parent_class;
+
+unsigned int nr_devs;
+
+/*
+ * Can be set to shutdown automatically when all server object
+ * instances are destroyed
+ */
+bool auto_shutdown;
+};
+
+struct VfuObject {
+/* private */
+Object parent;
+
+SocketAddress *socket;
+
+char *device;
+
+Error *err;
+};
+
+static void vfu_object_set_socket(Object *obj, Visitor *v, const char *name,
+  void *opaque, Error **errp)
+{
+VfuObject *o = VFU_OBJECT(obj);
+
+qapi_free_SocketAddress(o->socket);
+
+o->socket = NULL;
+
+visit_type_SocketAddress(v, name, >socket, errp);
+
+if (o->socket->type != SOCKET_ADDRESS_TYPE_UNIX) {
+qapi_free_SocketAddress(o->socket);
+o->socket = NULL;
+