From patchwork Tue Apr 30 18:10:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao Jiaxi X-Patchwork-Id: 1093418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=foxmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="Ll9+hB5f"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tqNw0GCSz9sB3 for ; Wed, 1 May 2019 04:12:00 +1000 (AEST) Received: from localhost ([127.0.0.1]:51390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXET-0008M8-Rs for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2019 14:11:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXDB-0007ZW-RI for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:10:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLXDA-0005BL-C5 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:10:37 -0400 Received: from smtpbg202.qq.com ([184.105.206.29]:50419) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLXD9-00056a-JP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:10:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1556647827; bh=elsID+L6NSJJoduRa7RHPrXwUkf2HhHlPBFKhzEZcX0=; h=From:To:Subject:Date:Message-Id; b=Ll9+hB5f24ukaD81GT+e2vGsUNhC63hGKt17hG2XtKkAFVJj0g04LP8LNoPVlJHzO R6M9muZk/A7UfRMHRR1ihH2Sd8qMt0ugqS+0S+ITEJhQeXEFFbI90AXzQTdijPFx9N r+CPisnuzMJK81L8jHPxn7TKKROGaPt5dok02Jyo= X-QQ-mid: esmtp3t1556647825to3efq6fe Received: from localhost (unknown [183.63.119.27]) by esmtp4.qq.com (ESMTP) with id ; Wed, 01 May 2019 02:10:24 +0800 (CST) X-QQ-SSF: B100000000000030F7F00F00000000O X-QQ-FEAT: +oIWmpEafD+ivI7ek+RcMjGBRslXbo1g9OUv7BSht0rPTShakCxnsaD8q4E/b hq9pB/w7IZciMWURREHUSUpsgpbGLApZSgDBfG+JUrm58XwfWzAQpg5emU984YvbIYkOy9p QD5WCUbV+gXZDvfiV/N1I2GnG5Ru+A/zcVy6bUHmEcvnCQmsfMMRfJVC+n/+F/HdB93geA5 WCl5rm1yUjgM2XFxgS7TCNCaa/lnVOcQzN+f8GxEajeo6ODldgC6B9MCop24YZMwsCM0ixO 4cvnmx4u5kQC9lJnECC6ozK5Vj/dDPlSe5ZqCoAXvtTmXDCxg7qhTh30E= X-QQ-GoodBg: 0 From: Cao Jiaxi To: samuel.thibault@ens-lyon.org, mst@redhat.com Date: Wed, 1 May 2019 02:10:09 +0800 Message-Id: <20190430181009.1066-1-driver1998@foxmail.com> X-Mailer: git-send-email 2.17.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign2 X-QQ-Bgrelay: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 184.105.206.29 Subject: [Qemu-devel] [PATCH v2 1/4] Initial Windows on ARM (AArch64 64-Bit) host support 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: Cao Jiaxi , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This series of patches is for initial support of Windows 10 on ARM as a QEMU host. Currently only TCG intepreter is working correctly, it crashes when TCG JIT is enabled. For now we assume it is built using the clang aarch64-w64-mingw32 toolchain, you can get a prebuilt toolchain at https://github.com/mstorsjo/llvm-mingw. QEMU_PACKED: Remove gcc_struct attribute in Windows non x86 targets This attribute is for x86 only, and it generates an warning on ARM64 Clang/MinGW targets. Signed-off-by: Cao Jiaxi --- contrib/libvhost-user/libvhost-user.h | 2 +- include/qemu/compiler.h | 2 +- scripts/cocci-macro-file.h | 7 ++++++- slirp/src/util.h | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h index 414ceb0a2f..78b33306e8 100644 --- a/contrib/libvhost-user/libvhost-user.h +++ b/contrib/libvhost-user/libvhost-user.h @@ -148,7 +148,7 @@ typedef struct VhostUserInflight { uint16_t queue_size; } VhostUserInflight; -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) # define VU_PACKED __attribute__((gcc_struct, packed)) #else # define VU_PACKED __attribute__((packed)) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 296b2fd572..09fc44cca4 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -28,7 +28,7 @@ #define QEMU_SENTINEL __attribute__((sentinel)) -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) # define QEMU_PACKED __attribute__((gcc_struct, packed)) #else # define QEMU_PACKED __attribute__((packed)) diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h index e485cdccae..c6bbc05ba3 100644 --- a/scripts/cocci-macro-file.h +++ b/scripts/cocci-macro-file.h @@ -23,7 +23,12 @@ #define QEMU_NORETURN __attribute__ ((__noreturn__)) #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define QEMU_SENTINEL __attribute__((sentinel)) -#define QEMU_PACKED __attribute__((gcc_struct, packed)) + +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) +# define QEMU_PACKED __attribute__((gcc_struct, packed)) +#else +# define QEMU_PACKED __attribute__((packed)) +#endif #define cat(x,y) x ## y #define cat2(x,y) cat(x,y) diff --git a/slirp/src/util.h b/slirp/src/util.h index 01f1e0e068..278828fe3f 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -43,7 +43,7 @@ #include #endif -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) # define SLIRP_PACKED __attribute__((gcc_struct, packed)) #else # define SLIRP_PACKED __attribute__((packed)) From patchwork Tue Apr 30 18:12:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao Jiaxi X-Patchwork-Id: 1093452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=foxmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="Q5P6ReeJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tqR53lDDz9s9y for ; Wed, 1 May 2019 04:13:53 +1000 (AEST) Received: from localhost ([127.0.0.1]:51407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXGJ-0001HV-Fd for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2019 14:13:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXFZ-0001F2-Q3 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLXFY-0006xw-Od for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:05 -0400 Received: from smtpproxy19.qq.com ([184.105.206.84]:57185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLXFY-0006wk-GV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1556647980; bh=nitcZo7Ica6bxaPIrVW3UM/lQlmnfjXu6RBr0DAnV5Q=; h=From:To:Subject:Date:Message-Id; b=Q5P6ReeJmhWgp/FYHnmVrDvKbgS/kIeh86wHZyDYoIPOi7BFPyJYPGyvlrI5EJRIj GV6l33xqM1rMopJXhVzt/WlVmUW6jpIYjyRKK0R+MsmqYgmIT1M2UrQW5vHwKB7ZCP H4Hi1l7yGv+se5xNJPlMych9ovDRGZ2tltB34JuE= X-QQ-mid: esmtp6t1556647979tsgmfeir4 Received: from localhost (unknown [183.63.119.27]) by esmtp4.qq.com (ESMTP) with id ; Wed, 01 May 2019 02:12:59 +0800 (CST) X-QQ-SSF: B100000000000030F7F00F00000000O X-QQ-FEAT: uLC2yWZT8bFf07dEYANqfu6Y4Id3QR3XmDOvTc7nv/ZBQ3xGeuDtVzSTQdaQg N+RuhCP+2PYsoSldiOESHQaHq2jVn4AHuoUPrmd7qjFV3K5UKF8J5IiRW4z2rt/xzhRA3kp wNxVuH2fJFpWGHVHkKOCbiNldsnQJV2rf0S1o7cbqKBJf+wcfs0Z6Z9ORBgGdsSXvdQ0xuf Sk3KpOLGESsW407zWRvNaci8ad50CM628TKREQOjdkWxsl61ubdqSRFXV1IVU1tjYHu86bz zBc6/Sb8EBOt5zBL5f4eSkHzY495vCHUfQOQ== X-QQ-GoodBg: 0 From: Cao Jiaxi To: mdroth@linux.vnet.ibm.com Date: Wed, 1 May 2019 02:12:57 +0800 Message-Id: <20190430181257.1265-1-driver1998@foxmail.com> X-Mailer: git-send-email 2.17.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign2 X-QQ-Bgrelay: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 184.105.206.84 Subject: [Qemu-devel] [PATCH v2 2/4] qga: Fix an enum conversion warning in commands-win32.c, hit by clang. 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: Cao Jiaxi , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Cao Jiaxi --- qga/commands-win32.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d40d61f605..4cdd2950bf 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -458,23 +458,24 @@ void qmp_guest_file_flush(int64_t handle, Error **errp) #ifdef CONFIG_QGA_NTDDSCSI static STORAGE_BUS_TYPE win2qemu[] = { - [BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN, - [BusTypeScsi] = GUEST_DISK_BUS_TYPE_SCSI, - [BusTypeAtapi] = GUEST_DISK_BUS_TYPE_IDE, - [BusTypeAta] = GUEST_DISK_BUS_TYPE_IDE, - [BusType1394] = GUEST_DISK_BUS_TYPE_IEEE1394, - [BusTypeSsa] = GUEST_DISK_BUS_TYPE_SSA, - [BusTypeFibre] = GUEST_DISK_BUS_TYPE_SSA, - [BusTypeUsb] = GUEST_DISK_BUS_TYPE_USB, - [BusTypeRAID] = GUEST_DISK_BUS_TYPE_RAID, - [BusTypeiScsi] = GUEST_DISK_BUS_TYPE_ISCSI, - [BusTypeSas] = GUEST_DISK_BUS_TYPE_SAS, - [BusTypeSata] = GUEST_DISK_BUS_TYPE_SATA, - [BusTypeSd] = GUEST_DISK_BUS_TYPE_SD, - [BusTypeMmc] = GUEST_DISK_BUS_TYPE_MMC, + [BusTypeUnknown] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_UNKNOWN, + [BusTypeScsi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SCSI, + [BusTypeAtapi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IDE, + [BusTypeAta] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IDE, + [BusType1394] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_IEEE1394, + [BusTypeSsa] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SSA, + [BusTypeFibre] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SSA, + [BusTypeUsb] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_USB, + [BusTypeRAID] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_RAID, + [BusTypeiScsi] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_ISCSI, + [BusTypeSas] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SAS, + [BusTypeSata] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SATA, + [BusTypeSd] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_SD, + [BusTypeMmc] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_MMC, #if (_WIN32_WINNT >= 0x0601) - [BusTypeVirtual] = GUEST_DISK_BUS_TYPE_VIRTUAL, - [BusTypeFileBackedVirtual] = GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL, + [BusTypeVirtual] = (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_VIRTUAL, + [BusTypeFileBackedVirtual] = + (STORAGE_BUS_TYPE)GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL, #endif }; @@ -483,7 +484,7 @@ static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus) if (bus >= ARRAY_SIZE(win2qemu) || (int)bus < 0) { return GUEST_DISK_BUS_TYPE_UNKNOWN; } - return win2qemu[(int)bus]; + return (GuestDiskBusType)win2qemu[(int)bus]; } DEFINE_GUID(GUID_DEVINTERFACE_DISK, From patchwork Tue Apr 30 18:13:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cao Jiaxi X-Patchwork-Id: 1093454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=foxmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="lEy5DO95"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tqTW62gcz9s47 for ; Wed, 1 May 2019 04:15:59 +1000 (AEST) Received: from localhost ([127.0.0.1]:51462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXIL-0002v3-R0 for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2019 14:15:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXGM-0001oe-Rj for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLXGK-0007LZ-HB for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:54 -0400 Received: from [103.7.28.233] (port=48940 helo=smtpbg65.qq.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLXGJ-0007Hj-0O for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1556648013; bh=fXh84p0STXn5EKlUSN9SkaMeXFu9HW8bXx5D12nm5Fs=; h=From:To:Subject:Date:Message-Id; b=lEy5DO95RAUKNPgzeGfdSzCbkirzV8d3zamC3Flux0eLVMB96J/6XMe9FpkFAYTXR zt/YOli9cs7GnpjG5avQo1EMFeShNtsWIum9OXF2WtJNix/akqK6LkLRGIHBo/nTDS s70zKwklfEw9xHubs3OgKyOR7BLrwUbRTQzGaYuQ= X-QQ-mid: esmtp7t1556648011t03dg8sce Received: from localhost (unknown [183.63.119.27]) by esmtp4.qq.com (ESMTP) with id ; Wed, 01 May 2019 02:13:30 +0800 (CST) X-QQ-SSF: B100000000000030F7F00F00000000O X-QQ-FEAT: Me8Xob1wlXKFmfv5qapX8itN2yV4+W/QesTEzkr0GqYAn7qQvKjofD3aqltiw 3E3JyPLdklFLtWYnXpjskd/NWE3kHr4Yu6hMX+ltiw+LZh7CSfzn6+eHCt+ffXfWUvusIgC MsPo+CAxp0m+ysKqnNAqMBBVGmsK25P9rHFtKaRY+9/XJ7VN7gLgH/7uBZF4lMwfkcaYTNO 3HecW86xw/RGheMc+hDzwCzleHQpbqD7wIfowoI8WB1GoFd5McirB3qKyiaSKqXgFVYfE1m 308cxcHa/k5dktNFv/SWyB7s7BRMPeL99E2A== X-QQ-GoodBg: 0 From: Cao Jiaxi To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 02:13:26 +0800 Message-Id: <20190430181326.1314-1-driver1998@foxmail.com> X-Mailer: git-send-email 2.17.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign4 X-QQ-Bgrelay: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 103.7.28.233 Subject: [Qemu-devel] [PATCH v2 3/4] util/cacheinfo.c: Use uintptr_t instead of unsigned long in AArch64 arch_cache_info() 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: Cao Jiaxi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Windows ARM64 uses LLP64 model, which breaks current assumptions. Signed-off-by: Cao Jiaxi Reviewed-by: Philippe Mathieu-Daudé --- util/cacheinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cacheinfo.c b/util/cacheinfo.c index 3cd080b83d..ce6f0dbf6a 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -107,7 +107,7 @@ static void sys_cache_info(int *isize, int *dsize) static void arch_cache_info(int *isize, int *dsize) { if (*isize == 0 || *dsize == 0) { - unsigned long ctr; + uintptr_t ctr; /* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1, but (at least under Linux) these are marked protected by the From patchwork Tue Apr 30 18:13:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao Jiaxi X-Patchwork-Id: 1093453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=foxmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.b="Gru+gr7B"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tqS30rhFz9sBr for ; Wed, 1 May 2019 04:14:42 +1000 (AEST) Received: from localhost ([127.0.0.1]:51419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXH6-0001rX-RG for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2019 14:14:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLXGM-0001oc-RP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLXGK-0007LT-GE for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:54 -0400 Received: from smtpbgeu2.qq.com ([18.194.254.142]:38649) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLXGJ-0007K9-3f for qemu-devel@nongnu.org; Tue, 30 Apr 2019 14:13:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1556648025; bh=CQirBRpOqVgUGWxDqn/rT1V4oQiTaduNM5WoiWaimwM=; h=From:To:Subject:Date:Message-Id; b=Gru+gr7BWW7JRQGqIfkOu2PsoeO4gQWdaPRLT4KB8Vpo1HHwrkBg7aDB3Sex9kCEY g3A2zWby8iYP5yyK2sYGDxCbgPlecjAaaC9Z9l+5xkTY/OF+miEnc6k2/k9UqazDVQ LhGlez3Kebd/d7qGP0BOHJg9hwsKJ4rmf/DloVVg= X-QQ-mid: esmtp5t1556648024tb6k12gfz Received: from localhost (unknown [183.63.119.27]) by esmtp4.qq.com (ESMTP) with id ; Wed, 01 May 2019 02:13:43 +0800 (CST) X-QQ-SSF: B100000000000030F7F00F00000000O X-QQ-FEAT: 4BYgmPH5RlGcu2N1hoA3KgOnr5CIotVbVs/BfRNnV2ZmDk1rDaN0n61zv3BAR X4xhR7hnig3yEnw1QPRWUj8q+kd/5w36EDqoUI2DBb9+RKPuL6PjP7gZYDH0nM+xKb2Akjq ZGLEX7xc+mFEvbNBN4dEarVh2rLmxD2vB7NhuB1F2nrs9za9Q99hp2g7eqa100Lp2ccdpFP FkEYzghXLq5+Kkf2mgQpZNFk7tbMFrMrUMFnM2/0O8gslGe5/9DqWokQpjXs7AvyZE2heKS 1fVsuJsbScVF6g6JIoamBsTceyCM6UMh2hpg== X-QQ-GoodBg: 0 From: Cao Jiaxi To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 02:13:43 +0800 Message-Id: <20190430181343.1362-1-driver1998@foxmail.com> X-Mailer: git-send-email 2.17.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign2 X-QQ-Bgrelay: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 18.194.254.142 Subject: [Qemu-devel] [PATCH v2 4/4] include/qemu/osdep.h: Move the __USE_MINGW_ANSI_STDIO define up to avoid confliction. 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: Cao Jiaxi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Cao Jiaxi Signed-off-by:... --- include/qemu/osdep.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 303d315c5d..af2b91f0b8 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -85,17 +85,17 @@ extern int daemon(int, int); #endif #endif +/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ +#ifdef __MINGW32__ +#define __USE_MINGW_ANSI_STDIO 1 +#endif + #include #include #include #include #include #include - -/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ -#ifdef __MINGW32__ -#define __USE_MINGW_ANSI_STDIO 1 -#endif #include #include