mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/i386/vmport: Introduce vmport.h

Browse Source 
No functional change. This is mere refactoring.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200312165431.82118-8-liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Liran Alon 2020-03-12 18:54:22 +02:00 committed by Paolo Bonzini
parent f8bdc55037
commit d8f23d619c
5 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/pc.c
View File

@ -31,6 +31,7 @@
#include "hw/i386/apic.h" #include "hw/i386/apic.h"
#include "hw/i386/topology.h" #include "hw/i386/topology.h"
#include "hw/i386/fw_cfg.h" #include "hw/i386/fw_cfg.h"
#include "hw/i386/vmport.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
#include "hw/ide.h" #include "hw/ide.h"
@ -91,7 +92,6 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "config-devices.h" #include "config-devices.h"
#include "e820_memory_layout.h" #include "e820_memory_layout.h"
#include "vmport.h"
#include "fw_cfg.h" #include "fw_cfg.h"
#include "trace.h" #include "trace.h"

2
hw/i386/vmmouse.c
View File

@ -25,10 +25,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/i386/vmport.h"
#include "hw/input/i8042.h" #include "hw/input/i8042.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "vmport.h"
#include "cpu.h" #include "cpu.h"
/* debug only vmmouse */ /* debug only vmmouse */

2
hw/i386/vmport.c
View File

@ -30,10 +30,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/vmport.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "sysemu/hw_accel.h" #include "sysemu/hw_accel.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "vmport.h"
#include "cpu.h" #include "cpu.h"
#include "trace.h" #include "trace.h"

34
hw/i386/vmport.h
View File

@ -1,34 +0,0 @@
/*
* QEMU VMPort emulation
*
* Copyright (C) 2007 Hervé Poussineau
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef HW_I386_VMPORT_H
#define HW_I386_VMPORT_H
#define TYPE_VMPORT "vmport"
typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address);
void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque);
#endif

16
include/hw/i386/vmport.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef HW_VMPORT_H
#define HW_VMPORT_H
#include "hw/isa/isa.h"
#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);
#endif