qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] fed163: imx_ccm: Rename IMX_GET_CLASS macro

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] fed163: imx_ccm: Rename IMX_GET_CLASS macro
Date: Wed, 02 Sep 2020 12:15:28 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fed163c987667c233d799a1830ff20481487b635
      
https://github.com/qemu/qemu/commit/fed163c987667c233d799a1830ff20481487b635
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/misc/imx_ccm.c
    M include/hw/misc/imx_ccm.h

  Log Message:
  -----------
  imx_ccm: Rename IMX_GET_CLASS macro

Rename it to IMX_CCM_GET_CLASS to be consistent with the existing
IMX_CCM and IXM_CCM_CLASS macro.

This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-45-ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 9db70dac85446d7cb86669c39d1f4278f033337e
      
https://github.com/qemu/qemu/commit/9db70dac85446d7cb86669c39d1f4278f033337e
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/misc/mac_via.c
    M hw/misc/macio/cuda.c
    M hw/misc/macio/pmu.c
    M hw/misc/mos6522.c
    M include/hw/misc/mos6522.h

  Log Message:
  -----------
  mos6522: Rename QOM macros

Rename the MOS6522_DEVICE_CLASS and MOS6522_DEVICE_GET_CLASS
macros to be consistent with the TYPE_MOS6522 and MOS6522 macros.

This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-46-ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 30c60f77a81c07f897ec4f482713f2d181509c78
      
https://github.com/qemu/qemu/commit/30c60f77a81c07f897ec4f482713f2d181509c78
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/i386/amd_iommu.c
    M hw/i386/intel_iommu.c
    M hw/i386/x86-iommu.c
    M include/hw/i386/x86-iommu.h
    M target/i386/kvm.c

  Log Message:
  -----------
  x86-iommu: Rename QOM type macros

Some QOM macros were using a X86_IOMMU_DEVICE prefix, and others
were using a X86_IOMMU prefix.  Rename all of them to use the
same X86_IOMMU_DEVICE prefix.

This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-47-ehabkost@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 7b4433bb93f2a4e934aa451b3db4b268f440c8e3
      
https://github.com/qemu/qemu/commit/7b4433bb93f2a4e934aa451b3db4b268f440c8e3
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/rdma/vmw/pvrdma_main.c
    M include/hw/rdma/rdma.h

  Log Message:
  -----------
  rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro

Rename the macro to be consistent with RDMA_PROVIDER and
RDMA_PROVIDER_GET_CLASS.

This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-48-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 37e3d65043229bb20bd07af74dc0866e12071415
      
https://github.com/qemu/qemu/commit/37e3d65043229bb20bd07af74dc0866e12071415
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/arm/cpu-qom.h

  Log Message:
  -----------
  arm: Fix typo in AARCH64_CPU_GET_CLASS definition

There's a typo in the type name of AARCH64_CPU_GET_CLASS.  This
was never detected because the macro is not used by any code.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-52-ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 38688fdbe9c5db9ca5ed22f9f6881ab444abcb1d
      
https://github.com/qemu/qemu/commit/38688fdbe9c5db9ca5ed22f9f6881ab444abcb1d
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/rx/rx-gdbsim.c
    M target/rx/cpu-qom.h
    M target/rx/cpu.c
    M target/rx/gdbstub.c
    M target/rx/helper.c
    M target/rx/translate.c

  Log Message:
  -----------
  rx: Rename QOM type check macros

Currently we have a RXCPU typedef and a RXCPU type checking
macro, but OBJECT_DECLARE* would transform the RXCPU macro into a
function, and the function name would conflict with the typedef
name.

Rename the RXCPU* QOM type check macros to RX_CPU*, so we will
avoid the conflict and make the macro names consistent with the
TYPE_RX_CPU constant name.

This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-53-ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: b116cedd5ffe8721a8de16c5bf5f792866b8eb31
      
https://github.com/qemu/qemu/commit/b116cedd5ffe8721a8de16c5bf5f792866b8eb31
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/rx/cpu-qom.h
    M target/rx/cpu.h

  Log Message:
  -----------
  rx: Move typedef RXCPU to cpu-qom.h

Move the typedef closer to the QOM type checking macros.
This will make future conversion to OBJECT_DECLARE* easier.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20200825192110.3528606-54-ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: edf632ee66f957dbd410e7a55e3bdd02bca9d112
      
https://github.com/qemu/qemu/commit/edf632ee66f957dbd410e7a55e3bdd02bca9d112
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/audio/hda-codec.c

  Log Message:
  -----------
  hda-audio: Set instance_size at base class

Setting instance_size correctly at the base class will help us
avoid mistakes when declaring new subclasses.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200826171005.4055015-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: a7c893a1c4df756fdd14413f42d2732150b3e089
      
https://github.com/qemu/qemu/commit/a7c893a1c4df756fdd14413f42d2732150b3e089
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M crypto/tls-cipher-suites.c

  Log Message:
  -----------
  tls-cipher-suites: Correct instance_size

We do have a QCryptoTLSCipherSuites struct.  It must be used when
setting instance_size of the QOM type.  Luckily this never caused
problems because the QCryptoTLSCipherSuites struct has only a
parent_obj field and nothing else.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200826171005.4055015-5-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: fb49865d26d18a7a39c3de49f81874e218a64e81
      
https://github.com/qemu/qemu/commit/fb49865d26d18a7a39c3de49f81874e218a64e81
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/i386/pc.c
    M target/i386/cpu.c
    M target/i386/cpu.h

  Log Message:
  -----------
  Revert "i386: Fix pkg_id offset for EPYC cpu models"

This reverts commit 7b225762c8c05fd31d4c2be116aedfbc00383f8b.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Also fix all the references of pkg_offset.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889933119.21294.8112825730577505757.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 081599cb9f9b2043aa543907e932bc6f2bb315ba
      
https://github.com/qemu/qemu/commit/081599cb9f9b2043aa543907e932bc6f2bb315ba
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  Revert "target/i386: Enable new apic id encoding for EPYC based cpus models"

This reverts commit 247b18c593ec298446645af8d5d28911daf653b1.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889933756.21294.13999336052652073520.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: dfe7ed0a896e23451abf699bf17a9eedd0ba2b1f
      
https://github.com/qemu/qemu/commit/dfe7ed0a896e23451abf699bf17a9eedd0ba2b1f
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/x86.c

  Log Message:
  -----------
  Revert "hw/i386: Move arch_id decode inside x86_cpus_init"

This reverts commit 2e26f4ab3bf8390a2677d3afd9b1a04f015d7721.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889934379.21294.15323080164340490855.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: e77fc3ecc02d3b791a53cf87b81b4bd061e3dcac
      
https://github.com/qemu/qemu/commit/e77fc3ecc02d3b791a53cf87b81b4bd061e3dcac
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/i386/cpu.c
    M target/i386/cpu.h

  Log Message:
  -----------
  Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition"

This reverts commit 0c1538cb1a26287c072645f4759b9872b1596d79.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889935015.21294.1425332462852607813.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 0a714bff6c1506c11ae6fc5806112b998f3d1d46
      
https://github.com/qemu/qemu/commit/0a714bff6c1506c11ae6fc5806112b998f3d1d46
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/i386/x86.c
    M include/hw/i386/x86.h

  Log Message:
  -----------
  Revert "hw/i386: Introduce apicid functions inside X86MachineState"

This reverts commit 6121c7fbfd98dbc3af1b00b56ff2eef66df87828.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889935648.21294.8095493980805969544.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 08ead27169c78e979570cebd1e16be59947a7087
      
https://github.com/qemu/qemu/commit/08ead27169c78e979570cebd1e16be59947a7087
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  Revert "target/i386: Cleanup and use the EPYC mode topology functions"

This reverts commit dd08ef0318e2b61d14bc069590d174913f7f437a.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889936257.21294.1786224705357428082.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 10f20ae96b76aeaa97fbd37e757eee49b4ec77a8
      
https://github.com/qemu/qemu/commit/10f20ae96b76aeaa97fbd37e757eee49b4ec77a8
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M include/hw/i386/topology.h

  Log Message:
  -----------
  Revert "hw/386: Add EPYC mode topology decoding functions"

This reverts commit 7568b205555a6405042f62c64af3268f4330aed5.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889936871.21294.1454526726636639780.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 0a48666a31575f1dc4e4c63f2edaa29c16923fb7
      
https://github.com/qemu/qemu/commit/0a48666a31575f1dc4e4c63f2edaa29c16923fb7
  Author: Babu Moger <babu.moger@amd.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/x86.c
    M include/hw/i386/topology.h
    M target/i386/cpu.c
    M target/i386/cpu.h
    M tests/test-x86-cpuid.c

  Log Message:
  -----------
  Revert "hw/i386: Update structures to save the number of nodes per package"

This reverts commit c24a41bb53c0854d22c96b30d57cfcaa543c409d.

Remove the EPYC specific apicid decoding and use the generic
default decoding.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889937478.21294.4192291354416942986.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: 74ded8b487a074aff89a642630c0402053f80d1b
      
https://github.com/qemu/qemu/commit/74ded8b487a074aff89a642630c0402053f80d1b
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-pci.c

  Log Message:
  -----------
  virtio: add Virtio*BusClass sizes

Both VirtioPCIBusClass and VirtioCcwBusClass are typedefs of
VirtioBusClass, but set .class_size in the TypeInfo anyway
to be safe if that changes in the future.

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Message-Id: <20200824122051.99432-1-cohuck@redhat.com>


  Commit: 3aa8203e5ef460f9e22ca1dd78f2013fa9610276
      
https://github.com/qemu/qemu/commit/3aa8203e5ef460f9e22ca1dd78f2013fa9610276
  Author: Pan Nengyuan <pannengyuan@huawei.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  target/i386/cpu: Fix memleak in x86_cpu_class_check_missing_features

'err' forgot to free in x86_cpu_class_check_missing_features error path.
Fix that.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200831134315.1221-7-pannengyuan@huawei.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: efacd5b89643ea98c9377630f9054de8b380008b
      
https://github.com/qemu/qemu/commit/efacd5b89643ea98c9377630f9054de8b380008b
  Author: Pan Nengyuan <pannengyuan@huawei.com>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M target/i386/sev.c

  Log Message:
  -----------
  target/i386/sev: Plug memleak in sev_read_file_base64

Missing g_error_free() in sev_read_file_base64() error path.
Fix that.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200831134315.1221-5-pannengyuan@huawei.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


  Commit: ed215cec0fcaeaece064b0fdf37fe3bceb06d76c
      
https://github.com/qemu/qemu/commit/ed215cec0fcaeaece064b0fdf37fe3bceb06d76c
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-02 (Wed, 02 Sep 2020)

  Changed paths:
    M crypto/tls-cipher-suites.c
    M hw/audio/hda-codec.c
    M hw/i386/amd_iommu.c
    M hw/i386/intel_iommu.c
    M hw/i386/pc.c
    M hw/i386/x86-iommu.c
    M hw/i386/x86.c
    M hw/misc/imx_ccm.c
    M hw/misc/mac_via.c
    M hw/misc/macio/cuda.c
    M hw/misc/macio/pmu.c
    M hw/misc/mos6522.c
    M hw/rdma/vmw/pvrdma_main.c
    M hw/rx/rx-gdbsim.c
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-pci.c
    M include/hw/i386/topology.h
    M include/hw/i386/x86-iommu.h
    M include/hw/i386/x86.h
    M include/hw/misc/imx_ccm.h
    M include/hw/misc/mos6522.h
    M include/hw/rdma/rdma.h
    M target/arm/cpu-qom.h
    M target/i386/cpu.c
    M target/i386/cpu.h
    M target/i386/kvm.c
    M target/i386/sev.c
    M target/rx/cpu-qom.h
    M target/rx/cpu.c
    M target/rx/cpu.h
    M target/rx/gdbstub.c
    M target/rx/helper.c
    M target/rx/translate.c
    M tests/test-x86-cpuid.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/ehabkost/tags/machine-next-pull-request' into staging

x86 and machine queue, 2020-09-02

Bug fixes:
* Revert EPYC topology patches that caused regressions
  (Babu Moger)
* Memory leak fixes (Pan Nengyuan)

QOM Cleanups:
* Fix typo in AARCH64_CPU_GET_CLASS
* Rename QOM macros for consistency and/or to avoid
  conflicts with other symbols
* Move typedefs to header files
* Correct instance/class sizes

# gpg: Signature made Wed 02 Sep 2020 12:49:57 BST
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  target/i386/sev: Plug memleak in sev_read_file_base64
  target/i386/cpu: Fix memleak in x86_cpu_class_check_missing_features
  virtio: add Virtio*BusClass sizes
  Revert "hw/i386: Update structures to save the number of nodes per package"
  Revert "hw/386: Add EPYC mode topology decoding functions"
  Revert "target/i386: Cleanup and use the EPYC mode topology functions"
  Revert "hw/i386: Introduce apicid functions inside X86MachineState"
  Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition"
  Revert "hw/i386: Move arch_id decode inside x86_cpus_init"
  Revert "target/i386: Enable new apic id encoding for EPYC based cpus models"
  Revert "i386: Fix pkg_id offset for EPYC cpu models"
  tls-cipher-suites: Correct instance_size
  hda-audio: Set instance_size at base class
  rx: Move typedef RXCPU to cpu-qom.h
  rx: Rename QOM type check macros
  arm: Fix typo in AARCH64_CPU_GET_CLASS definition
  rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro
  x86-iommu: Rename QOM type macros
  mos6522: Rename QOM macros
  imx_ccm: Rename IMX_GET_CLASS macro

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/7068d5ef399b...ed215cec0fca
reply via email to
[Prev in Thread] Current Thread [Next in Thread]