Commit 8571ed35 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm-all: move internal types to kvm_int.h 



i386 code will have to define a different KVMMemoryListener.  Create
an internal header so that KVMSlot is not exposed outside.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 714f78c5

include/sysemu/kvm_int.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Internal definitions for a target's KVM support

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */



#ifndef QEMU_KVM_INT_H

#define QEMU_KVM_INT_H



#include "sysemu/sysemu.h"

#include "sysemu/accel.h"

#include "sysemu/kvm.h"



typedef struct KVMSlot

{

    hwaddr start_addr;

    ram_addr_t memory_size;

    void *ram;

    int slot;

    int flags;

} KVMSlot;



#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")



#define KVM_STATE(obj) \

    OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL)



#endif

kvm-all.c

+1 −17
Original line number Diff line number Diff line
@@ -24,13 +24,11 @@ 
#include "qemu/atomic.h"

#include "qemu/option.h"

#include "qemu/config-file.h"

#include "sysemu/sysemu.h"

#include "sysemu/accel.h"

#include "hw/hw.h"

#include "hw/pci/msi.h"

#include "hw/s390x/adapter.h"

#include "exec/gdbstub.h"

#include "sysemu/kvm.h"

#include "sysemu/kvm_int.h"

#include "qemu/bswap.h"

#include "exec/memory.h"

#include "exec/ram_addr.h"
@@ -60,15 +58,6 @@ 


#define KVM_MSI_HASHTAB_SIZE    256



typedef struct KVMSlot

{

    hwaddr start_addr;

    ram_addr_t memory_size;

    void *ram;

    int slot;

    int flags;

} KVMSlot;



struct KVMState

{

    AccelState parent_obj;
@@ -106,11 +95,6 @@ struct KVMState 
#endif

};



#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")



#define KVM_STATE(obj) \

    OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL)



KVMState *kvm_state;

bool kvm_kernel_irqchip;

bool kvm_async_interrupts_allowed;