virDomainShmemDef: Change type of role to virDomainShmemRole

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-27 17:04:37 +02:00 committed by Ján Tomko
parent b3a6daa36d
commit c0e5c370c8
3 changed files with 5 additions and 3 deletions

View File

@ -13637,12 +13637,14 @@ virDomainShmemDefParseXML(virDomainXMLOption *xmlopt,
if (def->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) { if (def->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) {
tmp = virXMLPropString(node, "role"); tmp = virXMLPropString(node, "role");
if (tmp) { if (tmp) {
if ((def->role = virDomainShmemRoleTypeFromString(tmp)) <= 0) { int role;
if ((role = virDomainShmemRoleTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("Unknown shmem role type '%s'"), tmp); _("Unknown shmem role type '%s'"), tmp);
goto cleanup; goto cleanup;
} }
def->role = role;
VIR_FREE(tmp); VIR_FREE(tmp);
} }
} }

View File

@ -1956,7 +1956,7 @@ struct _virDomainShmemDef {
char *name; char *name;
unsigned long long size; unsigned long long size;
virDomainShmemModel model; virDomainShmemModel model;
int role; /* enum virDomainShmemRole */ virDomainShmemRole role;
struct { struct {
bool enabled; bool enabled;
virDomainChrSourceDef chr; virDomainChrSourceDef chr;

View File

@ -9003,7 +9003,7 @@ qemuBuildShmemDevStr(virDomainDef *def,
} else { } else {
virBufferAsprintf(&buf, ",memdev=shmmem-%s", shmem->info.alias); virBufferAsprintf(&buf, ",memdev=shmmem-%s", shmem->info.alias);
switch ((virDomainShmemRole) shmem->role) { switch (shmem->role) {
case VIR_DOMAIN_SHMEM_ROLE_MASTER: case VIR_DOMAIN_SHMEM_ROLE_MASTER:
virBufferAddLit(&buf, ",master=on"); virBufferAddLit(&buf, ",master=on");
break; break;