Re: [libvirt] [PATCH 5/7] Update QEMU driver to support multiple security drivers

--- src/driver.h | 8 ++- src/qemu/qemu_conf.c | 33 ++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 196 ++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_process.c | 53 +++++++++---- 5 files changed, 236 insertions(+), 55 deletions(-) diff --git a/src/driver.h b/src/driver.h index 03d249b..ca4927f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -305,11 +305,14 @@ typedef int int maplen); typedef int (*virDrvDomainGetMaxVcpus) (virDomainPtr domain); - typedef int - (*virDrvDomainGetSecurityLabel) (virDomainPtr domain, + (*virDrvDomainGetSecurityLabel) (virDomainPtr domain, virSecurityLabelPtr seclabel); typedef int + (*virDrvDomainGetSecurityLabelList) (virDomainPtr domain, + virSecurityLabelPtr seclabels, + int nseclabels); +typedef int (*virDrvNodeGetSecurityModel) (virConnectPtr conn, virSecurityModelPtr secmodel); typedef int @@ -911,6 +914,7 @@ struct _virDriver { virDrvDomainGetVcpus domainGetVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus; virDrvDomainGetSecurityLabel domainGetSecurityLabel; + virDrvDomainGetSecurityLabelList domainGetSecurityLabelList; virDrvNodeGetSecurityModel nodeGetSecurityModel; virDrvDomainGetXMLDesc domainGetXMLDesc; virDrvConnectDomainXMLFromNative domainXMLFromNative;

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 88a04bc..5cc2071 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -202,6 +202,39 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, } } + p = virConfGetValue (conf, "additional_security_drivers"); + CHECK_TYPE ("additional_security_driver", VIR_CONF_STRING);