From patchwork Mon Aug 15 10:28:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 9280775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B28E60839 for ; Mon, 15 Aug 2016 10:28:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E46DE28C03 for ; Mon, 15 Aug 2016 10:28:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D937028C06; Mon, 15 Aug 2016 10:28:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CBF628C03 for ; Mon, 15 Aug 2016 10:28:55 +0000 (UTC) Received: from localhost ([::1]:35914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZF8Y-0001bp-CK for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Aug 2016 06:28:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZF86-0001ZA-7Y for qemu-devel@nongnu.org; Mon, 15 Aug 2016 06:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZF80-0002Qr-Nw for qemu-devel@nongnu.org; Mon, 15 Aug 2016 06:28:25 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:60973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZF80-0002Qk-F1 for qemu-devel@nongnu.org; Mon, 15 Aug 2016 06:28:20 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7FANsJh080241 for ; Mon, 15 Aug 2016 06:28:19 -0400 Received: from e06smtp09.uk.ibm.com (e06smtp09.uk.ibm.com [195.75.94.105]) by mx0a-001b2d01.pphosted.com with ESMTP id 24sxumbm2c-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 15 Aug 2016 06:28:19 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Aug 2016 11:28:16 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp09.uk.ibm.com (192.168.101.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Aug 2016 11:28:14 +0100 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: borntraeger@de.ibm.com X-IBM-RcptTo: peter.maydell@linaro.org; qemu-devel@nongnu.org; marcandre.lureau@redhat.com; pbonzini@redhat.com Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 74A9217D8042; Mon, 15 Aug 2016 11:29:55 +0100 (BST) Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u7FASDhr11993328; Mon, 15 Aug 2016 10:28:13 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A68E5206B; Mon, 15 Aug 2016 10:27:25 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 19F995204D; Mon, 15 Aug 2016 10:27:25 +0100 (BST) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id BDAE020F5C2; Mon, 15 Aug 2016 12:28:12 +0200 (CEST) From: Christian Borntraeger To: cornelia.huck@de.ibm.com Date: Mon, 15 Aug 2016 12:28:11 +0200 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1471256891-203570-1-git-send-email-borntraeger@de.ibm.com> References: <1471256891-203570-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16081510-0036-0000-0000-000002165900 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16081510-0037-0000-0000-00001214CE01 Message-Id: <1471256891-203570-2-git-send-email-borntraeger@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-15_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608150122 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 1/1] pc-bios/s390-ccw.img: Fix build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pbonzini@redhat.com, qemu-devel@nongnu.org, Christian Borntraeger , marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since commit a9c87304b76d ("build-sys: fix building with make CFLAGS=.. argument") pc-bios/s390-ccw.img build might fail with --- snip --- main.o: In function `virtio_setup': qemu/pc-bios/s390-ccw/main.c:117: undefined reference to `__stack_chk_fail' --- snip --- Changing the CFLAGS to QEMU_CFLAGS does the trick. We also need to fix a potential aliasing bug as we now compile with -O2 instead of -O0. This was the warning message: --- snip --- /home/cborntra/REPOS/qemu/pc-bios/s390-ccw/virtio.c:64:5: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing] return kvm_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY, *(u32 *)&schid, --- snip --- Signed-off-by: Christian Borntraeger --- pc-bios/s390-ccw/Makefile | 6 ++++-- pc-bios/s390-ccw/virtio.c | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 4208cb4..a9dcca4 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -10,8 +10,10 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) .PHONY : all clean build-all OBJECTS = start.o main.o bootmap.o sclp-ascii.o virtio.o virtio-scsi.o -CFLAGS += -fPIE -fno-stack-protector -ffreestanding -march=z900 -CFLAGS += -fno-delete-null-pointer-checks -msoft-float +QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS)) +QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float +QEMU_CFLAGS += -march=z900 -fPIE +QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector) LDFLAGS += -Wl,-pie -nostdlib build-all: s390-ccw.img diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 1d34e8c..9a7681d 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -61,7 +61,12 @@ static long kvm_hypercall(unsigned long nr, unsigned long param1, static long virtio_notify(SubChannelId schid, int vq_idx, long cookie) { - return kvm_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY, *(u32 *)&schid, + union { + SubChannelId schid; + u32 value; + } sch; + sch.schid = schid; + return kvm_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY, sch.value, vq_idx, cookie); }