From: Maxim Nestratov <mnestratov@parallels.com>
Date: Thu, 21 May 2015 17:23:56 +0000 (+0300)
Subject: node_device: fix libvirt build if WITH_HAL is defined
X-Git-Tag: v1.2.16-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b903b3b01ed3e8295208e6bd5e48d69bf26aef40;p=thirdparty%2Flibvirt.git

node_device: fix libvirt build if WITH_HAL is defined

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.
---

diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 2d3bc170ec..6d18a8789b 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -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) {