[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 59/61] i386/pc: move vmport.c to hw/i386/
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 59/61] i386/pc: move vmport.c to hw/i386/ |
Date: |
Mon, 18 Dec 2017 00:28:04 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
It's a x86-only device, so it does not make sense to keep it
in the shared misc folder.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
hw/i386/Makefile.objs | 1 +
hw/{misc => i386}/vmport.c | 17 +++++++++--------
hw/misc/Makefile.objs | 2 --
3 files changed, 10 insertions(+), 10 deletions(-)
rename hw/{misc => i386}/vmport.c (95%)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 2e5e1299ad..1548ad1ad0 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -5,6 +5,7 @@ obj-y += pc_sysfw.o
obj-y += x86-iommu.o intel_iommu.o
obj-y += amd_iommu.o
obj-$(CONFIG_XEN) += ../xenpv/ xen/
+obj-$(CONFIG_VMPORT) += vmport.o
obj-y += kvmvapic.o
obj-y += acpi-build.o
diff --git a/hw/misc/vmport.c b/hw/i386/vmport.c
similarity index 95%
rename from hw/misc/vmport.c
rename to hw/i386/vmport.c
index 165500223f..eb880c6def 100644
--- a/hw/misc/vmport.c
+++ b/hw/i386/vmport.c
@@ -28,7 +28,7 @@
#include "sysemu/hw_accel.h"
#include "hw/qdev.h"
-//#define VMPORT_DEBUG
+/* #define VMPORT_DEBUG */
#define VMPORT_CMD_GETVERSION 0x0a
#define VMPORT_CMD_GETRAMSIZE 0x14
@@ -38,8 +38,7 @@
#define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT)
-typedef struct VMPortState
-{
+typedef struct VMPortState {
ISADevice parent_obj;
MemoryRegion io;
@@ -51,8 +50,9 @@ static VMPortState *port_state;
void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque)
{
- if (command >= VMPORT_ENTRIES)
+ if (command >= VMPORT_ENTRIES) {
return;
+ }
port_state->func[command] = func;
port_state->opaque[command] = opaque;
@@ -71,14 +71,15 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr
addr,
cpu_synchronize_state(cs);
eax = env->regs[R_EAX];
- if (eax != VMPORT_MAGIC)
+ if (eax != VMPORT_MAGIC) {
return eax;
+ }
command = env->regs[R_ECX];
- if (command >= VMPORT_ENTRIES)
+ if (command >= VMPORT_ENTRIES) {
return eax;
- if (!s->func[command])
- {
+ }
+ if (!s->func[command]) {
#ifdef VMPORT_DEBUG
fprintf(stderr, "vmport: unknown command %x\n", command);
#endif
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 10c88a84b4..d517f83e81 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) += edu.o
common-obj-y += unimp.o
common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
-obj-$(CONFIG_VMPORT) += vmport.o
-
# ARM devices
common-obj-$(CONFIG_PL310) += arm_l2x0.o
common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o
--
2.11.0
- [Qemu-trivial] [PULL 00/61] Trivial patches for 2017-12-18, Michael Tokarev, 2017/12/17
- [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 <=
- [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, 2017/12/17
- [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