openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup: Change datatype of secret->ephemeral to boolean

This commit is contained in:
Osier Yang 2013-04-11 11:50:23 +08:00
parent ba474c7844
commit 4258a548d2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/secret_conf.c
View File

@ -161,9 +161,9 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
prop = virXPathString("string(./@ephemeral)", ctxt); prop = virXPathString("string(./@ephemeral)", ctxt);
if (prop != NULL) { if (prop != NULL) {
if (STREQ(prop, "yes")) if (STREQ(prop, "yes"))
def->ephemeral = 1; def->ephemeral = true;
else if (STREQ(prop, "no")) else if (STREQ(prop, "no"))
def->ephemeral = 0; def->ephemeral = false;
else { else {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid value of 'ephemeral'")); _("invalid value of 'ephemeral'"));

2
src/conf/secret_conf.h
View File

@ -31,7 +31,7 @@ VIR_ENUM_DECL(virSecretUsageType)
typedef struct _virSecretDef virSecretDef; typedef struct _virSecretDef virSecretDef;
typedef virSecretDef *virSecretDefPtr; typedef virSecretDef *virSecretDefPtr;
struct _virSecretDef { struct _virSecretDef {
unsigned ephemeral : 1; bool ephemeral;
unsigned private : 1; unsigned private : 1;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
char *description; /* May be NULL */ char *description; /* May be NULL */

2
src/storage/storage_backend.c
View File

@ -480,7 +480,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
def->ephemeral = 0; def->ephemeral = false;
def->private = 0; def->private = 0;
if (virStorageGenerateSecretUUID(conn, def->uuid) < 0) if (virStorageGenerateSecretUUID(conn, def->uuid) < 0)
goto cleanup; goto cleanup;