Commit e4e8ba04 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Eliminate PcGuestInfo struct 



The struct is not used for anything, now.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent dd4c2f01

hw/i386/pc.c

+1 −3
Original line number Diff line number Diff line
@@ -1183,9 +1183,8 @@ void pc_machine_done(Notifier *notifier, void *data) 
    acpi_setup();

}



PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)

void pc_guest_info_init(PCMachineState *pcms)

{

    PcGuestInfo *guest_info = &pcms->acpi_guest_info;

    int i, j;



    pcms->apic_id_limit = pc_apic_id_limit(max_cpus);
@@ -1213,7 +1212,6 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms) 


    pcms->machine_done.notify = pc_machine_done;

    qemu_add_machine_init_done_notifier(&pcms->machine_done);

    return guest_info;

}



/* setup pci memory address space mapping into system address space */

include/hw/i386/pc.h

+1 −6
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
#define kvm_ioapic_in_kernel()   0

#endif



/* Machine info for ACPI build: */

struct PcGuestInfo {

};



/**

 * PCMachineState:

 * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling
@@ -49,7 +45,6 @@ struct PCMachineState { 


    /* State for other subsystems/APIs: */

    MemoryHotplugState hotplug_memory;

    PcGuestInfo acpi_guest_info;

    Notifier machine_done;



    /* Pointers to devices and objects: */
@@ -233,7 +228,7 @@ void pc_cpus_init(PCMachineState *pcms); 
void pc_hot_add_cpu(const int64_t id, Error **errp);

void pc_acpi_init(const char *default_dsdt);



PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);

void pc_guest_info_init(PCMachineState *pcms);



#define PCI_HOST_PROP_PCI_HOLE_START   "pci-hole-start"

#define PCI_HOST_PROP_PCI_HOLE_END     "pci-hole-end"