From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: peter.maydell@linaro.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>,
borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com,
qemu-devel@nongnu.org, agraf@suse.de
Subject: [Qemu-devel] [PULL v2 8/8] s390x/virtio-ccw: fix vhost-scsi intialization
Date: Fri, 10 Oct 2014 15:09:16 +0200 [thread overview]
Message-ID: <1412946556-11820-9-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <1412946556-11820-1-git-send-email-cornelia.huck@de.ibm.com>
The vhost-scsi-ccw backend is of type VHostSCSICcw, not VirtIOSCSICcw.
This fixes a segfault when invoking
qemu-system-s390x -device vhost-scsi-ccw,?
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
hw/s390x/virtio-ccw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index e7d3ea1..18ba29f 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1528,7 +1528,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, void *data)
static const TypeInfo vhost_ccw_scsi = {
.name = TYPE_VHOST_SCSI_CCW,
.parent = TYPE_VIRTIO_CCW_DEVICE,
- .instance_size = sizeof(VirtIOSCSICcw),
+ .instance_size = sizeof(VHostSCSICcw),
.instance_init = vhost_ccw_scsi_instance_init,
.class_init = vhost_ccw_scsi_class_init,
};
--
1.7.9.5
next prev parent reply other threads:[~2014-10-10 13:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 13:09 [Qemu-devel] [PULL v2 0/8] s390x patches for 2.2 Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 1/8] linux-headers: update to 3.17-rc7 Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 2/8] s390x/kvm: introduce proper states for s390 cpus Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 3/8] s390x/kvm: proper use of the cpu states OPERATING and STOPPED Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 4/8] s390x/kvm: propagate s390 cpu state to kvm Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 5/8] s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 6/8] s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET Cornelia Huck
2014-10-10 13:09 ` [Qemu-devel] [PULL v2 7/8] s390x/migration: migrate CPU state Cornelia Huck
2014-10-10 13:09 ` Cornelia Huck [this message]
2014-10-10 19:03 ` [Qemu-devel] [PULL v2 0/8] s390x patches for 2.2 Peter Maydell
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=1412946556-11820-9-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=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).