]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
node_device: fix libvirt build if WITH_HAL is defined
authorMaxim Nestratov <mnestratov@parallels.com>
Thu, 21 May 2015 17:23:56 +0000 (20:23 +0300)
committerLaine Stump <laine@laine.org>
Thu, 21 May 2015 18:25:20 +0000 (14:25 -0400)
commit ffc40b63b50ecb changed uniond _virNodeDevCapData into a typedef
named virNodeDevCapData with a struct that contains the union as well
as a type enum. This change necessitated changing every reference to
"caps->type" into "caps->data.type", but the author of that patch
failed to test a build "WITH_HAL". This patch fixes the one place in
the hal backend that needed changing.

src/node_device/node_device_hal.c

index 2d3bc170ecbd2f7885ed33266a690019ef9a79b1..6d18a8789b91aa622dd440468c60a58e61c50da4 100644 (file)
@@ -372,7 +372,7 @@ gather_capability(LibHalContext *ctx, const char *udi,
         virNodeDevCapsDefPtr caps;
         if (VIR_ALLOC(caps) < 0)
             return ENOMEM;
-        caps->type = entry->type;
+        caps->data.type = entry->type;
         if (entry->gather_fn) {
             int rv = (*entry->gather_fn)(ctx, udi, &caps->data);
             if (rv != 0) {