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

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



Machine Core queue, 2019-06-07

* Improve CPU hotplug error message
  (Laurent Vivier)
* Remove unused AccelClass::opt_name field
  (Wainer dos Santos Moschetta)

# gpg: Signature made Fri 07 Jun 2019 19:31:28 BST
# gpg:                using RSA key 2807936F984DC5A6
# 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:
  accel: Remove unused AccelClass::opt_name attribute
  numa: improve cpu hotplug error message with a wrong node-id

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 185b7ccc 754f1dbc

include/sysemu/accel.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ typedef struct AccelClass { 
    ObjectClass parent_class;

    /*< public >*/



    const char *opt_name;

    const char *name;

    int (*init_machine)(MachineState *ms);

    void (*setup_post)(MachineState *ms, AccelState *accel);

numa.c

+2 −2
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp) 
                                    "node-id", errp);

        }

    } else if (node_id != slot->props.node_id) {

        error_setg(errp, "node-id=%d must match numa node specified "

                   "with -numa option", node_id);

        error_setg(errp, "invalid node-id, must be %"PRId64,

                   slot->props.node_id);

    }

}