mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
pc,pci,virtio fixes and cleanups
This includes pc and pci cleanups, future-proofing of ROM files, and a virtio bugfix correcting splice on virtio console. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJSGvbsAAoJECgfDbjSjVRp0qsH/2N/b/5bNhL6gx5Kjigzv7Lt bmCUsSsUm/Rnhke2SpDPVdIOU9W5WIX2zte8qiXuBJi3j/RS9procbgUZrCetpUI GHQOn+n8e2TX/P9CIcHaN/bA1b+Kx+bvaVbDL/6P2PJvodbDGwDLp/9y+Tisv5Ye kLow8Y4ZJcaTlmPf/Mh1AnhNa3gel231A3qwugVUNDSyITM6pG/0M07xk8YBj+JJ 6DYrlK0bKMNDxPu5St+YP94D1ODv2zM1aio/TdMUaNfqTZM1iqGTj3zKkBS2PjT0 RhuU2x4N91lY/uCdudtWSj5dYtfRT/xw7qwNAz9IHNz6RlGeX0n++ClMC8z9Y8A= =Pc09 -----END PGP SIGNATURE----- Merge remote-tracking branch 'mst/tags/for_anthony' into stable-1.5 pc,pci,virtio fixes and cleanups This includes pc and pci cleanups, future-proofing of ROM files, and a virtio bugfix correcting splice on virtio console. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon 26 Aug 2013 01:34:20 AM CDT using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Markus Armbruster (5) and others # Via Michael S. Tsirkin * mst/tags/for_anthony: virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table pc_piix: Kill pc_init1() memory region args pc: pc_compat_1_4() now can call pc_compat_1_5() pc: Create pc_compat_*() functions pc: Kill pc_init_pci_1_0() pc: Don't explode QEMUMachineInitArgs into local variables needlessly pc: Don't prematurely explode QEMUMachineInitArgs ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params ppc: Don't explode QEMUMachineInitArgs into local variables needlessly sun4: Don't prematurely explode QEMUMachineInitArgs q35: Add PCIe switch to example q35 configuration loader: store FW CFG ROM files in RAM arch_init: align MR size to target page size pc: cleanup 1.4 compat support Message-id: 1377535318-30491-1-git-send-email-mst@redhat.com
This commit is contained in:
Anthony Liguori
commit
3e998a7788
13 changed files with 233 additions and 272 deletions
|
|
@ -124,13 +124,14 @@ static void dt_serial_create(void *fdt, unsigned long long offset,
|
|||
}
|
||||
|
||||
static int ppce500_load_device_tree(CPUPPCState *env,
|
||||
QEMUMachineInitArgs *args,
|
||||
PPCE500Params *params,
|
||||
hwaddr addr,
|
||||
hwaddr initrd_base,
|
||||
hwaddr initrd_size)
|
||||
{
|
||||
int ret = -1;
|
||||
uint64_t mem_reg_property[] = { 0, cpu_to_be64(params->ram_size) };
|
||||
uint64_t mem_reg_property[] = { 0, cpu_to_be64(args->ram_size) };
|
||||
int fdt_size;
|
||||
void *fdt;
|
||||
uint8_t hypercall[16];
|
||||
|
|
@ -205,7 +206,7 @@ static int ppce500_load_device_tree(CPUPPCState *env,
|
|||
}
|
||||
|
||||
ret = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs",
|
||||
params->kernel_cmdline);
|
||||
args->kernel_cmdline);
|
||||
if (ret < 0)
|
||||
fprintf(stderr, "couldn't set /chosen/bootargs\n");
|
||||
|
||||
|
|
@ -559,7 +560,7 @@ static qemu_irq *ppce500_init_mpic(PPCE500Params *params, MemoryRegion *ccsr,
|
|||
return mpic;
|
||||
}
|
||||
|
||||
void ppce500_init(PPCE500Params *params)
|
||||
void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params)
|
||||
{
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||
|
|
@ -584,8 +585,8 @@ void ppce500_init(PPCE500Params *params)
|
|||
PPCE500CCSRState *ccsr;
|
||||
|
||||
/* Setup CPUs */
|
||||
if (params->cpu_model == NULL) {
|
||||
params->cpu_model = "e500v2_v30";
|
||||
if (args->cpu_model == NULL) {
|
||||
args->cpu_model = "e500v2_v30";
|
||||
}
|
||||
|
||||
irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
|
||||
|
|
@ -595,7 +596,7 @@ void ppce500_init(PPCE500Params *params)
|
|||
CPUState *cs;
|
||||
qemu_irq *input;
|
||||
|
||||
cpu = cpu_ppc_init(params->cpu_model);
|
||||
cpu = cpu_ppc_init(args->cpu_model);
|
||||
if (cpu == NULL) {
|
||||
fprintf(stderr, "Unable to initialize CPU!\n");
|
||||
exit(1);
|
||||
|
|
@ -634,7 +635,7 @@ void ppce500_init(PPCE500Params *params)
|
|||
|
||||
/* Fixup Memory size on a alignment boundary */
|
||||
ram_size &= ~(RAM_SIZES_ALIGN - 1);
|
||||
params->ram_size = ram_size;
|
||||
args->ram_size = ram_size;
|
||||
|
||||
/* Register Memory */
|
||||
memory_region_init_ram(ram, NULL, "mpc8544ds.ram", ram_size);
|
||||
|
|
@ -701,11 +702,11 @@ void ppce500_init(PPCE500Params *params)
|
|||
sysbus_create_simple("e500-spin", MPC8544_SPIN_BASE, NULL);
|
||||
|
||||
/* Load kernel. */
|
||||
if (params->kernel_filename) {
|
||||
kernel_size = load_uimage(params->kernel_filename, &entry,
|
||||
if (args->kernel_filename) {
|
||||
kernel_size = load_uimage(args->kernel_filename, &entry,
|
||||
&loadaddr, NULL);
|
||||
if (kernel_size < 0) {
|
||||
kernel_size = load_elf(params->kernel_filename, NULL, NULL,
|
||||
kernel_size = load_elf(args->kernel_filename, NULL, NULL,
|
||||
&elf_entry, &elf_lowaddr, NULL, 1,
|
||||
ELF_MACHINE, 0);
|
||||
entry = elf_entry;
|
||||
|
|
@ -714,7 +715,7 @@ void ppce500_init(PPCE500Params *params)
|
|||
/* XXX try again as binary */
|
||||
if (kernel_size < 0) {
|
||||
fprintf(stderr, "qemu: could not load kernel '%s'\n",
|
||||
params->kernel_filename);
|
||||
args->kernel_filename);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -726,14 +727,14 @@ void ppce500_init(PPCE500Params *params)
|
|||
}
|
||||
|
||||
/* Load initrd. */
|
||||
if (params->initrd_filename) {
|
||||
if (args->initrd_filename) {
|
||||
initrd_base = (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK;
|
||||
initrd_size = load_image_targphys(params->initrd_filename, initrd_base,
|
||||
initrd_size = load_image_targphys(args->initrd_filename, initrd_base,
|
||||
ram_size - initrd_base);
|
||||
|
||||
if (initrd_size < 0) {
|
||||
fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
|
||||
params->initrd_filename);
|
||||
args->initrd_filename);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -741,12 +742,12 @@ void ppce500_init(PPCE500Params *params)
|
|||
}
|
||||
|
||||
/* If we're loading a kernel directly, we must load the device tree too. */
|
||||
if (params->kernel_filename) {
|
||||
if (args->kernel_filename) {
|
||||
struct boot_info *boot_info;
|
||||
int dt_size;
|
||||
|
||||
dt_size = ppce500_load_device_tree(env, params, dt_base, initrd_base,
|
||||
initrd_size);
|
||||
dt_size = ppce500_load_device_tree(env, args, params, dt_base,
|
||||
initrd_base, initrd_size);
|
||||
if (dt_size < 0) {
|
||||
fprintf(stderr, "couldn't load device tree\n");
|
||||
exit(1);
|
||||
|
|
|
|||
|
|
@ -1,25 +1,18 @@
|
|||
#ifndef PPCE500_H
|
||||
#define PPCE500_H
|
||||
|
||||
#include "hw/boards.h"
|
||||
|
||||
typedef struct PPCE500Params {
|
||||
/* Standard QEMU machine init params */
|
||||
ram_addr_t ram_size;
|
||||
const char *boot_device;
|
||||
const char *kernel_filename;
|
||||
const char *kernel_cmdline;
|
||||
const char *initrd_filename;
|
||||
const char *cpu_model;
|
||||
int pci_first_slot;
|
||||
int pci_nr_slots;
|
||||
|
||||
/* e500-specific params */
|
||||
|
||||
/* required -- must at least add toplevel board compatible */
|
||||
void (*fixup_devtree)(struct PPCE500Params *params, void *fdt);
|
||||
|
||||
int mpic_version;
|
||||
} PPCE500Params;
|
||||
|
||||
void ppce500_init(PPCE500Params *params);
|
||||
void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -30,19 +30,7 @@ static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
|
|||
|
||||
static void e500plat_init(QEMUMachineInitArgs *args)
|
||||
{
|
||||
ram_addr_t ram_size = args->ram_size;
|
||||
const char *boot_device = args->boot_device;
|
||||
const char *cpu_model = args->cpu_model;
|
||||
const char *kernel_filename = args->kernel_filename;
|
||||
const char *kernel_cmdline = args->kernel_cmdline;
|
||||
const char *initrd_filename = args->initrd_filename;
|
||||
PPCE500Params params = {
|
||||
.ram_size = ram_size,
|
||||
.boot_device = boot_device,
|
||||
.kernel_filename = kernel_filename,
|
||||
.kernel_cmdline = kernel_cmdline,
|
||||
.initrd_filename = initrd_filename,
|
||||
.cpu_model = cpu_model,
|
||||
.pci_first_slot = 0x1,
|
||||
.pci_nr_slots = PCI_SLOT_MAX - 1,
|
||||
.fixup_devtree = e500plat_fixup_devtree,
|
||||
|
|
@ -55,7 +43,7 @@ static void e500plat_init(QEMUMachineInitArgs *args)
|
|||
params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20;
|
||||
}
|
||||
|
||||
ppce500_init(¶ms);
|
||||
ppce500_init(args, ¶ms);
|
||||
}
|
||||
|
||||
static QEMUMachine e500plat_machine = {
|
||||
|
|
|
|||
|
|
@ -28,26 +28,14 @@ static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
|
|||
|
||||
static void mpc8544ds_init(QEMUMachineInitArgs *args)
|
||||
{
|
||||
ram_addr_t ram_size = args->ram_size;
|
||||
const char *boot_device = args->boot_device;
|
||||
const char *cpu_model = args->cpu_model;
|
||||
const char *kernel_filename = args->kernel_filename;
|
||||
const char *kernel_cmdline = args->kernel_cmdline;
|
||||
const char *initrd_filename = args->initrd_filename;
|
||||
PPCE500Params params = {
|
||||
.ram_size = ram_size,
|
||||
.boot_device = boot_device,
|
||||
.kernel_filename = kernel_filename,
|
||||
.kernel_cmdline = kernel_cmdline,
|
||||
.initrd_filename = initrd_filename,
|
||||
.cpu_model = cpu_model,
|
||||
.pci_first_slot = 0x11,
|
||||
.pci_nr_slots = 2,
|
||||
.fixup_devtree = mpc8544ds_fixup_devtree,
|
||||
.mpic_version = OPENPIC_MODEL_FSL_MPIC_20,
|
||||
};
|
||||
|
||||
ppce500_init(¶ms);
|
||||
ppce500_init(args, ¶ms);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue