Commit e47dccc6 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 



pci: misc cleanups

This includes some pci-related cleanups,
and fw cfg cleanups which will be useful for on-going
pci related work.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Sun 02 Jun 2013 02:46:52 PM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (8) and Laszlo Ersek (1)
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  pvpanic: use FWCfgState explicitly
  fw_cfg: fw_cfg is a singleton
  fw_cfg: add API to find FW cfg object
  fw_cfg: move typedef to qemu/typedefs.h
  refer to FWCfgState explicitly
  apic: rename apic specific bitopts
  firmware_abi: move to include/hw/nvram/
  dec.c - move to pci-bridge
  q35: set fw_name

Message-id: 1370202787-3712-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 17139240 c3c4fe35

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int piix4_pm_initfn(PCIDevice *dev) 


i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,

                       qemu_irq sci_irq, qemu_irq smi_irq,

                       int kvm_enabled, void *fw_cfg)

                       int kvm_enabled, FWCfgState *fw_cfg)

{

    PCIDevice *dev;

    PIIX4PMState *s;

hw/core/loader.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ int rom_load_all(void) 
    return 0;

}



void rom_set_fw(void *f)

void rom_set_fw(FWCfgState *f)

{

    fw_cfg = f;

}

hw/i386/multiboot.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void mb_add_mod(MultibootState *s, 
    s->mb_mods_count++;

}



int load_multiboot(void *fw_cfg,

int load_multiboot(FWCfgState *fw_cfg,

                   FILE *f,

                   const char *kernel_filename,

                   const char *initrd_filename,

hw/i386/multiboot.h

+3 −1
Original line number Diff line number Diff line 
#ifndef QEMU_MULTIBOOT_H

#define QEMU_MULTIBOOT_H



int load_multiboot(void *fw_cfg,

#include "hw/nvram/fw_cfg.h"



int load_multiboot(FWCfgState *fw_cfg,

                   FILE *f,

                   const char *kernel_filename,

                   const char *initrd_filename,

hw/i386/pc.c

+12 −12
Original line number Diff line number Diff line
@@ -595,9 +595,9 @@ static unsigned int pc_apic_id_limit(unsigned int max_cpus) 
    return x86_cpu_apic_id_from_index(max_cpus - 1) + 1;

}



static void *bochs_bios_init(void)

static FWCfgState *bochs_bios_init(void)

{

    void *fw_cfg;

    FWCfgState *fw_cfg;

    uint8_t *smbios_table;

    size_t smbios_len;

    uint64_t *numa_fw_cfg;
@@ -674,7 +674,7 @@ static long get_file_size(FILE *f) 
    return size;

}



static void load_linux(void *fw_cfg,

static void load_linux(FWCfgState *fw_cfg,

                       const char *kernel_filename,

                       const char *initrd_filename,

                       const char *kernel_cmdline,
@@ -1012,7 +1012,7 @@ void pc_acpi_init(const char *default_dsdt) 
    }

}



void *pc_memory_init(MemoryRegion *system_memory,

FWCfgState *pc_memory_init(MemoryRegion *system_memory,

                           const char *kernel_filename,

                           const char *kernel_cmdline,

                           const char *initrd_filename,
@@ -1024,7 +1024,7 @@ void *pc_memory_init(MemoryRegion *system_memory, 
    int linux_boot, i;

    MemoryRegion *ram, *option_rom_mr;

    MemoryRegion *ram_below_4g, *ram_above_4g;

    void *fw_cfg;

    FWCfgState *fw_cfg;



    linux_boot = (kernel_filename != NULL);