Commit 0d5d8a3a authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael Tokarev
Browse files

hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h" 



and remove the old i386/pc dependency.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 489983d6

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include "qemu/error-report.h"

#include "hw/pci/pci.h"

#include "qom/cpu.h"

#include "hw/i386/pc.h"

#include "target/i386/cpu.h"

#include "hw/misc/pvpanic.h"

#include "hw/timer/hpet.h"

#include "hw/acpi/acpi-defs.h"

#include "hw/acpi/acpi.h"

hw/misc/pvpanic.c

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "qemu/log.h"



#include "hw/nvram/fw_cfg.h"

#include "hw/i386/pc.h"

#include "hw/misc/pvpanic.h"



/* The bit of supported pv event */

#define PVPANIC_F_PANICKED      0
@@ -25,9 +25,8 @@ 
/* The pv event value */

#define PVPANIC_PANICKED        (1 << PVPANIC_F_PANICKED)



#define TYPE_ISA_PVPANIC_DEVICE    "pvpanic"

#define ISA_PVPANIC_DEVICE(obj)    \

    OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE)

    OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC)



static void handle_event(int event)

{
@@ -104,7 +103,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) 


uint16_t pvpanic_port(void)

{

    Object *o = object_resolve_path_type("", TYPE_ISA_PVPANIC_DEVICE, NULL);

    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);

    if (!o) {

        return 0;

    }
@@ -126,7 +125,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data) 
}



static TypeInfo pvpanic_isa_info = {

    .name          = TYPE_ISA_PVPANIC_DEVICE,

    .name          = TYPE_PVPANIC,

    .parent        = TYPE_ISA_DEVICE,

    .instance_size = sizeof(PVPanicState),

    .instance_init = pvpanic_isa_initfn,

include/hw/i386/pc.h

+0 −3
Original line number Diff line number Diff line
@@ -306,9 +306,6 @@ int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); 
void pc_system_firmware_init(MemoryRegion *rom_memory,

                             bool isapc_ram_fw);



/* pvpanic.c */

uint16_t pvpanic_port(void);



/* acpi-build.c */

void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,

                       const CPUArchIdList *apic_ids, GArray *entry);

include/hw/misc/pvpanic.h

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

 * QEMU simulated pvpanic device.

 *

 * Copyright Fujitsu, Corp. 2013

 *

 * Authors:

 *     Wen Congyang <wency@cn.fujitsu.com>

 *     Hu Tao <hutao@cn.fujitsu.com>

 *

 * 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 HW_MISC_PVPANIC_H

#define HW_MISC_PVPANIC_H



#define TYPE_PVPANIC "pvpanic"



uint16_t pvpanic_port(void);



#endif