External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: prefer unsigned int for flags

Browse Source 
* src/conf/domain_conf.c (virDomainGraphicsDefParseXML)
(virDomainDeviceInfoFormat, virDomainDeviceInfoParseXML)
(virDomainDiskDefParseXML, virDomainControllerDefParseXML)
(virDomainFSDefParseXML, virDomainNetDefParseXML)
(virDomainChrDefParseTargetXML, virDomainChrDefParseXML)
(virDomainSmartcardDefParseXML, virDomainInputDefParseXML)
(virDomainTimerDefParseXML, virDomainSoundDefParseXML)
(virDomainWatchdogDefParseXML, virDomainMemballoonDefParseXML)
(virDomainVideoDefParseXML)
(virDomainHostdevSubsysUsbDefParseXML)
(virDomainHostdevSubsysPciDefParseXML)
(virDomainHostdevDefParseXML, virSecurityLabelDefParseXML)
(virDomainVcpuPinDefParseXML, virDomainDefParseXML)
(virDomainDefParse, virDomainDiskDefFormat)
(virDomainControllerDefFormat, virDomainFSDefFormat)
(virDomainNetDefFormat, virDomainChrSourceDefFormat)
(virDomainChrDefFormat, virDomainSmartcardDefFormat)
(virDomainSoundDefFormat, virDomainMemballoonDefFormat)
(virDomainWatchdogDefFormat, virDomainVideoDefFormat)
(virDomainInputDefFormat, virDomainGraphicsDefFormat)
(virDomainHostdevDefFormat, virDomainObjFormat): Switch signature.
(virDomainObjTaint, virDomainSaveStatus): Use unsigned flags.
This commit is contained in:
Eric Blake 2011-07-06 16:05:03 -06:00
parent 1740c38116
commit 7931639b7a
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/conf/domain_conf.c
View File

@ -588,7 +588,7 @@ virDomainObjPtr virDomainFindByName(const virDomainObjListPtr doms,
bool virDomainObjTaint(virDomainObjPtr obj, bool virDomainObjTaint(virDomainObjPtr obj,
enum virDomainTaintFlags taint) enum virDomainTaintFlags taint)
{ {
int flag = (1 << taint); unsigned int flag = (1 << taint);
if (obj->taint & flag) if (obj->taint & flag)
return false; return false;
@ -1456,7 +1456,7 @@ void virDomainDefClearDeviceAliases(virDomainDefPtr def)
static int ATTRIBUTE_NONNULL(2) static int ATTRIBUTE_NONNULL(2)
virDomainDeviceInfoFormat(virBufferPtr buf, virDomainDeviceInfoFormat(virBufferPtr buf,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
int flags) unsigned int flags)
{ {
if (info->alias && if (info->alias &&
!(flags & VIR_DOMAIN_XML_INACTIVE)) { !(flags & VIR_DOMAIN_XML_INACTIVE)) {
@ -1712,7 +1712,7 @@ cleanup:
static int static int
virDomainDeviceInfoParseXML(xmlNodePtr node, virDomainDeviceInfoParseXML(xmlNodePtr node,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
int flags) unsigned int flags)
{ {
xmlNodePtr cur; xmlNodePtr cur;
xmlNodePtr address = NULL; xmlNodePtr address = NULL;
@ -1998,7 +1998,7 @@ static virDomainDiskDefPtr
virDomainDiskDefParseXML(virCapsPtr caps, virDomainDiskDefParseXML(virCapsPtr caps,
xmlNodePtr node, xmlNodePtr node,
virBitmapPtr bootMap, virBitmapPtr bootMap,
int flags) unsigned int flags)
{ {
virDomainDiskDefPtr def; virDomainDiskDefPtr def;
xmlNodePtr cur, host; xmlNodePtr cur, host;
@ -2370,7 +2370,7 @@ no_memory:
*/ */
static virDomainControllerDefPtr static virDomainControllerDefPtr
virDomainControllerDefParseXML(xmlNodePtr node, virDomainControllerDefParseXML(xmlNodePtr node,
int flags) unsigned int flags)
{ {
virDomainControllerDefPtr def; virDomainControllerDefPtr def;
char *type = NULL; char *type = NULL;
@ -2477,7 +2477,7 @@ cleanup:
*/ */
static virDomainFSDefPtr static virDomainFSDefPtr
virDomainFSDefParseXML(xmlNodePtr node, virDomainFSDefParseXML(xmlNodePtr node,
int flags) { unsigned int flags) {
virDomainFSDefPtr def; virDomainFSDefPtr def;
xmlNodePtr cur; xmlNodePtr cur;
char *type = NULL; char *type = NULL;
@ -2720,7 +2720,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
xmlNodePtr node, xmlNodePtr node,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
virBitmapPtr bootMap, virBitmapPtr bootMap,
int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
virDomainNetDefPtr def; virDomainNetDefPtr def;
xmlNodePtr cur; xmlNodePtr cur;
@ -3173,7 +3173,7 @@ static int
virDomainChrDefParseTargetXML(virCapsPtr caps, virDomainChrDefParseTargetXML(virCapsPtr caps,
virDomainChrDefPtr def, virDomainChrDefPtr def,
xmlNodePtr cur, xmlNodePtr cur,
int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
int ret = -1; int ret = -1;
unsigned int port; unsigned int port;
@ -3519,7 +3519,8 @@ virDomainChrDefNew(void) {
static virDomainChrDefPtr static virDomainChrDefPtr
virDomainChrDefParseXML(virCapsPtr caps, virDomainChrDefParseXML(virCapsPtr caps,
xmlNodePtr node, xmlNodePtr node,
int flags) { unsigned int flags)
{
xmlNodePtr cur; xmlNodePtr cur;
char *type = NULL; char *type = NULL;
const char *nodeName; const char *nodeName;
@ -3591,7 +3592,7 @@ error:
static virDomainSmartcardDefPtr static virDomainSmartcardDefPtr
virDomainSmartcardDefParseXML(xmlNodePtr node, virDomainSmartcardDefParseXML(xmlNodePtr node,
int flags) unsigned int flags)
{ {
xmlNodePtr cur; xmlNodePtr cur;
char *mode = NULL; char *mode = NULL;
@ -3721,7 +3722,8 @@ error:
static virDomainInputDefPtr static virDomainInputDefPtr
virDomainInputDefParseXML(const char *ostype, virDomainInputDefParseXML(const char *ostype,
xmlNodePtr node, xmlNodePtr node,
int flags) { unsigned int flags)
{
virDomainInputDefPtr def; virDomainInputDefPtr def;
char *type = NULL; char *type = NULL;
char *bus = NULL; char *bus = NULL;
@ -3811,7 +3813,7 @@ error:
static virDomainTimerDefPtr static virDomainTimerDefPtr
virDomainTimerDefParseXML(const xmlNodePtr node, virDomainTimerDefParseXML(const xmlNodePtr node,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
char *name = NULL; char *name = NULL;
char *present = NULL; char *present = NULL;
@ -3992,7 +3994,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de
/* Parse the XML definition for a graphics device */ /* Parse the XML definition for a graphics device */
static virDomainGraphicsDefPtr static virDomainGraphicsDefPtr
virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { virDomainGraphicsDefParseXML(xmlNodePtr node, unsigned int flags)
{
virDomainGraphicsDefPtr def; virDomainGraphicsDefPtr def;
char *type = NULL; char *type = NULL;
@ -4375,7 +4378,7 @@ error:
static virDomainSoundDefPtr static virDomainSoundDefPtr
virDomainSoundDefParseXML(const xmlNodePtr node, virDomainSoundDefParseXML(const xmlNodePtr node,
int flags) unsigned int flags)
{ {
char *model; char *model;
virDomainSoundDefPtr def; virDomainSoundDefPtr def;
@ -4409,7 +4412,7 @@ error:
static virDomainWatchdogDefPtr static virDomainWatchdogDefPtr
virDomainWatchdogDefParseXML(const xmlNodePtr node, virDomainWatchdogDefParseXML(const xmlNodePtr node,
int flags) unsigned int flags)
{ {
char *model = NULL; char *model = NULL;
@ -4464,7 +4467,7 @@ error:
static virDomainMemballoonDefPtr static virDomainMemballoonDefPtr
virDomainMemballoonDefParseXML(const xmlNodePtr node, virDomainMemballoonDefParseXML(const xmlNodePtr node,
int flags) unsigned int flags)
{ {
char *model; char *model;
virDomainMemballoonDefPtr def; virDomainMemballoonDefPtr def;
@ -4674,7 +4677,8 @@ virDomainVideoAccelDefParseXML(const xmlNodePtr node) {
static virDomainVideoDefPtr static virDomainVideoDefPtr
virDomainVideoDefParseXML(const xmlNodePtr node, virDomainVideoDefParseXML(const xmlNodePtr node,
virDomainDefPtr dom, virDomainDefPtr dom,
int flags) { unsigned int flags)
{
virDomainVideoDefPtr def; virDomainVideoDefPtr def;
xmlNodePtr cur; xmlNodePtr cur;
char *type = NULL; char *type = NULL;
@ -4754,7 +4758,8 @@ error:
static int static int
virDomainHostdevSubsysUsbDefParseXML(const xmlNodePtr node, virDomainHostdevSubsysUsbDefParseXML(const xmlNodePtr node,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def,
int flags ATTRIBUTE_UNUSED) { unsigned int flags ATTRIBUTE_UNUSED)
{
int ret = -1; int ret = -1;
int got_product, got_vendor; int got_product, got_vendor;
@ -4876,7 +4881,8 @@ out:
static int static int
virDomainHostdevSubsysPciDefParseXML(const xmlNodePtr node, virDomainHostdevSubsysPciDefParseXML(const xmlNodePtr node,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def,
int flags) { unsigned int flags)
{
int ret = -1; int ret = -1;
xmlNodePtr cur; xmlNodePtr cur;
@ -4923,7 +4929,7 @@ out:
static virDomainHostdevDefPtr static virDomainHostdevDefPtr
virDomainHostdevDefParseXML(const xmlNodePtr node, virDomainHostdevDefParseXML(const xmlNodePtr node,
virBitmapPtr bootMap, virBitmapPtr bootMap,
int flags) unsigned int flags)
{ {
xmlNodePtr cur; xmlNodePtr cur;
@ -5051,7 +5057,7 @@ static int virDomainLifecycleParseXML(xmlXPathContextPtr ctxt,
static int static int
virSecurityLabelDefParseXML(const virDomainDefPtr def, virSecurityLabelDefParseXML(const virDomainDefPtr def,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
int flags) unsigned int flags)
{ {
char *p; char *p;
@ -5691,7 +5697,7 @@ static virDomainVcpuPinDefPtr
virDomainVcpuPinDefParseXML(const xmlNodePtr node, virDomainVcpuPinDefParseXML(const xmlNodePtr node,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
int maxvcpus, int maxvcpus,
int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
virDomainVcpuPinDefPtr def; virDomainVcpuPinDefPtr def;
xmlNodePtr oldnode = ctxt->node; xmlNodePtr oldnode = ctxt->node;
@ -5760,7 +5766,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
xmlDocPtr xml, xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
int flags) unsigned int flags)
{ {
xmlNodePtr *nodes = NULL, node = NULL; xmlNodePtr *nodes = NULL, node = NULL;
char *tmp = NULL; char *tmp = NULL;
@ -6801,7 +6807,7 @@ static virDomainDefPtr
virDomainDefParse(const char *xmlStr, virDomainDefParse(const char *xmlStr,
const char *filename, const char *filename,
virCapsPtr caps, virCapsPtr caps,
int flags) unsigned int flags)
{ {
xmlDocPtr xml; xmlDocPtr xml;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
@ -8355,7 +8361,7 @@ virDomainLeaseDefFormat(virBufferPtr buf,
static int static int
virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskDefFormat(virBufferPtr buf,
virDomainDiskDefPtr def, virDomainDiskDefPtr def,
int flags) unsigned 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);
@ -8483,7 +8489,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
static int static int
virDomainControllerDefFormat(virBufferPtr buf, virDomainControllerDefFormat(virBufferPtr buf,
virDomainControllerDefPtr def, virDomainControllerDefPtr def,
int flags) unsigned int flags)
{ {
const char *type = virDomainControllerTypeToString(def->type); const char *type = virDomainControllerTypeToString(def->type);
const char *model = NULL; const char *model = NULL;
@ -8543,7 +8549,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
static int static int
virDomainFSDefFormat(virBufferPtr buf, virDomainFSDefFormat(virBufferPtr buf,
virDomainFSDefPtr def, virDomainFSDefPtr def,
int flags) unsigned int flags)
{ {
const char *type = virDomainFSTypeToString(def->type); const char *type = virDomainFSTypeToString(def->type);
const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode);
@ -8605,7 +8611,7 @@ virDomainFSDefFormat(virBufferPtr buf,
static int static int
virDomainNetDefFormat(virBufferPtr buf, virDomainNetDefFormat(virBufferPtr buf,
virDomainNetDefPtr def, virDomainNetDefPtr def,
int flags) unsigned int flags)
{ {
const char *type = virDomainNetTypeToString(def->type); const char *type = virDomainNetTypeToString(def->type);
char *attrs; char *attrs;
@ -8742,7 +8748,7 @@ static int
virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefFormat(virBufferPtr buf,
virDomainChrSourceDefPtr def, virDomainChrSourceDefPtr def,
bool tty_compat, bool tty_compat,
int flags) unsigned int flags)
{ {
const char *type = virDomainChrTypeToString(def->type); const char *type = virDomainChrTypeToString(def->type);
@ -8838,7 +8844,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
static int static int
virDomainChrDefFormat(virBufferPtr buf, virDomainChrDefFormat(virBufferPtr buf,
virDomainChrDefPtr def, virDomainChrDefPtr def,
int flags) unsigned int flags)
{ {
const char *elementName = virDomainChrDeviceTypeToString(def->deviceType); const char *elementName = virDomainChrDeviceTypeToString(def->deviceType);
const char *targetType = virDomainChrTargetTypeToString(def->deviceType, const char *targetType = virDomainChrTargetTypeToString(def->deviceType,
@ -8932,7 +8938,7 @@ virDomainChrDefFormat(virBufferPtr buf,
static int static int
virDomainSmartcardDefFormat(virBufferPtr buf, virDomainSmartcardDefFormat(virBufferPtr buf,
virDomainSmartcardDefPtr def, virDomainSmartcardDefPtr def,
int flags) unsigned int flags)
{ {
const char *mode = virDomainSmartcardTypeToString(def->type); const char *mode = virDomainSmartcardTypeToString(def->type);
size_t i; size_t i;
@ -8983,7 +8989,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf,
static int static int
virDomainSoundDefFormat(virBufferPtr buf, virDomainSoundDefFormat(virBufferPtr buf,
virDomainSoundDefPtr def, virDomainSoundDefPtr def,
int flags) unsigned int flags)
{ {
const char *model = virDomainSoundModelTypeToString(def->model); const char *model = virDomainSoundModelTypeToString(def->model);
@ -9012,7 +9018,7 @@ virDomainSoundDefFormat(virBufferPtr buf,
static int static int
virDomainMemballoonDefFormat(virBufferPtr buf, virDomainMemballoonDefFormat(virBufferPtr buf,
virDomainMemballoonDefPtr def, virDomainMemballoonDefPtr def,
int flags) unsigned int flags)
{ {
const char *model = virDomainMemballoonModelTypeToString(def->model); const char *model = virDomainMemballoonModelTypeToString(def->model);
@ -9054,7 +9060,7 @@ virDomainSysinfoDefFormat(virBufferPtr buf,
static int static int
virDomainWatchdogDefFormat(virBufferPtr buf, virDomainWatchdogDefFormat(virBufferPtr buf,
virDomainWatchdogDefPtr def, virDomainWatchdogDefPtr def,
int flags) unsigned int flags)
{ {
const char *model = virDomainWatchdogModelTypeToString (def->model); const char *model = virDomainWatchdogModelTypeToString (def->model);
const char *action = virDomainWatchdogActionTypeToString (def->action); const char *action = virDomainWatchdogActionTypeToString (def->action);
@ -9102,7 +9108,7 @@ virDomainVideoAccelDefFormat(virBufferPtr buf,
static int static int
virDomainVideoDefFormat(virBufferPtr buf, virDomainVideoDefFormat(virBufferPtr buf,
virDomainVideoDefPtr def, virDomainVideoDefPtr def,
int flags) unsigned int flags)
{ {
const char *model = virDomainVideoTypeToString(def->type); const char *model = virDomainVideoTypeToString(def->type);
@ -9138,7 +9144,7 @@ virDomainVideoDefFormat(virBufferPtr buf,
static int static int
virDomainInputDefFormat(virBufferPtr buf, virDomainInputDefFormat(virBufferPtr buf,
virDomainInputDefPtr def, virDomainInputDefPtr def,
int flags) unsigned int flags)
{ {
const char *type = virDomainInputTypeToString(def->type); const char *type = virDomainInputTypeToString(def->type);
const char *bus = virDomainInputBusTypeToString(def->bus); const char *bus = virDomainInputBusTypeToString(def->bus);
@ -9279,7 +9285,7 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf,
static int static int
virDomainGraphicsDefFormat(virBufferPtr buf, virDomainGraphicsDefFormat(virBufferPtr buf,
virDomainGraphicsDefPtr def, virDomainGraphicsDefPtr def,
int flags) unsigned int flags)
{ {
const char *type = virDomainGraphicsTypeToString(def->type); const char *type = virDomainGraphicsTypeToString(def->type);
int children = 0; int children = 0;
@ -9445,7 +9451,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
static int static int
virDomainHostdevDefFormat(virBufferPtr buf, virDomainHostdevDefFormat(virBufferPtr buf,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def,
int flags) unsigned int flags)
{ {
const char *mode = virDomainHostdevModeTypeToString(def->mode); const char *mode = virDomainHostdevModeTypeToString(def->mode);
const char *type; const char *type;
@ -9934,7 +9940,7 @@ char *virDomainDefFormat(virDomainDefPtr def,
static char *virDomainObjFormat(virCapsPtr caps, static char *virDomainObjFormat(virCapsPtr caps,
virDomainObjPtr obj, virDomainObjPtr obj,
int flags) unsigned int flags)
{ {
char *config_xml = NULL; char *config_xml = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -10053,7 +10059,7 @@ int virDomainSaveStatus(virCapsPtr caps,
const char *statusDir, const char *statusDir,
virDomainObjPtr obj) virDomainObjPtr obj)
{ {
int flags = VIR_DOMAIN_XML_SECURE|VIR_DOMAIN_XML_INTERNAL_STATUS; unsigned int flags = VIR_DOMAIN_XML_SECURE|VIR_DOMAIN_XML_INTERNAL_STATUS;
int ret = -1; int ret = -1;
char *xml; char *xml;