falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trivial patches for 2017-12-18 

-----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAlo3y/MPHG1qdEB0bHMu
 bXNrLnJ1AAoJEHAbT2saaT5Zl9YIAILvUZ5q2PXcTbyIEdUt71WHbuudSXLGl97S
 g88PJvv/VB4xx3VOcrKDgxIRAe+jBMw9Is8f+oKF32FK5jVrYmQ1taX5t0Ty9c22
 tJJEQKXtRoQMpHFzTM8r+pNldbAwEfrKNDrnQr0S+MuGgIgfAw4tr3gV832SL7Q/
 N1gRSk+Ze2bWGPnPJ/dKHU18E8yy//tkK1RO2Lg4ccMOyNUc7T8ghF6RGWWBBMDx
 qg8Z/mLcJBdfb29tgxdNlLVTj8dLIkkXllo6YjbrygMOoByh2TLnn/U+qGFVwT9e
 JXTjRtHfM2mr2xwR425LoJOIsYByrVk7zroYVg8P1ii9pWplOPs=
 =EIEH
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging

trivial patches for 2017-12-18

# gpg: Signature made Mon 18 Dec 2017 14:08:51 GMT
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (60 commits)
  misc: drop old i386 dependency
  i386/pc: move vmmouse.c to hw/i386/
  i386/pc: move vmport.c to hw/i386/
  hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"
  hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
  hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"
  hw/display/vga: "vga_int.h" requires "ui/console.h"
  hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"
  hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc
  hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
  hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()
  hw/timer/i8254: rename pit_init() -> i8254_pit_init()
  hw/unicore32: restrict hw addr defines to source file
  hw/virtio-balloon: remove old i386 dependency
  hw/tpm: remove old i386 dependency
  hw/i2c: remove old i386 dependency
  hw/ipmi: remove old i386 dependency
  hw/ide: remove old i386 dependency
  misc: remove old i386 dependency
  amd_iommu: avoid needless includes in header file
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-12-18 14:17:42 +00:00
parent 411ad78115 c0578de60f
commit eaefea537b
141 changed files with 256 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,7 +53,6 @@
/qemu-version.h.tmp /qemu-version.h.tmp
/module_block.h /module_block.h
/scsi/qemu-pr-helper /scsi/qemu-pr-helper
/vscclient
/vhost-user-scsi /vhost-user-scsi
/fsdev/virtfs-proxy-helper /fsdev/virtfs-proxy-helper
*.tmp *.tmp

14
MAINTAINERS
View File

@ -732,7 +732,11 @@ F: hw/ppc/prep.c
F: hw/ppc/prep_systemio.c F: hw/ppc/prep_systemio.c
F: hw/ppc/rs6000_mc.c F: hw/ppc/rs6000_mc.c
F: hw/pci-host/prep.[hc] F: hw/pci-host/prep.[hc]
F: hw/isa/i82378.c
F: hw/isa/pc87312.[hc] F: hw/isa/pc87312.[hc]
F: hw/dma/i82374.c
F: hw/timer/m48t59-isa.c
F: include/hw/timer/m48t59.h
F: pc-bios/ppc_rom.bin F: pc-bios/ppc_rom.bin
sPAPR sPAPR
@ -861,12 +865,13 @@ F: hw/misc/sga.c
PC Chipset PC Chipset
M: Michael S. Tsirkin <mst@redhat.com> M: Michael S. Tsirkin <mst@redhat.com>
M: Paolo Bonzini <pbonzini@redhat.com> M: Paolo Bonzini <pbonzini@redhat.com>
S: Support S: Supported
F: hw/char/debugcon.c F: hw/char/debugcon.c
F: hw/char/parallel.c F: hw/char/parallel.c
F: hw/char/serial* F: hw/char/serial*
F: hw/dma/i8257* F: hw/dma/i8257*
F: hw/i2c/pm_smbus.c F: hw/i2c/pm_smbus.c
F: hw/input/pckbd.c
F: hw/intc/apic* F: hw/intc/apic*
F: hw/intc/ioapic* F: hw/intc/ioapic*
F: hw/intc/i8259* F: hw/intc/i8259*
@ -875,7 +880,10 @@ F: hw/misc/pc-testdev.c
F: hw/timer/hpet* F: hw/timer/hpet*
F: hw/timer/i8254* F: hw/timer/i8254*
F: hw/timer/mc146818rtc* F: hw/timer/mc146818rtc*
F: hw/watchdog/wdt_ib700.c
F: include/hw/display/vga.h
F: include/hw/i2c/pm_smbus.h F: include/hw/i2c/pm_smbus.h
F: include/hw/isa/i8257.h
F: include/hw/timer/hpet.h F: include/hw/timer/hpet.h
F: include/hw/timer/i8254* F: include/hw/timer/i8254*
F: include/hw/timer/mc146818rtc* F: include/hw/timer/mc146818rtc*
@ -976,7 +984,9 @@ M: Alexander Graf <agraf@suse.de>
L: qemu-ppc@nongnu.org L: qemu-ppc@nongnu.org
S: Odd Fixes S: Odd Fixes
F: hw/ppc/ppc4*.c F: hw/ppc/ppc4*.c
F: hw/i2c/ppc4xx_i2c.c
F: include/hw/ppc/ppc4xx.h F: include/hw/ppc/ppc4xx.h
F: include/hw/i2c/ppc4xx_i2c.h
ppce500 ppce500
M: Alexander Graf <agraf@suse.de> M: Alexander Graf <agraf@suse.de>
@ -995,6 +1005,7 @@ Network devices
M: Jason Wang <jasowang@redhat.com> M: Jason Wang <jasowang@redhat.com>
S: Odd Fixes S: Odd Fixes
F: hw/net/ F: hw/net/
F: include/hw/net/
F: tests/virtio-net-test.c F: tests/virtio-net-test.c
T: git git://github.com/jasowang/qemu.git net T: git git://github.com/jasowang/qemu.git net
@ -1538,6 +1549,7 @@ M: Alistair Francis <alistair.francis@xilinx.com>
S: Maintained S: Maintained
F: hw/core/register.c F: hw/core/register.c
F: include/hw/register.h F: include/hw/register.h
F: include/hw/registerfields.h
SLIRP SLIRP
M: Samuel Thibault <samuel.thibault@ens-lyon.org> M: Samuel Thibault <samuel.thibault@ens-lyon.org>

11
Makefile
View File

@ -6,7 +6,10 @@ BUILD_DIR=$(CURDIR)
# Before including a proper config-host.mak, assume we are in the source tree # Before including a proper config-host.mak, assume we are in the source tree
SRC_PATH=. SRC_PATH=.
UNCHECKED_GOALS := %clean TAGS cscope ctags docker docker-% help UNCHECKED_GOALS := %clean TAGS cscope ctags dist \
html info pdf txt \
help check-help \
docker docker-% vm-test vm-build-%
# All following code might depend on configuration variables # All following code might depend on configuration variables
ifneq ($(wildcard config-host.mak),) ifneq ($(wildcard config-host.mak),)
@ -50,7 +53,7 @@ ifneq ($(realpath $(SRC_PATH)),$(realpath .))
ifneq ($(wildcard $(SRC_PATH)/config-host.mak),) ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)
$(error This is an out of tree build but your source tree ($(SRC_PATH)) \ $(error This is an out of tree build but your source tree ($(SRC_PATH)) \
seems to have been used for an in-tree build. You can fix this by running \ seems to have been used for an in-tree build. You can fix this by running \
"make distclean && rm -rf *-linux-user *-softmmu" in your source tree) "$(MAKE) distclean && rm -rf *-linux-user *-softmmu" in your source tree)
endif endif
endif endif
@ -304,7 +307,7 @@ endif
else \ else \
echo "WARNING: $@ out of date.";\ echo "WARNING: $@ out of date.";\
fi; \ fi; \
echo "Run \"make defconfig\" to regenerate."; \ echo "Run \"$(MAKE) defconfig\" to regenerate."; \
rm $@.tmp; \ rm $@.tmp; \
fi; \ fi; \
else \ else \
@ -934,4 +937,4 @@ ifdef QEMU_GA_MSI_ENABLED
endif endif
@echo '' @echo ''
endif endif
@echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' @echo ' $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'

1
accel/tcg/cpu-exec-common.c
View File

@ -21,7 +21,6 @@
#include "cpu.h" #include "cpu.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "exec/memory-internal.h"
bool tcg_allowed; bool tcg_allowed;

3
accel/tcg/translate-all.c
View File

@ -31,7 +31,6 @@
#include "tcg.h" #include "tcg.h"
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
#include "qemu.h" #include "qemu.h"
#include "exec/exec-all.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/param.h> #include <sys/param.h>
#if __FreeBSD_version >= 700104 #if __FreeBSD_version >= 700104
@ -257,7 +256,7 @@ static target_long decode_sleb128(uint8_t **pp)
/* Encode the data collected about the instructions while compiling TB. /* Encode the data collected about the instructions while compiling TB.
Place the data at BLOCK, and return the number of bytes consumed. Place the data at BLOCK, and return the number of bytes consumed.
The logical table consisits of TARGET_INSN_START_WORDS target_ulong's, The logical table consists of TARGET_INSN_START_WORDS target_ulong's,
which come from the target's insn_start data, followed by a uintptr_t which come from the target's insn_start data, followed by a uintptr_t
which comes from the host pc of the end of the code implementing the insn. which comes from the host pc of the end of the code implementing the insn.

1
block/dmg.h
View File

@ -26,7 +26,6 @@
#ifndef BLOCK_DMG_H #ifndef BLOCK_DMG_H
#define BLOCK_DMG_H #define BLOCK_DMG_H
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "block/block_int.h" #include "block/block_int.h"
#include <zlib.h> #include <zlib.h>

1
bsd-user/main.c
View File

@ -32,7 +32,6 @@
#include "qemu/envlist.h" #include "qemu/envlist.h"
#include "exec/log.h" #include "exec/log.h"
#include "trace/control.h" #include "trace/control.h"
#include "glib-compat.h"
int singlestep; int singlestep;
unsigned long mmap_min_addr; unsigned long mmap_min_addr;

4
chardev/wctablet.c
View File

@ -25,10 +25,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"

25
configure vendored
View File

@ -1582,6 +1582,20 @@ fi
# Suppress writing compiled files # Suppress writing compiled files
python="$python -B" python="$python -B"
# Check that the C compiler works. Doing this here before testing
# the host CPU ensures that we had a valid CC to autodetect the
# $cpu var (and we should bail right here if that's not the case).
# It also allows the help message to be printed without a CC.
write_c_skeleton;
if compile_object ; then
: C compiler works ok
else
error_exit "\"$cc\" either does not exist or does not work"
fi
if ! compile_prog ; then
error_exit "\"$cc\" cannot build an executable (is your linker broken?)"
fi
# Now we have handled --enable-tcg-interpreter and know we're not just # Now we have handled --enable-tcg-interpreter and know we're not just
# printing the help message, bail out if the host CPU isn't supported. # printing the help message, bail out if the host CPU isn't supported.
if test "$ARCH" = "unknown"; then if test "$ARCH" = "unknown"; then
@ -1603,17 +1617,6 @@ if test -z "$werror" ; then
fi fi
fi fi
# check that the C compiler works.
write_c_skeleton;
if compile_object ; then
: C compiler works ok
else
error_exit "\"$cc\" either does not exist or does not work"
fi
if ! compile_prog ; then
error_exit "\"$cc\" cannot build an executable (is your linker broken?)"
fi
if test "$bogus_os" = "yes"; then if test "$bogus_os" = "yes"; then
# Now that we know that we're not printing the help and that # Now that we know that we're not printing the help and that
# the compiler works (so the results of the check_defines we used # the compiler works (so the results of the check_defines we used

2
disas/arm.c
View File

@ -1662,7 +1662,7 @@ print_insn_coprocessor (bfd_vma pc, struct disassemble_info *info, long given,
} }
else else
{ {
/* Only match unconditional instuctions against unconditional /* Only match unconditional instructions against unconditional
patterns. */ patterns. */
if ((given & 0xf0000000) == 0xf0000000) if ((given & 0xf0000000) == 0xf0000000)
{ {

3
disas/nios2.c
View File

@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings;
#endif /* _NIOS2_H */ #endif /* _NIOS2_H */
/*#include "sysdep.h" /*#include "sysdep.h"
#include <stdio.h>
#include "opcode/nios2.h" #include "opcode/nios2.h"
*/ */
/* Register string table */ /* Register string table */
@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8;
#include "dis-asm.h" #include "dis-asm.h"
#include "opcode/nios2.h" #include "opcode/nios2.h"
#include "libiberty.h" #include "libiberty.h"
#include <string.h>
#include <assert.h>
*/ */
/* No symbol table is available when this code runs out in an embedded /* No symbol table is available when this code runs out in an embedded
system as when it is used for disassembler support in a monitor. */ system as when it is used for disassembler support in a monitor. */

3
exec.c
View File

@ -18,8 +18,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#ifndef _WIN32
#endif
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "cpu.h" #include "cpu.h"
@ -51,7 +49,6 @@
#include "trace-root.h" #include "trace-root.h"
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
#include <fcntl.h>
#include <linux/falloc.h> #include <linux/falloc.h>
#endif #endif

1
hw/acpi/core.c
View File

@ -21,7 +21,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h" #include "hw/nvram/fw_cfg.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"

1
hw/acpi/ipmi-stub.c
View File

@ -7,6 +7,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hw/acpi/ipmi.h" #include "hw/acpi/ipmi.h"
void build_acpi_ipmi_devices(Aml *table, BusState *bus) void build_acpi_ipmi_devices(Aml *table, BusState *bus)

4
hw/alpha/dp264.c
View File

@ -78,9 +78,9 @@ static void clipper_init(MachineState *machine)
clipper_pci_map_irq); clipper_pci_map_irq);
/* Since we have an SRM-compatible PALcode, use the SRM epoch. */ /* Since we have an SRM-compatible PALcode, use the SRM epoch. */
rtc_init(isa_bus, 1900, rtc_irq); mc146818_rtc_init(isa_bus, 1900, rtc_irq);
pit_init(isa_bus, 0x40, 0, NULL); i8254_pit_init(isa_bus, 0x40, 0, NULL);
isa_create_simple(isa_bus, "i8042"); isa_create_simple(isa_bus, "i8042");
/* VGA setup. Don't bother loading the bios. */ /* VGA setup. Don't bother loading the bios. */

1
hw/arm/spitz.c
View File

@ -29,7 +29,6 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "cpu.h" #include "cpu.h"
#undef REG_FMT #undef REG_FMT

1
hw/audio/fmopl.c
View File

@ -34,7 +34,6 @@
#include <math.h> #include <math.h>
//#include "driver.h" /* use M.A.M.E. */ //#include "driver.h" /* use M.A.M.E. */
#include "fmopl.h" #include "fmopl.h"
#include "qemu/osdep.h"
#ifndef PI #ifndef PI
#define PI 3.14159265358979323846 #define PI 3.14159265358979323846
#endif #endif

1
hw/audio/fmopl.h
View File

@ -1,7 +1,6 @@
#ifndef FMOPL_H #ifndef FMOPL_H
#define FMOPL_H #define FMOPL_H
#include <stdint.h>
typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval_Sec); typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval_Sec);

1
hw/audio/pcspk.c
View File

@ -24,7 +24,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/audio/soundhw.h" #include "hw/audio/soundhw.h"
#include "audio/audio.h" #include "audio/audio.h"

1
hw/char/debugcon.c
View File

@ -29,7 +29,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon"
#define ISA_DEBUGCON_DEVICE(obj) \ #define ISA_DEBUGCON_DEVICE(obj) \

1
hw/char/xen_console.c
View File

@ -27,7 +27,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "hw/xen/xen_backend.h" #include "hw/xen/xen_backend.h"
#include "qapi/error.h"
#include <xen/io/console.h> #include <xen/io/console.h>

1
hw/core/machine.c
View File

@ -20,7 +20,6 @@
#include "sysemu/numa.h" #include "sysemu/numa.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "sysemu/numa.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
static char *machine_get_accel(Object *obj, Error **errp) static char *machine_get_accel(Object *obj, Error **errp)

1
hw/cpu/core.c
View File

@ -6,6 +6,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hw/cpu/core.h" #include "hw/cpu/core.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/error.h" #include "qapi/error.h"

1
hw/display/cirrus_vga.c
View File

@ -31,7 +31,6 @@
#include "trace.h" #include "trace.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "ui/console.h"
#include "ui/pixel_ops.h" #include "ui/pixel_ops.h"
#include "vga_int.h" #include "vga_int.h"
#include "hw/loader.h" #include "hw/loader.h"

1
hw/display/qxl.h
View File

@ -3,7 +3,6 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "ui/console.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "vga_int.h" #include "vga_int.h"

4
hw/display/vga-isa-mm.c
View File

@ -23,11 +23,9 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "ui/console.h" #include "hw/display/vga.h"
#include "hw/i386/pc.h"
#include "vga_int.h" #include "vga_int.h"
#include "ui/pixel_ops.h" #include "ui/pixel_ops.h"
#include "qemu/timer.h"
#define VGA_RAM_SIZE (8192 * 1024) #define VGA_RAM_SIZE (8192 * 1024)

3
hw/display/vga-isa.c
View File

@ -25,8 +25,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "ui/console.h" #include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#include "vga_int.h" #include "vga_int.h"
#include "ui/pixel_ops.h" #include "ui/pixel_ops.h"
#include "qemu/timer.h" #include "qemu/timer.h"

1
hw/display/vga-pci.c
View File

@ -25,7 +25,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "ui/console.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "vga_int.h" #include "vga_int.h"
#include "ui/pixel_ops.h" #include "ui/pixel_ops.h"

5
hw/display/vga.c
View File

@ -24,11 +24,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "vga.h" #include "hw/display/vga.h"
#include "ui/console.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "vga_int.h" #include "vga_int.h"
#include "vga_regs.h"
#include "ui/pixel_ops.h" #include "ui/pixel_ops.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/xen/xen.h" #include "hw/xen/xen.h"

3
hw/display/vga_int.h
View File

@ -25,8 +25,9 @@
#ifndef HW_VGA_INT_H #ifndef HW_VGA_INT_H
#define HW_VGA_INT_H #define HW_VGA_INT_H
#include "hw/hw.h" #include "exec/ioport.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "ui/console.h"
#define ST01_V_RETRACE 0x08 #define ST01_V_RETRACE 0x08
#define ST01_DISP_ENABLE 0x01 #define ST01_DISP_ENABLE 0x01

0
hw/display/vga.h → hw/display/vga_regs.h
View File

1
hw/display/virtio-vga.c
View File

@ -1,7 +1,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "ui/console.h"
#include "vga_int.h" #include "vga_int.h"
#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-pci.h"
#include "qapi/error.h" #include "qapi/error.h"

1
hw/display/vmware_vga.c
View File

@ -26,7 +26,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "trace.h" #include "trace.h"
#include "ui/console.h"
#include "ui/vnc.h" #include "ui/vnc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"

1
hw/i2c/pm_smbus.c
View File

@ -19,7 +19,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/i2c/pm_smbus.h" #include "hw/i2c/pm_smbus.h"
#include "hw/i2c/smbus.h" #include "hw/i2c/smbus.h"

1
hw/i2c/smbus_ich9.c
View File

@ -26,7 +26,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/i2c/pm_smbus.h" #include "hw/i2c/pm_smbus.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

2
hw/i386/Makefile.objs
View File

@ -5,6 +5,8 @@ obj-y += pc_sysfw.o
obj-y += x86-iommu.o intel_iommu.o obj-y += x86-iommu.o intel_iommu.o
obj-y += amd_iommu.o obj-y += amd_iommu.o
obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-$(CONFIG_XEN) += ../xenpv/ xen/
obj-$(CONFIG_VMPORT) += vmport.o
obj-$(CONFIG_VMMOUSE) += vmmouse.o
obj-y += kvmvapic.o obj-y += kvmvapic.o
obj-y += acpi-build.o obj-y += acpi-build.o

2
hw/i386/acpi-build.c
View File

@ -28,8 +28,8 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "qom/cpu.h" #include "qom/cpu.h"
#include "hw/i386/pc.h"
#include "target/i386/cpu.h" #include "target/i386/cpu.h"
#include "hw/misc/pvpanic.h"
#include "hw/timer/hpet.h" #include "hw/timer/hpet.h"
#include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"

5
hw/i386/amd_iommu.c
View File

@ -20,7 +20,10 @@
* Cache implementation inspired by hw/i386/intel_iommu.c * Cache implementation inspired by hw/i386/intel_iommu.c
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/i386/amd_iommu.h" #include "hw/i386/pc.h"
#include "hw/pci/msi.h"
#include "hw/pci/pci_bus.h"
#include "amd_iommu.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "trace.h" #include "trace.h"

5
hw/i386/amd_iommu.h
View File

@ -23,11 +23,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/msi.h"
#include "hw/sysbus.h"
#include "sysemu/dma.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_bus.h"
#include "hw/i386/x86-iommu.h" #include "hw/i386/x86-iommu.h"
/* Capability registers */ /* Capability registers */

5
hw/i386/pc.c
View File

@ -69,6 +69,7 @@
#include "qom/cpu.h" #include "qom/cpu.h"
#include "hw/nmi.h" #include "hw/nmi.h"
#include "hw/i386/intel_iommu.h" #include "hw/i386/intel_iommu.h"
#include "hw/net/ne2000-isa.h"
/* debug PC/ISA interrupts */ /* debug PC/ISA interrupts */
//#define DEBUG_IRQ //#define DEBUG_IRQ
@ -1565,7 +1566,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);
} }
} }
*rtc_state = rtc_init(isa_bus, 2000, rtc_irq); *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq);
qemu_register_boot_set(pc_boot_set, *rtc_state); qemu_register_boot_set(pc_boot_set, *rtc_state);
@ -1573,7 +1574,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
if (kvm_pit_in_kernel()) { if (kvm_pit_in_kernel()) {
pit = kvm_pit_init(isa_bus, 0x40); pit = kvm_pit_init(isa_bus, 0x40);
} else { } else {
pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq); pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
} }
if (hpet) { if (hpet) {
/* connect PIT to output control line of the HPET */ /* connect PIT to output control line of the HPET */

1
hw/input/vmmouse.c → hw/i386/vmmouse.c
View File

@ -24,7 +24,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/input/ps2.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/qdev.h" #include "hw/qdev.h"

17
hw/misc/vmport.c → hw/i386/vmport.c
View File

@ -28,7 +28,7 @@
#include "sysemu/hw_accel.h" #include "sysemu/hw_accel.h"
#include "hw/qdev.h" #include "hw/qdev.h"
//#define VMPORT_DEBUG /* #define VMPORT_DEBUG */
#define VMPORT_CMD_GETVERSION 0x0a #define VMPORT_CMD_GETVERSION 0x0a
#define VMPORT_CMD_GETRAMSIZE 0x14 #define VMPORT_CMD_GETRAMSIZE 0x14
@ -38,8 +38,7 @@
#define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT) #define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT)
typedef struct VMPortState typedef struct VMPortState {
{
ISADevice parent_obj; ISADevice parent_obj;
MemoryRegion io; MemoryRegion io;
@ -51,8 +50,9 @@ static VMPortState *port_state;
void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque) void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque)
{ {
if (command >= VMPORT_ENTRIES) if (command >= VMPORT_ENTRIES) {
return; return;
}
port_state->func[command] = func; port_state->func[command] = func;
port_state->opaque[command] = opaque; port_state->opaque[command] = opaque;
@ -71,14 +71,15 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr addr,
cpu_synchronize_state(cs); cpu_synchronize_state(cs);
eax = env->regs[R_EAX]; eax = env->regs[R_EAX];
if (eax != VMPORT_MAGIC) if (eax != VMPORT_MAGIC) {
return eax; return eax;
}
command = env->regs[R_ECX]; command = env->regs[R_ECX];
if (command >= VMPORT_ENTRIES) if (command >= VMPORT_ENTRIES) {
return eax; return eax;
if (!s->func[command]) }
{ if (!s->func[command]) {
#ifdef VMPORT_DEBUG #ifdef VMPORT_DEBUG
fprintf(stderr, "vmport: unknown command %x\n", command); fprintf(stderr, "vmport: unknown command %x\n", command);
#endif #endif

2
hw/i386/xen/xen-mapcache.c
View File

@ -199,7 +199,7 @@ static void xen_remap_bucket(MapCacheEntry *entry,
*/ */
vaddr_base = mmap(vaddr, size, PROT_READ | PROT_WRITE, vaddr_base = mmap(vaddr, size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0); MAP_ANON | MAP_SHARED, -1, 0);
if (vaddr_base == NULL) { if (vaddr_base == MAP_FAILED) {
perror("mmap"); perror("mmap");
exit(-1); exit(-1);
} }

1
hw/i386/xen/xen_platform.c
View File

@ -26,7 +26,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/ide.h" #include "hw/ide.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/irq.h" #include "hw/irq.h"

1
hw/ide/ahci.c
View File

@ -24,7 +24,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

1
hw/ide/cmd646.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"

3
hw/ide/core.c
View File

@ -24,17 +24,16 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "hw/ide/internal.h" #include "hw/ide/internal.h"
#include "trace.h" #include "trace.h"

1
hw/ide/ich.c
View File

@ -63,7 +63,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"

1
hw/ide/isa.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"

1
hw/ide/microdrive.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pcmcia.h" #include "hw/pcmcia.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"

1
hw/ide/pci.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"

2
hw/ide/piix.c
View File

@ -25,11 +25,11 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/ide/pci.h" #include "hw/ide/pci.h"

1
hw/ide/via.c
View File

@ -25,7 +25,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"

1
hw/input/Makefile.objs
View File

@ -6,7 +6,6 @@ common-obj-$(CONFIG_PL050) += pl050.o
common-obj-y += ps2.o common-obj-y += ps2.o
common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
common-obj-$(CONFIG_TSC2005) += tsc2005.o common-obj-$(CONFIG_TSC2005) += tsc2005.o
common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
common-obj-$(CONFIG_VIRTIO) += virtio-input.o common-obj-$(CONFIG_VIRTIO) += virtio-input.o
common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o

2
hw/input/adb.c
View File

@ -24,8 +24,8 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/input/adb.h" #include "hw/input/adb.h"
#include "hw/input/adb-keys.h"
#include "ui/console.h" #include "ui/console.h"
#include "include/hw/input/adb-keys.h"
#include "ui/input.h" #include "ui/input.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

8
hw/input/hid.c
View File

@ -57,14 +57,14 @@ static const uint8_t hid_usage_keys[0x100] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x58, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xe4, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x46,
0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x48, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x48, 0x4a,
0x52, 0x4b, 0x00, 0x50, 0x00, 0x4f, 0x00, 0x4d, 0x52, 0x4b, 0x00, 0x50, 0x00, 0x4f, 0x00, 0x4d,
0x51, 0x4e, 0x49, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x51, 0x4e, 0x49, 0x4c, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xe3, 0xe7, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe7, 0x65, 0x66, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

1
hw/intc/lm32_pic.c
View File

@ -20,7 +20,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "trace.h" #include "trace.h"

1
hw/ipmi/isa_ipmi_bt.c
View File

@ -26,7 +26,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/ipmi/ipmi.h" #include "hw/ipmi/ipmi.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/pc.h"
/* Control register */ /* Control register */
#define IPMI_BT_CLR_WR_BIT 0 #define IPMI_BT_CLR_WR_BIT 0

1
hw/ipmi/isa_ipmi_kcs.c
View File

@ -26,7 +26,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/ipmi/ipmi.h" #include "hw/ipmi/ipmi.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#define IPMI_KCS_OBF_BIT 0 #define IPMI_KCS_OBF_BIT 0
#define IPMI_KCS_IBF_BIT 1 #define IPMI_KCS_IBF_BIT 1

5
hw/isa/i82378.c
View File

@ -21,6 +21,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/timer/mc146818rtc.h"
#include "hw/audio/pcspk.h" #include "hw/audio/pcspk.h"
#define TYPE_I82378 "i82378" #define TYPE_I82378 "i82378"
@ -97,7 +98,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
isa_bus_irqs(isabus, s->i8259); isa_bus_irqs(isabus, s->i8259);
/* 1 82C54 (pit) */ /* 1 82C54 (pit) */
isa = pit_init(isabus, 0x40, 0, NULL); isa = i8254_pit_init(isabus, 0x40, 0, NULL);
/* speaker */ /* speaker */
pcspk_init(isabus, isa); pcspk_init(isabus, isa);
@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
isa = isa_create_simple(isabus, "i82374"); isa = isa_create_simple(isabus, "i82374");
/* timer */ /* timer */
isa_create_simple(isabus, "mc146818rtc"); isa_create_simple(isabus, TYPE_MC146818_RTC);
} }
static void i82378_init(Object *obj) static void i82378_init(Object *obj)

1
hw/isa/vt82c686.c
View File

@ -12,7 +12,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/vt82c686.h" #include "hw/isa/vt82c686.h"
#include "hw/i2c/i2c.h" #include "hw/i2c/i2c.h"
#include "hw/i2c/smbus.h" #include "hw/i2c/smbus.h"

4
hw/mips/mips_fulong2e.c
View File

@ -359,13 +359,13 @@ static void mips_fulong2e_init(MachineState *machine)
smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd)); smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
/* init other devices */ /* init other devices */
pit = pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
DMA_init(isa_bus, 0); DMA_init(isa_bus, 0);
/* Super I/O */ /* Super I/O */
isa_create_simple(isa_bus, "i8042"); isa_create_simple(isa_bus, "i8042");
rtc_init(isa_bus, 2000, NULL); mc146818_rtc_init(isa_bus, 2000, NULL);
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
parallel_hds_isa_init(isa_bus, 1); parallel_hds_isa_init(isa_bus, 1);

5
hw/mips/mips_jazz.c
View File

@ -39,6 +39,7 @@
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/display/vga.h"
#include "hw/audio/pcspk.h" #include "hw/audio/pcspk.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -218,7 +219,7 @@ static void mips_jazz_init(MachineState *machine,
i8259 = i8259_init(isa_bus, env->irq[4]); i8259 = i8259_init(isa_bus, env->irq[4]);
isa_bus_irqs(isa_bus, i8259); isa_bus_irqs(isa_bus, i8259);
DMA_init(isa_bus, 0); DMA_init(isa_bus, 0);
pit = pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_bus, pit); pcspk_init(isa_bus, pit);
/* Video card */ /* Video card */
@ -288,7 +289,7 @@ static void mips_jazz_init(MachineState *machine,
fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds); fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds);
/* Real time clock */ /* Real time clock */
rtc_init(isa_bus, 1980, NULL); mc146818_rtc_init(isa_bus, 1980, NULL);
memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000);
memory_region_add_subregion(address_space, 0x80004000, rtc); memory_region_add_subregion(address_space, 0x80004000, rtc);

4
hw/mips/mips_malta.c
View File

@ -1208,13 +1208,13 @@ void mips_malta_init(MachineState *machine)
isa_get_irq(NULL, 9), NULL, 0, NULL); isa_get_irq(NULL, 9), NULL, 0, NULL);
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf); g_free(smbus_eeprom_buf);
pit = pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
DMA_init(isa_bus, 0); DMA_init(isa_bus, 0);
/* Super I/O */ /* Super I/O */
isa_create_simple(isa_bus, "i8042"); isa_create_simple(isa_bus, "i8042");
rtc_init(isa_bus, 2000, NULL); mc146818_rtc_init(isa_bus, 2000, NULL);
serial_hds_isa_init(isa_bus, 0, 2); serial_hds_isa_init(isa_bus, 0, 2);
parallel_hds_isa_init(isa_bus, 1); parallel_hds_isa_init(isa_bus, 1);

5
hw/mips/mips_r4k.c
View File

@ -18,6 +18,7 @@
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "net/net.h" #include "net/net.h"
#include "hw/net/ne2000-isa.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/block/flash.h" #include "hw/block/flash.h"
@ -270,9 +271,9 @@ void mips_r4k_init(MachineState *machine)
i8259 = i8259_init(isa_bus, env->irq[2]); i8259 = i8259_init(isa_bus, env->irq[2]);
isa_bus_irqs(isa_bus, i8259); isa_bus_irqs(isa_bus, i8259);
rtc_init(isa_bus, 2000, NULL); mc146818_rtc_init(isa_bus, 2000, NULL);
pit = pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);

2
hw/misc/Makefile.objs
View File

@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) += edu.o
common-obj-y += unimp.o common-obj-y += unimp.o
common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
obj-$(CONFIG_VMPORT) += vmport.o
# ARM devices # ARM devices
common-obj-$(CONFIG_PL310) += arm_l2x0.o common-obj-$(CONFIG_PL310) += arm_l2x0.o
common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o

2
hw/misc/imx6_ccm.c
View File

@ -335,7 +335,7 @@ static uint64_t imx6_ccm_get_ipg_clk(IMX6CCMState *dev)
uint64_t freq = 0; uint64_t freq = 0;
freq = imx6_ccm_get_ahb_clk(dev) freq = imx6_ccm_get_ahb_clk(dev)
/ (1 + EXTRACT(dev->ccm[CCM_CBCDR], IPG_PODF));; / (1 + EXTRACT(dev->ccm[CCM_CBCDR], IPG_PODF));
DPRINTF("freq = %d\n", (uint32_t)freq); DPRINTF("freq = %d\n", (uint32_t)freq);

1
hw/misc/ivshmem.c
View File

@ -20,7 +20,6 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/pci/msix.h" #include "hw/pci/msix.h"

12
hw/misc/pvpanic.c
View File

@ -13,14 +13,11 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qjson.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/nvram/fw_cfg.h" #include "hw/nvram/fw_cfg.h"
#include "hw/i386/pc.h" #include "hw/misc/pvpanic.h"
#include "qapi-event.h"
/* The bit of supported pv event */ /* The bit of supported pv event */
#define PVPANIC_F_PANICKED 0 #define PVPANIC_F_PANICKED 0
@ -28,9 +25,8 @@
/* The pv event value */ /* The pv event value */
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED) #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
#define TYPE_ISA_PVPANIC_DEVICE "pvpanic"
#define ISA_PVPANIC_DEVICE(obj) \ #define ISA_PVPANIC_DEVICE(obj) \
OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE) OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC)
static void handle_event(int event) static void handle_event(int event)
{ {
@ -107,7 +103,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
uint16_t pvpanic_port(void) uint16_t pvpanic_port(void)
{ {
Object *o = object_resolve_path_type("", TYPE_ISA_PVPANIC_DEVICE, NULL); Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);
if (!o) { if (!o) {
return 0; return 0;
} }
@ -129,7 +125,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
} }
static TypeInfo pvpanic_isa_info = { static TypeInfo pvpanic_isa_info = {
.name = TYPE_ISA_PVPANIC_DEVICE, .name = TYPE_PVPANIC,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(PVPanicState), .instance_size = sizeof(PVPanicState),
.instance_init = pvpanic_isa_initfn, .instance_init = pvpanic_isa_initfn,

1
hw/misc/sga.c
View File

@ -26,7 +26,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/i386/pc.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

1
hw/moxie/moxiesim.c
View File

@ -30,7 +30,6 @@
#include "cpu.h" #include "cpu.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "net/net.h" #include "net/net.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

6
hw/net/ne2000-isa.c
View File

@ -22,17 +22,15 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/net/ne2000-isa.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "net/net.h"
#include "ne2000.h" #include "ne2000.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#define TYPE_ISA_NE2000 "ne2k_isa"
#define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000) #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000)
typedef struct ISANE2000State { typedef struct ISANE2000State {

2
hw/net/ne2000.c
View File

@ -22,9 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "net/net.h"
#include "ne2000.h" #include "ne2000.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

3
hw/net/ne2000.h
View File

@ -1,6 +1,9 @@
#ifndef HW_NE2000_H #ifndef HW_NE2000_H
#define HW_NE2000_H #define HW_NE2000_H
#include "hw/hw.h"
#include "net/net.h"
#define NE2000_PMEM_SIZE (32*1024) #define NE2000_PMEM_SIZE (32*1024)
#define NE2000_PMEM_START (16*1024) #define NE2000_PMEM_START (16*1024)
#define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) #define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START)

1
hw/nios2/boot.c
View File

@ -34,7 +34,6 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu-common.h"
#include "sysemu/device_tree.h" #include "sysemu/device_tree.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/loader.h" #include "hw/loader.h"

1
hw/pci-bridge/pci_expander_bridge.c
View File

@ -16,7 +16,6 @@
#include "hw/pci/pci_bus.h" #include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bridge.h"
#include "hw/i386/pc.h"
#include "qemu/range.h" #include "qemu/range.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "sysemu/numa.h" #include "sysemu/numa.h"

2
hw/ppc/pnv.c
View File

@ -655,7 +655,7 @@ static void ppc_powernv_init(MachineState *machine)
serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS); serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS);
/* Create an RTC ISA device too */ /* Create an RTC ISA device too */
rtc_init(pnv->isa_bus, 2000, NULL); mc146818_rtc_init(pnv->isa_bus, 2000, NULL);
/* OpenPOWER systems use a IPMI SEL Event message to notify the /* OpenPOWER systems use a IPMI SEL Event message to notify the
* host to powerdown */ * host to powerdown */

1
hw/ppc/prep.c
View File

@ -42,6 +42,7 @@
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc.h"
#include "hw/isa/pc87312.h" #include "hw/isa/pc87312.h"
#include "hw/net/ne2000-isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

1
hw/ppc/spapr_cpu_core.c
View File

@ -6,6 +6,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hw/cpu/core.h" #include "hw/cpu/core.h"
#include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_cpu_core.h"
#include "target/ppc/cpu.h" #include "target/ppc/cpu.h"

1
hw/ppc/spapr_hcall.c
View File

@ -13,7 +13,6 @@
#include "trace.h" #include "trace.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "hw/ppc/spapr_ovec.h" #include "hw/ppc/spapr_ovec.h"
#include "qemu/error-report.h"
#include "mmu-book3s-v3.h" #include "mmu-book3s-v3.h"
struct SPRSyncState { struct SPRSyncState {

1
hw/s390x/css.c
View File

@ -13,7 +13,6 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "qemu/error-report.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"

2
hw/s390x/virtio-ccw.c
View File

@ -486,7 +486,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
} else { } else {
address_space_stb(&address_space_memory, ccw.cda, vdev->status, address_space_stb(&address_space_memory, ccw.cda, vdev->status,
MEMTXATTRS_UNSPECIFIED, NULL); MEMTXATTRS_UNSPECIFIED, NULL);
sch->curr_status.scsw.count = ccw.count - sizeof(vdev->status);; sch->curr_status.scsw.count = ccw.count - sizeof(vdev->status);
ret = 0; ret = 0;
} }
break; break;

1
hw/scsi/vhost-user-scsi.c
View File

@ -18,7 +18,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/typedefs.h"
#include "qom/object.h" #include "qom/object.h"
#include "hw/fw-path-provider.h" #include "hw/fw-path-provider.h"
#include "hw/qdev-core.h" #include "hw/qdev-core.h"

1
hw/smbios/smbios_type_38-stub.c
View File

@ -7,6 +7,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/osdep.h"
#include "hw/smbios/ipmi.h" #include "hw/smbios/ipmi.h"
void smbios_build_type_38_table(void) void smbios_build_type_38_table(void)

1
hw/sparc/sun4m.c
View File

@ -36,7 +36,6 @@
#include "net/net.h" #include "net/net.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/scsi/esp.h" #include "hw/scsi/esp.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/nvram/sun_nvram.h" #include "hw/nvram/sun_nvram.h"
#include "hw/nvram/chrp_nvram.h" #include "hw/nvram/chrp_nvram.h"

3
hw/ssi/aspeed_smc.c
View File

@ -26,8 +26,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "include/qemu/error-report.h" #include "qemu/error-report.h"
#include "exec/address-spaces.h"
#include "hw/ssi/aspeed_smc.h" #include "hw/ssi/aspeed_smc.h"

1
hw/timer/i8254.c
View File

@ -23,7 +23,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"

1
hw/timer/i8254_common.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"

2
hw/timer/mc146818rtc.c
View File

@ -999,7 +999,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
qdev_init_gpio_out(dev, &s->irq, 1); qdev_init_gpio_out(dev, &s->irq, 1);
} }
ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
{ {
DeviceState *dev; DeviceState *dev;
ISADevice *isadev; ISADevice *isadev;

1
hw/tpm/tpm_emulator.c
View File

@ -33,7 +33,6 @@
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
#include "tpm_int.h" #include "tpm_int.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "tpm_util.h" #include "tpm_util.h"
#include "tpm_ioctl.h" #include "tpm_ioctl.h"
#include "migration/blocker.h" #include "migration/blocker.h"

1
hw/tpm/tpm_passthrough.c
View File

@ -29,7 +29,6 @@
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
#include "tpm_int.h" #include "tpm_int.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h"
#include "qapi/clone-visitor.h" #include "qapi/clone-visitor.h"
#include "tpm_util.h" #include "tpm_util.h"

15
hw/unicore32/puv3.c
View File

@ -11,16 +11,11 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h" #include "cpu.h"
#include "ui/console.h" #include "ui/console.h"
#include "elf.h"
#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#undef DEBUG_PUV3 #undef DEBUG_PUV3
@ -29,6 +24,16 @@
#define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_LOAD_ADDR 0x03000000
#define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */
/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */
#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */
/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */
#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */
#define PUV3_INTC_BASE (0xee600000) /* APB-6 */
#define PUV3_OST_BASE (0xee800000) /* APB-8 */
#define PUV3_PM_BASE (0xeea00000) /* APB-10 */
#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */
static void puv3_intc_cpu_handler(void *opaque, int irq, int level) static void puv3_intc_cpu_handler(void *opaque, int irq, int level)
{ {
UniCore32CPU *cpu = opaque; UniCore32CPU *cpu = opaque;

2
hw/vfio/ccw.c
View File

@ -11,11 +11,11 @@
* directory. * directory.
*/ */
#include "qemu/osdep.h"
#include <linux/vfio.h> #include <linux/vfio.h>
#include <linux/vfio_ccw.h> #include <linux/vfio_ccw.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/vfio/vfio.h" #include "hw/vfio/vfio.h"

2
hw/virtio/vhost-vsock.c
View File

@ -11,8 +11,8 @@
* top-level directory. * top-level directory.
*/ */
#include <sys/ioctl.h>
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <sys/ioctl.h>
#include "standard-headers/linux/virtio_vsock.h" #include "standard-headers/linux/virtio_vsock.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"

2
hw/virtio/virtio-balloon.c
View File

@ -18,7 +18,7 @@
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/i386/pc.h" #include "hw/mem/pc-dimm.h"
#include "sysemu/balloon.h" #include "sysemu/balloon.h"
#include "hw/virtio/virtio-balloon.h" #include "hw/virtio/virtio-balloon.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

1
hw/watchdog/wdt_ib700.c
View File

@ -25,7 +25,6 @@
#include "sysemu/watchdog.h" #include "sysemu/watchdog.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/pc.h"
/*#define IB700_DEBUG 1*/ /*#define IB700_DEBUG 1*/

12
include/exec/memory.h
View File

@ -1240,18 +1240,6 @@ void memory_region_set_flush_coalesced(MemoryRegion *mr);
*/ */
void memory_region_clear_flush_coalesced(MemoryRegion *mr); void memory_region_clear_flush_coalesced(MemoryRegion *mr);
/**
* memory_region_set_global_locking: Declares the access processing requires
* QEMU's global lock.
*
* When this is invoked, accesses to the memory region will be processed while
* holding the global lock of QEMU. This is the default behavior of memory
* regions.
*
* @mr: the memory region to be updated.
*/
void memory_region_set_global_locking(MemoryRegion *mr);
/** /**
* memory_region_clear_global_locking: Declares that access processing does * memory_region_clear_global_locking: Declares that access processing does
* not depend on the QEMU global lock. * not depend on the QEMU global lock.

11
include/hw/acpi/acpi.h
View File

@ -39,6 +39,17 @@
#define ACPI_PM2_REGISTER_WIDTH 8 #define ACPI_PM2_REGISTER_WIDTH 8
#define ACPI_PM_TIMER_WIDTH 32 #define ACPI_PM_TIMER_WIDTH 32
/* PC-style peripherals (also used by other machines). */
#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
#define ACPI_PM_PROP_S4_VAL "s4_val"
#define ACPI_PM_PROP_SCI_INT "sci_int"
#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
/* PM Timer ticks per second (HZ) */ /* PM Timer ticks per second (HZ) */
#define PM_TIMER_FREQUENCY 3579545 #define PM_TIMER_FREQUENCY 3579545

2
include/hw/acpi/ich9.h
View File

@ -63,6 +63,8 @@ typedef struct ICH9LPCPMRegs {
TCOIORegs tco_regs; TCOIORegs tco_regs;
} ICH9LPCPMRegs; } ICH9LPCPMRegs;
#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
bool smm_enabled, bool smm_enabled,
qemu_irq sci_irq); qemu_irq sci_irq);

1
include/hw/acpi/ipmi.h
View File

@ -9,7 +9,6 @@
#ifndef HW_ACPI_IPMI_H #ifndef HW_ACPI_IPMI_H
#define HW_ACPI_IPMI_H #define HW_ACPI_IPMI_H
#include "qemu/osdep.h"
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"
/* /*

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