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: Rename virSecurityManagerRestoreImageLabel to *Disk*

Browse Source 
I'm going to add functions that will deal with individual image files
rather than whole disks. Rename the security function to make room for
the new one.
This commit is contained in:
Peter Krempa 2014-06-18 14:46:27 +02:00
parent 74d52fe809
commit 23a8646a89
11 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -911,8 +911,8 @@ virSecurityManagerPreFork;
virSecurityManagerReleaseLabel; virSecurityManagerReleaseLabel;
virSecurityManagerReserveLabel; virSecurityManagerReserveLabel;
virSecurityManagerRestoreAllLabel; virSecurityManagerRestoreAllLabel;
virSecurityManagerRestoreDiskLabel;
virSecurityManagerRestoreHostdevLabel; virSecurityManagerRestoreHostdevLabel;
virSecurityManagerRestoreImageLabel;
virSecurityManagerRestoreSavedStateLabel; virSecurityManagerRestoreSavedStateLabel;
virSecurityManagerSetAllLabel; virSecurityManagerSetAllLabel;
virSecurityManagerSetChildProcessLabel; virSecurityManagerSetChildProcessLabel;

2
src/qemu/qemu_driver.c
View File

@ -12096,7 +12096,7 @@ qemuDomainPrepareDiskChainElement(virQEMUDriverPtr driver,
disk->readonly = mode == VIR_DISK_CHAIN_READ_ONLY; disk->readonly = mode == VIR_DISK_CHAIN_READ_ONLY;
if (mode == VIR_DISK_CHAIN_NO_ACCESS) { if (mode == VIR_DISK_CHAIN_NO_ACCESS) {
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on %s", disk->src->path); VIR_WARN("Unable to restore security label on %s", disk->src->path);
if (qemuTeardownDiskCgroup(vm, disk) < 0) if (qemuTeardownDiskCgroup(vm, disk) < 0)

12
src/qemu/qemu_hotplug.c
View File

@ -161,7 +161,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
if (ret < 0) if (ret < 0)
goto error; goto error;
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, origdisk) < 0) vm->def, origdisk) < 0)
VIR_WARN("Unable to restore security label on ejected image %s", VIR_WARN("Unable to restore security label on ejected image %s",
virDomainDiskGetSource(origdisk)); virDomainDiskGetSource(origdisk));
@ -182,7 +182,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
return ret; return ret;
error: error:
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on new media %s", src); VIR_WARN("Unable to restore security label on new media %s", src);
@ -347,7 +347,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
if (releaseaddr) if (releaseaddr)
qemuDomainReleaseDeviceAddress(vm, &disk->info, src); qemuDomainReleaseDeviceAddress(vm, &disk->info, src);
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on %s", src); VIR_WARN("Unable to restore security label on %s", src);
@ -597,7 +597,7 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
return ret; return ret;
error: error:
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on %s", src); VIR_WARN("Unable to restore security label on %s", src);
@ -691,7 +691,7 @@ qemuDomainAttachUSBMassstorageDevice(virConnectPtr conn,
return ret; return ret;
error: error:
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on %s", src); VIR_WARN("Unable to restore security label on %s", src);
@ -2504,7 +2504,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
qemuDomainReleaseDeviceAddress(vm, &disk->info, src); qemuDomainReleaseDeviceAddress(vm, &disk->info, src);
if (virSecurityManagerRestoreImageLabel(driver->securityManager, if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
vm->def, disk) < 0) vm->def, disk) < 0)
VIR_WARN("Unable to restore security label on %s", src); VIR_WARN("Unable to restore security label on %s", src);

4
src/security/security_apparmor.c
View File

@ -684,7 +684,7 @@ AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
/* Called when hotplugging */ /* Called when hotplugging */
static int static int
AppArmorRestoreSecurityImageLabel(virSecurityManagerPtr mgr, AppArmorRestoreSecurityDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
@ -973,7 +973,7 @@ virSecurityDriver virAppArmorSecurityDriver = {
.domainSecurityVerify = AppArmorSecurityVerify, .domainSecurityVerify = AppArmorSecurityVerify,
.domainSetSecurityDiskLabel = AppArmorSetSecurityDiskLabel, .domainSetSecurityDiskLabel = AppArmorSetSecurityDiskLabel,
.domainRestoreSecurityImageLabel = AppArmorRestoreSecurityImageLabel, .domainRestoreSecurityDiskLabel = AppArmorRestoreSecurityDiskLabel,
.domainSetSecurityDaemonSocketLabel = AppArmorSetSecurityDaemonSocketLabel, .domainSetSecurityDaemonSocketLabel = AppArmorSetSecurityDaemonSocketLabel,
.domainSetSecuritySocketLabel = AppArmorSetSecuritySocketLabel, .domainSetSecuritySocketLabel = AppArmorSetSecuritySocketLabel,

4
src/security/security_dac.c
View File

@ -410,7 +410,7 @@ virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr,
static int static int
virSecurityDACRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreSecurityDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
@ -1274,7 +1274,7 @@ virSecurityDriver virSecurityDriverDAC = {
.domainSecurityVerify = virSecurityDACVerify, .domainSecurityVerify = virSecurityDACVerify,
.domainSetSecurityDiskLabel = virSecurityDACSetSecurityDiskLabel, .domainSetSecurityDiskLabel = virSecurityDACSetSecurityDiskLabel,
.domainRestoreSecurityImageLabel = virSecurityDACRestoreSecurityImageLabel, .domainRestoreSecurityDiskLabel = virSecurityDACRestoreSecurityDiskLabel,
.domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel, .domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel,
.domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel, .domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel,

4
src/security/security_driver.h
View File

@ -51,7 +51,7 @@ typedef const char *(*virSecurityDriverGetBaseLabel) (virSecurityManagerPtr mgr,
typedef int (*virSecurityDriverPreFork) (virSecurityManagerPtr mgr); typedef int (*virSecurityDriverPreFork) (virSecurityManagerPtr mgr);
typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainRestoreDiskLabel) (virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk); virDomainDiskDefPtr disk);
typedef int (*virSecurityDomainSetDaemonSocketLabel)(virSecurityManagerPtr mgr, typedef int (*virSecurityDomainSetDaemonSocketLabel)(virSecurityManagerPtr mgr,
@ -128,7 +128,7 @@ struct _virSecurityDriver {
virSecurityDomainSecurityVerify domainSecurityVerify; virSecurityDomainSecurityVerify domainSecurityVerify;
virSecurityDomainSetDiskLabel domainSetSecurityDiskLabel; virSecurityDomainSetDiskLabel domainSetSecurityDiskLabel;
virSecurityDomainRestoreImageLabel domainRestoreSecurityImageLabel; virSecurityDomainRestoreDiskLabel domainRestoreSecurityDiskLabel;
virSecurityDomainSetDaemonSocketLabel domainSetSecurityDaemonSocketLabel; virSecurityDomainSetDaemonSocketLabel domainSetSecurityDaemonSocketLabel;
virSecurityDomainSetSocketLabel domainSetSecuritySocketLabel; virSecurityDomainSetSocketLabel domainSetSecuritySocketLabel;

6
src/security/security_manager.c
View File

@ -306,14 +306,14 @@ bool virSecurityManagerGetRequireConfined(virSecurityManagerPtr mgr)
return mgr->requireConfined; return mgr->requireConfined;
} }
int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, int virSecurityManagerRestoreDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
if (mgr->drv->domainRestoreSecurityImageLabel) { if (mgr->drv->domainRestoreSecurityDiskLabel) {
int ret; int ret;
virObjectLock(mgr); virObjectLock(mgr);
ret = mgr->drv->domainRestoreSecurityImageLabel(mgr, vm, disk); ret = mgr->drv->domainRestoreSecurityDiskLabel(mgr, vm, disk);
virObjectUnlock(mgr); virObjectUnlock(mgr);
return ret; return ret;
} }

2
src/security/security_manager.h
View File

@ -61,7 +61,7 @@ bool virSecurityManagerGetAllowDiskFormatProbing(virSecurityManagerPtr mgr);
bool virSecurityManagerGetDefaultConfined(virSecurityManagerPtr mgr); bool virSecurityManagerGetDefaultConfined(virSecurityManagerPtr mgr);
bool virSecurityManagerGetRequireConfined(virSecurityManagerPtr mgr); bool virSecurityManagerGetRequireConfined(virSecurityManagerPtr mgr);
int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, int virSecurityManagerRestoreDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk); virDomainDiskDefPtr disk);
int virSecurityManagerSetDaemonSocketLabel(virSecurityManagerPtr mgr, int virSecurityManagerSetDaemonSocketLabel(virSecurityManagerPtr mgr,

4
src/security/security_nop.c
View File

@ -50,7 +50,7 @@ static const char * virSecurityDriverGetDOINop(virSecurityManagerPtr mgr ATTRIBU
return "0"; return "0";
} }
static int virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecurityDomainRestoreDiskLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
virDomainDefPtr vm ATTRIBUTE_UNUSED, virDomainDefPtr vm ATTRIBUTE_UNUSED,
virDomainDiskDefPtr disk ATTRIBUTE_UNUSED) virDomainDiskDefPtr disk ATTRIBUTE_UNUSED)
{ {
@ -207,7 +207,7 @@ virSecurityDriver virSecurityDriverNop = {
.domainSecurityVerify = virSecurityDomainVerifyNop, .domainSecurityVerify = virSecurityDomainVerifyNop,
.domainSetSecurityDiskLabel = virSecurityDomainSetDiskLabelNop, .domainSetSecurityDiskLabel = virSecurityDomainSetDiskLabelNop,
.domainRestoreSecurityImageLabel = virSecurityDomainRestoreImageLabelNop, .domainRestoreSecurityDiskLabel = virSecurityDomainRestoreDiskLabelNop,
.domainSetSecurityDaemonSocketLabel = virSecurityDomainSetDaemonSocketLabelNop, .domainSetSecurityDaemonSocketLabel = virSecurityDomainSetDaemonSocketLabelNop,
.domainSetSecuritySocketLabel = virSecurityDomainSetSocketLabelNop, .domainSetSecuritySocketLabel = virSecurityDomainSetSocketLabelNop,

4
src/security/security_selinux.c
View File

@ -1182,7 +1182,7 @@ virSecuritySELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr,
static int static int
virSecuritySELinuxRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virSecuritySELinuxRestoreSecurityDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
@ -2427,7 +2427,7 @@ virSecurityDriver virSecurityDriverSELinux = {
.domainSecurityVerify = virSecuritySELinuxSecurityVerify, .domainSecurityVerify = virSecuritySELinuxSecurityVerify,
.domainSetSecurityDiskLabel = virSecuritySELinuxSetSecurityDiskLabel, .domainSetSecurityDiskLabel = virSecuritySELinuxSetSecurityDiskLabel,
.domainRestoreSecurityImageLabel = virSecuritySELinuxRestoreSecurityImageLabel, .domainRestoreSecurityDiskLabel = virSecuritySELinuxRestoreSecurityDiskLabel,
.domainSetSecurityDaemonSocketLabel = virSecuritySELinuxSetSecurityDaemonSocketLabel, .domainSetSecurityDaemonSocketLabel = virSecuritySELinuxSetSecurityDaemonSocketLabel,
.domainSetSecuritySocketLabel = virSecuritySELinuxSetSecuritySocketLabel, .domainSetSecuritySocketLabel = virSecuritySELinuxSetSecuritySocketLabel,

6
src/security/security_stack.c
View File

@ -240,7 +240,7 @@ virSecurityStackSetSecurityDiskLabel(virSecurityManagerPtr mgr,
static int static int
virSecurityStackRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virSecurityStackRestoreSecurityDiskLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
@ -249,7 +249,7 @@ virSecurityStackRestoreSecurityImageLabel(virSecurityManagerPtr mgr,
int rc = 0; int rc = 0;
for (; item; item = item->next) { for (; item; item = item->next) {
if (virSecurityManagerRestoreImageLabel(item->securityManager, vm, disk) < 0) if (virSecurityManagerRestoreDiskLabel(item->securityManager, vm, disk) < 0)
rc = -1; rc = -1;
} }
@ -579,7 +579,7 @@ virSecurityDriver virSecurityDriverStack = {
.domainSecurityVerify = virSecurityStackVerify, .domainSecurityVerify = virSecurityStackVerify,
.domainSetSecurityDiskLabel = virSecurityStackSetSecurityDiskLabel, .domainSetSecurityDiskLabel = virSecurityStackSetSecurityDiskLabel,
.domainRestoreSecurityImageLabel = virSecurityStackRestoreSecurityImageLabel, .domainRestoreSecurityDiskLabel = virSecurityStackRestoreSecurityDiskLabel,
.domainSetSecurityDaemonSocketLabel = virSecurityStackSetDaemonSocketLabel, .domainSetSecurityDaemonSocketLabel = virSecurityStackSetDaemonSocketLabel,
.domainSetSecuritySocketLabel = virSecurityStackSetSocketLabel, .domainSetSecuritySocketLabel = virSecurityStackSetSocketLabel,