[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 40/43] i386/pc: move vmport.c to hw/i386/
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 40/43] i386/pc: move vmport.c to hw/i386/ |
Date: |
Fri, 15 Dec 2017 00:30:12 -0300 |
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/{misc => i386}/vmport.c | 17 +++++++++--------
hw/i386/Makefile.objs | 1 +
hw/misc/Makefile.objs | 2 --
3 files changed, 10 insertions(+), 10 deletions(-)
rename hw/{misc => i386}/vmport.c (95%)
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/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/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.15.1
- [Qemu-devel] [PATCH v4 30/43] hw/unicore32: restrict hw addr defines to source file, (continued)
- [Qemu-devel] [PATCH v4 30/43] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 31/43] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 32/43] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 33/43] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 34/43] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 35/43] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 36/43] hw/display/vga: "vga_int.h" requires "ui/console.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 37/43] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 38/43] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 39/43] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 40/43] i386/pc: move vmport.c to hw/i386/,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 41/43] i386/pc: move vmmouse.c to hw/i386/, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 42/43] hw/i386/vmport: replace fprintf() by trace events, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v4 43/43] misc: drop old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- Re: [Qemu-devel] [PATCH v4 00/43] remove i386/pc dependency from non-PC world (part 1), no-reply, 2017/12/15
- Re: [Qemu-devel] [PATCH v4 00/43] remove i386/pc dependency from non-PC world (part 1), no-reply, 2017/12/16