External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

security_dac: remove extra Security from function names

Browse Source 
Many of the functions follow the pattern:
virSecurity.*Security.*Label

Remove the second 'Security' from the names, it should be obvious
that the virSecurity* functions deal with security labels even
without it.
This commit is contained in:
Ján Tomko 2015-12-09 14:33:55 +01:00
parent cbd3d06541
commit be33e96533
1 changed files with 121 additions and 121 deletions

242
src/security/security_dac.c

@ -376,9 +376,9 @@ virSecurityDACSetOwnership(virSecurityDACDataPtr priv,
static int static int
virSecurityDACRestoreSecurityFileLabelInternal(virSecurityDACDataPtr priv, virSecurityDACRestoreFileLabelInternal(virSecurityDACDataPtr priv,
virStorageSourcePtr src, virStorageSourcePtr src,
const char *path) const char *path)
{ {
int rv; int rv;
uid_t uid = 0; /* By default return to root:root */ uid_t uid = 0; /* By default return to root:root */
@ -404,17 +404,17 @@ virSecurityDACRestoreSecurityFileLabelInternal(virSecurityDACDataPtr priv,
static int static int
virSecurityDACRestoreSecurityFileLabel(virSecurityDACDataPtr priv, virSecurityDACRestoreFileLabel(virSecurityDACDataPtr priv,
const char *path) const char *path)
{ {
return virSecurityDACRestoreSecurityFileLabelInternal(priv, NULL, path); return virSecurityDACRestoreFileLabelInternal(priv, NULL, path);
} }
static int static int
virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, virSecurityDACSetImageLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virStorageSourcePtr src) virStorageSourcePtr src)
{ {
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
virSecurityDeviceLabelDefPtr disk_seclabel; virSecurityDeviceLabelDefPtr disk_seclabel;
@ -447,15 +447,15 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityDACSetSecurityDiskLabel(virSecurityManagerPtr mgr, virSecurityDACSetDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
virStorageSourcePtr next; virStorageSourcePtr next;
for (next = disk->src; next; next = next->backingStore) { for (next = disk->src; next; next = next->backingStore) {
if (virSecurityDACSetSecurityImageLabel(mgr, def, next) < 0) if (virSecurityDACSetImageLabel(mgr, def, next) < 0)
return -1; return -1;
} }
@ -464,10 +464,10 @@ virSecurityDACSetSecurityDiskLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr, virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virStorageSourcePtr src, virStorageSourcePtr src,
bool migrated) bool migrated)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
@ -514,31 +514,31 @@ virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr,
} }
} }
return virSecurityDACRestoreSecurityFileLabelInternal(priv, src, NULL); return virSecurityDACRestoreFileLabelInternal(priv, src, NULL);
} }
static int static int
virSecurityDACRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreImageLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virStorageSourcePtr src) virStorageSourcePtr src)
{ {
return virSecurityDACRestoreSecurityImageLabelInt(mgr, def, src, false); return virSecurityDACRestoreImageLabelInt(mgr, def, src, false);
} }
static int static int
virSecurityDACRestoreSecurityDiskLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
return virSecurityDACRestoreSecurityImageLabelInt(mgr, def, disk->src, false); return virSecurityDACRestoreImageLabelInt(mgr, def, disk->src, false);
} }
static int static int
virSecurityDACSetSecurityHostdevLabelHelper(const char *file, virSecurityDACSetHostdevLabelHelper(const char *file,
void *opaque) void *opaque)
{ {
virSecurityDACCallbackDataPtr cbdata = opaque; virSecurityDACCallbackDataPtr cbdata = opaque;
virSecurityManagerPtr mgr = cbdata->manager; virSecurityManagerPtr mgr = cbdata->manager;
@ -555,37 +555,37 @@ virSecurityDACSetSecurityHostdevLabelHelper(const char *file,
static int static int
virSecurityDACSetSecurityPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
return virSecurityDACSetSecurityHostdevLabelHelper(file, opaque); return virSecurityDACSetHostdevLabelHelper(file, opaque);
} }
static int static int
virSecurityDACSetSecurityUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
return virSecurityDACSetSecurityHostdevLabelHelper(file, opaque); return virSecurityDACSetHostdevLabelHelper(file, opaque);
} }
static int static int
virSecurityDACSetSecuritySCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACSetSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
return virSecurityDACSetSecurityHostdevLabelHelper(file, opaque); return virSecurityDACSetHostdevLabelHelper(file, opaque);
} }
static int static int
virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,
const char *vroot) const char *vroot)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityDACCallbackData cbdata; virSecurityDACCallbackData cbdata;
@ -600,7 +600,7 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
return 0; return 0;
/* Like virSecurityDACSetSecurityImageLabel() for a networked disk, /* Like virSecurityDACSetImageLabel() for a networked disk,
* do nothing for an iSCSI hostdev * do nothing for an iSCSI hostdev
*/ */
if (dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && if (dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
@ -624,7 +624,7 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
goto done; goto done;
ret = virUSBDeviceFileIterate(usb, ret = virUSBDeviceFileIterate(usb,
virSecurityDACSetSecurityUSBLabel, virSecurityDACSetUSBLabel,
&cbdata); &cbdata);
virUSBDeviceFree(usb); virUSBDeviceFree(usb);
break; break;
@ -645,11 +645,11 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
virPCIDeviceFree(pci); virPCIDeviceFree(pci);
goto done; goto done;
} }
ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, &cbdata); ret = virSecurityDACSetPCILabel(pci, vfioGroupDev, &cbdata);
VIR_FREE(vfioGroupDev); VIR_FREE(vfioGroupDev);
} else { } else {
ret = virPCIDeviceFileIterate(pci, ret = virPCIDeviceFileIterate(pci,
virSecurityDACSetSecurityPCILabel, virSecurityDACSetPCILabel,
&cbdata); &cbdata);
} }
@ -669,7 +669,7 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
goto done; goto done;
ret = virSCSIDeviceFileIterate(scsi, ret = virSCSIDeviceFileIterate(scsi,
virSecurityDACSetSecuritySCSILabel, virSecurityDACSetSCSILabel,
&cbdata); &cbdata);
virSCSIDeviceFree(scsi); virSCSIDeviceFree(scsi);
@ -687,43 +687,43 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityDACRestoreSecurityPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
virSecurityManagerPtr mgr = opaque; virSecurityManagerPtr mgr = opaque;
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
return virSecurityDACRestoreSecurityFileLabel(priv, file); return virSecurityDACRestoreFileLabel(priv, file);
} }
static int static int
virSecurityDACRestoreSecurityUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
virSecurityManagerPtr mgr = opaque; virSecurityManagerPtr mgr = opaque;
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
return virSecurityDACRestoreSecurityFileLabel(priv, file); return virSecurityDACRestoreFileLabel(priv, file);
} }
static int static int
virSecurityDACRestoreSecuritySCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED,
const char *file, const char *file,
void *opaque) void *opaque)
{ {
virSecurityManagerPtr mgr = opaque; virSecurityManagerPtr mgr = opaque;
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
return virSecurityDACRestoreSecurityFileLabel(priv, file); return virSecurityDACRestoreFileLabel(priv, file);
} }
static int static int
virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,
const char *vroot) const char *vroot)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
@ -741,7 +741,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr,
if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
return 0; return 0;
/* Like virSecurityDACRestoreSecurityImageLabelInt() for a networked disk, /* Like virSecurityDACRestoreImageLabelInt() for a networked disk,
* do nothing for an iSCSI hostdev * do nothing for an iSCSI hostdev
*/ */
if (dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && if (dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
@ -758,7 +758,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr,
if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot))) if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot)))
goto done; goto done;
ret = virUSBDeviceFileIterate(usb, virSecurityDACRestoreSecurityUSBLabel, mgr); ret = virUSBDeviceFileIterate(usb, virSecurityDACRestoreUSBLabel, mgr);
virUSBDeviceFree(usb); virUSBDeviceFree(usb);
break; break;
@ -779,10 +779,10 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr,
virPCIDeviceFree(pci); virPCIDeviceFree(pci);
goto done; goto done;
} }
ret = virSecurityDACRestoreSecurityPCILabel(pci, vfioGroupDev, mgr); ret = virSecurityDACRestorePCILabel(pci, vfioGroupDev, mgr);
VIR_FREE(vfioGroupDev); VIR_FREE(vfioGroupDev);
} else { } else {
ret = virPCIDeviceFileIterate(pci, virSecurityDACRestoreSecurityPCILabel, mgr); ret = virPCIDeviceFileIterate(pci, virSecurityDACRestorePCILabel, mgr);
} }
virPCIDeviceFree(pci); virPCIDeviceFree(pci);
break; break;
@ -799,7 +799,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr,
if (!scsi) if (!scsi)
goto done; goto done;
ret = virSCSIDeviceFileIterate(scsi, virSecurityDACRestoreSecuritySCSILabel, mgr); ret = virSCSIDeviceFileIterate(scsi, virSecurityDACRestoreSCSILabel, mgr);
virSCSIDeviceFree(scsi); virSCSIDeviceFree(scsi);
break; break;
@ -922,7 +922,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr,
switch ((virDomainChrType) dev_source->type) { switch ((virDomainChrType) dev_source->type) {
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_FILE:
ret = virSecurityDACRestoreSecurityFileLabel(priv, dev_source->data.file.path); ret = virSecurityDACRestoreFileLabel(priv, dev_source->data.file.path);
break; break;
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
@ -930,10 +930,10 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr,
virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0)
goto done; goto done;
if (virFileExists(in) && virFileExists(out)) { if (virFileExists(in) && virFileExists(out)) {
if (virSecurityDACRestoreSecurityFileLabel(priv, out) < 0 || if (virSecurityDACRestoreFileLabel(priv, out) < 0 ||
virSecurityDACRestoreSecurityFileLabel(priv, in) < 0) virSecurityDACRestoreFileLabel(priv, in) < 0)
goto done; goto done;
} else if (virSecurityDACRestoreSecurityFileLabel(priv, dev_source->data.file.path) < 0) { } else if (virSecurityDACRestoreFileLabel(priv, dev_source->data.file.path) < 0) {
goto done; goto done;
} }
ret = 0; ret = 0;
@ -973,9 +973,9 @@ virSecurityDACRestoreChardevCallback(virDomainDefPtr def,
static int static int
virSecurityDACSetSecurityTPMFileLabel(virSecurityManagerPtr mgr, virSecurityDACSetTPMFileLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainTPMDefPtr tpm) virDomainTPMDefPtr tpm)
{ {
int ret = 0; int ret = 0;
@ -993,9 +993,9 @@ virSecurityDACSetSecurityTPMFileLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityDACRestoreSecurityTPMFileLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreTPMFileLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainTPMDefPtr tpm) virDomainTPMDefPtr tpm)
{ {
int ret = 0; int ret = 0;
@ -1057,7 +1057,7 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr,
switch ((virDomainInputType) input->type) { switch ((virDomainInputType) input->type) {
case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
ret = virSecurityDACRestoreSecurityFileLabel(priv, input->source.evdev); ret = virSecurityDACRestoreFileLabel(priv, input->source.evdev);
break; break;
case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_MOUSE:
@ -1073,9 +1073,9 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
bool migrated) bool migrated)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
@ -1091,10 +1091,10 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
def->name, migrated); def->name, migrated);
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACRestoreSecurityHostdevLabel(mgr, if (virSecurityDACRestoreHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],
NULL) < 0) NULL) < 0)
rc = -1; rc = -1;
} }
@ -1104,10 +1104,10 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
} }
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
if (virSecurityDACRestoreSecurityImageLabelInt(mgr, if (virSecurityDACRestoreImageLabelInt(mgr,
def, def,
def->disks[i]->src, def->disks[i]->src,
migrated) < 0) migrated) < 0)
rc = -1; rc = -1;
} }
@ -1118,26 +1118,26 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
rc = -1; rc = -1;
if (def->tpm) { if (def->tpm) {
if (virSecurityDACRestoreSecurityTPMFileLabel(mgr, if (virSecurityDACRestoreTPMFileLabel(mgr,
def, def,
def->tpm) < 0) def->tpm) < 0)
rc = -1; rc = -1;
} }
if (def->os.loader && def->os.loader->nvram && if (def->os.loader && def->os.loader->nvram &&
virSecurityDACRestoreSecurityFileLabel(priv, def->os.loader->nvram) < 0) virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0)
rc = -1; rc = -1;
if (def->os.kernel && if (def->os.kernel &&
virSecurityDACRestoreSecurityFileLabel(priv, def->os.kernel) < 0) virSecurityDACRestoreFileLabel(priv, def->os.kernel) < 0)
rc = -1; rc = -1;
if (def->os.initrd && if (def->os.initrd &&
virSecurityDACRestoreSecurityFileLabel(priv, def->os.initrd) < 0) virSecurityDACRestoreFileLabel(priv, def->os.initrd) < 0)
rc = -1; rc = -1;
if (def->os.dtb && if (def->os.dtb &&
virSecurityDACRestoreSecurityFileLabel(priv, def->os.dtb) < 0) virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0)
rc = -1; rc = -1;
return rc; return rc;
@ -1156,9 +1156,9 @@ virSecurityDACSetChardevCallback(virDomainDefPtr def,
static int static int
virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
const char *stdin_path ATTRIBUTE_UNUSED) const char *stdin_path ATTRIBUTE_UNUSED)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
@ -1175,9 +1175,9 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
/* XXX fixme - we need to recursively label the entire tree :-( */ /* XXX fixme - we need to recursively label the entire tree :-( */
if (virDomainDiskGetType(def->disks[i]) == VIR_STORAGE_TYPE_DIR) if (virDomainDiskGetType(def->disks[i]) == VIR_STORAGE_TYPE_DIR)
continue; continue;
if (virSecurityDACSetSecurityDiskLabel(mgr, if (virSecurityDACSetDiskLabel(mgr,
def, def,
def->disks[i]) < 0) def->disks[i]) < 0)
return -1; return -1;
} }
@ -1187,10 +1187,10 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
} }
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACSetSecurityHostdevLabel(mgr, if (virSecurityDACSetHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],
NULL) < 0) NULL) < 0)
return -1; return -1;
} }
@ -1201,9 +1201,9 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
return -1; return -1;
if (def->tpm) { if (def->tpm) {
if (virSecurityDACSetSecurityTPMFileLabel(mgr, if (virSecurityDACSetTPMFileLabel(mgr,
def, def,
def->tpm) < 0) def->tpm) < 0)
return -1; return -1;
} }
@ -1263,7 +1263,7 @@ virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr,
if (!priv->dynamicOwnership) if (!priv->dynamicOwnership)
return 0; return 0;
return virSecurityDACRestoreSecurityFileLabel(priv, savefile); return virSecurityDACRestoreFileLabel(priv, savefile);
} }
@ -1585,11 +1585,11 @@ virSecurityDriver virSecurityDriverDAC = {
.domainSecurityVerify = virSecurityDACVerify, .domainSecurityVerify = virSecurityDACVerify,
.domainSetSecurityDiskLabel = virSecurityDACSetSecurityDiskLabel, .domainSetSecurityDiskLabel = virSecurityDACSetDiskLabel,
.domainRestoreSecurityDiskLabel = virSecurityDACRestoreSecurityDiskLabel, .domainRestoreSecurityDiskLabel = virSecurityDACRestoreDiskLabel,
.domainSetSecurityImageLabel = virSecurityDACSetSecurityImageLabel, .domainSetSecurityImageLabel = virSecurityDACSetImageLabel,
.domainRestoreSecurityImageLabel = virSecurityDACRestoreSecurityImageLabel, .domainRestoreSecurityImageLabel = virSecurityDACRestoreImageLabel,
.domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel, .domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel,
.domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel, .domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel,
@ -1603,11 +1603,11 @@ virSecurityDriver virSecurityDriverDAC = {
.domainSetSecurityProcessLabel = virSecurityDACSetProcessLabel, .domainSetSecurityProcessLabel = virSecurityDACSetProcessLabel,
.domainSetSecurityChildProcessLabel = virSecurityDACSetChildProcessLabel, .domainSetSecurityChildProcessLabel = virSecurityDACSetChildProcessLabel,
.domainSetSecurityAllLabel = virSecurityDACSetSecurityAllLabel, .domainSetSecurityAllLabel = virSecurityDACSetAllLabel,
.domainRestoreSecurityAllLabel = virSecurityDACRestoreSecurityAllLabel, .domainRestoreSecurityAllLabel = virSecurityDACRestoreAllLabel,
.domainSetSecurityHostdevLabel = virSecurityDACSetSecurityHostdevLabel, .domainSetSecurityHostdevLabel = virSecurityDACSetHostdevLabel,
.domainRestoreSecurityHostdevLabel = virSecurityDACRestoreSecurityHostdevLabel, .domainRestoreSecurityHostdevLabel = virSecurityDACRestoreHostdevLabel,
.domainSetSavedStateLabel = virSecurityDACSetSavedStateLabel, .domainSetSavedStateLabel = virSecurityDACSetSavedStateLabel,
.domainRestoreSavedStateLabel = virSecurityDACRestoreSavedStateLabel, .domainRestoreSavedStateLabel = virSecurityDACRestoreSavedStateLabel,