motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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 */