On Fri, 20 Sept 2024 at 11:45, Igor Mammedov <imamm...@redhat.com> wrote:
>
> On Thu, 19 Sep 2024 13:34:54 +0100
> Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> > On Tue, 10 Sept 2024 at 10:38, Peter Maydell <peter.mayd...@linaro.org>
> > wrote:
> > >
> > > On Tue, 10 Sept 2024 at 10:03, Igor Mammedov <imamm...@redhat.com> wrote:
> > > >
> > > > On Mon, 19 Aug 2024 15:43:03 +0100
> > > > Peter Maydell <peter.mayd...@linaro.org> wrote:
> > > > > @@ -83,34 +83,32 @@ vCPU hotplug
> > > > >
> > > > > (QEMU) query-cpus-fast
> > > > > {
> > > > > - "execute": "query-cpus-fast",
> > > > > "arguments": {}
> > > > > + "execute": "query-cpus-fast",
> > > > > }
> > > > > {
> > > > > "return": [
> > > > > {
> > > > > - "qom-path": "/machine/unattached/device[0]",
> > > > > - "target": "x86_64",
> > > > > - "thread-id": 11534,
> > > > > "cpu-index": 0,
> > > > > "props": {
> > > > > - "socket-id": 0,
> > > > > "core-id": 0,
> > > > > + "socket-id": 0,
> > > > > "thread-id": 0
> > > > > },
> > > > > - "arch": "x86"
> > > > > + "qom-path": "/machine/unattached/device[0]",
> > > > > + "target": "x86_64",
> > > > > + "thread-id": 28957
> > > > > },
> > > > > {
> > > > > - "qom-path": "/machine/peripheral/cpu-2",
> > > > > - "target": "x86_64",
> > > > > - "thread-id": 12106,
> > > > > "cpu-index": 1,
> > > > > "props": {
> > > > > - "socket-id": 1,
> > > > > - "core-id": 0,
> > > > > + "core-id": 1,
> > > > > + "socket-id": 0,
> > > > > "thread-id": 0
> > > > > },
> > > > > - "arch": "x86"
> > > > > + "qom-path": "/machine/peripheral/cpu-2",
> > > > > + "target": "x86_64",
> > > > > + "thread-id": 29095
> > > > > }
> > > >
> > > > beside reordering, which seems fine, this hunk also introduces target
> > > > change
> > > > perhaps a separate patch for that?
> > >
> > > What target change? It all says "target": "x86_64" both before
> > > and after.
>
> my mistake,
> I should've said '"arch": "x86"' instead, which is gone after the patch
This is because the "arch" output member was removed
from the query-cpus-fast output in QEMU 6.0. If we
mention this also in the commit message, is that OK?
======
docs/system/cpu-hotplug: Update example to match current QEMU
The example of how to do vCPU hotplug and hot-unlpug in the
cpu-hotplug documentation no longer works, because the way
we allocate socket-id and core-id to CPUs by default has
changed at some point. The output also no longer matches what
current QEMU produces in some more cosmetic ways.
Update the example to match current QEMU. The differences are:
* the second CPU is now socket-id=0 core-id=1,
not socket-id=1 core-id=0
* the order of fields from the qmp_shell is now in
alphabetical order
* the "arch" member is no longer present in the query-cpus-fast
output (it was removed in QEMU 6.0)
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
======
If that seems OK to you I'll send out a v2 with the updated
commit message and the fix to the device_add line.
thanks
-- PMM
