mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-07 14:55:46 +00:00
f8fe8f0345
If a pci address had a function number out of range, the error message would be: Insufficient specification for PCI address which is logged by virDevicePCIAddressParseXML() after virDevicePCIAddressIsValid returns a failure. This patch enhances virDevicePCIAddressIsValid() to optionally report the error itself (since it is the place that decides which part of the address is "invalid"), and uses that feature when calling from virDevicePCIAddressParseXML(), so that the error will be more useful, e.g.: Invalid PCI address function=0x8, must be <= 7 Previously, virDevicePCIAddressIsValid didn't check for the theoretical limits of domain or bus, only for slot or function. While adding log messages, we also correct that ommission. (The RNG for PCI addresses already enforces this limit, which by the way means that we can't add any negative tests for this - as far as I know our domainschematest has no provisions for passing XML that is supposed to fail). Note that virDevicePCIAddressIsValid() can only check against the absolute maximum attribute values for *any* possible PCI controller, not for the actual maximums of the specific controller that this device is attaching to; fortunately there is later more specific validation for guest-side PCI addresses when building the set of assigned PCI addresses. For host-side PCI addresses (e.g. for <hostdev> and for network device pools), we rely on the error that will be logged when it is found that the device doesn't actually exist. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1004596
104 lines
3.1 KiB
C
104 lines
3.1 KiB
C
/*
|
|
* device_conf.h: device XML handling entry points
|
|
*
|
|
* Copyright (C) 2006-2012, 2014-2015 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#ifndef __DEVICE_CONF_H__
|
|
# define __DEVICE_CONF_H__
|
|
|
|
# include <libxml/parser.h>
|
|
# include <libxml/tree.h>
|
|
# include <libxml/xpath.h>
|
|
|
|
# include "internal.h"
|
|
# include "virutil.h"
|
|
# include "virthread.h"
|
|
# include "virbuffer.h"
|
|
|
|
typedef enum {
|
|
VIR_INTERFACE_STATE_UNKNOWN = 1,
|
|
VIR_INTERFACE_STATE_NOT_PRESENT,
|
|
VIR_INTERFACE_STATE_DOWN,
|
|
VIR_INTERFACE_STATE_LOWER_LAYER_DOWN,
|
|
VIR_INTERFACE_STATE_TESTING,
|
|
VIR_INTERFACE_STATE_DORMANT,
|
|
VIR_INTERFACE_STATE_UP,
|
|
VIR_INTERFACE_STATE_LAST
|
|
} virInterfaceState;
|
|
|
|
VIR_ENUM_DECL(virInterfaceState)
|
|
|
|
typedef struct _virDevicePCIAddress virDevicePCIAddress;
|
|
typedef virDevicePCIAddress *virDevicePCIAddressPtr;
|
|
struct _virDevicePCIAddress {
|
|
unsigned int domain;
|
|
unsigned int bus;
|
|
unsigned int slot;
|
|
unsigned int function;
|
|
int multi; /* virTristateSwitch */
|
|
};
|
|
|
|
typedef struct _virInterfaceLink virInterfaceLink;
|
|
typedef virInterfaceLink *virInterfaceLinkPtr;
|
|
struct _virInterfaceLink {
|
|
virInterfaceState state; /* link state */
|
|
unsigned int speed; /* link speed in Mbits per second */
|
|
};
|
|
|
|
typedef enum {
|
|
VIR_NET_DEV_FEAT_GRXCSUM,
|
|
VIR_NET_DEV_FEAT_GTXCSUM,
|
|
VIR_NET_DEV_FEAT_GSG,
|
|
VIR_NET_DEV_FEAT_GTSO,
|
|
VIR_NET_DEV_FEAT_GGSO,
|
|
VIR_NET_DEV_FEAT_GGRO,
|
|
VIR_NET_DEV_FEAT_LRO,
|
|
VIR_NET_DEV_FEAT_RXVLAN,
|
|
VIR_NET_DEV_FEAT_TXVLAN,
|
|
VIR_NET_DEV_FEAT_NTUPLE,
|
|
VIR_NET_DEV_FEAT_RXHASH,
|
|
VIR_NET_DEV_FEAT_RDMA,
|
|
VIR_NET_DEV_FEAT_TXUDPTNL,
|
|
VIR_NET_DEV_FEAT_LAST
|
|
} virNetDevFeature;
|
|
|
|
VIR_ENUM_DECL(virNetDevFeature)
|
|
|
|
int virDevicePCIAddressIsValid(virDevicePCIAddressPtr addr,
|
|
bool report);
|
|
|
|
int virDevicePCIAddressParseXML(xmlNodePtr node,
|
|
virDevicePCIAddressPtr addr);
|
|
|
|
int virDevicePCIAddressFormat(virBufferPtr buf,
|
|
virDevicePCIAddress addr,
|
|
bool includeTypeInAddr);
|
|
|
|
bool virDevicePCIAddressEqual(virDevicePCIAddress *addr1,
|
|
virDevicePCIAddress *addr2);
|
|
|
|
int virInterfaceLinkParseXML(xmlNodePtr node,
|
|
virInterfaceLinkPtr lnk);
|
|
|
|
int virInterfaceLinkFormat(virBufferPtr buf,
|
|
const virInterfaceLink *lnk);
|
|
|
|
#endif /* __DEVICE_CONF_H__ */
|