NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tpm: adapt sysfs cancel path for new TPM driver

Browse Source 
This patch addresses BZ 1244895.

Adapt the sysfs TPM command cancel path for the TPM driver that
does not use a miscdevice anymore since Linux 4.0. Support old
and new paths and check their availability.

Add a mockup for the test cases to avoid the testing for
availability of the cancel path.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger
2015-11-17 19:44:13 -05:00
committed by Cole Robinson
parent b6e19cf4cb
commit 5ed7afa9de
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/virtpm.c
View File

@@ -26,6 +26,8 @@
#include "virstring.h"
#include "virerror.h"
#include "viralloc.h"
#include "virfile.h"
#include "virtpm.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@@ -41,14 +43,27 @@ virTPMCreateCancelPath(const char *devpath)
{
char *path = NULL;
const char *dev;
const char *prefix[] = {"misc/", "tpm/"};
size_t i;
if (devpath) {
dev = strrchr(devpath, '/');
if (dev) {
dev++;
if (virAsprintf(&path, "/sys/class/misc/%s/device/cancel",
dev) < 0)
goto cleanup;
for (i = 0; i < ARRAY_CARDINALITY(prefix); i++) {
if (virAsprintf(&path, "/sys/class/%s%s/device/cancel",
prefix[i], dev) < 0)
goto cleanup;
if (virFileExists(path))
break;
VIR_FREE(path);
}
if (!path)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("No usable sysfs TPM cancel file could be "
"found"));
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("TPM device path %s is invalid"), devpath);