Skip to contentSkip to conversation

audio: set top level latch for each slot

PATCH Applied Prasad Joshi 9 participants 21 messages Mar 23, 2014 – Apr 2, 2014 Networking

lore
Share & tools
lore

Prasad Joshi

author
#0 lore raw

PATCH 1/6 audio: set top level latch for each slot

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 <[email protected]>
---
 hw/audio/fmopl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/fmopl.c +1 -1
index 290a224..eb60c12 100644
@@ -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);
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/6 intc/openpic_kvm: fix MemListener delete regiion callback function

Signed-off-by Prasad Joshi <[email protected]>
---
 hw/intc/openpic_kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/openpic_kvm.c +1 -1
index 87fdb12..afa604d 100644
@@ -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 */
Signature · 1 line
1.8.1.2
#2 lore raw

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

Am 23.03.2014 10:28, schrieb Prasad Joshi:

Quoted 4 lines
Signed-off-by Prasad Joshi <[email protected]>
---
 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

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#3 lore raw

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

Quoted 7 lines · Andreas Färber

Am 23.03.2014 10:28, schrieb Prasad Joshi:

Quoted 4 lines
Signed-off-by Prasad Joshi <[email protected]>
---
  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

#4 lore raw

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

Am 02.04.2014 10:54, schrieb Alexander Graf:

Quoted 11 lines · Andreas Färber
Quoted 7 lines

Am 23.03.2014 10:28, schrieb Prasad Joshi:

Quoted 4 lines
Signed-off-by Prasad Joshi <[email protected]>
---
  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

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#5 lore raw

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

Quoted 12 lines

Am 02.04.2014 um 12:53 schrieb Andreas Färber <[email protected]>:

Am 02.04.2014 10:54, schrieb Alexander Graf:

Quoted 7 lines · Andreas Färber
Quoted 5 lines

Am 23.03.2014 10:28, schrieb Prasad Joshi:

Quoted 4 lines
Signed-off-by Prasad Joshi <[email protected]>
---
 hw/intc/openpic_kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

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 :).

Quoted 5 lines

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

Quoted 6 lines

Andreas

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
author
#6 lore raw

PATCH 3/6 pcnet: remove duplicate assignment

In reply to Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>
---
 hw/net/pcnet.c | 1 -
 1 file changed, 1 deletion(-)
hw/net/pcnet.c +0 -1
index 7cb47b3..ebe5057 100644
@@ -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;
Signature · 1 line
1.8.1.2
author
#9 lore raw

PATCH 4/6 hw/timer/grlib_gptimer: remove unnecessary assignment

In reply to Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>
---
 hw/timer/grlib_gptimer.c | 1 -
 1 file changed, 1 deletion(-)
hw/timer/grlib_gptimer.c +0 -1
index 7672d3a..d655bb2 100644
@@ -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;
Signature · 1 line
1.8.1.2
Applied
#10 lore raw

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

Thanks, applied to -trivial.

/mjt

author
#11 lore raw

PATCH 5/6 linux-user: remove duplicate statement

In reply to Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>
---
 linux-user/signal.c | 2 --
 1 file changed, 2 deletions(-)
linux-user/signal.c +0 -2
index e5fb933..7d6246f 100644
@@ -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;
Signature · 1 line
1.8.1.2
Acked-by on v1 5/6
#12 lore raw

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

Quoted 1 line · Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>a
Acked-by Riku Voipio <[email protected]>
Quoted 19 lines
---
 linux-user/signal.c | 2 --
 1 file changed, 2 deletions(-)
linux-user/signal.c +0 -2
index e5fb933..7d6246f 100644
@@ -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;
Signature · 1 line
1.8.1.2
author
#14 lore raw

PATCH 6/6 net: netmap_poll must update both read/write poll state

In reply to Prasad Joshi
Signed-off-by Prasad Joshi <[email protected]>
---
 net/netmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/netmap.c +2 -2
index 8213304..0c1772b 100644
@@ -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);
     }
 }
Signature · 1 line
1.8.1.2
#17 lore raw
In reply to Prasad Joshi
Quoted 8 lines · 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 <[email protected]>
---
 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.

Quoted 16 lines
hw/audio/fmopl.c +1 -1
index 290a224..eb60c12 100644
@@ -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);
Signature · 1 line
1.8.1.2
#18 lore raw
Quoted 11 lines · Stefan Hajnoczi
Quoted 8 lines · 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 <[email protected]>
---
 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

#19 lore raw

Am 24.03.2014 14:22, schrieb Peter Maydell:

Quoted 11 lines · Stefan Hajnoczi
Quoted 10 lines · Prasad Joshi
Quoted 8 lines

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 <[email protected]>
---
 hw/audio/fmopl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 5 lines
Quoted 1 line

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.

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#20 lore raw
In reply to Peter Maydell
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Stefan Hajnoczi
Quoted 8 lines · 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 <[email protected]>
---
 hw/audio/fmopl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 5 lines
Quoted 1 line

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