[libvirt] [PATCH] virsh: Allow using complete <capabilities> elements with cpu-baseline

[Eric Blake]

On 09/15/2011 06:05 AM, Peter Krempa wrote:
> This patch cleans the cpu baseline function using new libvirt helper
> functions and fixes XPath expression that selects<cpu>  elements from
> the source file, that can contain concatenated<capabilities>  XMLs,
> domain XMLs and bare<cpu>  elements. The fixed XPath expression ensures
> not to select NUMA<cpu id=... elements.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=731645
> ---
>   tools/virsh.c |   88 ++++++++++++++++++++++++--------------------------------
>   1 files changed, 38 insertions(+), 50 deletions(-)
>

Fixing bugs and more compact at the same time!  I didn't see anything 
obviously wrong with what you've done, but the patch is incomplete, as I 
now get a compiler warning - you removed the last use of vshRealloc, so 
you have even more lines of code to remove!

virsh.c:418:1: error: '_vshRealloc' defined but not used [-Wunused-function]

ACK if you squash this in:

diff --git i/tools/virsh.c w/tools/virsh.c
index 3e05ce9..1863db3 100644
--- i/tools/virsh.c
+++ w/tools/virsh.c
@@ -384,9 +384,6 @@ static void *_vshMalloc(vshControl *ctl, size_t sz, 
const char *filename, int li
  static void *_vshCalloc(vshControl *ctl, size_t nmemb, size_t sz, 
const char *filename, int line);
  #define vshCalloc(_ctl, _nmemb, _sz)    _vshCalloc(_ctl, _nmemb, _sz, 
__FILE__, __LINE__)

-static void *_vshRealloc(vshControl *ctl, void *ptr, size_t sz, const 
char *filename, int line);
-#define vshRealloc(_ctl, _ptr, _sz)    _vshRealloc(_ctl, _ptr, _sz, 
__FILE__, __LINE__)
-
  static char *_vshStrdup(vshControl *ctl, const char *s, const char 
*filename, int line);
  #define vshStrdup(_ctl, _s)    _vshStrdup(_ctl, _s, __FILE__, __LINE__)

@@ -414,19 +411,6 @@ _vshCalloc(vshControl *ctl, size_t nmemb, size_t 
size, const char *filename, int
      exit(EXIT_FAILURE);
  }

-static void *
-_vshRealloc(vshControl *ctl, void *ptr, size_t size, const char 
*filename, int line)
-{
-    void *x;
-
-    if ((x = realloc(ptr, size)))
-        return x;
-    VIR_FREE(ptr);
-    vshError(ctl, _("%s: %d: failed to allocate %d bytes"),
-             filename, line, (int) size);
-    exit(EXIT_FAILURE);
-}
-
  static char *
  _vshStrdup(vshControl *ctl, const char *s, const char *filename, int line)
  {


-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org