Attachment #583762 for bug #690280

View | Details | Raw Unified | Return to bug 690280
Collapse All | Expand All

Lines 24-29 Link Here

(-)a/hw/core/machine.c (+3 lines)
24	#include "hw/pci/pci.h"	24	#include "hw/pci/pci.h"
25	#include "hw/mem/nvdimm.h"	25	#include "hw/mem/nvdimm.h"
26		26
		27	GlobalProperty hw_compat_4_0[] = {};
		28	const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
		29
27	GlobalProperty hw_compat_3_1[] = {	30	GlobalProperty hw_compat_3_1[] = {
28	{ "pcie-root-port", "x-speed", "2_5" },	31	{ "pcie-root-port", "x-speed", "2_5" },
29	{ "pcie-root-port", "x-width", "1" },	32	{ "pcie-root-port", "x-width", "1" },

Lines 115-120 struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; Link Here

(-)a/hw/i386/pc.c (+3 lines)
115	/* Physical Address of PVH entry point read from kernel ELF NOTE */	115	/* Physical Address of PVH entry point read from kernel ELF NOTE */
116	static size_t pvh_start_addr;	116	static size_t pvh_start_addr;
117		117
		118	GlobalProperty pc_compat_4_0[] = {};
		119	const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
		120
118	GlobalProperty pc_compat_3_1[] = {	121	GlobalProperty pc_compat_3_1[] = {
119	{ "intel-iommu", "dma-drain", "off" },	122	{ "intel-iommu", "dma-drain", "off" },
120	{ "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },	123	{ "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },




    m->units_per_default_bus = 1;
    m->default_machine_opts = "firmware=bios-256k.bin";
    m->default_display = "std";
    m->default_kernel_irqchip_split = false;
    m->no_floppy = 1;
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);

    m->max_cpus = 288;
}

static void pc_q35_4_0_1_machine_options(MachineClass *m)
{
    pc_q35_machine_options(m);
    m->alias = "q35";
}

DEFINE_Q35_MACHINE(v4_0_1, "pc-q35-4.0.1", NULL,
                   pc_q35_4_0_1_machine_options);

static void pc_q35_4_0_machine_options(MachineClass *m)
{
    pc_q35_4_0_1_machine_options(m);
    m->default_kernel_irqchip_split = true;
    m->alias = NULL;
    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
}

DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
                   pc_q35_4_0_machine_options);


Lines 293-298 struct MachineState { Link Here

(-)a/include/hw/boards.h (+3 lines)
293	} \	293	} \
294	type_init(machine_initfn##_register_types)	294	type_init(machine_initfn##_register_types)
295		295
		296	extern GlobalProperty hw_compat_4_0[];
		297	extern const size_t hw_compat_4_0_len;
		298
296	extern GlobalProperty hw_compat_3_1[];	299	extern GlobalProperty hw_compat_3_1[];
297	extern const size_t hw_compat_3_1_len;	300	extern const size_t hw_compat_3_1_len;
298		301

Lines 293-298 int e820_add_entry(uint64_t, uint64_t, uint32_t); Link Here

(-)a/include/hw/i386/pc.h (+3 lines)
293	int e820_get_num_entries(void);	293	int e820_get_num_entries(void);
294	bool e820_get_entry(int, uint32_t, uint64_t , uint64_t );	294	bool e820_get_entry(int, uint32_t, uint64_t , uint64_t );
295		295
		296	extern GlobalProperty pc_compat_4_0[];
		297	extern const size_t pc_compat_4_0_len;
		298
296	extern GlobalProperty pc_compat_3_1[];	299	extern GlobalProperty pc_compat_3_1[];
297	extern const size_t pc_compat_3_1_len;	300	extern const size_t pc_compat_3_1_len;

Return to bug 690280

Lines 357-363 static void pc_q35_machine_options(MachineClass *m) Link Here

(-)a/hw/i386/pc_q35.c (-2 / +14 lines)
357	m->units_per_default_bus = 1;	357	m->units_per_default_bus = 1;
358	m->default_machine_opts = "firmware=bios-256k.bin";	358	m->default_machine_opts = "firmware=bios-256k.bin";
359	m->default_display = "std";	359	m->default_display = "std";
360	m->default_kernel_irqchip_split = true;	360	m->default_kernel_irqchip_split = false;
361	m->no_floppy = 1;	361	m->no_floppy = 1;
362	machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);	362	machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
363	machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);	363	machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
Lines 365-376 static void pc_q35_machine_options(MachineClass *m) Link Here
365	m->max_cpus = 288;	365	m->max_cpus = 288;
366	}	366	}
367		367
368	static void pc_q35_4_0_machine_options(MachineClass *m)	368	static void pc_q35_4_0_1_machine_options(MachineClass *m)
369	{	369	{
370	pc_q35_machine_options(m);	370	pc_q35_machine_options(m);
371	m->alias = "q35";	371	m->alias = "q35";
372	}	372	}
373		373
		374	DEFINE_Q35_MACHINE(v4_0_1, "pc-q35-4.0.1", NULL,
		375	pc_q35_4_0_1_machine_options);
		376
		377	static void pc_q35_4_0_machine_options(MachineClass *m)
		378	{
		379	pc_q35_4_0_1_machine_options(m);
		380	m->default_kernel_irqchip_split = true;
		381	m->alias = NULL;
		382	compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
		383	compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
		384	}
		385
374	DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,	386	DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
375	pc_q35_4_0_machine_options);	387	pc_q35_4_0_machine_options);
376		388