mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: hw/pc.c: Fix converting of ioport_register* to MemoryRegion Replace remaining gmtime, localtime by gmtime_r, localtime_r savevm: Remove MinGW specific code which is no longer needed qga/channel-posix.c: Explicitly include string.h configure: Fix comment (copy+paste bug) readline: avoid memcpy() of overlapping regions Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
commit
fedf2de310
9 changed files with 22 additions and 52 deletions
12
hw/pc.c
12
hw/pc.c
|
@ -103,6 +103,11 @@ static void ioport80_write(void *opaque, hwaddr addr, uint64_t data,
|
|||
{
|
||||
}
|
||||
|
||||
static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
|
||||
{
|
||||
return 0xffffffffffffffff;
|
||||
}
|
||||
|
||||
/* MSDOS compatibility mode FPU exception support */
|
||||
static qemu_irq ferr_irq;
|
||||
|
||||
|
@ -123,6 +128,11 @@ static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data,
|
|||
qemu_irq_lower(ferr_irq);
|
||||
}
|
||||
|
||||
static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
|
||||
{
|
||||
return 0xffffffffffffffff;
|
||||
}
|
||||
|
||||
/* TSC handling */
|
||||
uint64_t cpu_get_tsc(CPUX86State *env)
|
||||
{
|
||||
|
@ -960,6 +970,7 @@ static void cpu_request_exit(void *opaque, int irq, int level)
|
|||
|
||||
static const MemoryRegionOps ioport80_io_ops = {
|
||||
.write = ioport80_write,
|
||||
.read = ioport80_read,
|
||||
.endianness = DEVICE_NATIVE_ENDIAN,
|
||||
.impl = {
|
||||
.min_access_size = 1,
|
||||
|
@ -969,6 +980,7 @@ static const MemoryRegionOps ioport80_io_ops = {
|
|||
|
||||
static const MemoryRegionOps ioportF0_io_ops = {
|
||||
.write = ioportF0_write,
|
||||
.read = ioportF0_read,
|
||||
.endianness = DEVICE_NATIVE_ENDIAN,
|
||||
.impl = {
|
||||
.min_access_size = 1,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue