shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

Introduce a standardized data structure for device addresses

Browse Source 
All guest devices now use a common device address structure
summarized by:

  enum virDomainDeviceAddressType {
    VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE,
    VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI,
  };

  struct _virDomainDevicePCIAddress {
    unsigned int domain;
    unsigned int bus;
    unsigned int slot;
    unsigned int function;
  };

  struct _virDomainDeviceInfo {
    int type;
    union {
        virDomainDevicePCIAddress pci;
    } addr;
  };

This replaces the anonymous structs in Disk/Net/Hostdev data
structures. Where available, the address is *always* printed
in the XML file, instead of being hidden in the internal state
file.

  <address type='pci' domain='0x0000' bus='0x1e' slot='0x07' function='0x0'/>

The structure definition is based on Wolfgang Mauerer's disk
controller patch series.

* docs/schemas/domain.rng: Define the <address> syntax and
  associate it with disk/net/hostdev devices
* src/conf/domain_conf.h, src/conf/domain_conf.c,
  src/libvirt_private.syms: APIs for parsing/formatting address
  information. Also remove the QEMU specific 'pci_addr' attributes
* src/qemu/qemu_driver.c: Replace use of 'pci_addr' attrs with
  new standardized format.
This commit is contained in:
Daniel P. Berrange 2009-11-30 18:35:58 +00:00
parent e8ac4a79f1
commit 1b0cce7d3a
5 changed files with 428 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
docs/schemas/domain.rng
View File

@ -385,6 +385,9 @@
<optional> <optional>
<ref name="encryption"/> <ref name="encryption"/>
</optional> </optional>
<optional>
<ref name="address"/>
</optional>
</define> </define>
<!-- <!--
A disk description can be either of type file or block A disk description can be either of type file or block
@ -715,6 +718,9 @@
<empty/> <empty/>
</element> </element>
</optional> </optional>
<optional>
<ref name="address"/>
</optional>
</interleave> </interleave>
</define> </define>
<!-- <!--
@ -1134,10 +1140,15 @@
<choice> <choice>
<ref name="usbproduct"/> <ref name="usbproduct"/>
<ref name="usbaddress"/> <ref name="usbaddress"/>
<ref name="pciaddress"/> <element name="address">
<ref name="pciaddress"/>
</element>
</choice> </choice>
</element> </element>
</group> </group>
<optional>
<ref name="address"/>
</optional>
</element> </element>
</define> </define>
<define name="usbproduct"> <define name="usbproduct">
@ -1163,22 +1174,20 @@
</element> </element>
</define> </define>
<define name="pciaddress"> <define name="pciaddress">
<element name="address"> <optional>
<optional> <attribute name="domain">
<attribute name="domain"> <ref name="pciDomain"/>
<ref name="pciDomain"/>
</attribute>
</optional>
<attribute name="bus">
<ref name="pciBus"/>
</attribute> </attribute>
<attribute name="slot"> </optional>
<ref name="pciSlot"/> <attribute name="bus">
</attribute> <ref name="pciBus"/>
<attribute name="function"> </attribute>
<ref name="pciFunc"/> <attribute name="slot">
</attribute> <ref name="pciSlot"/>
</element> </attribute>
<attribute name="function">
<ref name="pciFunc"/>
</attribute>
</define> </define>
<!-- <!--
Devices attached to a domain. Devices attached to a domain.
@ -1286,6 +1295,20 @@
</interleave> </interleave>
</element> </element>
</define> </define>
<define name="address">
<element name="address">
<choice>
<group>
<attribute name="type">
<value>pci</value>
</attribute>
<ref name="pciaddress"/>
</group>
</choice>
</element>
</define>
<!-- <!--
Type library Type library

420
src/conf/domain_conf.c
View File

@ -88,6 +88,10 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
"hostdev", "hostdev",
"watchdog") "watchdog")
VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
"none",
"pci")
VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST,
"block", "block",
"file", "file",
@ -357,6 +361,7 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
VIR_FREE(def->driverName); VIR_FREE(def->driverName);
VIR_FREE(def->driverType); VIR_FREE(def->driverType);
virStorageEncryptionFree(def->encryption); virStorageEncryptionFree(def->encryption);
virDomainDeviceInfoClear(&def->info);
VIR_FREE(def); VIR_FREE(def);
} }
@ -408,8 +413,10 @@ void virDomainNetDefFree(virDomainNetDefPtr def)
} }
VIR_FREE(def->ifname); VIR_FREE(def->ifname);
VIR_FREE(def->nic_name);
VIR_FREE(def->hostnet_name); VIR_FREE(def->hostnet_name);
virDomainDeviceInfoClear(&def->info);
VIR_FREE(def); VIR_FREE(def);
} }
@ -483,6 +490,7 @@ void virDomainHostdevDefFree(virDomainHostdevDefPtr def)
return; return;
VIR_FREE(def->target); VIR_FREE(def->target);
virDomainDeviceInfoClear(&def->info);
VIR_FREE(def); VIR_FREE(def);
} }
@ -731,6 +739,220 @@ void virDomainRemoveInactive(virDomainObjListPtr doms,
} }
int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info,
int type)
{
if (info->type != type)
return 0;
switch (info->type) {
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
return virDomainDevicePCIAddressIsValid(&info->addr.pci);
}
return 0;
}
int virDomainDevicePCIAddressIsValid(virDomainDevicePCIAddressPtr addr)
{
return addr->domain || addr->bus || addr->slot;
}
int virDomainDeviceInfoIsSet(virDomainDeviceInfoPtr info)
{
if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
return 1;
return 0;
}
void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info)
{
memset(&info->addr, 0, sizeof(info->addr));
info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE;
}
/* Generate a string representation of a device address
* @param address Device address to stringify
*/
static int virDomainDeviceInfoFormat(virBufferPtr buf,
virDomainDeviceInfoPtr info)
{
if (!info) {
virDomainReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("missing device information"));
return -1;
}
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
return 0;
/* We'll be in domain/devices/[device type]/ so 3 level indent */
virBufferVSprintf(buf, " <address type='%s'",
virDomainDeviceAddressTypeToString(info->type));
switch (info->type) {
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
virBufferVSprintf(buf, " domain='0x%.4x' bus='0x%.2x' slot='0x%.2x' function='0x%.1x'",
info->addr.pci.domain,
info->addr.pci.bus,
info->addr.pci.slot,
info->addr.pci.function);
break;
default:
virDomainReportError(NULL, VIR_ERR_INTERNAL_ERROR,
_("unknown address type '%d'"), info->type);
return -1;
}
virBufferAddLit(buf, "/>\n");
return 0;
}
int virDomainDevicePCIAddressEqual(virDomainDevicePCIAddressPtr a,
virDomainDevicePCIAddressPtr b)
{
if (a->domain == b->domain &&
a->bus == b->bus &&
a->slot == b->slot &&
a->function == b->function)
return 1;
return 0;
}
static int
virDomainDevicePCIAddressParseXML(virConnectPtr conn,
xmlNodePtr node,
virDomainDevicePCIAddressPtr addr)
{
char *domain, *slot, *bus, *function;
int ret = -1;
memset(addr, 0, sizeof(*addr));
domain = virXMLPropString(node, "domain");
bus = virXMLPropString(node, "bus");
slot = virXMLPropString(node, "slot");
function = virXMLPropString(node, "function");
if (domain &&
virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse <address> 'domain' attribute"));
goto cleanup;
}
if (bus &&
virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse <address> 'bus' attribute"));
goto cleanup;
}
if (slot &&
virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse <address> 'slot' attribute"));
goto cleanup;
}
if (function &&
virStrToLong_ui(function, NULL, 16, &addr->function) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse <address> 'function' attribute"));
goto cleanup;
}
if (!virDomainDevicePCIAddressIsValid(addr)) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Insufficient specification for PCI address"));
goto cleanup;
}
ret = 0;
cleanup:
VIR_FREE(domain);
VIR_FREE(bus);
VIR_FREE(slot);
VIR_FREE(function);
return ret;
}
/* Parse the XML definition for a device address
* @param node XML nodeset to parse for device address definition
*/
static int
virDomainDeviceInfoParseXML(virConnectPtr conn,
xmlNodePtr node,
virDomainDeviceInfoPtr info,
unsigned int flags ATTRIBUTE_UNUSED)
{
xmlNodePtr cur;
xmlNodePtr address = NULL;
char *type = NULL;
int ret = -1;
virDomainDeviceInfoClear(info);
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (address == NULL &&
xmlStrEqual(cur->name, BAD_CAST "address")) {
address = cur;
}
}
cur = cur->next;
}
if (!address)
return 0;
type = virXMLPropString(address, "type");
if (type) {
if ((info->type = virDomainDeviceAddressTypeFromString(type)) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("unknown address type '%s'"), type);
goto cleanup;
}
} else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("No type specified for device address"));
goto cleanup;
}
switch (info->type) {
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
if (virDomainDevicePCIAddressParseXML(conn, address, &info->addr.pci) < 0)
goto cleanup;
break;
default:
/* Should not happen */
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("Unknown device address type"));
goto cleanup;
}
ret = 0;
cleanup:
VIR_FREE(type);
return ret;
}
/* Parse the XML definition for a disk /* Parse the XML definition for a disk
* @param node XML nodeset to parse for disk definition * @param node XML nodeset to parse for disk definition
*/ */
@ -819,6 +1041,7 @@ virDomainDiskDefParseXML(virConnectPtr conn,
def->shared = 1; def->shared = 1;
} else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
xmlStrEqual(cur->name, BAD_CAST "state")) { xmlStrEqual(cur->name, BAD_CAST "state")) {
/* Legacy back-compat. Don't add any more attributes here */
devaddr = virXMLPropString(cur, "devaddr"); devaddr = virXMLPropString(cur, "devaddr");
} else if (encryption == NULL && } else if (encryption == NULL &&
xmlStrEqual(cur->name, BAD_CAST "encryption")) { xmlStrEqual(cur->name, BAD_CAST "encryption")) {
@ -928,15 +1151,20 @@ virDomainDiskDefParseXML(virConnectPtr conn,
goto error; goto error;
} }
if (devaddr && if (devaddr) {
sscanf(devaddr, "%x:%x:%x", if (sscanf(devaddr, "%x:%x:%x",
&def->pci_addr.domain, &def->info.addr.pci.domain,
&def->pci_addr.bus, &def->info.addr.pci.bus,
&def->pci_addr.slot) < 3) { &def->info.addr.pci.slot) < 3) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("Unable to parse devaddr parameter '%s'"), _("Unable to parse devaddr parameter '%s'"),
devaddr); devaddr);
goto error; goto error;
}
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} else {
if (virDomainDeviceInfoParseXML(conn, node, &def->info, flags) < 0)
goto error;
} }
def->src = source; def->src = source;
@ -1153,6 +1381,7 @@ virDomainNetDefParseXML(virConnectPtr conn,
model = virXMLPropString(cur, "type"); model = virXMLPropString(cur, "type");
} else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
xmlStrEqual(cur->name, BAD_CAST "state")) { xmlStrEqual(cur->name, BAD_CAST "state")) {
/* Legacy back-compat. Don't add any more attributes here */
nic_name = virXMLPropString(cur, "nic"); nic_name = virXMLPropString(cur, "nic");
hostnet_name = virXMLPropString(cur, "hostnet"); hostnet_name = virXMLPropString(cur, "hostnet");
devaddr = virXMLPropString(cur, "devaddr"); devaddr = virXMLPropString(cur, "devaddr");
@ -1173,14 +1402,28 @@ virDomainNetDefParseXML(virConnectPtr conn,
virCapabilitiesGenerateMac(caps, def->mac); virCapabilitiesGenerateMac(caps, def->mac);
} }
if (devaddr && if (devaddr) {
sscanf(devaddr, "%x:%x:%x", if (sscanf(devaddr, "%x:%x:%x",
&def->pci_addr.domain, &def->info.addr.pci.domain,
&def->pci_addr.bus, &def->info.addr.pci.bus,
&def->pci_addr.slot) < 3) { &def->info.addr.pci.slot) < 3) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("Unable to parse devaddr parameter '%s'"), _("Unable to parse devaddr parameter '%s'"),
devaddr); devaddr);
goto error;
}
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} else {
if (virDomainDeviceInfoParseXML(conn, node, &def->info, flags) < 0)
goto error;
}
/* XXX what about ISA/USB based NIC models - once we support
* them we should make sure address type is correct */
if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Network interfaces must use 'pci' address type"));
goto error; goto error;
} }
@ -2321,83 +2564,27 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "address")) { if (xmlStrEqual(cur->name, BAD_CAST "address")) {
virDomainDevicePCIAddressPtr addr =
&def->source.subsys.u.pci;
char *domain = virXMLPropString(cur, "domain"); if (virDomainDevicePCIAddressParseXML(conn, cur, addr) < 0)
if (domain) {
if (virStrToLong_ui(domain, NULL, 0,
&def->source.subsys.u.pci.domain) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot parse domain %s"),
domain);
VIR_FREE(domain);
goto out;
}
VIR_FREE(domain);
}
char *bus = virXMLPropString(cur, "bus");
if (bus) {
if (virStrToLong_ui(bus, NULL, 0,
&def->source.subsys.u.pci.bus) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot parse bus %s"), bus);
VIR_FREE(bus);
goto out;
}
VIR_FREE(bus);
} else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
"%s", _("pci address needs bus id"));
goto out; goto out;
}
char *slot = virXMLPropString(cur, "slot");
if (slot) {
if (virStrToLong_ui(slot, NULL, 0,
&def->source.subsys.u.pci.slot) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot parse slot %s"),
slot);
VIR_FREE(slot);
goto out;
}
VIR_FREE(slot);
} else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
"%s", _("pci address needs slot id"));
goto out;
}
char *function = virXMLPropString(cur, "function");
if (function) {
if (virStrToLong_ui(function, NULL, 0,
&def->source.subsys.u.pci.function) < 0) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot parse function %s"),
function);
VIR_FREE(function);
goto out;
}
VIR_FREE(function);
} else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("pci address needs function id"));
goto out;
}
} else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
xmlStrEqual(cur->name, BAD_CAST "state")) { xmlStrEqual(cur->name, BAD_CAST "state")) {
/* Legacy back-compat. Don't add any more attributes here */
char *devaddr = virXMLPropString(cur, "devaddr"); char *devaddr = virXMLPropString(cur, "devaddr");
if (devaddr && if (devaddr &&
sscanf(devaddr, "%x:%x:%x", sscanf(devaddr, "%x:%x:%x",
&def->source.subsys.u.pci.guest_addr.domain, &def->info.addr.pci.domain,
&def->source.subsys.u.pci.guest_addr.bus, &def->info.addr.pci.bus,
&def->source.subsys.u.pci.guest_addr.slot) < 3) { &def->info.addr.pci.slot) < 3) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("Unable to parse devaddr parameter '%s'"), _("Unable to parse devaddr parameter '%s'"),
devaddr); devaddr);
VIR_FREE(devaddr); VIR_FREE(devaddr);
goto out; goto out;
} }
def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
} else { } else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("unknown pci source type '%s'"), _("unknown pci source type '%s'"),
@ -2475,14 +2662,29 @@ virDomainHostdevDefParseXML(virConnectPtr conn,
if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def, flags) < 0) if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def, flags) < 0)
goto error; goto error;
} }
} else {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("unknown node %s"), cur->name);
} }
} }
cur = cur->next; cur = cur->next;
} }
if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
if (virDomainDeviceInfoParseXML(conn, node, &def->info, flags) < 0)
goto error;
}
if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
switch (def->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("PCI host devices must use 'pci' address type"));
goto error;
}
break;
}
}
cleanup: cleanup:
VIR_FREE(type); VIR_FREE(type);
VIR_FREE(mode); VIR_FREE(mode);
@ -3869,8 +4071,7 @@ virDomainLifecycleDefFormat(virConnectPtr conn,
static int static int
virDomainDiskDefFormat(virConnectPtr conn, virDomainDiskDefFormat(virConnectPtr conn,
virBufferPtr buf, virBufferPtr buf,
virDomainDiskDefPtr def, virDomainDiskDefPtr def)
int flags)
{ {
const char *type = virDomainDiskTypeToString(def->type); const char *type = virDomainDiskTypeToString(def->type);
const char *device = virDomainDiskDeviceTypeToString(def->device); const char *device = virDomainDiskDeviceTypeToString(def->device);
@ -3947,15 +4148,8 @@ virDomainDiskDefFormat(virConnectPtr conn,
virStorageEncryptionFormat(conn, buf, def->encryption) < 0) virStorageEncryptionFormat(conn, buf, def->encryption) < 0)
return -1; return -1;
if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) { if (virDomainDeviceInfoFormat(buf, &def->info) < 0)
virBufferAddLit(buf, " <state"); return -1;
if (virDiskHasValidPciAddr(def))
virBufferVSprintf(buf, " devaddr='%.4x:%.2x:%.2x'",
def->pci_addr.domain,
def->pci_addr.bus,
def->pci_addr.slot);
virBufferAddLit(buf, "/>\n");
}
virBufferAddLit(buf, " </disk>\n"); virBufferAddLit(buf, " </disk>\n");
@ -4089,21 +4283,18 @@ virDomainNetDefFormat(virConnectPtr conn,
def->model); def->model);
if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) { if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) {
/* Legacy back-compat. Don't add any more attributes here */
virBufferAddLit(buf, " <state"); virBufferAddLit(buf, " <state");
if (def->nic_name)
virBufferEscapeString(buf, " nic='%s'", def->nic_name);
if (def->hostnet_name) if (def->hostnet_name)
virBufferEscapeString(buf, " hostnet='%s'", def->hostnet_name); virBufferEscapeString(buf, " hostnet='%s'", def->hostnet_name);
if (virNetHasValidPciAddr(def))
virBufferVSprintf(buf, " devaddr='%.4x:%.2x:%.2x'",
def->pci_addr.domain,
def->pci_addr.bus,
def->pci_addr.slot);
if (def->vlan > 0) if (def->vlan > 0)
virBufferVSprintf(buf, " vlan='%d'", def->vlan); virBufferVSprintf(buf, " vlan='%d'", def->vlan);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
if (virDomainDeviceInfoFormat(buf, &def->info) < 0)
return -1;
virBufferAddLit(buf, " </interface>\n"); virBufferAddLit(buf, " </interface>\n");
return 0; return 0;
@ -4477,8 +4668,7 @@ virDomainGraphicsDefFormat(virConnectPtr conn,
static int static int
virDomainHostdevDefFormat(virConnectPtr conn, virDomainHostdevDefFormat(virConnectPtr conn,
virBufferPtr buf, virBufferPtr buf,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def)
int flags)
{ {
const char *mode = virDomainHostdevModeTypeToString(def->mode); const char *mode = virDomainHostdevModeTypeToString(def->mode);
const char *type; const char *type;
@ -4512,25 +4702,19 @@ virDomainHostdevDefFormat(virConnectPtr conn,
def->source.subsys.u.usb.bus, def->source.subsys.u.usb.bus,
def->source.subsys.u.usb.device); def->source.subsys.u.usb.device);
} }
} } else if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
virBufferVSprintf(buf, " <address domain='0x%.4x' bus='0x%.2x' slot='0x%.2x' function='0x%.1x'/>\n", virBufferVSprintf(buf, " <address domain='0x%.4x' bus='0x%.2x' slot='0x%.2x' function='0x%.1x'/>\n",
def->source.subsys.u.pci.domain, def->source.subsys.u.pci.domain,
def->source.subsys.u.pci.bus, def->source.subsys.u.pci.bus,
def->source.subsys.u.pci.slot, def->source.subsys.u.pci.slot,
def->source.subsys.u.pci.function); def->source.subsys.u.pci.function);
if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) {
virBufferAddLit(buf, " <state");
if (virHostdevHasValidGuestAddr(def))
virBufferVSprintf(buf, " devaddr='%.4x:%.2x:%.2x'",
def->source.subsys.u.pci.guest_addr.domain,
def->source.subsys.u.pci.guest_addr.bus,
def->source.subsys.u.pci.guest_addr.slot);
virBufferAddLit(buf, "/>\n");
}
} }
virBufferAddLit(buf, " </source>\n"); virBufferAddLit(buf, " </source>\n");
if (virDomainDeviceInfoFormat(buf, &def->info) < 0)
return -1;
virBufferAddLit(buf, " </hostdev>\n"); virBufferAddLit(buf, " </hostdev>\n");
return 0; return 0;
@ -4695,7 +4879,7 @@ char *virDomainDefFormat(virConnectPtr conn,
def->emulator); def->emulator);
for (n = 0 ; n < def->ndisks ; n++) for (n = 0 ; n < def->ndisks ; n++)
if (virDomainDiskDefFormat(conn, &buf, def->disks[n], flags) < 0) if (virDomainDiskDefFormat(conn, &buf, def->disks[n]) < 0)
goto cleanup; goto cleanup;
for (n = 0 ; n < def->nfss ; n++) for (n = 0 ; n < def->nfss ; n++)
@ -4763,7 +4947,7 @@ char *virDomainDefFormat(virConnectPtr conn,
goto cleanup; goto cleanup;
for (n = 0 ; n < def->nhostdevs ; n++) for (n = 0 ; n < def->nhostdevs ; n++)
if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n], flags) < 0) if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n]) < 0)
goto cleanup; goto cleanup;
if (def->watchdog) if (def->watchdog)

84
src/conf/domain_conf.h
View File

@ -64,6 +64,32 @@ enum virDomainVirtType {
VIR_DOMAIN_VIRT_LAST, VIR_DOMAIN_VIRT_LAST,
}; };
enum virDomainDeviceAddressType {
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST
};
typedef struct _virDomainDevicePCIAddress virDomainDevicePCIAddress;
typedef virDomainDevicePCIAddress *virDomainDevicePCIAddressPtr;
struct _virDomainDevicePCIAddress {
unsigned int domain;
unsigned int bus;
unsigned int slot;
unsigned int function;
};
typedef struct _virDomainDeviceInfo virDomainDeviceInfo;
typedef virDomainDeviceInfo *virDomainDeviceInfoPtr;
struct _virDomainDeviceInfo {
int type;
union {
virDomainDevicePCIAddress pci;
} addr;
};
/* Two types of disk backends */ /* Two types of disk backends */
enum virDomainDiskType { enum virDomainDiskType {
VIR_DOMAIN_DISK_TYPE_BLOCK, VIR_DOMAIN_DISK_TYPE_BLOCK,
@ -119,20 +145,10 @@ struct _virDomainDiskDef {
int cachemode; int cachemode;
unsigned int readonly : 1; unsigned int readonly : 1;
unsigned int shared : 1; unsigned int shared : 1;
struct { virDomainDeviceInfo info;
unsigned domain;
unsigned bus;
unsigned slot;
} pci_addr;
virStorageEncryptionPtr encryption; virStorageEncryptionPtr encryption;
}; };
static inline int
virDiskHasValidPciAddr(virDomainDiskDefPtr def)
{
return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
}
/* Two types of disk backends */ /* Two types of disk backends */
enum virDomainFSType { enum virDomainFSType {
@ -199,22 +215,15 @@ struct _virDomainNetDef {
} internal; } internal;
} data; } data;
char *ifname; char *ifname;
virDomainDeviceInfo info;
/* XXX figure out how to remove this */
char *nic_name; char *nic_name;
/* XXX figure out how to remove this */
char *hostnet_name; char *hostnet_name;
struct { /* XXX figure out how to remove this */
unsigned domain;
unsigned bus;
unsigned slot;
} pci_addr;
int vlan; int vlan;
}; };
static inline int
virNetHasValidPciAddr(virDomainNetDefPtr def)
{
return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
}
enum virDomainChrTargetType { enum virDomainChrTargetType {
VIR_DOMAIN_CHR_TARGET_TYPE_NULL = 0, VIR_DOMAIN_CHR_TARGET_TYPE_NULL = 0,
VIR_DOMAIN_CHR_TARGET_TYPE_MONITOR, VIR_DOMAIN_CHR_TARGET_TYPE_MONITOR,
@ -442,17 +451,7 @@ struct _virDomainHostdevDef {
unsigned vendor; unsigned vendor;
unsigned product; unsigned product;
} usb; } usb;
struct { virDomainDevicePCIAddress pci; /* host address */
unsigned domain;
unsigned bus;
unsigned slot;
unsigned function;
struct {
unsigned domain;
unsigned bus;
unsigned slot;
} guest_addr;
} pci;
} u; } u;
} subsys; } subsys;
struct { struct {
@ -463,16 +462,9 @@ struct _virDomainHostdevDef {
} caps; } caps;
} source; } source;
char* target; char* target;
virDomainDeviceInfo info; /* Guest address */
}; };
static inline int
virHostdevHasValidGuestAddr(virDomainHostdevDefPtr def)
{
return def->source.subsys.u.pci.guest_addr.domain ||
def->source.subsys.u.pci.guest_addr.bus ||
def->source.subsys.u.pci.guest_addr.slot;
}
/* Flags for the 'type' field in next struct */ /* Flags for the 'type' field in next struct */
enum virDomainDeviceType { enum virDomainDeviceType {
VIR_DOMAIN_DEVICE_DISK, VIR_DOMAIN_DEVICE_DISK,
@ -673,6 +665,7 @@ virDomainObjIsActive(virDomainObjPtr dom)
return dom->def->id != -1; return dom->def->id != -1;
} }
int virDomainObjListInit(virDomainObjListPtr objs); int virDomainObjListInit(virDomainObjListPtr objs);
void virDomainObjListDeinit(virDomainObjListPtr objs); void virDomainObjListDeinit(virDomainObjListPtr objs);
@ -695,6 +688,13 @@ void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
void virDomainVideoDefFree(virDomainVideoDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def);
void virDomainHostdevDefFree(virDomainHostdevDefPtr def); void virDomainHostdevDefFree(virDomainHostdevDefPtr def);
void virDomainDeviceDefFree(virDomainDeviceDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def);
int virDomainDevicePCIAddressEqual(virDomainDevicePCIAddressPtr a,
virDomainDevicePCIAddressPtr b);
int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info,
int type);
int virDomainDevicePCIAddressIsValid(virDomainDevicePCIAddressPtr addr);
int virDomainDeviceInfoIsSet(virDomainDeviceInfoPtr info);
void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info);
void virDomainDefFree(virDomainDefPtr vm); void virDomainDefFree(virDomainDefPtr vm);
void virDomainObjRef(virDomainObjPtr vm); void virDomainObjRef(virDomainObjPtr vm);
/* Returns 1 if the object was freed, 0 if more refs exist */ /* Returns 1 if the object was freed, 0 if more refs exist */
@ -832,6 +832,8 @@ VIR_ENUM_DECL(virDomainBoot)
VIR_ENUM_DECL(virDomainFeature) VIR_ENUM_DECL(virDomainFeature)
VIR_ENUM_DECL(virDomainLifecycle) VIR_ENUM_DECL(virDomainLifecycle)
VIR_ENUM_DECL(virDomainDevice) VIR_ENUM_DECL(virDomainDevice)
VIR_ENUM_DECL(virDomainDeviceAddress)
VIR_ENUM_DECL(virDomainDeviceAddressMode)
VIR_ENUM_DECL(virDomainDisk) VIR_ENUM_DECL(virDomainDisk)
VIR_ENUM_DECL(virDomainDiskDevice) VIR_ENUM_DECL(virDomainDiskDevice)
VIR_ENUM_DECL(virDomainDiskBus) VIR_ENUM_DECL(virDomainDiskBus)

6
src/libvirt_private.syms
View File

@ -174,6 +174,12 @@ virDomainObjListInit;
virDomainObjListDeinit; virDomainObjListDeinit;
virDomainObjRef; virDomainObjRef;
virDomainObjUnref; virDomainObjUnref;
virDomainDeviceAddressEqual;
virDomainDevicePCIAddressEqual;
virDomainDeviceAddressIsValid;
virDomainDevicePCIAddressIsValid;
virDomainDeviceInfoIsSet;
virDomainDeviceAddressClear;
# domain_event.h # domain_event.h

64
src/qemu/qemu_driver.c
View File

@ -5111,13 +5111,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
ret = qemuMonitorAddPCIDisk(priv->mon, ret = qemuMonitorAddPCIDisk(priv->mon,
dev->data.disk->src, dev->data.disk->src,
type, type,
&dev->data.disk->pci_addr.domain, &dev->data.disk->info.addr.pci.domain,
&dev->data.disk->pci_addr.bus, &dev->data.disk->info.addr.pci.bus,
&dev->data.disk->pci_addr.slot); &dev->data.disk->info.addr.pci.slot);
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
if (ret == 0) if (ret == 0) {
dev->data.disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
virDomainDiskInsertPreAlloced(vm->def, dev->data.disk); virDomainDiskInsertPreAlloced(vm->def, dev->data.disk);
}
return ret; return ret;
} }
@ -5240,12 +5242,13 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn,
qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorAddPCINetwork(priv->mon, nicstr, if (qemuMonitorAddPCINetwork(priv->mon, nicstr,
&net->pci_addr.domain, &net->info.addr.pci.domain,
&net->pci_addr.bus, &net->info.addr.pci.bus,
&net->pci_addr.slot) < 0) { &net->info.addr.pci.slot) < 0) {
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
goto try_remove; goto try_remove;
} }
net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
ret = 0; ret = 0;
@ -5328,12 +5331,13 @@ static int qemudDomainAttachHostPciDevice(virConnectPtr conn,
hostdev->source.subsys.u.pci.bus, hostdev->source.subsys.u.pci.bus,
hostdev->source.subsys.u.pci.slot, hostdev->source.subsys.u.pci.slot,
hostdev->source.subsys.u.pci.function, hostdev->source.subsys.u.pci.function,
&hostdev->source.subsys.u.pci.guest_addr.domain, &hostdev->info.addr.pci.domain,
&hostdev->source.subsys.u.pci.guest_addr.bus, &hostdev->info.addr.pci.bus,
&hostdev->source.subsys.u.pci.guest_addr.slot); &hostdev->info.addr.pci.slot);
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
if (ret < 0) if (ret < 0)
goto error; goto error;
hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
@ -5563,18 +5567,18 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
if (!virDiskHasValidPciAddr(detach)) { if (!virDomainDeviceAddressIsValid(&detach->info,
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) {
_("disk %s cannot be detached - no PCI address for device"), qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, "%s",
detach->dst); _("device cannot be detached without a PCI address"));
goto cleanup; goto cleanup;
} }
qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorRemovePCIDevice(priv->mon, if (qemuMonitorRemovePCIDevice(priv->mon,
detach->pci_addr.domain, detach->info.addr.pci.domain,
detach->pci_addr.bus, detach->info.addr.pci.bus,
detach->pci_addr.slot) < 0) { detach->info.addr.pci.slot) < 0) {
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
goto cleanup; goto cleanup;
} }
@ -5629,7 +5633,14 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
if (!virNetHasValidPciAddr(detach) || detach->vlan < 0 || !detach->hostnet_name) { if (!virDomainDeviceAddressIsValid(&detach->info,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("device cannot be detached without a PCI address"));
goto cleanup;
}
if (detach->vlan < 0 || !detach->hostnet_name) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("network device cannot be detached - device state missing")); "%s", _("network device cannot be detached - device state missing"));
goto cleanup; goto cleanup;
@ -5637,9 +5648,9 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorRemovePCIDevice(priv->mon, if (qemuMonitorRemovePCIDevice(priv->mon,
detach->pci_addr.domain, detach->info.addr.pci.domain,
detach->pci_addr.bus, detach->info.addr.pci.bus,
detach->pci_addr.slot) < 0) { detach->info.addr.pci.slot) < 0) {
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
goto cleanup; goto cleanup;
} }
@ -5717,17 +5728,18 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
return -1; return -1;
} }
if (!virHostdevHasValidGuestAddr(detach)) { if (!virDomainDeviceAddressIsValid(&detach->info,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("hostdev cannot be detached - device state missing")); "%s", _("device cannot be detached without a PCI address"));
return -1; return -1;
} }
qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorRemovePCIDevice(priv->mon, if (qemuMonitorRemovePCIDevice(priv->mon,
detach->source.subsys.u.pci.guest_addr.domain, detach->info.addr.pci.domain,
detach->source.subsys.u.pci.guest_addr.bus, detach->info.addr.pci.bus,
detach->source.subsys.u.pci.guest_addr.slot) < 0) { detach->info.addr.pci.slot) < 0) {
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
return -1; return -1;
} }