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

hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35

5.0 machine type uses 4.2 compats. This seems to be incorrect, since
the latests machine type by now is 5.0 and it should use its own
compat or shouldn't use any relying on the defaults.
Seems, like this appeared because of some problems on merge/rebase.

Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
Message-Id: <20191223072856.5369-1-dplotnikov@virtuozzo.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Denis Plotnikov and committed by
Michael S. Tsirkin
d940208c f0472439

-2
-1
hw/i386/pc_piix.c
··· 425 425 m->alias = "pc"; 426 426 m->is_default = 1; 427 427 pcmc->default_cpu_version = 1; 428 - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); 429 428 } 430 429 431 430 DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,
-1
hw/i386/pc_q35.c
··· 354 354 pc_q35_machine_options(m); 355 355 m->alias = "q35"; 356 356 pcmc->default_cpu_version = 1; 357 - compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); 358 357 } 359 358 360 359 DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,