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

Miscellaneous patches for 2019-05-13

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJc2RbiAAoJEDhwtADrkYZTfpAP/itXg+X9wRfMeerni6SAkgtz
 knaLtJNC7YvwH7W6TIkSf2QgMrg/nYzIXxxj6V+Y3Vdn4CD93C7ldItWkm33amlA
 SEhREHpAn4F3wg/LsOGYYgpuqF/wrUcZsmzudnslfMd3mM6Q9Q6J3q6mu8n1oRcl
 RRKlk++ElqyRdvmxFhddhPxk797Vuunh76vd3ARUFmzKs2n7CGkeBu+qbk41VqI9
 YtjmWHO6BDY5b01PvjuWPir6n1yJsYcpfo3ZElZvPf5jQHMmO6fGB3SZc/PIWegq
 gAVeoXtwhNm+nywMpIv1wHQMkvRDZW0wrurIQBc4VGpH1Pa90dR9FNVZ8r0OZqPB
 aErPCdC7ED73uzJwzXKTnLxY0XDgdhsAsW7lFggANs6YyewZNcbDaVhZWsopTTK/
 3jBbddIw2RsfHNQgXlFVVzjZJGHBNHxFjAFASCKcapUWQwDKU42kQrS1GqxG56NI
 Lgi8Ce+Q0GsVF4wme96Oa/8EMRfmNvsHMfWQvmqGqA1OACSOf2PSGCeD618A5gq6
 kV6wF4v5HdGFkc0x9Vr5ur7kv3eOhpzFzBM6XJXe3CyqnYrkNuBldkyGZBbrNY7G
 aW5sR26Is4m9i+7159cNB5LmnfQqtsscibkSC0UQiXcuWgevd6cdiF+0r1YuNp7C
 Faa2yPOHs4mHCjUwade9
 =yKfZ
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-05-13' into staging

Miscellaneous patches for 2019-05-13

# gpg: Signature made Mon 13 May 2019 08:04:02 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2019-05-13:
  Clean up decorations and whitespace around header guards
  Normalize header guard symbol definition.
  Clean up ill-advised or unusual header guards
  Clean up header guards that don't match their file name
  target/xtensa: Clean up core-isa.h header guards
  linux-user/nios2 linux-user/riscv: Clean up header guards
  authz: Normalize #include "authz/trace.h" to "trace.h"
  Use #include "..." for our own headers, <...> for others
  Clean up includes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-05-13 13:55:13 +01:00
commit 01807c8b0e
123 changed files with 274 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
authz/base.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "authz/base.h"
#include "authz/trace.h"
#include "trace.h"
bool qauthz_is_allowed(QAuthZ *authz,
const char *identity,

2
authz/list.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "authz/list.h"
#include "authz/trace.h"
#include "trace.h"
#include "qom/object_interfaces.h"
#include "qapi/qapi-visit-authz.h"

2
authz/listfile.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "authz/listfile.h"
#include "authz/trace.h"
#include "trace.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/sockets.h"

2
authz/pamacct.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "authz/pamacct.h"
#include "authz/trace.h"
#include "trace.h"
#include "qom/object_interfaces.h"
#include <security/pam_appl.h>

2
authz/simple.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "authz/simple.h"
#include "authz/trace.h"
#include "trace.h"
#include "qom/object_interfaces.h"
static bool qauthz_simple_is_allowed(QAuthZ *authz,

6
block/crypto.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef BLOCK_CRYPTO_H__
#define BLOCK_CRYPTO_H__
#ifndef BLOCK_CRYPTO_H
#define BLOCK_CRYPTO_H
#define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \
{ \
@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp);
QCryptoBlockOpenOptions *
block_crypto_open_opts_init(QDict *opts, Error **errp);
#endif /* BLOCK_CRYPTO_H__ */
#endif /* BLOCK_CRYPTO_H */

3
contrib/elf2dmp/main.c
View File

@ -5,9 +5,8 @@
*
*/
#include <inttypes.h>
#include "qemu/osdep.h"
#include "err.h"
#include "addrspace.h"
#include "pe.h"

3
contrib/elf2dmp/pdb.c
View File

@ -18,9 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <inttypes.h>
#include "qemu/osdep.h"
#include "pdb.h"
#include "err.h"

6
contrib/elf2dmp/qemu_elf.h
View File

@ -5,8 +5,8 @@
*
*/
#ifndef ELF2DMP_ELF_H
#define ELF2DMP_ELF_H
#ifndef EMPF2DMP_QEMU_ELF_H
#define EMPF2DMP_QEMU_ELF_H
#include "elf.h"
@ -47,4 +47,4 @@ void QEMU_Elf_exit(QEMU_Elf *qe);
Elf64_Phdr *elf64_getphdr(void *map);
Elf64_Half elf_getphdrnum(void *map);
#endif /* ELF2DMP_ELF_H */
#endif /* ELF2DMP_QEMU_ELF_H */

18
contrib/rdmacm-mux/main.c
View File

@ -14,16 +14,16 @@
*/
#include "qemu/osdep.h"
#include "sys/poll.h"
#include "sys/ioctl.h"
#include "pthread.h"
#include "syslog.h"
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <pthread.h>
#include <syslog.h>
#include "infiniband/verbs.h"
#include "infiniband/umad.h"
#include "infiniband/umad_types.h"
#include "infiniband/umad_sa.h"
#include "infiniband/umad_cm.h"
#include <infiniband/verbs.h>
#include <infiniband/umad.h>
#include <infiniband/umad_types.h>
#include <infiniband/umad_sa.h>
#include <infiniband/umad_cm.h>
#include "rdmacm-mux.h"

6
contrib/rdmacm-mux/rdmacm-mux.h
View File

@ -17,9 +17,9 @@
#define RDMACM_MUX_H
#include "linux/if.h"
#include "infiniband/verbs.h"
#include "infiniband/umad.h"
#include "rdma/rdma_user_cm.h"
#include <infiniband/verbs.h>
#include <infiniband/umad.h>
#include <rdma/rdma_user_cm.h>
typedef enum RdmaCmMuxMsgType {
RDMACM_MUX_MSG_TYPE_REQ = 0,

4
disas/nanomips.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef NANOMIPS_DISASSEMBLER_H
#define NANOMIPS_DISASSEMBLER_H
#ifndef DISAS_NANOMIPS_H
#define DISAS_NANOMIPS_H
#include <string>

7
fsdev/qemu-fsdev-throttle.h
View File

@ -12,8 +12,8 @@
*
*/
#ifndef _FSDEV_THROTTLE_H
#define _FSDEV_THROTTLE_H
#ifndef QEMU_FSDEV_THROTTLE_H
#define QEMU_FSDEV_THROTTLE_H
#include "block/aio.h"
#include "qemu/main-loop.h"
@ -35,4 +35,5 @@ void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool ,
struct iovec *, int);
void fsdev_throttle_cleanup(FsThrottle *);
#endif /* _FSDEV_THROTTLE_H */
#endif /* QEMU_FSDEV_THROTTLE_H */

4
hw/arm/smmuv3-internal.h
View File

@ -18,8 +18,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef HW_ARM_SMMU_V3_INTERNAL_H
#define HW_ARM_SMMU_V3_INTERNAL_H
#ifndef HW_ARM_SMMUV3_INTERNAL_H
#define HW_ARM_SMMUV3_INTERNAL_H
#include "hw/arm/smmu-common.h"

1
hw/display/ati.c
View File

@ -16,6 +16,7 @@
* No 3D at all yet (maybe after 2D works, but feel free to improve it)
*/
#include "qemu/osdep.h"
#include "ati_int.h"
#include "ati_regs.h"
#include "vga_regs.h"

1
hw/display/ati_2d.c
View File

@ -7,6 +7,7 @@
* This work is licensed under the GNU GPL license version 2 or later.
*/
#include "qemu/osdep.h"
#include "ati_int.h"
#include "ati_regs.h"
#include "qemu/log.h"

1
hw/display/ati_dbg.c
View File

@ -1,3 +1,4 @@
#include "qemu/osdep.h"
#include "ati_int.h"
#ifdef DEBUG_ATI

1
hw/display/ati_int.h
View File

@ -9,7 +9,6 @@
#ifndef ATI_INT_H
#define ATI_INT_H
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "vga_int.h"

6
hw/display/vga_regs.h
View File

@ -14,8 +14,8 @@
*
*/
#ifndef LINUX_VIDEO_VGA_H
#define LINUX_VIDEO_VGA_H
#ifndef HW_VGA_REGS_H
#define HW_VGA_REGS_H
/* Some of the code below is taken from SVGAlib. The original,
unmodified copyright notice for that code is below. */
@ -156,4 +156,4 @@
/* VGA graphics controller bit masks */
#define VGA_GR06_GRAPHICS_MODE 0x01
#endif /* LINUX_VIDEO_VGA_H */
#endif /* HW_VGA_REGS_H */

4
hw/i386/amd_iommu.h
View File

@ -18,8 +18,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef AMD_IOMMU_H_
#define AMD_IOMMU_H_
#ifndef AMD_IOMMU_H
#define AMD_IOMMU_H
#include "hw/hw.h"
#include "hw/pci/pci.h"

2
hw/ide/ahci_internal.h
View File

@ -394,4 +394,4 @@ void ahci_reset(AHCIState *s);
#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
#endif /* HW_IDE_AHCI_H */
#endif /* HW_IDE_AHCI_INTERNAL_H */

1
hw/rdma/rdma_utils.h
View File

@ -20,7 +20,6 @@
#include "qemu/error-report.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
#include "stdio.h"
#define rdma_error_report(fmt, ...) \
error_report("%s: " fmt, "rdma", ## __VA_ARGS__)

4
hw/rdma/vmw/pvrdma_qp_ops.h
View File

@ -13,8 +13,8 @@
*
*/
#ifndef PVRDMA_QP_H
#define PVRDMA_QP_H
#ifndef PVRDMA_QP_OPS_H
#define PVRDMA_QP_OPS_H
#include "pvrdma.h"

5
hw/sd/sdmmc-internal.h
View File

@ -7,8 +7,9 @@
* See the COPYING file in the top-level directory.
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef SD_INTERNAL_H
#define SD_INTERNAL_H
#ifndef SDMMC_INTERNAL_H
#define SDMMC_INTERNAL_H
#define SDMMC_CMD_MAX 64

3
hw/timer/m48t59-internal.h
View File

@ -22,8 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef HW_M48T59_INTERNAL_H
#define HW_M48T59_INTERNAL_H 1
#define HW_M48T59_INTERNAL_H
#define M48T59_DEBUG 0

7
hw/tpm/tpm_ioctl.h
View File

@ -5,8 +5,9 @@
*
* This file is licensed under the terms of the 3-clause BSD license
*/
#ifndef _TPM_IOCTL_H_
#define _TPM_IOCTL_H_
#ifndef TPM_IOCTL_H
#define TPM_IOCTL_H
#include <sys/uio.h>
#include <sys/ioctl.h>
@ -267,4 +268,4 @@ enum {
CMD_SET_BUFFERSIZE,
};
#endif /* _TPM_IOCTL_H */
#endif /* TPM_IOCTL_H */

4
hw/xtensa/xtensa_memory.h
View File

@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _XTENSA_MEMORY_H
#define _XTENSA_MEMORY_H
#ifndef XTENSA_MEMORY_H
#define XTENSA_MEMORY_H
#include "qemu-common.h"
#include "cpu.h"

7
include/authz/base.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QAUTHZ_BASE_H__
#define QAUTHZ_BASE_H__
#ifndef QAUTHZ_BASE_H
#define QAUTHZ_BASE_H
#include "qemu-common.h"
#include "qapi/error.h"
@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid,
const char *identity,
Error **errp);
#endif /* QAUTHZ_BASE_H__ */
#endif /* QAUTHZ_BASE_H */

7
include/authz/list.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QAUTHZ_LIST_H__
#define QAUTHZ_LIST_H__
#ifndef QAUTHZ_LIST_H
#define QAUTHZ_LIST_H
#include "authz/base.h"
#include "qapi/qapi-types-authz.h"
@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth,
const char *match);
#endif /* QAUTHZ_LIST_H__ */
#endif /* QAUTHZ_LIST_H */

8
include/authz/listfile.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QAUTHZ_LIST_FILE_H__
#define QAUTHZ_LIST_FILE_H__
#ifndef QAUTHZ_LISTFILE_H
#define QAUTHZ_LISTFILE_H
#include "authz/list.h"
#include "qapi/qapi-types-authz.h"
@ -106,6 +106,4 @@ QAuthZListFile *qauthz_list_file_new(const char *id,
bool refresh,
Error **errp);
#endif /* QAUTHZ_LIST_FILE_H__ */
#endif /* QAUTHZ_LISTFILE_H */

7
include/authz/pamacct.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QAUTHZ_PAM_H__
#define QAUTHZ_PAM_H__
#ifndef QAUTHZ_PAMACCT_H
#define QAUTHZ_PAMACCT_H
#include "authz/base.h"
@ -96,5 +96,4 @@ QAuthZPAM *qauthz_pam_new(const char *id,
const char *service,
Error **errp);
#endif /* QAUTHZ_PAM_H__ */
#endif /* QAUTHZ_PAMACCT_H */

7
include/authz/simple.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QAUTHZ_SIMPLE_H__
#define QAUTHZ_SIMPLE_H__
#ifndef QAUTHZ_SIMPLE_H
#define QAUTHZ_SIMPLE_H
#include "authz/base.h"
@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id,
Error **errp);
#endif /* QAUTHZ_SIMPLE_H__ */
#endif /* QAUTHZ_SIMPLE_H */

2
include/block/aio-wait.h
View File

@ -124,4 +124,4 @@ void aio_wait_kick(void);
*/
void aio_wait_bh_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
#endif /* QEMU_AIO_WAIT */
#endif /* QEMU_AIO_WAIT_H */

4
include/chardev/spice.h
View File

@ -1,5 +1,5 @@
#ifndef CHARDEV_SPICE_H_
#define CHARDEV_SPICE_H_
#ifndef CHARDEV_SPICE_H
#define CHARDEV_SPICE_H
#include <spice.h>
#include "chardev/char-fe.h"

2
include/disas/capstone.h
View File

@ -1,5 +1,5 @@
#ifndef QEMU_CAPSTONE_H
#define QEMU_CAPSTONE_H 1
#define QEMU_CAPSTONE_H
#ifdef CONFIG_CAPSTONE

2
include/exec/translator.h
View File

@ -142,4 +142,4 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
void translator_loop_temp_check(DisasContextBase *db);
#endif /* EXEC__TRANSLATOR_H */
#endif /* EXEC__TRANSLATOR_H */

1
include/hw/arm/nrf51_soc.h
View File

@ -53,4 +53,3 @@ typedef struct NRF51State {
} NRF51State;
#endif

2
include/hw/arm/smmu-common.h
View File

@ -163,4 +163,4 @@ void smmu_inv_notifiers_all(SMMUState *s);
/* Unmap the range of all the notifiers registered to @mr */
void smmu_inv_notifiers_mr(IOMMUMemoryRegion *mr);
#endif /* HW_ARM_SMMU_COMMON */
#endif /* HW_ARM_SMMU_COMMON_H */

4
include/hw/audio/soundhw.h
View File

@ -1,5 +1,5 @@
#ifndef HW_AUDIO_H
#define HW_AUDIO_H
#ifndef HW_SOUNDHW_H
#define HW_SOUNDHW_H
void isa_register_soundhw(const char *name, const char *descr,
int (*init_isa)(ISABus *bus));

1
include/hw/cpu/cluster.h
View File

@ -20,7 +20,6 @@
#ifndef HW_CPU_CLUSTER_H
#define HW_CPU_CLUSTER_H
#include "qemu/osdep.h"
#include "hw/qdev.h"
/*

4
include/hw/i386/x86-iommu.h
View File

@ -17,8 +17,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef IOMMU_COMMON_H
#define IOMMU_COMMON_H
#ifndef HW_I386_X86_IOMMU_H
#define HW_I386_X86_IOMMU_H
#include "hw/sysbus.h"
#include "hw/pci/pci.h"

6
include/hw/intc/heathrow_pic.h
View File

@ -23,8 +23,8 @@
* THE SOFTWARE.
*/
#ifndef HEATHROW_H
#define HEATHROW_H
#ifndef HW_INTC_HEATHROW_PIC_H
#define HW_INTC_HEATHROW_PIC_H
#define TYPE_HEATHROW "heathrow"
#define HEATHROW(obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW)
@ -46,4 +46,4 @@ typedef struct HeathrowState {
#define HEATHROW_NUM_IRQS 64
#endif /* HEATHROW_H */
#endif /* HW_INTC_HEATHROW_PIC_H */

6
include/hw/intc/xlnx-pmu-iomod-intc.h
View File

@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#ifndef XLNX_PMU_IO_INTC_H
#define XLNX_PMU_IO_INTC_H
#ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H
#define HW_INTC_XLNX_PMU_IOMOD_INTC_H
#include "hw/sysbus.h"
#include "hw/register.h"
@ -54,4 +54,4 @@ typedef struct XlnxPMUIOIntc {
RegisterInfo regs_info[XLNXPMUIOINTC_R_MAX];
} XlnxPMUIOIntc;
#endif /* XLNX_PMU_IO_INTC_H */
#endif /* HW_INTC_XLNX_PMU_IOMOD_INTC_H */

4
include/hw/misc/armsse-mhu.h
View File

@ -20,8 +20,8 @@
* + sysbus IRQ 1: interrupt for CPU 1
*/
#ifndef HW_MISC_SSE_MHU_H
#define HW_MISC_SSE_MHU_H
#ifndef HW_MISC_ARMSSE_MHU_H
#define HW_MISC_ARMSSE_MHU_H
#include "hw/sysbus.h"

2
include/hw/misc/imx2_wdt.h
View File

@ -30,4 +30,4 @@ typedef struct IMX2WdtState {
MemoryRegion mmio;
} IMX2WdtState;
#endif /* IMX7_SNVS_H */
#endif /* IMX2_WDT_H */

3
include/hw/misc/nrf51_rng.h
View File

@ -30,6 +30,7 @@
* the COPYING file in the top-level directory.
*
*/
#ifndef NRF51_RNG_H
#define NRF51_RNG_H
@ -80,4 +81,4 @@ typedef struct {
} NRF51RNGState;
#endif /* NRF51_RNG_H_ */
#endif /* NRF51_RNG_H */

4
include/hw/net/ne2000-isa.h
View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
#ifndef HW_NET_NE2K_ISA_H
#define HW_NET_NE2K_ISA_H
#ifndef HW_NET_NE2000_ISA_H
#define HW_NET_NE2000_ISA_H
#include "hw/hw.h"
#include "hw/qdev.h"

2
include/hw/pci-host/designware.h
View File

@ -99,4 +99,4 @@ typedef struct DesignwarePCIEHost {
MemoryRegion mmio;
} DesignwarePCIEHost;
#endif /* DESIGNWARE_H */
#endif /* DESIGNWARE_H */

4
include/hw/pci-host/sabre.h
View File

@ -1,5 +1,5 @@
#ifndef PCI_HOST_APB_H
#define PCI_HOST_APB_H
#ifndef HW_PCI_HOST_SABRE_H
#define HW_PCI_HOST_SABRE_H
#include "hw/sparc/sun4u_iommu.h"

7
include/hw/ppc/pnv.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_H
#define _PPC_PNV_H
#ifndef PPC_PNV_H
#define PPC_PNV_H
#include "hw/boards.h"
#include "hw/sysbus.h"
@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc);
#define PNV9_PSIHB_ESB_SIZE 0x0000000000010000ull
#define PNV9_PSIHB_ESB_BASE(chip) PNV9_CHIP_BASE(chip, 0x00060302031c0000ull)
#endif /* _PPC_PNV_H */
#endif /* PPC_PNV_H */

7
include/hw/ppc/pnv_core.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_CORE_H
#define _PPC_PNV_CORE_H
#ifndef PPC_PNV_CORE_H
#define PPC_PNV_CORE_H
#include "hw/cpu/core.h"
@ -68,4 +69,4 @@ typedef struct PnvQuad {
uint32_t id;
MemoryRegion xscom_regs;
} PnvQuad;
#endif /* _PPC_PNV_CORE_H */
#endif /* PPC_PNV_CORE_H */

7
include/hw/ppc/pnv_lpc.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_LPC_H
#define _PPC_PNV_LPC_H
#ifndef PPC_PNV_LPC_H
#define PPC_PNV_LPC_H
#include "hw/ppc/pnv_psi.h"
@ -98,4 +99,4 @@ struct PnvChip;
ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp);
int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset);
#endif /* _PPC_PNV_LPC_H */
#endif /* PPC_PNV_LPC_H */

7
include/hw/ppc/pnv_occ.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_OCC_H
#define _PPC_PNV_OCC_H
#ifndef PPC_PNV_OCC_H
#define PPC_PNV_OCC_H
#include "hw/ppc/pnv_psi.h"
@ -52,4 +53,4 @@ typedef struct PnvOCCClass {
int psi_irq;
} PnvOCCClass;
#endif /* _PPC_PNV_OCC_H */
#endif /* PPC_PNV_OCC_H */

7
include/hw/ppc/pnv_psi.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_PSI_H
#define _PPC_PNV_PSI_H
#ifndef PPC_PNV_PSI_H
#define PPC_PNV_PSI_H
#include "hw/sysbus.h"
#include "hw/ppc/xics.h"
@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state);
void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon);
#endif /* _PPC_PNV_PSI_H */
#endif /* PPC_PNV_PSI_H */

7
include/hw/ppc/pnv_xscom.h
View File

@ -16,8 +16,9 @@
* 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 _PPC_PNV_XSCOM_H
#define _PPC_PNV_XSCOM_H
#ifndef PPC_PNV_XSCOM_H
#define PPC_PNV_XSCOM_H
#include "qom/object.h"
@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr,
const char *name,
uint64_t size);
#endif /* _PPC_PNV_XSCOM_H */
#endif /* PPC_PNV_XSCOM_H */

7
include/hw/ppc/spapr_ovec.h
View File

@ -33,8 +33,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef _SPAPR_OVEC_H
#define _SPAPR_OVEC_H
#ifndef SPAPR_OVEC_H
#define SPAPR_OVEC_H
#include "cpu.h"
#include "migration/vmstate.h"
@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
/* migration */
extern const VMStateDescription vmstate_spapr_ovec;
#endif /* !defined (_SPAPR_OVEC_H) */
#endif /* SPAPR_OVEC_H */

1
include/hw/riscv/sifive_plic.h
View File

@ -80,4 +80,3 @@ DeviceState *sifive_plic_create(hwaddr addr, char *hart_config,
uint32_t aperture_size);
#endif

2
include/hw/scsi/emulation.h
View File

@ -1,5 +1,5 @@
#ifndef HW_SCSI_EMULATION_H
#define HW_SCSI_EMULATION_H 1
#define HW_SCSI_EMULATION_H
typedef struct SCSIBlockLimits {
bool wsnz;

4
include/hw/timer/pl031.h
View File

@ -11,8 +11,8 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#ifndef HW_TIMER_PL031
#define HW_TIMER_PL031
#ifndef HW_TIMER_PL031_H
#define HW_TIMER_PL031_H
#include "hw/sysbus.h"

6
include/hw/virtio/vhost-vsock.h
View File

@ -11,8 +11,8 @@
* top-level directory.
*/
#ifndef _QEMU_VHOST_VSOCK_H
#define _QEMU_VHOST_VSOCK_H
#ifndef QEMU_VHOST_VSOCK_H
#define QEMU_VHOST_VSOCK_H
#include "hw/virtio/virtio.h"
#include "hw/virtio/vhost.h"
@ -38,4 +38,4 @@ typedef struct {
/*< public >*/
} VHostVSock;
#endif /* _QEMU_VHOST_VSOCK_H */
#endif /* QEMU_VHOST_VSOCK_H */

6
include/hw/virtio/virtio-crypto.h
View File

@ -11,8 +11,8 @@
* top-level directory.
*/
#ifndef _QEMU_VIRTIO_CRYPTO_H
#define _QEMU_VIRTIO_CRYPTO_H
#ifndef QEMU_VIRTIO_CRYPTO_H
#define QEMU_VIRTIO_CRYPTO_H
#include "standard-headers/linux/virtio_crypto.h"
#include "hw/virtio/virtio.h"
@ -99,4 +99,4 @@ typedef struct VirtIOCrypto {
uint8_t vhost_started;
} VirtIOCrypto;
#endif /* _QEMU_VIRTIO_CRYPTO_H */
#endif /* QEMU_VIRTIO_CRYPTO_H */

7
include/hw/watchdog/wdt_aspeed.h
View File

@ -6,8 +6,9 @@
* This code is licensed under the GPL version 2 or later. See the
* COPYING file in the top-level directory.
*/
#ifndef ASPEED_WDT_H
#define ASPEED_WDT_H
#ifndef WDT_ASPEED_H
#define WDT_ASPEED_H
#include "hw/sysbus.h"
@ -31,4 +32,4 @@ typedef struct AspeedWDTState {
uint32_t ext_pulse_width_mask;
} AspeedWDTState;
#endif /* ASPEED_WDT_H */
#endif /* WDT_ASPEED_H */

6
include/hw/xen/start_info.h
View File

@ -20,8 +20,8 @@
* Copyright (c) 2016, Citrix Systems, Inc.
*/
#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__
#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__
#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H
#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H
/*
* Start of day structure passed to PVH guests and to HVM guests in %ebx.
@ -143,4 +143,4 @@ struct hvm_memmap_table_entry {
uint32_t reserved;
};
#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */
#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */

6
include/hw/xen/xen-legacy-backend.h
View File

@ -1,5 +1,5 @@
#ifndef QEMU_HW_XEN_BACKEND_H
#define QEMU_HW_XEN_BACKEND_H
#ifndef HW_XEN_LEGACY_BACKEND_H
#define HW_XEN_LEGACY_BACKEND_H
#include "hw/xen/xen_common.h"
#include "hw/xen/xen_pvdev.h"
@ -101,4 +101,4 @@ int xen_config_dev_vfb(int vdev, const char *type);
int xen_config_dev_vkbd(int vdev);
int xen_config_dev_console(int vdev);
#endif /* QEMU_HW_XEN_BACKEND_H */
#endif /* HW_XEN_LEGACY_BACKEND_H */

4
include/hw/xtensa/mx_pic.h
View File

@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _XTENSA_MX_PIC_H
#define _XTENSA_MX_PIC_H
#ifndef XTENSA_MX_PIC_H
#define XTENSA_MX_PIC_H
#include "exec/memory.h"
#include "hw/irq.h"

6
include/hw/xtensa/xtensa-isa.h
View File

@ -22,8 +22,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef XTENSA_LIBISA_H
#define XTENSA_LIBISA_H
#ifndef HW_XTENSA_XTENSA_ISA_H
#define HW_XTENSA_XTENSA_ISA_H
#ifdef __cplusplus
extern "C" {
@ -833,4 +833,4 @@ int xtensa_funcUnit_num_copies(xtensa_isa isa, xtensa_funcUnit fun);
#ifdef __cplusplus
}
#endif
#endif /* XTENSA_LIBISA_H */
#endif /* HW_XTENSA_XTENSA_ISA_H */

4
include/migration/qemu-file-types.h
View File

@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#ifndef QEMU_FILE_H
#define QEMU_FILE_H
#ifndef MIGRATION_QEMU_FILE_TYPES_H
#define MIGRATION_QEMU_FILE_TYPES_H
int qemu_file_get_error(QEMUFile *f);

4
include/qemu/drm.h
View File

@ -1,5 +1,5 @@
#ifndef QEMU_DRM_H_
#define QEMU_DRM_H_
#ifndef QEMU_DRM_H
#define QEMU_DRM_H
int qemu_drm_rendernode_open(const char *rendernode);

6
include/qemu/filemonitor.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QEMU_FILE_MONITOR_H
#define QEMU_FILE_MONITOR_H
#ifndef QEMU_FILEMONITOR_H
#define QEMU_FILEMONITOR_H
#include "qemu-common.h"
@ -125,4 +125,4 @@ void qemu_file_monitor_remove_watch(QFileMonitor *mon,
const char *dirpath,
int64_t id);
#endif /* QEMU_FILE_MONITOR_H */
#endif /* QEMU_FILEMONITOR_H */

6
include/qemu/jhash.h
View File

@ -21,8 +21,8 @@
* Jozsef
*/
#ifndef QEMU_JHASH_H__
#define QEMU_JHASH_H__
#ifndef QEMU_JHASH_H
#define QEMU_JHASH_H
#include "qemu/bitops.h"
@ -56,4 +56,4 @@
/* An arbitrary initial parameter */
#define JHASH_INITVAL 0xdeadbeef
#endif /* QEMU_JHASH_H__ */
#endif /* QEMU_JHASH_H */

2
include/qemu/pmem.h
View File

@ -33,4 +33,4 @@ pmem_persist(const void *addr, size_t len)
#endif /* CONFIG_LIBPMEM */
#endif /* !QEMU_PMEM_H */
#endif /* QEMU_PMEM_H */

2
include/qemu/stats64.h
View File

@ -10,7 +10,7 @@
*/
#ifndef QEMU_STATS64_H
#define QEMU_STATS64_H 1
#define QEMU_STATS64_H
#include "qemu/atomic.h"

2
include/qemu/sys_membarrier.h
View File

@ -7,7 +7,7 @@
*/
#ifndef QEMU_SYS_MEMBARRIER_H
#define QEMU_SYS_MEMBARRIER_H 1
#define QEMU_SYS_MEMBARRIER_H
#ifdef CONFIG_MEMBARRIER
/* Only block reordering at the compiler level in the performance-critical

2
include/qemu/systemd.h
View File

@ -11,7 +11,7 @@
*/
#ifndef QEMU_SYSTEMD_H
#define QEMU_SYSTEMD_H 1
#define QEMU_SYSTEMD_H
#define FIRST_SOCKET_ACTIVATION_FD 3 /* defined by systemd ABI */

4
include/scsi/constants.h
View File

@ -20,8 +20,8 @@
* the scsi code for linux.
*/
#ifndef BLOCK_SCSI_H
#define BLOCK_SCSI_H
#ifndef SCSI_CONSTANTS_H
#define SCSI_CONSTANTS_H
/*
* SCSI opcodes

2
include/scsi/utils.h
View File

@ -1,5 +1,5 @@
#ifndef SCSI_UTILS_H
#define SCSI_UTILS_H 1
#define SCSI_UTILS_H
#ifdef CONFIG_LINUX
#include <scsi/sg.h>

5
include/sysemu/hvf.h
View File

@ -9,8 +9,9 @@
*/
/* header to be included in non-HVF-specific code */
#ifndef _HVF_H
#define _HVF_H
#ifndef HVF_H
#define HVF_H
#include "qemu-common.h"
#include "qemu/bitops.h"

3
include/ui/kbd-state.h
View File

@ -3,8 +3,9 @@
* (at your option) any later version. See the COPYING file in the
* top-level directory.
*/
#ifndef QEMU_UI_KBD_STATE_H
#define QEMU_UI_KBD_STATE_H 1
#define QEMU_UI_KBD_STATE_H
#include "qapi/qapi-types-ui.h"

4
linux-user/nios2/target_cpu.h
View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TARGET_CPU_H
#define TARGET_CPU_H
#ifndef NIOS2_TARGET_CPU_H
#define NIOS2_TARGET_CPU_H
static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp)
{

6
linux-user/nios2/target_signal.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef NIOS2_TARGET_SIGNAL_H
#define NIOS2_TARGET_SIGNAL_H
/* this struct defines a stack used during syscall handling */
@ -18,4 +18,4 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
#endif /* TARGET_SIGNAL_H */
#endif /* NIOS2_TARGET_SIGNAL_H */

4
linux-user/nios2/target_structs.h
View File

@ -16,8 +16,8 @@
* 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 TARGET_STRUCTS_H
#define TARGET_STRUCTS_H
#ifndef NIOS2_TARGET_STRUCTS_H
#define NIOS2_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */

6
linux-user/nios2/target_syscall.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SYSCALL_H
#define TARGET_SYSCALL_H
#ifndef NIOS2_TARGET_SYSCALL_H
#define NIOS2_TARGET_SYSCALL_H
#define UNAME_MACHINE "nios2"
#define UNAME_MINIMUM_RELEASE "3.19.0"
@ -34,4 +34,4 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
#endif /* TARGET_SYSCALL_H */
#endif /* NIOS2_TARGET_SYSCALL_H */

4
linux-user/riscv/target_cpu.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_CPU_H
#define TARGET_CPU_H
#ifndef RISCV_TARGET_CPU_H
#define RISCV_TARGET_CPU_H
static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp)
{

6
linux-user/riscv/target_signal.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef RISCV_TARGET_SIGNAL_H
#define RISCV_TARGET_SIGNAL_H
typedef struct target_sigaltstack {
abi_ulong ss_sp;
@ -15,4 +15,4 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
#endif /* TARGET_SIGNAL_H */
#endif /* RISCV_TARGET_SIGNAL_H */

4
linux-user/riscv/target_structs.h
View File

@ -4,8 +4,8 @@
* This is a copy of ../aarch64/target_structs.h atm.
*
*/
#ifndef TARGET_STRUCTS_H
#define TARGET_STRUCTS_H
#ifndef RISCV_TARGET_STRUCTS_H
#define RISCV_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */

6
linux-user/xtensa/syscall_nr.h
View File

@ -8,8 +8,8 @@
* Copyright (C) 2001 - 2009 Tensilica Inc.
*/
#ifndef _XTENSA_UNISTD_H
#define _XTENSA_UNISTD_H
#ifndef XTENSA_SYSCALL_NR_H
#define XTENSA_SYSCALL_NR_H
#define TARGET_NR_spill 0
#define TARGET_NR_xtensa 1
@ -434,4 +434,4 @@
#define TARGET_NR_syscall_count 352
#endif /* _XTENSA_UNISTD_H */
#endif /* XTENSA_SYSCALL_NR_H */

4
linux-user/xtensa/target_structs.h
View File

@ -1,5 +1,5 @@
#ifndef XTENSA_TARGET_STRUCTS_T
#define XTENSA_TARGET_STRUCTS_T
#ifndef XTENSA_TARGET_STRUCTS_H
#define XTENSA_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */

6
linux-user/xtensa/termbits.h
View File

@ -10,8 +10,8 @@
* Copyright (C) 2001 - 2005 Tensilica Inc.
*/
#ifndef _XTENSA_TERMBITS_H
#define _XTENSA_TERMBITS_H
#ifndef XTENSA_TERMBITS_H
#define XTENSA_TERMBITS_H
#include <linux/posix_types.h>
@ -325,4 +325,4 @@ struct target_ktermios {
#define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */
#define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#endif /* _XTENSA_TERMBITS_H */
#endif /* XTENSA_TERMBITS_H */

6
net/colo.h
View File

@ -12,8 +12,8 @@
* later. See the COPYING file in the top-level directory.
*/
#ifndef QEMU_COLO_PROXY_H
#define QEMU_COLO_PROXY_H
#ifndef NET_COLO_H
#define NET_COLO_H
#include "qemu/jhash.h"
#include "qemu/timer.h"
@ -103,4 +103,4 @@ void connection_hashtable_reset(GHashTable *connection_track_table);
Packet *packet_new(const void *data, int size, int vnet_hdr_len);
void packet_destroy(void *opaque, void *user_data);
#endif /* QEMU_COLO_PROXY_H */
#endif /* NET_COLO_H */

4
qga/vss-win32/vss-handles.h
View File

@ -1,5 +1,5 @@
#ifndef VSS_HANDLES
#define VSS_HANDLES
#ifndef VSS_HANDLES_H
#define VSS_HANDLES_H
/* Constants for QGA VSS Provider */

3
scsi/pr-helper.h
View File

@ -23,8 +23,9 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#ifndef QEMU_PR_HELPER_H
#define QEMU_PR_HELPER_H 1
#define QEMU_PR_HELPER_H
#define PR_HELPER_CDB_SIZE 16
#define PR_HELPER_SENSE_SIZE 96

4
target/i386/hax-i386.h
View File

@ -10,8 +10,8 @@
*
*/
#ifndef _HAX_I386_H
#define _HAX_I386_H
#ifndef HAX_I386_H
#define HAX_I386_H
#include "cpu.h"
#include "sysemu/hax.h"

4
target/i386/hax-interface.h
View File

@ -14,8 +14,8 @@
/* Interface with HAX kernel module */
#ifndef _HAX_INTERFACE_H
#define _HAX_INTERFACE_H
#ifndef HAX_INTERFACE_H
#define HAX_INTERFACE_H
/* fx_layout has 3 formats table 3-56, 512bytes */
struct fx_layout {

6
target/i386/hax-posix.h
View File

@ -12,8 +12,8 @@
*
*/
#ifndef TARGET_I386_HAX_DARWIN_H
#define TARGET_I386_HAX_DARWIN_H
#ifndef TARGET_I386_HAX_POSIX_H
#define TARGET_I386_HAX_POSIX_H
#include <sys/ioctl.h>
@ -58,4 +58,4 @@ static inline void hax_close_fd(hax_fd fd)
#define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t)
#define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t)
#endif /* TARGET_I386_HAX_DARWIN_H */
#endif /* TARGET_I386_HAX_POSIX_H */

4
target/i386/hvf/hvf-i386.h
View File

@ -13,8 +13,8 @@
*
*/
#ifndef _HVF_I386_H
#define _HVF_I386_H
#ifndef HVF_I386_H
#define HVF_I386_H
#include "sysemu/hvf.h"
#include "cpu.h"

4
target/i386/hvf/vmcs.h
View File

@ -26,8 +26,8 @@
* $FreeBSD$
*/
#ifndef _VMCS_H_
#define _VMCS_H_
#ifndef VMCS_H
#define VMCS_H
#include <Hypervisor/hv.h>
#include <Hypervisor/hv_vmx.h>

2
target/i386/hvf/x86.h
View File

@ -17,7 +17,7 @@
*/
#ifndef HVF_X86_H
#define HVF_X86_H 1
#define HVF_X86_H
typedef struct x86_register {
union {

2
target/i386/hvf/x86_decode.h
View File

@ -16,7 +16,7 @@
*/
#ifndef HVF_X86_DECODE_H
#define HVF_X86_DECODE_H 1
#define HVF_X86_DECODE_H
#include "cpu.h"
#include "x86.h"

2
target/i386/hvf/x86_descr.h
View File

@ -17,7 +17,7 @@
*/
#ifndef HVF_X86_DESCR_H
#define HVF_X86_DESCR_H 1
#define HVF_X86_DESCR_H
#include "x86.h"

5
target/i386/hvf/x86_emu.h
View File

@ -15,8 +15,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __X86_EMU_H__
#define __X86_EMU_H__
#ifndef X86_EMU_H
#define X86_EMU_H
#include "x86.h"
#include "x86_decode.h"

Some files were not shown because too many files have changed in this diff Show More