Commit 6e6ffc9f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Machine queue, 2018-10-25

* sysbus init/realize cleanups
  (Cédric Le Goater, Philippe Mathieu-Daudé)
* memory-device refactoring (David Hildenbrand)
* -smp: deprecate incorrect CPUs topology (Igor Mammedov)
* -numa parsing cleanups (Markus Armbruster)
* Fix hostmem-file memory leak (Zhang Yi)
* Typo fix (Li Qiang)

# gpg: Signature made Thu 25 Oct 2018 14:31:46 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request: (43 commits)
  net: xgmac: convert SysBus init method to a realize method
  net: stellaris_enet: add a reset method
  net: stellaris_enet: convert SysBus init method to a realize method
  net: smc91c111: convert SysBus init method to a realize method
  net: opencores_eth: convert SysBus init method to a realize method
  net: mipsnet: convert SysBus init method to a realize method
  net: milkymist_minimac2: convert SysBus init method to a realize method
  net: lance: convert SysBus init method to a realize method
  net: lan9118: convert SysBus init method to a realize method
  net: etraxfs_eth: add a reset method
  net: etraxfs_eth: convert SysBus init method to a realize method
  memory-device: trace when pre_plugging/plugging/unplugging
  memory-device: complete factoring out unplug handling
  memory-device: complete factoring out plug handling
  memory-device: complete factoring out pre_plug handling
  memory-device: add device class function set_addr()
  memory-device: drop get_region_size()
  memory-device: factor out get_memory_region() from pc-dimm
  memory-device: add and use memory_device_get_region_size()
  memory-device: document MemoryDeviceClass
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 808ebd66 8fa922c2

backends/hostmem-file.c

+8 −2
Original line number Diff line number Diff line
@@ -145,20 +145,26 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) 
    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (host_memory_backend_mr_inited(backend)) {

        char *path = object_get_canonical_path_component(o);



        error_setg(errp, "cannot change property 'pmem' of %s '%s'",

                   object_get_typename(o),

                   object_get_canonical_path_component(o));

                   path);

        g_free(path);

        return;

    }



#ifndef CONFIG_LIBPMEM

    if (value) {

        Error *local_err = NULL;

        char *path = object_get_canonical_path_component(o);



        error_setg(&local_err,

                   "Lack of libpmem support while setting the 'pmem=on'"

                   " of %s '%s'. We can't ensure data persistence.",

                   object_get_typename(o),

                   object_get_canonical_path_component(o));

                   path);

        g_free(path);

        error_propagate(errp, local_err);

        return;

    }

default-configs/i386-softmmu.mak

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ CONFIG_PCI_Q35=y 
CONFIG_APIC=y

CONFIG_IOAPIC=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_MEM_DEVICE=y

CONFIG_DIMM=y

CONFIG_NVDIMM=y

CONFIG_ACPI_NVDIMM=y

CONFIG_PCIE_PORT=y

default-configs/ppc64-softmmu.mak

+2 −1
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ CONFIG_VIRTIO_VGA=y 
CONFIG_XICS=$(CONFIG_PSERIES)

CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)

CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))

CONFIG_MEM_HOTPLUG=y
 
CONFIG_MEM_DEVICE=y

CONFIG_DIMM=y

default-configs/sparc64-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ CONFIG_SIMBA=y 
CONFIG_SUNHME=y

CONFIG_MC146818RTC=y

CONFIG_ISA_TESTDEV=y

CONFIG_EMPTY_SLOT=y

CONFIG_SUN4V_RTC=y

hw/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/ 
devices-dirs-$(CONFIG_SOFTMMU) += virtio/

devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

devices-dirs-$(CONFIG_SOFTMMU) += xen/

devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/

devices-dirs-$(CONFIG_MEM_DEVICE) += mem/

devices-dirs-$(CONFIG_SOFTMMU) += smbios/

devices-dirs-y += core/

common-obj-y += $(devices-dirs-y)