Commit f1e29879 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

machine: Replace QEMUMachine by MachineClass in accelerator configuration 



This minimizes QEMUMachine usage, as part of machine QOM-ification.

Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent aaa66391

include/hw/boards.h

+1 −2
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ 
#ifndef HW_BOARDS_H

#define HW_BOARDS_H



#include "qemu/typedefs.h"

#include "sysemu/blockdev.h"

#include "hw/qdev.h"

#include "qom/object.h"



typedef struct MachineClass MachineClass;



typedef struct QEMUMachineInitArgs {

    const MachineClass *machine;

    ram_addr_t ram_size;

include/hw/xen/xen.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); 


qemu_irq *xen_interrupt_controller_init(void);



int xen_init(QEMUMachine *machine);

int xen_init(MachineClass *mc);

int xen_hvm_init(MemoryRegion **ram_memory);

void xenstore_store_pv_console_info(int i, struct CharDriverState *chr);

include/qemu/typedefs.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ typedef struct MemoryListener MemoryListener; 
typedef struct MemoryMappingList MemoryMappingList;



typedef struct QEMUMachine QEMUMachine;

typedef struct MachineClass MachineClass;

typedef struct NICInfo NICInfo;

typedef struct HCIInfo HCIInfo;

typedef struct AudioState AudioState;

include/sysemu/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ extern KVMState *kvm_state; 


/* external API */



int kvm_init(QEMUMachine *machine);

int kvm_init(MachineClass *mc);



int kvm_has_sync_mmu(void);

int kvm_has_vcpu_events(void);

include/sysemu/qtest.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static inline bool qtest_enabled(void) 


bool qtest_driver(void);



int qtest_init_accel(QEMUMachine *machine);

int qtest_init_accel(MachineClass *mc);

void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);



static inline int qtest_available(void)