jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

pc: Add 2.9 machine-types

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Gabriel Somlo <somlo@cmu.edu>
Tested-by: Gabriel Somlo <somlo@cmu.edu>
Cc: Gabriel Somlo <somlo@cmu.edu>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

authored by

Eduardo Habkost and committed by
Michael S. Tsirkin d580bd4b e12f3a13

+25 -5
+12 -3
hw/i386/pc_piix.c
··· 437 437 m->default_display = "std"; 438 438 } 439 439 440 - static void pc_i440fx_2_8_machine_options(MachineClass *m) 440 + static void pc_i440fx_2_9_machine_options(MachineClass *m) 441 441 { 442 442 pc_i440fx_machine_options(m); 443 443 m->alias = "pc"; 444 444 m->is_default = 1; 445 445 } 446 446 447 + DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL, 448 + pc_i440fx_2_9_machine_options); 449 + 450 + static void pc_i440fx_2_8_machine_options(MachineClass *m) 451 + { 452 + pc_i440fx_2_9_machine_options(m); 453 + m->is_default = 0; 454 + m->alias = NULL; 455 + SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); 456 + } 457 + 447 458 DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, 448 459 pc_i440fx_2_8_machine_options); 449 460 ··· 451 462 static void pc_i440fx_2_7_machine_options(MachineClass *m) 452 463 { 453 464 pc_i440fx_2_8_machine_options(m); 454 - m->is_default = 0; 455 - m->alias = NULL; 456 465 SET_MACHINE_COMPAT(m, PC_COMPAT_2_7); 457 466 } 458 467
+11 -2
hw/i386/pc_q35.c
··· 301 301 m->max_cpus = 288; 302 302 } 303 303 304 - static void pc_q35_2_8_machine_options(MachineClass *m) 304 + static void pc_q35_2_9_machine_options(MachineClass *m) 305 305 { 306 306 pc_q35_machine_options(m); 307 307 m->alias = "q35"; 308 308 } 309 309 310 + DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL, 311 + pc_q35_2_9_machine_options); 312 + 313 + static void pc_q35_2_8_machine_options(MachineClass *m) 314 + { 315 + pc_q35_2_9_machine_options(m); 316 + m->alias = NULL; 317 + SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); 318 + } 319 + 310 320 DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, 311 321 pc_q35_2_8_machine_options); 312 322 313 323 static void pc_q35_2_7_machine_options(MachineClass *m) 314 324 { 315 325 pc_q35_2_8_machine_options(m); 316 - m->alias = NULL; 317 326 m->max_cpus = 255; 318 327 SET_MACHINE_COMPAT(m, PC_COMPAT_2_7); 319 328 }
+2
include/hw/i386/pc.h
··· 375 375 bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 376 376 377 377 #define PC_COMPAT_2_8 \ 378 + HW_COMPAT_2_8 \ 379 + 378 380 379 381 #define PC_COMPAT_2_7 \ 380 382 HW_COMPAT_2_7 \