From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVeG2-0005RL-70 for qemu-devel@nongnu.org; Fri, 26 Apr 2013 04:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVeG1-0007Pl-5n for qemu-devel@nongnu.org; Fri, 26 Apr 2013 04:43:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVeG0-0007Pf-Uc for qemu-devel@nongnu.org; Fri, 26 Apr 2013 04:43:53 -0400 From: Jason Wang Date: Fri, 26 Apr 2013 16:34:04 +0800 Message-Id: <1366965244-20542-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1366965244-20542-1-git-send-email-jasowang@redhat.com> References: <1366965244-20542-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] s390-virtio-bus: sync config only when config_len is not zero List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, mst@redhat.com, qemu-devel@nongnu.org Cc: Jason Wang , pmatouse@redhat.com, Alexander Graf , Richard Henderson virtio-rng-s390 has zero config length, so no need to sync its config otherwise qemu will crash since vdev->config is NULL. Cc: Alexander Graf Cc: Richard Henderson Signed-off-by: Jason Wang --- hw/s390x/s390-virtio-bus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index dabbc2e..0f83516 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -350,6 +350,10 @@ void s390_virtio_device_sync(VirtIOS390Device *dev) dev->feat_offs = cur_offs + dev->feat_len; cur_offs += dev->feat_len * 2; + if (!dev->vdev->config_len) { + return; + } + /* Sync config space */ if (dev->vdev->get_config) { dev->vdev->get_config(dev->vdev, dev->vdev->config); -- 1.7.1