[Qemu-devel] [0/3] Accumulated ppc patches

[Qemu-devel] [0/3] Accumulated ppc patches

[David Gibson]

Hi Alex,

I see that you're now back from your holiday.  Here, rather belatedly,
is my series of ppc related patches collected while acting ppc
maintainer.  As you can see there aren't many at all. I'm not sure if
that's because I wasn't looking in the right places for people sending
patches, or there just wasn't much activity.  Anyway, here they are,
do with them as you see fit.

[Qemu-devel] [PATCH 1/3] target-ppc: Change default machine for 64-bit

[David Gibson]

Currently, for qemu-system-ppc64, the default machine type is 'mac99'.
The mac99 machine is not being actively maintained, and represents a
bizarre hybrid of components that never actually existed as a real system.
This patch changes the default machine to 'pseries', which is actively
maintained and works well with most modern ppc64 Linux distributions as a
guest.

Because the pseries machine type is optional (it is only built when libfdt
is available), this can result in a build with no default machine.  In that
case vl.c will print a "No machine found" message.  This seems reasonable,
given that as mentioned, mac99 is unlikely to be a good choice.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/mac_newworld.c | 3 ---
 hw/ppc/spapr.c        | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index ce44e95..dafe7d2 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -458,9 +458,6 @@ static QEMUMachine core99_machine = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .max_cpus = MAX_CPUS,
-#ifdef TARGET_PPC64
-    .is_default = 1,
-#endif
     DEFAULT_MACHINE_OPTIONS,
 };
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 218ea23..5363c3f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -971,6 +971,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
 static QEMUMachine spapr_machine = {
     .name = "pseries",
     .desc = "pSeries Logical Partition (PAPR compliant)",
+    .is_default = 1,
     .init = ppc_spapr_init,
     .reset = ppc_spapr_reset,
     .block_default_type = IF_SCSI,
-- 
1.8.1.4

[Qemu-devel] [PATCH 2/3] target-ppc kvm: save cr register

[David Gibson]

From: Alexey Kardashevskiy <aik@ozlabs.ru>

This adds a missing code to save CR (condition register) via
kvm_arch_put_registers(). kvm_arch_get_registers() already has it.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 target-ppc/kvm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 2bbc3b8..c89dd58 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -791,6 +791,11 @@ int kvm_arch_put_registers(CPUState *cs, int level)
     for (i = 0;i < 32; i++)
         regs.gpr[i] = env->gpr[i];
 
+    regs.cr = 0;
+    for (i = 0; i < 8; i++) {
+        regs.cr |= (env->crf[i] & 15) << (4 * (7 - i));
+    }
+
     ret = kvm_vcpu_ioctl(cs, KVM_SET_REGS, &regs);
     if (ret < 0)
         return ret;
-- 
1.8.1.4

[Qemu-devel] [PATCH 3/3] pseries: Update MAINTAINERS information

[David Gibson]

I'm no longer at IBM, and therefore no long actively working on the pseries
(aka sPAPR) qemu machine type.  This patch replaces my information in the
MAINTAINERS file with that for Alexey Kardashevskiy, who is taking over
maintainership of the pseries code.  While we're at it, I've added some
extra file patterns for pseries specific files that weren't included in the
existing pattern.

Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 MAINTAINERS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3412b07..af28c77 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -428,11 +428,15 @@ F: hw/pci/devices/host-prep.[hc]
 F: hw/isa/pc87312.[hc]
 
 sPAPR
-M: David Gibson <david@gibson.dropbear.id.au>
+M: Alexey Kardashevskiy <aik@ozlabs.ru>
 M: Alexander Graf <agraf@suse.de>
 L: qemu-ppc@nongnu.org
 S: Supported
 F: hw/*/spapr*
+F: include/hw/*/spapr*
+F: hw/*/xics*
+F: include/hw/*/xics*
+F: pc-bios/spapr-rtas/*
 
 virtex_ml507
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-- 
1.8.1.4

Re: [Qemu-devel] [0/3] Accumulated ppc patches

[Alexander Graf]

On 15.06.2013, at 03:51, David Gibson wrote:

> Hi Alex,
> 
> I see that you're now back from your holiday.  Here, rather belatedly,
> is my series of ppc related patches collected while acting ppc
> maintainer.  As you can see there aren't many at all. I'm not sure if
> that's because I wasn't looking in the right places for people sending
> patches, or there just wasn't much activity.  Anyway, here they are,
> do with them as you see fit.
> 

Thanks, applied all except for Alexey's addition as maintainer to ppc-next.

Alexey, please lurk on the list, review patches, write patches that I don't have to comment anything on before applying them - in short: prove that you'd be a great maintainer and then I'll reconsider adding you to the file :).


Alex

Re: [Qemu-devel] [0/3] Accumulated ppc patches

[Alexey Kardashevskiy]

On 06/19/2013 01:49 AM, Alexander Graf wrote:
> 
> On 15.06.2013, at 03:51, David Gibson wrote:
> 
>> Hi Alex,
>> 
>> I see that you're now back from your holiday.  Here, rather
>> belatedly, is my series of ppc related patches collected while acting
>> ppc maintainer.  As you can see there aren't many at all. I'm not sure
>> if that's because I wasn't looking in the right places for people
>> sending patches, or there just wasn't much activity.  Anyway, here
>> they are, do with them as you see fit.
>> 
> 
> Thanks, applied all except for Alexey's addition as maintainer to
> ppc-next.
> 

> Alexey, please lurk on the list, review patches, write patches that I
> don't have to comment anything on before applying them - in short: prove
> that you'd be a great maintainer and then I'll reconsider adding you to
> the file :).

So in short - you did not pull anything from the list posted by David or me
(except David's changes in maintainers list) in last 2 weeks and not going
to, is that correct? :) I am asking because I am waiting till you finish
with the queue in your mailbox to see what I still have to repost.


-- 
Alexey

Re: [Qemu-devel] [0/3] Accumulated ppc patches

[Alexander Graf]

On 19.06.2013, at 01:20, Alexey Kardashevskiy wrote:

> On 06/19/2013 01:49 AM, Alexander Graf wrote:
>> 
>> On 15.06.2013, at 03:51, David Gibson wrote:
>> 
>>> Hi Alex,
>>> 
>>> I see that you're now back from your holiday.  Here, rather
>>> belatedly, is my series of ppc related patches collected while acting
>>> ppc maintainer.  As you can see there aren't many at all. I'm not sure
>>> if that's because I wasn't looking in the right places for people
>>> sending patches, or there just wasn't much activity.  Anyway, here
>>> they are, do with them as you see fit.
>>> 
>> 
>> Thanks, applied all except for Alexey's addition as maintainer to
>> ppc-next.
>> 
> 
>> Alexey, please lurk on the list, review patches, write patches that I
>> don't have to comment anything on before applying them - in short: prove
>> that you'd be a great maintainer and then I'll reconsider adding you to
>> the file :).
> 
> So in short - you did not pull anything from the list posted by David or me
> (except David's changes in maintainers list) in last 2 weeks and not going
> to, is that correct? :)

That's not what I was saying. I'm more than happy to apply patches from anyone, regardless of their tag in the MAINTAINERS file :). The tag mostly just indicates a level of trust that takes a while to earn.

> I am asking because I am waiting till you finish
> with the queue in your mailbox to see what I still have to repost.

Yes, I'm down to ~400. I'll send a note when I'm at a reasonable point. Hopefully by the end of this week.


Alex