qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>,
	borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de,
	Thomas Huth <thuth@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 5/9] s390x/kvm: Fix diag-308 register decoding
Date: Wed, 28 Jan 2015 15:31:34 +0100	[thread overview]
Message-ID: <1422455498-889-6-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <1422455498-889-1-git-send-email-cornelia.huck@de.ibm.com>

From: Thomas Huth <thuth@linux.vnet.ibm.com>

Fix the decoding of the r1 register number in the diagnose 308 handler.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 target-s390x/kvm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index dcd7505..6bf2719 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1046,7 +1046,7 @@ static void kvm_handle_diag_308(S390CPU *cpu, struct kvm_run *run)
     uint64_t r1, r3;
 
     cpu_synchronize_state(CPU(cpu));
-    r1 = (run->s390_sieic.ipa & 0x00f0) >> 8;
+    r1 = (run->s390_sieic.ipa & 0x00f0) >> 4;
     r3 = run->s390_sieic.ipa & 0x000f;
     handle_diag_308(&cpu->env, r1, r3);
 }
-- 
1.7.9.5

  parent reply	other threads:[~2015-01-28 14:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-28 14:31 [Qemu-devel] [PATCH 0/9] s390x bugfixes and cleanup Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 1/9] s390: Plug memory leak on s390_pci_generate_event() error path Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 2/9] s390x/pci: avoid sign extension in stpcifc Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 3/9] s390x/pci: check for invalid function handle Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 4/9] s390x/pci: fix dma notifications in rpcit instruction Cornelia Huck
2015-01-28 14:31 ` Cornelia Huck [this message]
2015-01-28 14:31 ` [Qemu-devel] [PATCH 6/9] s390x/kvm: unknown DIAGNOSE code should give a specification exception Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 7/9] s390x/ipl: Improved code indentation in s390_ipl_init() Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 8/9] pc-bios/s390-ccw: fix sparse warnings Cornelia Huck
2015-01-28 14:31 ` [Qemu-devel] [PATCH 9/9] pc-bios/s390-ccw: update binary Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422455498-889-6-git-send-email-cornelia.huck@de.ibm.com \
    --to=cornelia.huck@de.ibm.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=jfrei@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).