On Thu, Oct 25, 2012 at 14:51:37 +0800, Guannan Ren wrote:
--- src/security/virt-aa-helper.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 263fc92..3c3449c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -924,10 +924,9 @@ get_files(vahControl * ctl) /* XXX - if we knew the qemu user:group here we could send it in * so that the open could be re-tried as that user:group. */ - disk->chain = virStorageFileGetMetadata(disk->src, disk->format, - -1, -1, - ctl->allowDiskFormatProbing, - NULL); + disk->backingChain = virStorageFileGetMetadata(disk->src, disk->format, + -1, -1, + ctl->allowDiskFormatProbing);
/* XXX passing ignoreOpenFailure = true to get back to the behavior * from before using virDomainDiskDefForeachPath. actually we should
This could potentially lead to leaking the memory pointed to be previous value of disk->backingChain. Anyway, just drop this patch completely since I already sent the fix for this issue yesterday and pushed it now as commit 0111b409a393bd4c3f138419bc9bf5cb20ebbc77 Author: Jiri Denemark <jdenemar@redhat.com> Date: Wed Oct 24 12:13:48 2012 +0200 Fix build with apparmor Recent storage patches changed signature of virStorageFileGetMetadata and replaced chain with backingChain in virDomainDiskDef. Jirka