Commit f884294b authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Machine + x86 queue, 2019-09-03

Bug fixes:
* Fix die-id validation regression (Eduardo Habkost)
* vmmouse: Properly reset state (Jan Kiszka)
* hostmem-file: fix pmem file size check (Stefan Hajnoczi)
* Keep query-hotpluggable-cpus output compatible with older QEMU
  if '-smp dies' is not set (Igor Mammedov)
* migration: Do not re-read the clock on pre_save in case of paused guest
  (Maxiwell S. Garcia)

Cleanups:
* NUMA code cleanups (Tao Xu)
* Remove stale externs from includes (Alex Bennée)

Features:
* qapi: report the default CPU type for each machine (Daniel P. Berrangé)

# gpg: Signature made Tue 03 Sep 2019 21:57:37 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:
  migration: Do not re-read the clock on pre_save in case of paused guest
  x86: do not advertise die-id in query-hotpluggbale-cpus if '-smp dies' is not set
  i386/vmmouse: Properly reset state
  hostmem-file: fix pmem file size check
  qapi: report the default CPU type for each machine
  pc: Don't make die-id mandatory unless necessary
  pc: Improve error message when die-id is omitted
  pc: Fix error message on die-id validation
  numa: move numa global variable numa_info into MachineState
  numa: move numa global variable have_numa_distance into MachineState
  numa: move numa global variable nb_numa_nodes into MachineState
  hw/arm: simplify arm_load_dtb
  includes: remove stale [smp|max]_cpus externs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3c8153d3 41733249

backends/hostmem-file.c

+2 −2
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        uint64_t size;



        size = qemu_get_pmem_size(fb->mem_path, &local_err);

        if (!size) {

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }



        if (backend->size > size) {

        if (size && backend->size > size) {

            error_setg(errp, "size property %" PRIu64 " is larger than "

                       "pmem file \"%s\" size %" PRIu64, backend->size,

                       fb->mem_path, size);

exec.c

+4 −1
Original line number Diff line number Diff line
@@ -1750,6 +1750,7 @@ long qemu_minrampagesize(void) 
    long hpsize = LONG_MAX;

    long mainrampagesize;

    Object *memdev_root;

    MachineState *ms = MACHINE(qdev_get_machine());



    mainrampagesize = qemu_mempath_getpagesize(mem_path);
@@ -1777,7 +1778,9 @@ long qemu_minrampagesize(void) 
     * so if its page size is smaller we have got to report that size instead.

     */

    if (hpsize > mainrampagesize &&

        (nb_numa_nodes == 0 || numa_info[0].node_memdev == NULL)) {

        (ms->numa_state == NULL ||

         ms->numa_state->num_nodes == 0 ||

         ms->numa_state->nodes[0].node_memdev == NULL)) {

        static bool warned;

        if (!warned) {

            error_report("Huge page support disabled (n/a for main memory).");

hw/acpi/aml-build.c

+7 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "qemu/bswap.h"

#include "qemu/bitops.h"

#include "sysemu/numa.h"

#include "hw/boards.h"



static GArray *build_alloc_array(void)

{
@@ -1726,18 +1727,21 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, 
 * ACPI spec 5.2.17 System Locality Distance Information Table

 * (Revision 2.0 or later)

 */

void build_slit(GArray *table_data, BIOSLinker *linker)

void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms)

{

    int slit_start, i, j;

    slit_start = table_data->len;

    int nb_numa_nodes = ms->numa_state->num_nodes;



    acpi_data_push(table_data, sizeof(AcpiTableHeader));



    build_append_int_noprefix(table_data, nb_numa_nodes, 8);

    for (i = 0; i < nb_numa_nodes; i++) {

        for (j = 0; j < nb_numa_nodes; j++) {

            assert(numa_info[i].distance[j]);

            build_append_int_noprefix(table_data, numa_info[i].distance[j], 1);

            assert(ms->numa_state->nodes[i].distance[j]);

            build_append_int_noprefix(table_data,

                                      ms->numa_state->nodes[i].distance[j],

                                      1);

        }

    }

hw/arm/aspeed.c

+1 −4
Original line number Diff line number Diff line
@@ -242,9 +242,6 @@ static void aspeed_board_init(MachineState *machine, 
        write_boot_rom(drive0, FIRMWARE_ADDR, fl->size, &error_abort);

    }



    aspeed_board_binfo.kernel_filename = machine->kernel_filename;

    aspeed_board_binfo.initrd_filename = machine->initrd_filename;

    aspeed_board_binfo.kernel_cmdline = machine->kernel_cmdline;

    aspeed_board_binfo.ram_size = ram_size;

    aspeed_board_binfo.loader_start = sc->info->memmap[ASPEED_SDRAM];

    aspeed_board_binfo.nb_cpus = bmc->soc.num_cpus;
@@ -253,7 +250,7 @@ static void aspeed_board_init(MachineState *machine, 
        cfg->i2c_init(bmc);

    }



    arm_load_kernel(ARM_CPU(first_cpu), &aspeed_board_binfo);

    arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);

}



static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)

hw/arm/boot.c

+12 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "hw/boards.h"

#include "sysemu/reset.h"

#include "hw/loader.h"

#include "elf.h"
@@ -523,7 +524,7 @@ static void fdt_add_psci_node(void *fdt) 
}



int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,

                 hwaddr addr_limit, AddressSpace *as)

                 hwaddr addr_limit, AddressSpace *as, MachineState *ms)

{

    void *fdt = NULL;

    int size, rc, n = 0;
@@ -597,10 +598,10 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
    }

    g_strfreev(node_path);



    if (nb_numa_nodes > 0) {

    if (ms->numa_state != NULL && ms->numa_state->num_nodes > 0) {

        mem_base = binfo->loader_start;

        for (i = 0; i < nb_numa_nodes; i++) {

            mem_len = numa_info[i].node_mem;

        for (i = 0; i < ms->numa_state->num_nodes; i++) {

            mem_len = ms->numa_state->nodes[i].node_mem;

            rc = fdt_add_memory_node(fdt, acells, mem_base,

                                     scells, mem_len, i);

            if (rc < 0) {
@@ -626,9 +627,9 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
        qemu_fdt_add_subnode(fdt, "/chosen");

    }



    if (binfo->kernel_cmdline && *binfo->kernel_cmdline) {

    if (ms->kernel_cmdline && *ms->kernel_cmdline) {

        rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",

                                     binfo->kernel_cmdline);

                                     ms->kernel_cmdline);

        if (rc < 0) {

            fprintf(stderr, "couldn't set /chosen/bootargs\n");

            goto fail;
@@ -1260,7 +1261,7 @@ static void arm_setup_firmware_boot(ARMCPU *cpu, struct arm_boot_info *info) 
     */

}



void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)

void arm_load_kernel(ARMCPU *cpu, MachineState *ms, struct arm_boot_info *info)

{

    CPUState *cs;

    AddressSpace *as = arm_boot_address_space(cpu, info);
@@ -1281,7 +1282,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
     * doesn't support secure.

     */

    assert(!(info->secure_board_setup && kvm_enabled()));



    info->kernel_filename = ms->kernel_filename;

    info->kernel_cmdline = ms->kernel_cmdline;

    info->initrd_filename = ms->initrd_filename;

    info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");

    info->dtb_limit = 0;
@@ -1293,7 +1296,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
    }



    if (!info->skip_dtb_autoload && have_dtb(info)) {

        if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as) < 0) {

        if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as, ms) < 0) {

            exit(1);

        }

    }