[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/29] hw/i386/pc: Create 'vmport' device in place
From: |
Michael S. Tsirkin |
Subject: |
[PULL 26/29] hw/i386/pc: Create 'vmport' device in place |
Date: |
Mon, 4 May 2020 10:30:15 -0400 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 6 ------
hw/i386/pc.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 6ab6eda046..26e2a3d92b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -132,12 +132,6 @@ GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled);
/* vmport.c */
#define TYPE_VMPORT "vmport"
typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address);
-
-static inline void vmport_init(ISABus *bus)
-{
- isa_create_simple(bus, TYPE_VMPORT);
-}
-
void vmport_register(unsigned char command, VMPortReadFunc *func, void
*opaque);
void vmmouse_get_data(uint32_t *data);
void vmmouse_set_data(const uint32_t *data);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 5143c51653..84669ddc84 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1152,7 +1152,7 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl, bool no_vmport)
i8042 = isa_create_simple(isa_bus, "i8042");
if (!no_vmport) {
- vmport_init(isa_bus);
+ isa_create_simple(isa_bus, TYPE_VMPORT);
vmmouse = isa_try_create(isa_bus, "vmmouse");
} else {
vmmouse = NULL;
--
MST
- [PULL 12/29] checkpatch: fix acpi check with multiple file name, (continued)
- [PULL 12/29] checkpatch: fix acpi check with multiple file name, Michael S. Tsirkin, 2020/05/04
- [PULL 13/29] checkpatch: ignore allowed diff list, Michael S. Tsirkin, 2020/05/04
- [PULL 14/29] acpi: DSDT without _STA, Michael S. Tsirkin, 2020/05/04
- [PULL 15/29] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length, Michael S. Tsirkin, 2020/05/04
- [PULL 16/29] nvdimm: Use configurable ACPI IO base and size, Michael S. Tsirkin, 2020/05/04
- [PULL 20/29] bios-tables-test: test pc-dimm and nvdimm coldplug for arm/virt, Michael S. Tsirkin, 2020/05/04
- [PULL 21/29] tests/acpi: add expected tables for bios-tables-test, Michael S. Tsirkin, 2020/05/04
- [PULL 22/29] Refactor vhost_user_set_mem_table functions, Michael S. Tsirkin, 2020/05/04
- [PULL 23/29] acpi: unit-test: Ignore diff in WAET ACPI table, Michael S. Tsirkin, 2020/05/04
- [PULL 25/29] acpi: unit-test: Update WAET ACPI Table expected binaries, Michael S. Tsirkin, 2020/05/04
- [PULL 26/29] hw/i386/pc: Create 'vmport' device in place,
Michael S. Tsirkin <=
- [PULL 27/29] hw/i386/vmport: Remove unused 'hw/input/i8042.h' include, Michael S. Tsirkin, 2020/05/04
- [PULL 28/29] hw/i386: Add 'vmport.h' local header, Michael S. Tsirkin, 2020/05/04
- [PULL 29/29] hw/i386: Make vmmouse helpers static, Michael S. Tsirkin, 2020/05/04
- [PULL 24/29] acpi: Add Windows ACPI Emulated Device Table (WAET), Michael S. Tsirkin, 2020/05/04
- [PULL 17/29] hw/arm/virt: Add nvdimm hot-plug infrastructure, Michael S. Tsirkin, 2020/05/04
- [PULL 19/29] tests: Update ACPI tables list for upcoming arm/virt test changes, Michael S. Tsirkin, 2020/05/04
- [PULL 10/29] virtio-pci: update virtio pci bar layout documentation, Michael S. Tsirkin, 2020/05/04
- [PULL 18/29] hw/arm/virt: Add nvdimm hotplug support, Michael S. Tsirkin, 2020/05/04
- [PULL 04/29] acpi: add aml builder stubs, Michael S. Tsirkin, 2020/05/04
- Re: [PULL 00/29] virtio,acpi,pci,pc: backlog from pre-5.0, Peter Maydell, 2020/05/04