[CP-18781] Add device information in VIF.state (#288)

Signed-off-by: Marcello Seri <[email protected]>
xapi-project · Sep 13, 2016 · f66dd32 · f66dd32
1 parent 467271d
commit f66dd32
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/xenops_utils.ml b/lib/xenops_utils.ml
@@ -568,6 +568,7 @@ let unplugged_vif = {
      plugged = false;
      kthread_pid = 0;
      media_present = false;
+     device = None;
 }
 
 let unplugged_vgpu = {

diff --git a/xc/xenops_server_xen.ml b/xc/xenops_server_xen.ml
@@ -2590,11 +2590,14 @@ module VIF = struct
 					   from xenstore. The corrolary is that: only when the device
 					   is finally deleted from xenstore, can we remove bridges or
 					   switch configuration. *)
+					let domid = d.Device_common.frontend.Device_common.domid in
+					let device = "vif" ^ (string_of_int domid) ^ "." ^ (string_of_int vif.position) in
 					{
 						Vif.active = true;
 						plugged = true;
 						media_present = true;
-						kthread_pid = kthread_pid
+						kthread_pid = kthread_pid;
+						device = Some device
 					}
 				with
 					| (Does_not_exist(_,_))

diff --git a/xl/xenops_server_xenlight.ml b/xl/xenops_server_xenlight.ml
@@ -1651,11 +1651,14 @@ module VIF = struct
 					   from xenstore. The corrolary is that: only when the device
 					   is finally deleted from xenstore, can we remove bridges or
 					   switch configuration. *)
+					let domid = d.Device_common.frontend.Device_common.domid in
+					let device = "vif" ^ (string_of_int domid) ^ "." ^ (string_of_int vif.position) in
 					{
 						Vif.active = true;
 						plugged = true;
 						media_present = true;
-						kthread_pid = kthread_pid
+						kthread_pid = kthread_pid;
+						device = Some device
 					}
 				with
 					| (Does_not_exist(_,_))