<html><body>
<p>+1<br>
<br>
Sharad Mishra<br>
System x Enablement<br>
Linux Technology Center<br>
IBM<br>
<br>
<img width="16" height="16" src="cid:1__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt="Inactive hide details for Kaitlin Rupert ---01/28/2010 03:58:40 PM---# HG changeset patch"><font color="#424282">Kaitlin Rupert ---01/28/2010 03:58:40 PM---# HG changeset patch</font><br>
<br>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr valign="top"><td style="background-image:url(cid:2__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com); background-repeat: no-repeat; " width="40%">
<ul>
<ul>
<ul>
<ul><b><font size="2">Kaitlin Rupert <kaitlin@linux.vnet.ibm.com></font></b><font size="2"> </font><br>
<font size="2">Sent by: libvirt-cim-bounces@redhat.com</font>
<p><font size="2">01/28/2010 03:59 PM</font>
<table border="1">
<tr valign="top"><td width="168" bgcolor="#FFFFFF"><div align="center"><font size="2">Please respond to<br>
List for discussion and development of libvirt CIM <libvirt-cim@redhat.com></font></div></td></tr>
</table>
</ul>
</ul>
</ul>
</ul>
</td><td width="60%">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr valign="top"><td width="1%"><img width="58" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
<div align="right"><font size="2">To</font></div></td><td width="100%"><img width="1" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
<font size="2">libvirt-cim@redhat.com</font></td></tr>
<tr valign="top"><td width="1%"><img width="58" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
<div align="right"><font size="2">cc</font></div></td><td width="100%"><img width="1" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
</td></tr>
<tr valign="top"><td width="1%"><img width="58" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
<div align="right"><font size="2">Subject</font></div></td><td width="100%"><img width="1" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""><br>
<font size="2">[Libvirt-cim] [PATCH 3 of 3] Add support for defining a net device with the target device set</font></td></tr>
</table>
<table border="0" cellspacing="0" cellpadding="0">
<tr valign="top"><td width="58"><img width="1" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""></td><td width="336"><img width="1" height="1" src="cid:3__=07BBFC2FDFFC2EAD8f9e8a93df938@us.ibm.com" border="0" alt=""></td></tr>
</table>
</td></tr>
</table>
<br>
<tt># HG changeset patch<br>
# User Kaitlin Rupert <karupert@us.ibm.com><br>
# Date 1264722331 28800<br>
# Node ID 5b37fac8372729a7da9817a8fc0661159fc710b8<br>
# Parent 0273f86ebd7b6e54ec606d0a2a9aa54ce40246f1<br>
Add support for defining a net device with the target device set<br>
<br>
Also provide template RASDs with the VirtualDevice attribute exposed.<br>
<br>
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com><br>
<br>
diff -r 0273f86ebd7b -r 5b37fac83727 src/Virt_SettingsDefineCapabilities.c<br>
--- a/src/Virt_SettingsDefineCapabilities.c Thu Jan 28 15:45:31 2010 -0800<br>
+++ b/src/Virt_SettingsDefineCapabilities.c Thu Jan 28 15:45:31 2010 -0800<br>
@@ -546,6 +546,7 @@<br>
const char *net_type,<br>
const char *net_name,<br>
uint64_t num_nics,<br>
+ const char *device,<br>
const char *model,<br>
struct inst_list *list)<br>
{<br>
@@ -565,6 +566,10 @@<br>
(CMPIValue *)&num_nics, CMPI_uint64);<br>
<br>
if (model != NULL)<br>
+ CMSetProperty(inst, "VirtualDevice", <br>
+ (CMPIValue *)device, CMPI_chars);<br>
+<br>
+ if (model != NULL)<br>
CMSetProperty(inst, "ResourceSubType", <br>
(CMPIValue *)model, CMPI_chars);<br>
<br>
@@ -584,6 +589,7 @@<br>
CMPIStatus s = {CMPI_RC_OK, NULL};<br>
int i,j;<br>
const char *type[] = {"network", "bridge", "user"};<br>
+ const char *device[] = {"vtap1", NULL};<br>
const char *model[] = {"e1000", NULL};<br>
const char *name[] = {NULL, "br0", NULL};<br>
<br>
@@ -622,6 +628,7 @@<br>
type[i], <br>
name[i], <br>
num_nics, <br>
+ device[j], <br>
model[j], <br>
list);<br>
if (s.rc != CMPI_RC_OK)<br>
diff -r 0273f86ebd7b -r 5b37fac83727 src/Virt_VirtualSystemManagementService.c<br>
--- a/src/Virt_VirtualSystemManagementService.c Thu Jan 28 15:45:31 2010 -0800<br>
+++ b/src/Virt_VirtualSystemManagementService.c Thu Jan 28 15:45:31 2010 -0800<br>
@@ -752,6 +752,13 @@<br>
dev->dev.net.type = strdup(USER_TYPE);<br>
} else<br>
return "Invalid Network Type specified";<br>
+<br>
+ free(dev->dev.net.device);<br>
+ if (cu_get_str_prop(inst, "VirtualDevice", &val) != CMPI_RC_OK)<br>
+ dev->dev.net.device = NULL; <br>
+ else <br>
+ dev->dev.net.device = strdup(val);<br>
+<br>
free(dev->dev.net.model);<br>
<br>
if (cu_get_str_prop(inst, "ResourceSubType", &val) != CMPI_RC_OK)<br>
<br>
_______________________________________________<br>
Libvirt-cim mailing list<br>
Libvirt-cim@redhat.com<br>
</tt><tt><a href="https://www.redhat.com/mailman/listinfo/libvirt-cim">https://www.redhat.com/mailman/listinfo/libvirt-cim</a></tt><tt><br>
</tt><br>
</body></html>