Commit c39f95dc authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Stefan Berger
Browse files

tpm: add stubs 



Commit c37cacab moved tpm_cleanup() in the main loop exit, however this
function is not available when compiling with --disable-tpm.

Provides necessary stubs to keep code clean of #ifdef'fery.

Reported-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20171023102903.256AF7456A0@zero.eik.bme.hu>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
parent 6b287efe

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1544,6 +1544,7 @@ TPM 
M: Stefan Berger <stefanb@linux.vnet.ibm.com>

S: Maintained

F: tpm.c

F: stubs/tpm.c

F: hw/tpm/*

F: include/hw/acpi/tpm.h

F: include/sysemu/tpm*

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ bt-host.o-cflags := $(BLUEZ_CFLAGS) 
common-obj-y += dma-helpers.o

common-obj-y += vl.o

vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

common-obj-y += tpm.o

common-obj-$(CONFIG_TPM) += tpm.o



common-obj-$(CONFIG_SLIRP) += slirp/

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ stub-obj-y += runstate-check.o 
stub-obj-y += set-fd-handler.o

stub-obj-y += slirp.o

stub-obj-y += sysbus.o

stub-obj-y += tpm.o

stub-obj-y += trace-control.o

stub-obj-y += uuid.o

stub-obj-y += vm-stop.o

stubs/tpm.c

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * TPM stubs

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */

#include "qemu/osdep.h"

#include "sysemu/tpm.h"

#include "qmp-commands.h"



int tpm_init(void)

{

    return 0;

}



void tpm_cleanup(void)

{

}



TPMInfoList *qmp_query_tpm(Error **errp)

{

    return NULL;

}



TpmTypeList *qmp_query_tpm_types(Error **errp)

{

    return NULL;

}



TpmModelList *qmp_query_tpm_models(Error **errp)

{

    return NULL;

}