Commit 298d893d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-06-1' into staging 



Merge tpm 2020/05/06 v1

# gpg: Signature made Wed 06 May 2020 15:16:17 BST
# gpg:                using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2020-05-06-1:
  hw: add compat machines for 5.1
  hw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off
  tpm: tpm-tis-device: set PPI to false by default

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 570a9214 541aaa1d

hw/arm/virt.c

+7 −6
Original line number Diff line number Diff line
@@ -2352,15 +2352,16 @@ static void machvirt_machine_init(void) 
}

type_init(machvirt_machine_init);



static void virt_machine_5_0_options(MachineClass *mc)

static void virt_machine_5_1_options(MachineClass *mc)

{

    static GlobalProperty compat[] = {

        { TYPE_TPM_TIS_SYSBUS, "ppi", "false" },

    };

}

DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)



    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));

static void virt_machine_5_0_options(MachineClass *mc)

{

    virt_machine_5_1_options(mc);

}

DEFINE_VIRT_MACHINE_AS_LATEST(5, 0)

DEFINE_VIRT_MACHINE(5, 0)



static void virt_machine_4_2_options(MachineClass *mc)

{

hw/core/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include "hw/mem/nvdimm.h"

#include "migration/vmstate.h"



GlobalProperty hw_compat_5_0[] = {};

const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0);



GlobalProperty hw_compat_4_2[] = {

    { "virtio-blk-device", "queue-size", "128"},

    { "virtio-scsi-device", "virtqueue_size", "128"},

hw/i386/pc.c

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ 
#include "fw_cfg.h"

#include "trace.h"



GlobalProperty pc_compat_5_0[] = {};

const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);



GlobalProperty pc_compat_4_2[] = {

    { "mch", "smbase-smram", "off" },

};

hw/i386/pc_piix.c

+13 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);

}



static void pc_i440fx_5_0_machine_options(MachineClass *m)

static void pc_i440fx_5_1_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_machine_options(m);
@@ -430,6 +430,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) 
    pcmc->default_cpu_version = 1;

}



DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,

                      pc_i440fx_5_1_machine_options);



static void pc_i440fx_5_0_machine_options(MachineClass *m)

{

    pc_i440fx_5_1_machine_options(m);

    m->alias = NULL;

    m->is_default = false;

    compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);

    compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);

}



DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,

                      pc_i440fx_5_0_machine_options);

hw/i386/pc_q35.c

+12 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->max_cpus = 288;

}



static void pc_q35_5_0_machine_options(MachineClass *m)

static void pc_q35_5_1_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_machine_options(m);
@@ -359,6 +359,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) 
    pcmc->default_cpu_version = 1;

}



DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL,

                   pc_q35_5_1_machine_options);



static void pc_q35_5_0_machine_options(MachineClass *m)

{

    pc_q35_5_1_machine_options(m);

    m->alias = NULL;

    compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);

    compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);

}



DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,

                   pc_q35_5_0_machine_options);