All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
@ 2015-04-02  6:26 Alexey Kardashevskiy
  2015-04-07 20:43 ` Alexander Graf
  2015-04-08  2:49 ` [Qemu-devel] [PATCH qemu] " David Gibson
  0 siblings, 2 replies; 11+ messages in thread
From: Alexey Kardashevskiy @ 2015-04-02  6:26 UTC (permalink / raw)
  To: qemu-devel; +Cc: Alexey Kardashevskiy, qemu-ppc, Alexander Graf, David Gibson

Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
client-architecture-support patchset) there is a "compat" option
of "-cpu". However it was not documented at all and this is what this
patch is trying to do.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 qemu-options.hx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index c513352..bd15214 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
 DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
 
 DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
-    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
+    "-cpu cpu,[compat=MODE]\n"
+    "                select CPU ('-cpu help' for list)\n"
+    "                compat= processor compatibility mode (PPC64 only)\n",
+        QEMU_ARCH_ALL)
 STEXI
 @item -cpu @var{model}
 @findex -cpu
 Select CPU model (@code{-cpu help} for list and additional feature selection)
+@table @option
+@item compat=power6|power7|power8
+(PPC64 only)
+Enables architecture compatibility mode. "power6" enables PowerISA 2.05,
+"power7" - 2.06, "power8" - 2.07.
+@end table
 ETEXI
 
 DEF("smp", HAS_ARG, QEMU_OPTION_smp,
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-02  6:26 [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option Alexey Kardashevskiy
@ 2015-04-07 20:43 ` Alexander Graf
  2015-04-08  1:45   ` Alexey Kardashevskiy
  2015-04-08  2:49 ` [Qemu-devel] [PATCH qemu] " David Gibson
  1 sibling, 1 reply; 11+ messages in thread
From: Alexander Graf @ 2015-04-07 20:43 UTC (permalink / raw)
  To: Alexey Kardashevskiy, qemu-devel; +Cc: qemu-ppc, David Gibson

On 04/02/2015 08:26 AM, Alexey Kardashevskiy wrote:
> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
> client-architecture-support patchset) there is a "compat" option
> of "-cpu". However it was not documented at all and this is what this
> patch is trying to do.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>   qemu-options.hx | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index c513352..bd15214 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
>   DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
>   
>   DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
> +    "-cpu cpu,[compat=MODE]\n"
> +    "                select CPU ('-cpu help' for list)\n"
> +    "                compat= processor compatibility mode (PPC64 only)\n",
> +        QEMU_ARCH_ALL)

Shouldn't there be a way to show this only for the ppc64 target?


Alex

>   STEXI
>   @item -cpu @var{model}
>   @findex -cpu
>   Select CPU model (@code{-cpu help} for list and additional feature selection)
> +@table @option
> +@item compat=power6|power7|power8
> +(PPC64 only)
> +Enables architecture compatibility mode. "power6" enables PowerISA 2.05,
> +"power7" - 2.06, "power8" - 2.07.
> +@end table
>   ETEXI
>   
>   DEF("smp", HAS_ARG, QEMU_OPTION_smp,

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-07 20:43 ` Alexander Graf
@ 2015-04-08  1:45   ` Alexey Kardashevskiy
  2015-04-08  6:29     ` Alexander Graf
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Kardashevskiy @ 2015-04-08  1:45 UTC (permalink / raw)
  To: Alexander Graf, qemu-devel; +Cc: qemu-ppc, David Gibson

On 04/08/2015 06:43 AM, Alexander Graf wrote:
> On 04/02/2015 08:26 AM, Alexey Kardashevskiy wrote:
>> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
>> client-architecture-support patchset) there is a "compat" option
>> of "-cpu". However it was not documented at all and this is what this
>> patch is trying to do.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>>   qemu-options.hx | 11 ++++++++++-
>>   1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/qemu-options.hx b/qemu-options.hx
>> index c513352..bd15214 100644
>> --- a/qemu-options.hx
>> +++ b/qemu-options.hx
>> @@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
>>   DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
>>   DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
>> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
>> +    "-cpu cpu,[compat=MODE]\n"
>> +    "                select CPU ('-cpu help' for list)\n"
>> +    "                compat= processor compatibility mode (PPC64 only)\n",
>> +        QEMU_ARCH_ALL)
>
> Shouldn't there be a way to show this only for the ppc64 target?


I do not really know, I did not dig deep. I just saw "Intel IOMMU (VT-d)" 
in "qemu-system-ppc64 --help" output and concluded there is no easy way.



>
>
> Alex
>
>>   STEXI
>>   @item -cpu @var{model}
>>   @findex -cpu
>>   Select CPU model (@code{-cpu help} for list and additional feature
>> selection)
>> +@table @option
>> +@item compat=power6|power7|power8
>> +(PPC64 only)
>> +Enables architecture compatibility mode. "power6" enables PowerISA 2.05,
>> +"power7" - 2.06, "power8" - 2.07.
>> +@end table
>>   ETEXI
>>   DEF("smp", HAS_ARG, QEMU_OPTION_smp,
>


-- 
Alexey

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-02  6:26 [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option Alexey Kardashevskiy
  2015-04-07 20:43 ` Alexander Graf
@ 2015-04-08  2:49 ` David Gibson
  1 sibling, 0 replies; 11+ messages in thread
From: David Gibson @ 2015-04-08  2:49 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

On Thu, Apr 02, 2015 at 05:26:11PM +1100, Alexey Kardashevskiy wrote:
> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
> client-architecture-support patchset) there is a "compat" option
> of "-cpu". However it was not documented at all and this is what this
> patch is trying to do.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Acked-by: David Gibson <david@gibson.dropbear.id.au>

Merged into my spapr-next branch.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-08  1:45   ` Alexey Kardashevskiy
@ 2015-04-08  6:29     ` Alexander Graf
  2015-04-08  7:41       ` Alexey Kardashevskiy
  0 siblings, 1 reply; 11+ messages in thread
From: Alexander Graf @ 2015-04-08  6:29 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: qemu-ppc, qemu-devel, David Gibson




> Am 08.04.2015 um 03:45 schrieb Alexey Kardashevskiy <aik@ozlabs.ru>:
> 
>> On 04/08/2015 06:43 AM, Alexander Graf wrote:
>>> On 04/02/2015 08:26 AM, Alexey Kardashevskiy wrote:
>>> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
>>> client-architecture-support patchset) there is a "compat" option
>>> of "-cpu". However it was not documented at all and this is what this
>>> patch is trying to do.
>>> 
>>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>>> ---
>>>  qemu-options.hx | 11 ++++++++++-
>>>  1 file changed, 10 insertions(+), 1 deletion(-)
>>> 
>>> diff --git a/qemu-options.hx b/qemu-options.hx
>>> index c513352..bd15214 100644
>>> --- a/qemu-options.hx
>>> +++ b/qemu-options.hx
>>> @@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
>>>  DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
>>>  DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
>>> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
>>> +    "-cpu cpu,[compat=MODE]\n"
>>> +    "                select CPU ('-cpu help' for list)\n"
>>> +    "                compat= processor compatibility mode (PPC64 only)\n",
>>> +        QEMU_ARCH_ALL)
>> 
>> Shouldn't there be a way to show this only for the ppc64 target?
> 
> 
> I do not really know, I did not dig deep. I just saw "Intel IOMMU (VT-d)" in "qemu-system-ppc64 --help" output and concluded there is no easy way.

Please dig again :).

Alex

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-08  6:29     ` Alexander Graf
@ 2015-04-08  7:41       ` Alexey Kardashevskiy
  2015-04-08  7:46         ` Alexander Graf
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Kardashevskiy @ 2015-04-08  7:41 UTC (permalink / raw)
  To: Alexander Graf; +Cc: qemu-ppc, qemu-devel, David Gibson

On 04/08/2015 04:29 PM, Alexander Graf wrote:
>
>
>
>> Am 08.04.2015 um 03:45 schrieb Alexey Kardashevskiy <aik@ozlabs.ru>:
>>
>>> On 04/08/2015 06:43 AM, Alexander Graf wrote:
>>>> On 04/02/2015 08:26 AM, Alexey Kardashevskiy wrote:
>>>> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
>>>> client-architecture-support patchset) there is a "compat" option
>>>> of "-cpu". However it was not documented at all and this is what this
>>>> patch is trying to do.
>>>>
>>>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>>>> ---
>>>>   qemu-options.hx | 11 ++++++++++-
>>>>   1 file changed, 10 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/qemu-options.hx b/qemu-options.hx
>>>> index c513352..bd15214 100644
>>>> --- a/qemu-options.hx
>>>> +++ b/qemu-options.hx
>>>> @@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
>>>>   DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
>>>>   DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
>>>> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
>>>> +    "-cpu cpu,[compat=MODE]\n"
>>>> +    "                select CPU ('-cpu help' for list)\n"
>>>> +    "                compat= processor compatibility mode (PPC64 only)\n",
>>>> +        QEMU_ARCH_ALL)
>>>
>>> Shouldn't there be a way to show this only for the ppc64 target?
>>
>>
>> I do not really know, I did not dig deep. I just saw "Intel IOMMU (VT-d)" in "qemu-system-ppc64 --help" output and concluded there is no easy way.
>
> Please dig again :).


Ok. I did. I can do as below. QEMU shows different things on "-help" on PPC 
and x86_64. But qemu-doc.html has 2 entries for "-cpu" and it does not 
mention architecture per "-cpu" instance there (unless I keep the original 
"(PPC64 only)" which I find rather ugly):

===
    -cpu model
           Select CPU model (-cpu help for list and additional feature 
selection)

    -cpu model
           Select CPU model (-cpu help for list and additional feature 
selection)

         compat=power6|power7|power8
                 Enables architecture compatibility mode. "power6" enables 
PowerISA 2.05, "power7" - 2.06, "power8" - 2.07.

====


For the sake of a nice looking html, I would stick to the original patch 
but since you seem to know this stuff better, any help is very appreciated :)




diff --git a/qemu-options.hx b/qemu-options.hx
index c513352..428359a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -84,13 +84,30 @@ HXCOMM Deprecated by -machine
  DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)

  DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
-    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
+    "-cpu cpu        select CPU ('-cpu help' for list)\n",
+            QEMU_ARCH_ALL & ~QEMU_ARCH_PPC)
  STEXI
  @item -cpu @var{model}
  @findex -cpu
  Select CPU model (@code{-cpu help} for list and additional feature selection)
  ETEXI

+DEF("cpu", HAS_ARG, QEMU_OPTION_cpu_ppc,
+    "-cpu cpu,[compat=MODE]\n"
+    "                select CPU ('-cpu help' for list)\n"
+    "                compat= processor compatibility mode\n",
+        QEMU_ARCH_PPC)
+STEXI
+@item -cpu @var{model}
+@findex -cpu
+Select CPU model (@code{-cpu help} for list and additional feature selection)
+@table @option
+@item compat=power6|power7|power8
+Enables architecture compatibility mode. "power6" enables PowerISA 2.05,
+"power7" - 2.06, "power8" - 2.07.
+@end table
+ETEXI
+
  DEF("smp", HAS_ARG, QEMU_OPTION_smp,
      "-smp 
[cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n"
      "                set the number of CPUs to 'n' [default=1]\n"



-- 
Alexey

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-08  7:41       ` Alexey Kardashevskiy
@ 2015-04-08  7:46         ` Alexander Graf
  2015-04-08  9:33           ` [Qemu-devel] [PATCH qemu v2] " Alexey Kardashevskiy
  0 siblings, 1 reply; 11+ messages in thread
From: Alexander Graf @ 2015-04-08  7:46 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: qemu-ppc, qemu-devel, David Gibson




> Am 08.04.2015 um 09:41 schrieb Alexey Kardashevskiy <aik@ozlabs.ru>:
> 
>> On 04/08/2015 04:29 PM, Alexander Graf wrote:
>> 
>> 
>> 
>>>> Am 08.04.2015 um 03:45 schrieb Alexey Kardashevskiy <aik@ozlabs.ru>:
>>>> 
>>>>> On 04/08/2015 06:43 AM, Alexander Graf wrote:
>>>>> On 04/02/2015 08:26 AM, Alexey Kardashevskiy wrote:
>>>>> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
>>>>> client-architecture-support patchset) there is a "compat" option
>>>>> of "-cpu". However it was not documented at all and this is what this
>>>>> patch is trying to do.
>>>>> 
>>>>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>>>>> ---
>>>>>  qemu-options.hx | 11 ++++++++++-
>>>>>  1 file changed, 10 insertions(+), 1 deletion(-)
>>>>> 
>>>>> diff --git a/qemu-options.hx b/qemu-options.hx
>>>>> index c513352..bd15214 100644
>>>>> --- a/qemu-options.hx
>>>>> +++ b/qemu-options.hx
>>>>> @@ -84,11 +84,20 @@ HXCOMM Deprecated by -machine
>>>>>  DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
>>>>>  DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
>>>>> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
>>>>> +    "-cpu cpu,[compat=MODE]\n"
>>>>> +    "                select CPU ('-cpu help' for list)\n"
>>>>> +    "                compat= processor compatibility mode (PPC64 only)\n",
>>>>> +        QEMU_ARCH_ALL)
>>>> 
>>>> Shouldn't there be a way to show this only for the ppc64 target?
>>> 
>>> 
>>> I do not really know, I did not dig deep. I just saw "Intel IOMMU (VT-d)" in "qemu-system-ppc64 --help" output and concluded there is no easy way.
>> 
>> Please dig again :).
> 
> 
> Ok. I did. I can do as below. QEMU shows different things on "-help" on PPC and x86_64. But qemu-doc.html has 2 entries for "-cpu" and it does not mention architecture per "-cpu" instance there (unless I keep the original "(PPC64 only)" which I find rather ugly):

Can you find some way to only extend the arch_all message with a ppc specific def? Maybe restructure the layout?

Alex

> 
> ===
>   -cpu model
>          Select CPU model (-cpu help for list and additional feature selection)
> 
>   -cpu model
>          Select CPU model (-cpu help for list and additional feature selection)
> 
>        compat=power6|power7|power8
>                Enables architecture compatibility mode. "power6" enables PowerISA 2.05, "power7" - 2.06, "power8" - 2.07.
> 
> ====
> 
> 
> For the sake of a nice looking html, I would stick to the original patch but since you seem to know this stuff better, any help is very appreciated :)
> 
> 
> 
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index c513352..428359a 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -84,13 +84,30 @@ HXCOMM Deprecated by -machine
> DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
> 
> DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
> -    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
> +    "-cpu cpu        select CPU ('-cpu help' for list)\n",
> +            QEMU_ARCH_ALL & ~QEMU_ARCH_PPC)
> STEXI
> @item -cpu @var{model}
> @findex -cpu
> Select CPU model (@code{-cpu help} for list and additional feature selection)
> ETEXI
> 
> +DEF("cpu", HAS_ARG, QEMU_OPTION_cpu_ppc,
> +    "-cpu cpu,[compat=MODE]\n"
> +    "                select CPU ('-cpu help' for list)\n"
> +    "                compat= processor compatibility mode\n",
> +        QEMU_ARCH_PPC)
> +STEXI
> +@item -cpu @var{model}
> +@findex -cpu
> +Select CPU model (@code{-cpu help} for list and additional feature selection)
> +@table @option
> +@item compat=power6|power7|power8
> +Enables architecture compatibility mode. "power6" enables PowerISA 2.05,
> +"power7" - 2.06, "power8" - 2.07.
> +@end table
> +ETEXI
> +
> DEF("smp", HAS_ARG, QEMU_OPTION_smp,
>     "-smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n"
>     "                set the number of CPUs to 'n' [default=1]\n"
> 
> 
> 
> -- 
> Alexey

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Qemu-devel] [PATCH qemu v2] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-08  7:46         ` Alexander Graf
@ 2015-04-08  9:33           ` Alexey Kardashevskiy
  2015-04-10  2:16             ` David Gibson
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Kardashevskiy @ 2015-04-08  9:33 UTC (permalink / raw)
  To: qemu-devel; +Cc: Alexey Kardashevskiy, qemu-ppc, Alexander Graf, David Gibson

Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
client-architecture-support patchset) there is a "compat" option
of "-cpu". However it was not documented at all and this is what this
patch is trying to do.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

After the patch:

[aik@vpl2 ~]$ ./qemu-system-ppc64 --help | grep -a2 -- "-cpu cpu"
-cpu cpu[,compat=power6|power7|power8]
                select CPU ('-cpu help' for list)
                compat= processor compatibility mode


ka1:/scratch/alexey/p/qemu-build/x86_x86_64$ ./x86_64-softmmu/qemu-system-x86_64 -help | grep -a2 -- "-cpu cpu"
-cpu cpu        select CPU ('-cpu help' for list)
-smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]
                set the number of CPUs to 'n' [default=1]

qemu-doc.html:

-cpu model[,compat=mode]
    Select CPU model (-cpu help for list and additional feature selection)

    compat=power6|power7|power8
        Enables POWER architecture compatibility mode. ‘power6’ enables PowerISA 2.05-compatibility mode, ‘power7’ - 2.06, ‘power8’ - 2.07. ‘mode’ is only supported by a PPC64-pseries machine.



---
Changes:
v2:
* only show new option for PPC
---
 qemu-options.hx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index c513352..5214798 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -84,11 +84,22 @@ HXCOMM Deprecated by -machine
 DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
 
 DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
-    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL)
+    "-cpu cpu        select CPU ('-cpu help' for list)\n", QEMU_ARCH_ALL & ~QEMU_ARCH_PPC)
+DEF("cpu", HAS_ARG, QEMU_OPTION_cpu_ppc,
+    "-cpu cpu[,compat=power6|power7|power8]\n"
+    "                select CPU ('-cpu help' for list)\n"
+    "                compat= processor compatibility mode\n", QEMU_ARCH_PPC)
 STEXI
-@item -cpu @var{model}
+@item -cpu @var{model}[,compat=@var{mode}]
 @findex -cpu
 Select CPU model (@code{-cpu help} for list and additional feature selection)
+@table @option
+@item compat=power6|power7|power8
+Enables POWER architecture compatibility mode.
+@samp{power6} enables PowerISA 2.05-compatibility mode,
+@samp{power7} - 2.06, @samp{power8} - 2.07. @samp{mode} is only supported by
+a PPC64-pseries machine.
+@end table
 ETEXI
 
 DEF("smp", HAS_ARG, QEMU_OPTION_smp,
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu v2] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-08  9:33           ` [Qemu-devel] [PATCH qemu v2] " Alexey Kardashevskiy
@ 2015-04-10  2:16             ` David Gibson
  2015-04-28  7:25               ` Alexey Kardashevskiy
  0 siblings, 1 reply; 11+ messages in thread
From: David Gibson @ 2015-04-10  2:16 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 622 bytes --]

On Wed, Apr 08, 2015 at 07:33:21PM +1000, Alexey Kardashevskiy wrote:
> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
> client-architecture-support patchset) there is a "compat" option
> of "-cpu". However it was not documented at all and this is what this
> patch is trying to do.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

I've updated the previous version in spapr-next.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu v2] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-10  2:16             ` David Gibson
@ 2015-04-28  7:25               ` Alexey Kardashevskiy
  2015-04-29  1:47                 ` David Gibson
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Kardashevskiy @ 2015-04-28  7:25 UTC (permalink / raw)
  To: David Gibson; +Cc: qemu-ppc, qemu-devel, Alexander Graf

On 04/10/2015 12:16 PM, David Gibson wrote:
> On Wed, Apr 08, 2015 at 07:33:21PM +1000, Alexey Kardashevskiy wrote:
>> Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
>> client-architecture-support patchset) there is a "compat" option
>> of "-cpu". However it was not documented at all and this is what this
>> patch is trying to do.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>
> I've updated the previous version in spapr-next.

That was bad idea.

First of all this patch is missing this:

diff --git a/vl.c b/vl.c
index 694deb4..12ffa1c 100644
--- a/vl.c
+++ b/vl.c
@@ -2876,6 +2876,7 @@ int main(int argc, char **argv, char **envp)
                  break;
              }
              case QEMU_OPTION_cpu:
+            case QEMU_OPTION_cpu_ppc:
                  /* hw initialization will check this */
                  cpu_model = optarg;
                  break;


But even with it, "-cpu help" does not work as the "if (!(popt->arch_mask & 
arch_type))" fails at vl.c:2868 because QEMU_OPTION_cpu does not have 
PPC64bit set (in order to hide unwanted options on x86) and 
QEMU_OPTION_cpu_ppc is not "-cpu".

We should use the original patch or none at all.


-- 
Alexey

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [Qemu-devel] [PATCH qemu v2] qemu-options: Add documentation about PPC64's "-cpu compat" option
  2015-04-28  7:25               ` Alexey Kardashevskiy
@ 2015-04-29  1:47                 ` David Gibson
  0 siblings, 0 replies; 11+ messages in thread
From: David Gibson @ 2015-04-29  1:47 UTC (permalink / raw)
  To: Alexey Kardashevskiy; +Cc: qemu-ppc, qemu-devel, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 1628 bytes --]

On Tue, Apr 28, 2015 at 05:25:37PM +1000, Alexey Kardashevskiy wrote:
> On 04/10/2015 12:16 PM, David Gibson wrote:
> >On Wed, Apr 08, 2015 at 07:33:21PM +1000, Alexey Kardashevskiy wrote:
> >>Since 8dfa3a5e "target-ppc: Add "compat" CPU option" (which was a part of
> >>client-architecture-support patchset) there is a "compat" option
> >>of "-cpu". However it was not documented at all and this is what this
> >>patch is trying to do.
> >>
> >>Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> >
> >I've updated the previous version in spapr-next.
> 
> That was bad idea.
> 
> First of all this patch is missing this:
> 
> diff --git a/vl.c b/vl.c
> index 694deb4..12ffa1c 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2876,6 +2876,7 @@ int main(int argc, char **argv, char **envp)
>                  break;
>              }
>              case QEMU_OPTION_cpu:
> +            case QEMU_OPTION_cpu_ppc:
>                  /* hw initialization will check this */
>                  cpu_model = optarg;
>                  break;
> 
> 
> But even with it, "-cpu help" does not work as the "if (!(popt->arch_mask &
> arch_type))" fails at vl.c:2868 because QEMU_OPTION_cpu does not have
> PPC64bit set (in order to hide unwanted options on x86) and
> QEMU_OPTION_cpu_ppc is not "-cpu".
> 
> We should use the original patch or none at all.

Ok, I've dropped this from spapr-next for the time being.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2015-04-29  1:57 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-02  6:26 [Qemu-devel] [PATCH qemu] qemu-options: Add documentation about PPC64's "-cpu compat" option Alexey Kardashevskiy
2015-04-07 20:43 ` Alexander Graf
2015-04-08  1:45   ` Alexey Kardashevskiy
2015-04-08  6:29     ` Alexander Graf
2015-04-08  7:41       ` Alexey Kardashevskiy
2015-04-08  7:46         ` Alexander Graf
2015-04-08  9:33           ` [Qemu-devel] [PATCH qemu v2] " Alexey Kardashevskiy
2015-04-10  2:16             ` David Gibson
2015-04-28  7:25               ` Alexey Kardashevskiy
2015-04-29  1:47                 ` David Gibson
2015-04-08  2:49 ` [Qemu-devel] [PATCH qemu] " David Gibson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.