[Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Prasad Joshi]

CSMKeyControll function is supposed to set the top level latch for each
slot. However, at the moment, it incorrectly updates only the first
slot. Patch fixes the problem.

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 hw/audio/fmopl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 290a224..eb60c12 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -725,7 +725,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
 	OPL_KEYOFF(slot2);
 	/* total level latch */
 	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
-	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
+	slot2->TLL = slot2->TL + (CH->ksl_base>>slot2->ksl);
 	/* key on */
 	CH->op1_out[0] = CH->op1_out[1] = 0;
 	OPL_KEYON(slot1);
-- 
1.8.1.2

[Qemu-devel] [PATCH 2/6] intc/openpic_kvm: fix MemListener delete regiion callback function

[Prasad Joshi]

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 hw/intc/openpic_kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 87fdb12..afa604d 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -200,7 +200,7 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp)
     qdev_init_gpio_in(dev, kvm_openpic_set_irq, OPENPIC_MAX_IRQ);
 
     opp->mem_listener.region_add = kvm_openpic_region_add;
-    opp->mem_listener.region_add = kvm_openpic_region_del;
+    opp->mem_listener.region_del = kvm_openpic_region_del;
     memory_listener_register(&opp->mem_listener, &address_space_memory);
 
     /* indicate pic capabilities */
-- 
1.8.1.2

Re: [Qemu-devel] [PATCH 2/6] intc/openpic_kvm: fix MemListener delete regiion callback function

[Andreas Färber]

Am 23.03.2014 10:28, schrieb Prasad Joshi:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  hw/intc/openpic_kvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for spotting this, applied to ppc-next (w/ typo fix in subject):
https://github.com/afaerber/qemu-cpu/commits/ppc-next

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 2/6] intc/openpic_kvm: fix MemListener delete regiion callback function

[Alexander Graf]

On 24.03.14 15:25, Andreas Färber wrote:
> Am 23.03.2014 10:28, schrieb Prasad Joshi:
>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>> ---
>>   hw/intc/openpic_kvm.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> Thanks for spotting this, applied to ppc-next (w/ typo fix in subject):
> https://github.com/afaerber/qemu-cpu/commits/ppc-next

This patch breaks the e500 platform target.


Alex

Re: [Qemu-devel] [PATCH 2/6] intc/openpic_kvm: fix MemListener delete regiion callback function

[Andreas Färber]

Am 02.04.2014 10:54, schrieb Alexander Graf:
> 
> On 24.03.14 15:25, Andreas Färber wrote:
>> Am 23.03.2014 10:28, schrieb Prasad Joshi:
>>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>>> ---
>>>   hw/intc/openpic_kvm.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> Thanks for spotting this, applied to ppc-next (w/ typo fix in subject):
>> https://github.com/afaerber/qemu-cpu/commits/ppc-next
> 
> This patch breaks the e500 platform target.

Ouch. I had specifically tested build and -M pseries on PowerKVM but
obviously did not for e500.

Means it was theoretically broken from the start then, if you compare my
extended commit message:

http://git.qemu.org/?p=qemu.git;a=commit;h=6f1834a2baa2f2688efaa7756d000876c7898d13

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 2/6] intc/openpic_kvm: fix MemListener delete regiion callback function

[Alexander Graf]

> Am 02.04.2014 um 12:53 schrieb Andreas Färber <afaerber@suse.de>:
> 
> Am 02.04.2014 10:54, schrieb Alexander Graf:
>> 
>> On 24.03.14 15:25, Andreas Färber wrote:
>>> Am 23.03.2014 10:28, schrieb Prasad Joshi:
>>>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>>>> ---
>>>>  hw/intc/openpic_kvm.c | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>> Thanks for spotting this, applied to ppc-next (w/ typo fix in subject):
>>> https://github.com/afaerber/qemu-cpu/commits/ppc-next
>> 
>> This patch breaks the e500 platform target.
> 
> Ouch. I had specifically tested build and -M pseries on PowerKVM but
> obviously did not for e500.

Yeah, this file is only used on e500 with kvm enabled. No worries, things worked out well :).

> 
> Means it was theoretically broken from the start then, if you compare my
> extended commit message:
> 
> http://git.qemu.org/?p=qemu.git;a=commit;h=6f1834a2baa2f2688efaa7756d000876c7898d13

Well, it definitely worked before, though most likely by chance ;).


Alex

> 
> Andreas
> 
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 3/6] pcnet: remove duplicate assignment

[Prasad Joshi]

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 hw/net/pcnet.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 7cb47b3..ebe5057 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -718,7 +718,6 @@ static void pcnet_s_reset(PCNetState *s)
     s->csr[94]  = 0x0000;
     s->csr[100] = 0x0200;
     s->csr[103] = 0x0105;
-    s->csr[103] = 0x0105;
     s->csr[112] = 0x0000;
     s->csr[114] = 0x0000;
     s->csr[122] = 0x0000;
-- 
1.8.1.2

Re: [Qemu-devel] [PATCH 3/6] pcnet: remove duplicate assignment

[Stefan Hajnoczi]

On Sun, Mar 23, 2014 at 02:58:40PM +0530, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  hw/net/pcnet.c | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [PATCH 3/6] pcnet: remove duplicate assignment

[Stefan Hajnoczi]

On Sun, Mar 23, 2014 at 02:58:40PM +0530, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  hw/net/pcnet.c | 1 -
>  1 file changed, 1 deletion(-)

Thanks, applied to my net-next tree:
https://github.com/stefanha/qemu/commits/net-next

Stefan

[Qemu-devel] [PATCH 4/6] hw/timer/grlib_gptimer: remove unnecessary assignment

[Prasad Joshi]

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 hw/timer/grlib_gptimer.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 7672d3a..d655bb2 100644
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -328,7 +328,6 @@ static void grlib_gptimer_reset(DeviceState *d)
 
     unit->scaler = 0;
     unit->reload = 0;
-    unit->config = 0;
 
     unit->config  = unit->nr_timers;
     unit->config |= unit->irq_line << 3;
-- 
1.8.1.2

Re: [Qemu-devel] [Qemu-trivial] [PATCH 4/6] hw/timer/grlib_gptimer: remove unnecessary assignment

[Michael Tokarev]

Thanks, applied to -trivial.

/mjt

[Qemu-devel] [PATCH 5/6] linux-user: remove duplicate statement

[Prasad Joshi]

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 linux-user/signal.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index e5fb933..7d6246f 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -4043,8 +4043,6 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
     struct target_rt_sigframe *frame;
     abi_ulong info_addr, uc_addr;
 
-    frame_addr = get_sigframe(ka, env, sizeof *frame);
-
     frame_addr = get_sigframe(ka, env, sizeof(*frame));
     if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
         goto give_sigsegv;
-- 
1.8.1.2

Re: [Qemu-devel] [PATCH 5/6] linux-user: remove duplicate statement

[Riku Voipio]

On Sun, Mar 23, 2014 at 02:58:42PM +0530, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>a

Acked-by: Riku Voipio <riku.voipio@linaro.org>

> ---
>  linux-user/signal.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index e5fb933..7d6246f 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -4043,8 +4043,6 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
>      struct target_rt_sigframe *frame;
>      abi_ulong info_addr, uc_addr;
>  
> -    frame_addr = get_sigframe(ka, env, sizeof *frame);
> -
>      frame_addr = get_sigframe(ka, env, sizeof(*frame));
>      if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
>          goto give_sigsegv;
> -- 
> 1.8.1.2

Re: [Qemu-devel] [Qemu-trivial] [PATCH 5/6] linux-user: remove duplicate statement

[Michael Tokarev]

Thanks, applied to -trivial.

/mjt

[Qemu-devel] [PATCH 6/6] net: netmap_poll must update both read/write poll state

[Prasad Joshi]

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 net/netmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netmap.c b/net/netmap.c
index 8213304..0c1772b 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -177,8 +177,8 @@ static void netmap_poll(NetClientState *nc, bool enable)
     NetmapState *s = DO_UPCAST(NetmapState, nc, nc);
 
     if (s->read_poll != enable || s->write_poll != enable) {
-        s->read_poll = enable;
-        s->read_poll = enable;
+        s->write_poll = enable;
+        s->read_poll  = enable;
         netmap_update_fd_handler(s);
     }
 }
-- 
1.8.1.2

Re: [Qemu-devel] [PATCH 6/6] net: netmap_poll must update both read/write poll state

[Stefan Hajnoczi]

On Sun, Mar 23, 2014 at 02:58:43PM +0530, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  net/netmap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [PATCH 6/6] net: netmap_poll must update both read/write poll state

[Stefan Hajnoczi]

On Sun, Mar 23, 2014 at 02:58:43PM +0530, Prasad Joshi wrote:
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  net/netmap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, applied to my net tree:
https://github.com/stefanha/qemu/commits/net

Stefan

Re: [Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Stefan Hajnoczi]

On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
> CSMKeyControll function is supposed to set the top level latch for each
> slot. However, at the moment, it incorrectly updates only the first
> slot. Patch fixes the problem.
> 
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  hw/audio/fmopl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.

> diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
> index 290a224..eb60c12 100644
> --- a/hw/audio/fmopl.c
> +++ b/hw/audio/fmopl.c
> @@ -725,7 +725,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
>  	OPL_KEYOFF(slot2);
>  	/* total level latch */
>  	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
> -	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
> +	slot2->TLL = slot2->TL + (CH->ksl_base>>slot2->ksl);
>  	/* key on */
>  	CH->op1_out[0] = CH->op1_out[1] = 0;
>  	OPL_KEYON(slot1);
> -- 
> 1.8.1.2
> 

Re: [Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Peter Maydell]

On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
>> CSMKeyControll function is supposed to set the top level latch for each
>> slot. However, at the moment, it incorrectly updates only the first
>> slot. Patch fixes the problem.
>>
>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>> ---
>>  hw/audio/fmopl.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.

I'm currently assuming that bugfixes for 2.0 will appear in
the form of pullrequests marked 'for-2.0' from the appropriate
submaintainers...

thanks
-- PMM

Re: [Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Andreas Färber]

Am 24.03.2014 14:22, schrieb Peter Maydell:
> On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
>>> CSMKeyControll function is supposed to set the top level latch for each
>>> slot. However, at the moment, it incorrectly updates only the first
>>> slot. Patch fixes the problem.
>>>
>>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>>> ---
>>>  hw/audio/fmopl.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.
> 
> I'm currently assuming that bugfixes for 2.0 will appear in
> the form of pullrequests marked 'for-2.0' from the appropriate
> submaintainers...

I've already picked up the openpic patch earlier today and got
distracted from testing it on PowerKVM for sending out the message...

Regards,
Andreas

P.S. Prasad, please remember to prepend a cover letter 0/6 next time.

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 1/6] audio: set top level latch for each slot

[Stefan Hajnoczi]

On Mon, Mar 24, 2014 at 01:22:56PM +0000, Peter Maydell wrote:
> On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
> >> CSMKeyControll function is supposed to set the top level latch for each
> >> slot. However, at the moment, it incorrectly updates only the first
> >> slot. Patch fixes the problem.
> >>
> >> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> >> ---
> >>  hw/audio/fmopl.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.
> 
> I'm currently assuming that bugfixes for 2.0 will appear in
> the form of pullrequests marked 'for-2.0' from the appropriate
> submaintainers...

Okay, I'll take the relevant ones for the net subsystem and send a pull
request.

Stefan