diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-10-17 13:44:24 -0300 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2017-12-18 17:07:02 +0300 |
| commit | 323d7d1d999d8be31e4d5a50ee18f7e2ca5d096a (patch) | |
| tree | 4375dc2f7308091047fe8455196f272faa342f48 | |
| parent | 0d5d8a3a906f782eab8a85079eede78879dc8155 (diff) | |
| download | qemu-323d7d1d999d8be31e4d5a50ee18f7e2ca5d096a.zip qemu-323d7d1d999d8be31e4d5a50ee18f7e2ca5d096a.tar.gz qemu-323d7d1d999d8be31e4d5a50ee18f7e2ca5d096a.tar.bz2 | |
i386/pc: move vmport.c to hw/i386/
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é <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/i386/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/i386/vmport.c (renamed from hw/misc/vmport.c) | 17 | ||||
| -rw-r--r-- | hw/misc/Makefile.objs | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 2e5e129..1548ad1 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 index 1655002..eb880c6 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 10c88a8..d517f83 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 |