On Tue, Mar 11, 2014 at 10:06:37AM -0600, Eric Blake wrote:
On 03/11/2014 09:17 AM, Daniel P. Berrange wrote:
> When attaching to a QEMU process, the def->seclabels array is
> going to be empty. The qemuProcessAttach method must thus
> populate it with data for the security drivers.
>
> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
> ---
> src/qemu/qemu_process.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> @@ -4529,10 +4530,16 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
> goto error;
>
> for (i = 0; sec_managers[i]; i++) {
> + seclabelgen = false;
> + VIR_ERROR("Iter %zu", i);
> model = virSecurityManagerGetModel(sec_managers[i]);
> seclabeldef = virDomainDefGetSecurityLabelDef(vm->def, model);
> - if (seclabeldef == NULL)
> - goto error;
> + VIR_ERROR("model %s def %p", model, seclabeldef);
Do you really want VIR_ERROR() in here, or was this debug printf?
Everything else makes sense; ACK.
Lol, no, this was leftover debug cruft.
Regards,
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|