From 33b8fe1a294d670d67a2e9802ca0c753826b1562 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Aug 2022 14:26:29 +0200
Subject: Merging upstream version 1.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 libnvme/nvme.i | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'libnvme')

diff --git a/libnvme/nvme.i b/libnvme/nvme.i
index a295068..14e2415 100644
--- a/libnvme/nvme.i
+++ b/libnvme/nvme.i
@@ -302,10 +302,7 @@ struct nvme_subsystem {
 };
 
 struct nvme_ctrl {
-  %immutable transport;
-  %immutable subsysnqn;
-  %immutable traddr;
-  %immutable trsvcid;
+  %immutable sysfs_dir;
   %immutable address;
   %immutable firmware;
   %immutable model;
@@ -313,13 +310,17 @@ struct nvme_ctrl {
   %immutable queue_count;
   %immutable serial;
   %immutable sqsize;
-  %immutable persistent;
+  %immutable transport;
+  %immutable subsysnqn;
+  %immutable traddr;
+  %immutable trsvcid;
+  %immutable dhchap_key;
+  %immutable cntrltype;
+  %immutable dctype;
   %immutable discovery_ctrl;
-  char *transport;
-  char *subsysnqn;
-  char *traddr;
-  char *trsvcid;
-  char *dhchap_key;
+  %immutable discovered;
+  %immutable persistent;
+  char *sysfs_dir;
   char *address;
   char *firmware;
   char *model;
@@ -327,8 +328,16 @@ struct nvme_ctrl {
   char *queue_count;
   char *serial;
   char *sqsize;
-  bool persistent;
+  char *transport;
+  char *subsysnqn;
+  char *traddr;
+  char *trsvcid;
+  char *dhchap_key;
+  char *cntrltype;
+  char *dctype;
   bool discovery_ctrl;
+  bool discovered;
+  bool persistent;
 };
 
 struct nvme_ns {
-- 
cgit v1.2.3