mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header

Browse Source 
We are going to make "tpm_util.h" publicly accessible by
moving it to the include/ directory in the next commit.
The DEFINE_PROP_TPMBE() macro is only meaningful for the
TPM hardware files (in hw/tpm/), so keep this macro in a
local header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-11-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-06-12 10:54:42 +02:00 committed by Stefan Berger
parent eccc0b0f02
commit a3500613bd
6 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/tpm/tpm_crb.c
View File

@ -25,6 +25,7 @@
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "tpm_prop.h"
#include "tpm_util.h" #include "tpm_util.h"
#include "tpm_ppi.h" #include "tpm_ppi.h"
#include "trace.h" #include "trace.h"

31
hw/tpm/tpm_prop.h Normal file
View File

@ -0,0 +1,31 @@
/*
* TPM utility functions
*
* Copyright (c) 2010 - 2015 IBM Corporation
* Authors:
* Stefan Berger <stefanb@us.ibm.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
#ifndef HW_TPM_PROP_H
#define HW_TPM_PROP_H
#include "sysemu/tpm_backend.h"
#include "hw/qdev-properties.h"
#define DEFINE_PROP_TPMBE(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *)
#endif /* HW_TPM_PROP_H */

1
hw/tpm/tpm_spapr.c
View File

@ -21,6 +21,7 @@
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
#include "tpm_util.h" #include "tpm_util.h"
#include "tpm_prop.h"
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h" #include "hw/ppc/spapr_vio.h"

2
hw/tpm/tpm_tis_isa.c
View File

@ -27,7 +27,7 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/acpi/tpm.h" #include "hw/acpi/tpm.h"
#include "tpm_util.h" #include "tpm_prop.h"
#include "tpm_tis.h" #include "tpm_tis.h"
typedef struct TPMStateISA { typedef struct TPMStateISA {

2
hw/tpm/tpm_tis_sysbus.c
View File

@ -26,7 +26,7 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/acpi/tpm.h" #include "hw/acpi/tpm.h"
#include "tpm_util.h" #include "tpm_prop.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "tpm_tis.h" #include "tpm_tis.h"

3
hw/tpm/tpm_util.h
View File

@ -66,9 +66,6 @@ static inline void tpm_cmd_set_error(void *b, uint32_t error)
stl_be_p(b + 6, error); stl_be_p(b + 6, error);
} }
#define DEFINE_PROP_TPMBE(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *)
void tpm_util_show_buffer(const unsigned char *buffer, void tpm_util_show_buffer(const unsigned char *buffer,
size_t buffer_size, const char *string); size_t buffer_size, const char *string);