* [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07
@ 2019-06-07 18:32 Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 1/2] numa: improve cpu hotplug error message with a wrong node-id Eduardo Habkost
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Eduardo Habkost @ 2019-06-07 18:32 UTC (permalink / raw)
To: Peter Maydell, qemu-devel, Marcel Apfelbaum; +Cc: Eduardo Habkost
The following changes since commit 185b7ccc11354cbd69b6d53bf8d831dd964f6c88:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190607-2' into staging (2019-06-07 15:24:13 +0100)
are available in the Git repository at:
git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
for you to fetch changes up to 754f1dbcf1d4d543167e3212366055761c30bcf4:
accel: Remove unused AccelClass::opt_name attribute (2019-06-07 15:28:46 -0300)
----------------------------------------------------------------
Machine Core queue, 2019-06-07
* Improve CPU hotplug error message
(Laurent Vivier)
* Remove unused AccelClass::opt_name field
(Wainer dos Santos Moschetta)
----------------------------------------------------------------
Queue for Machine Core patches
Laurent Vivier (1):
numa: improve cpu hotplug error message with a wrong node-id
Wainer dos Santos Moschetta (1):
accel: Remove unused AccelClass::opt_name attribute
include/sysemu/accel.h | 1 -
numa.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 1/2] numa: improve cpu hotplug error message with a wrong node-id
2019-06-07 18:32 [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Eduardo Habkost
@ 2019-06-07 18:32 ` Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 2/2] accel: Remove unused AccelClass::opt_name attribute Eduardo Habkost
2019-06-10 10:53 ` [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Eduardo Habkost @ 2019-06-07 18:32 UTC (permalink / raw)
To: Peter Maydell, qemu-devel, Marcel Apfelbaum
Cc: Laurent Vivier, Eduardo Habkost
From: Laurent Vivier <lvivier@redhat.com>
On pseries, core-ids are strongly binded to a node-id by the command
line option. If an user tries to add a CPU to the wrong node, he has
an error but it is not really helpful:
qemu-system-ppc64 ... -smp 1,maxcpus=64,cores=1,threads=1,sockets=1 \
-numa node,nodeid=0 -numa node,nodeid=1 ...
(qemu) device_add power9_v2.0-spapr-cpu-core,core-id=30,node-id=1
Error: node-id=1 must match numa node specified with -numa option
This patch improves this error message by giving to the user the good
node-id to use with the core-id he's providing
Error: invalid node-id, must be 0
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20190529160747.778-1-lvivier@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
numa.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/numa.c b/numa.c
index 3875e1efda..955ec0c830 100644
--- a/numa.c
+++ b/numa.c
@@ -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);
}
}
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 2/2] accel: Remove unused AccelClass::opt_name attribute
2019-06-07 18:32 [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 1/2] numa: improve cpu hotplug error message with a wrong node-id Eduardo Habkost
@ 2019-06-07 18:32 ` Eduardo Habkost
2019-06-10 10:53 ` [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Eduardo Habkost @ 2019-06-07 18:32 UTC (permalink / raw)
To: Peter Maydell, qemu-devel, Marcel Apfelbaum
Cc: Eduardo Habkost, Wainer dos Santos Moschetta
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
The AccelType type was converted to AccelClass QOM
object on b14a0b7469f, and the original data type had
a field to store the option name which in turn was
used to search an accelerator. The lookup method
(accel_find) changed too, making the option field
unnecessary but it became AccelClass::opt_name despite
that. Therefore, and given that none accelerator
implementation sets AccelClass::opt_name, let's
remove this attribute.
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20190531165334.20403-2-wainersm@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/sysemu/accel.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
index 70e9e2f2a1..81293cdb08 100644
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@@ -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);
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07
2019-06-07 18:32 [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 1/2] numa: improve cpu hotplug error message with a wrong node-id Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 2/2] accel: Remove unused AccelClass::opt_name attribute Eduardo Habkost
@ 2019-06-10 10:53 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2019-06-10 10:53 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers
On Fri, 7 Jun 2019 at 19:32, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> The following changes since commit 185b7ccc11354cbd69b6d53bf8d831dd964f6c88:
>
> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190607-2' into staging (2019-06-07 15:24:13 +0100)
>
> are available in the Git repository at:
>
> git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
>
> for you to fetch changes up to 754f1dbcf1d4d543167e3212366055761c30bcf4:
>
> accel: Remove unused AccelClass::opt_name attribute (2019-06-07 15:28:46 -0300)
>
> ----------------------------------------------------------------
> Machine Core queue, 2019-06-07
>
> * Improve CPU hotplug error message
> (Laurent Vivier)
> * Remove unused AccelClass::opt_name field
> (Wainer dos Santos Moschetta)
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-10 10:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-07 18:32 [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 1/2] numa: improve cpu hotplug error message with a wrong node-id Eduardo Habkost
2019-06-07 18:32 ` [Qemu-devel] [PULL 2/2] accel: Remove unused AccelClass::opt_name attribute Eduardo Habkost
2019-06-10 10:53 ` [Qemu-devel] [PULL 0/2] Machine Core queue, 2019-06-07 Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).