[libvirt] [PATCH v3 4/4] node_device: Replace VIR_ERROR with standard vir*Error in state driver init

Cole Robinson crobinso at redhat.com
Tue Jun 7 18:13:47 UTC 2016


On 06/07/2016 11:59 AM, Jovanka Gulicoska wrote:
> ---
>  src/node_device/node_device_hal.c  | 26 +++++++++++++-------
>  src/node_device/node_device_udev.c | 49 +++++++++++++++++++++++---------------
>  2 files changed, 47 insertions(+), 28 deletions(-)
> 

I pushed patches 1-3, thanks!

This patch needs to be rebased on master, since node_device_udev had a bunch
of cleanups recently. There's also one issue I noticed:

> diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
> index 7d111c4..3315153 100644
> --- a/src/node_device/node_device_udev.c
> +++ b/src/node_device/node_device_udev.c

> @@ -1691,9 +1701,8 @@ static int udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED)
>           * situation, but a non-privileged user won't benefit much
>           * from udev in the first place.  */
>          if (errno != ENOENT && (privileged  || errno != EACCES)) {
> -            char ebuf[256];
> -            VIR_ERROR(_("Failed to initialize libpciaccess: %s"),
> -                      virStrerror(pciret, ebuf, sizeof(ebuf)));
> +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                           _("Failed to initialize libpciaccess: %s"));
>              return -1;
>          }
>      }

I think you forgot to preserve the virStrerror call here, otherwise the string
format is incorrect, with the trailing ": %s"

Thanks,
Cole




More information about the libvir-list mailing list