On 07/04/13 14:07, Michal Privoznik wrote:
--- tools/console.c | 6 +----- tools/virsh-domain-monitor.c | 4 +--- tools/virsh-domain.c | 28 ++++++++-------------------- tools/virsh.c | 1 - 4 files changed, 10 insertions(+), 29 deletions(-)
...
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5257416..1eb8ff8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c /* @@ -9192,10 +9184,8 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) if (n1_child_size == 0 && n2_child_size == 0) return true; - if (!(bitmap = virBitmapNew(n1_child_size))) { - virReportOOMError(); + if (!(bitmap = virBitmapNew(n1_child_size))) return false; - }
see my comment in patch 28/37 why this would be problematic if you don't adapt virBitmapNew fully.
child2 = n2->children; while (child2) {
ACK to this patch though, src/util/virbitmap.c needs a change, not this patch.
Peter -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list