[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimpl
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimplemented" sysbus device |
Date: |
Mon, 18 Dec 2017 00:27:07 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/alpha/alpha_sys.h | 1 -
hw/alpha/pci.c | 26 --------------------------
hw/alpha/typhoon.c | 6 ++----
3 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h
index b6d8369ed7..9e67f78c60 100644
--- a/hw/alpha/alpha_sys.h
+++ b/hw/alpha/alpha_sys.h
@@ -15,7 +15,6 @@ PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *,
AlphaCPU *[4],
pci_map_irq_fn);
/* alpha_pci.c. */
-extern const MemoryRegionOps alpha_pci_ignore_ops;
extern const MemoryRegionOps alpha_pci_conf1_ops;
extern const MemoryRegionOps alpha_pci_iack_ops;
diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c
index 8dde637bfe..e0bcde9f70 100644
--- a/hw/alpha/pci.c
+++ b/hw/alpha/pci.c
@@ -14,32 +14,6 @@
#include "trace.h"
-/* Fallback for unassigned PCI I/O operations. Avoids MCHK. */
-
-static uint64_t ignore_read(void *opaque, hwaddr addr, unsigned size)
-{
- return 0;
-}
-
-static void ignore_write(void *opaque, hwaddr addr, uint64_t v, unsigned size)
-{
-}
-
-const MemoryRegionOps alpha_pci_ignore_ops = {
- .read = ignore_read,
- .write = ignore_write,
- .endianness = DEVICE_LITTLE_ENDIAN,
- .valid = {
- .min_access_size = 1,
- .max_access_size = 8,
- },
- .impl = {
- .min_access_size = 1,
- .max_access_size = 8,
- },
-};
-
-
/* PCI config space reads/writes, to byte-word addressable memory. */
static uint64_t bw_conf1_read(void *opaque, hwaddr addr,
unsigned size)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index ae11e012c7..d8e2cac3f3 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,6 +11,7 @@
#include "cpu.h"
#include "hw/hw.h"
#include "hw/devices.h"
+#include "hw/misc/unimp.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
@@ -876,10 +877,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
&s->pchip.reg_mem);
/* Pchip0 PCI I/O, 0x801.FC00.0000, 32MB. */
- memory_region_init_io(&s->pchip.reg_io, OBJECT(s), &alpha_pci_ignore_ops,
- NULL, "pci0-io", 32*MB);
- memory_region_add_subregion(addr_space, 0x801fc000000ULL,
- &s->pchip.reg_io);
+ create_unimplemented_device("pci0-io", 0x801fc000000ULL, 32 * MB);
b = pci_register_bus(dev, "pci",
typhoon_set_irq, sys_map_irq, s,
--
2.11.0
- [Qemu-trivial] [PULL 05/61] qht: fix kernel-doc markup in qht.h, (continued)
- [Qemu-trivial] [PULL 05/61] qht: fix kernel-doc markup in qht.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 39/61] hw/input/vmmouse: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 30/61] block: remove "qemu/osdep.h" from header file, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 59/61] i386/pc: move vmport.c to hw/i386/, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h", Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 15/61] MAINTAINERS: add "hw/registerfields.h" in Register API entry, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 01/61] Remove empty statements, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 13/61] accel/tcg/cpu-exec-common.c: Remove unnecessary include of memory-internal.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 07/61] mmap(2) returns MAP_FAILED, not NULL, on failure, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimplemented" sysbus device,
Michael Tokarev <=
- [Qemu-trivial] [PULL 47/61] hw/tpm: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 04/61] translate-all: fix 'consisits' typo in comment, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 40/61] hw/misc/pvpanic: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code commented out), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 08/61] .gitignore: remove vscclient, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 34/61] i386/hax: remove duplicated includes, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 41/61] hw/ssi/aspeed_smc: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 23/61] MAINTAINERS: add an entry for the i82378 (superio), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 10/61] Document pretty parameter for mon option, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 35/61] i386/hax: remove duplicated include, Michael Tokarev, 2017/12/17