From patchwork Fri Jun 26 12:53:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1317632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=abMk7lGd; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tcJq2xd8z9sRN for ; Fri, 26 Jun 2020 22:54:02 +1000 (AEST) Received: from localhost ([::1]:45510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jonrj-0006SA-TB for incoming@patchwork.ozlabs.org; Fri, 26 Jun 2020 08:53:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jonrS-0006Rw-6O; Fri, 26 Jun 2020 08:53:42 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:45859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jonrQ-0008J3-KM; Fri, 26 Jun 2020 08:53:41 -0400 Received: by mail-ed1-x52f.google.com with SMTP id d16so183530edz.12; Fri, 26 Jun 2020 05:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Sk4jPNPZZZQEXgb8aF5QfKzPGN3qP8PnnMdQeGvFFTU=; b=abMk7lGd5t07QFlOoTpfbidIHLDBfYcKp4PdDojFXj9IHMAEYYXqYVnxpcxe9yed3c W134AHwz3Zs5klSg+AHdYWoD4HpjAOn4k2llbvKA26KiubwQcChOObE+8pW9Wkwr+G7d alAdUWuANlhyHanzokD3RhfY1y9aj7mJ1n/F1N4BdRkLg5d9mH4jn61H1aijto9fZ7zq BF7HRwU9ASCodm3DJ5bs3nO1d9q2bA/G8ZW8bpWaFEx4qIVH0sCYs6BAnyEBVFzbTnVX ZqR7X1IF0wgWmg4GnPUEIg/GeJXsFaw1HtA6+n0KY6RkZD4vai6oEbbssZI+h49VHf7e TjXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Sk4jPNPZZZQEXgb8aF5QfKzPGN3qP8PnnMdQeGvFFTU=; b=ZDYxCLaCGAD07idQjJ0ZHTjZTf6z0JjVxiBztY3+nw5SeH2xOMKGeF7Js81eXBNG28 TSpYoWfJC1x11owBNi0Wb99F8R8hC+hKCio5KeXS+8IWs9KPCmZiAgiA9heA0kHPfFMt HAeiueZAMpQyOAM04BWnvC+ymE727jNC+EbkCGuKeoFB5Qyo+vy+XfFKagiD+8xKADL8 Uf1M4oM2ZYxkQ69QEUKT8MT5bhxOO360EbJJKKZiuoCzs0CqSxoASj3DfKDbzztjMqEC ZvGjYPX5J8W4Ro2QfPYF1LTAPjd7CNyx+L+ofrAcWWK7p61DSDzT2pZbHjIsZmijcrRs UNgg== X-Gm-Message-State: AOAM532KD986Wm4kIxFAGn4Rzqs2K3QkmHe6cg+CTeGsthSgAf21lsui DcylCYOn2XejmsRGytuT4s3JjGdBvh5L6bdnZ4A/FHsBg4A= X-Google-Smtp-Source: ABdhPJwIJiIfN0T5obxxdaivsApcOpgizPB8NBnqNHU50qgZffab+9Yzwz0JYZGaKh06yH3NmNispOHU8G23LKOZi1M= X-Received: by 2002:a50:cf05:: with SMTP id c5mr3339253edk.232.1593176018534; Fri, 26 Jun 2020 05:53:38 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Fri, 26 Jun 2020 13:53:27 +0100 Message-ID: Subject: [PATCH 4/5] haiku build fix To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=devnexen@gmail.com; helo=mail-ed1-x52f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From a4dfa918e6eea7a5ccc4375d83d1f0162e3bb122 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 26 Jun 2020 13:43:59 +0000 Subject: [PATCH 1/3] check sys/signal.h presence Signed-off-by: David Carlier --- configure | 8 ++++++++ hw/xen/xen-legacy-backend.c | 1 - include/qemu/osdep.h | 2 +- util/oslib-posix.c | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ba88fd1824..5101fd79fd 100755 --- a/configure +++ b/configure @@ -3181,6 +3181,11 @@ if ! check_include "ifaddrs.h" ; then have_ifaddrs_h=no fi +have_sys_signal_h=no +if check_include "sys/signal.h" ; then + have_sys_signal_h=yes +fi + ########################################## # VTE probe @@ -7286,6 +7291,9 @@ fi if test "$have_broken_size_max" = "yes" ; then echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak fi +if test "$have_sys_signal_h" = "yes" ; then + echo "CONFIG_SYS_SIGNAL=y" >> $config_host_mak +fi # Work around a system header bug with some kernel/XFS header # versions where they both try to define 'struct fsxattr': diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 2335ee2e65..92f08fca29 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index ff7c17b857..f88fe23936 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -104,7 +104,7 @@ extern int daemon(int, int); #include #include -#ifdef __OpenBSD__ +#ifdef CONFIG_SYS_SIGNAL #include #endif diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 39ddc77c85..7ad9195c44 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -38,7 +38,6 @@ #include "qemu/sockets.h" #include "qemu/thread.h" #include -#include #include "qemu/cutils.h" #ifdef CONFIG_LINUX From patchwork Fri Jun 26 12:54:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1317633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ZYNLbpj6; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tcKj0NvSz9sPF for ; Fri, 26 Jun 2020 22:54:49 +1000 (AEST) Received: from localhost ([::1]:47184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jonsU-00078m-Qs for incoming@patchwork.ozlabs.org; Fri, 26 Jun 2020 08:54:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jons3-00076F-Tn; Fri, 26 Jun 2020 08:54:20 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:37018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jons2-0000KQ-Dc; Fri, 26 Jun 2020 08:54:19 -0400 Received: by mail-ej1-x62f.google.com with SMTP id mb16so9266576ejb.4; Fri, 26 Jun 2020 05:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=gkoQ7wKEqYIgyzpfrFvA5qo0YC+QngQ6l2mRgEwy8/M=; b=ZYNLbpj6m3OGREiI93R4gTLD8sDA0q5/+8Uc5eG6gH8x+d27g6j0IvKbuZo8HpcAh3 nqY3MPHwCZD7Vw/Te06wWJOskkRI5pLJcx3T6dwxKJTNs7FytZ+7Tu3H1LcPjGMikepN XGVbGohumRrhsAPIw9k1mdxc8v8ucQFD9pPO7xodUJUfHzio7iVkpYsTSaSoj4AsD2RO AR6nQ3daUT+uSzxXxa+XT9RguDRsW34KixoEKw4KMwNQm5N7Hi06XqgRKh9NJbOdDxS+ XYaI0S3SsXEv9/6GTj5AhRRhnIaiyVmzB+vrDVnHh2DVdMZPKAHs/7DAOW5QnQpsQhCm X0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gkoQ7wKEqYIgyzpfrFvA5qo0YC+QngQ6l2mRgEwy8/M=; b=qwGJdWq3PXU2on4z1DpmSR5Dx6VsFAjk5r4Fo/0qDTiu1XT7qYb514BLgbh9xdwtRm kDANI37FSf/lFSsY6Q8YTO9VNrRk1Vg6dGhBE9JAO5octY2KvWQA0L4hQyaznkWabOMt 9wfWDJN8HUS/zlHSWRBsDcOpkfxEZj4PTylNLvcEXvhiA49xgc0YbQ/Ng429J/dpElIK uYCHC5LvNQIwP9aJ+RAA9f4PJzfbwbyl3MbtVHkSw3pSzRlS9ThIApiH9Wg7wviVbl1/ ONIIi8eXrUkuAh1+GFADoJ7UlzB7FGxkxbhibtBF1WMAhH9VhCPEtMuIBBFIn1xyC7KW Ngrw== X-Gm-Message-State: AOAM530G/zsZri7E1Zms+xljQX1m7Q2pbYDB3/fW5qIhmmsxv0+DNoDi 64nu2QOupokyZVDpGWIxyC2uBIDLm0sDgvwWBZVnWtyugJs= X-Google-Smtp-Source: ABdhPJxvWsH0Qmmy+7MwHcom0a3MU7xLwfcgLlXd1b6ICYrWoz/LG3ln1HpqTDuurjheK1vXFEVD+UAVS2Ni0qWTOnE= X-Received: by 2002:a17:906:58c:: with SMTP id 12mr2303803ejn.311.1593176055335; Fri, 26 Jun 2020 05:54:15 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Fri, 26 Jun 2020 13:54:04 +0100 Message-ID: Subject: [PATCH 5/5] Haiku build fix To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=devnexen@gmail.com; helo=mail-ej1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From d36aba6190152c626f668fef3704ee6b61bfc323 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 26 Jun 2020 13:45:04 +0000 Subject: [PATCH 2/3] define SIGIO for haiku Signed-off-by: David Carlier --- include/qemu/osdep.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index f88fe23936..860bb3c16c 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -388,6 +388,10 @@ void qemu_anon_ram_free(void *ptr, size_t size); #define HAVE_CHARDEV_PARPORT 1 #endif +#if defined(__HAIKU__) +#define SIGIO SIGPOLL +#endif + #if defined(CONFIG_LINUX) #ifndef BUS_MCEERR_AR #define BUS_MCEERR_AR 4