From patchwork Mon Jun 29 21:48:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319432 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=lBNQA05S; 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 49wlvD74xqz9sRk for ; Tue, 30 Jun 2020 10:42:47 +1000 (AEST) Received: from localhost ([::1]:35914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4MF-0006py-TZ for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:42:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dZ-0007Bt-QP; Mon, 29 Jun 2020 17:48:25 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:40224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dX-00084B-An; Mon, 29 Jun 2020 17:48:25 -0400 Received: by mail-ed1-x541.google.com with SMTP id b15so14308386edy.7; Mon, 29 Jun 2020 14:48:22 -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=VYDxu7agkxJI4PvbXPb7hzG3FFKhEiHrZUcRd/JBY8M=; b=lBNQA05S/zpAbA1PKviRFeS0idexucbJMHXiBGM+T+f7esMFuKAPqPemPKehxLAgtb Ayq3xhc+AnyxtU2yopX8ucFpSj5JgCj7ljx2nVsZXCBTqK+FhESSPSyz0dYF8t0mDAJy f07AsrT0JDtL2wYBcAvsbyMT7U1YyzQxVoWArxzf7ioL4UUKU8yKkVfF59tV5C0+7aTE nltEbxSFizdauJ/hcg12+wV3Chbu2ZQ91Eh+H6Wz+WV6/H1kh3Bv0aMSras0caHpFIi2 ZYX1Euxxanoi2w7JbSxaoUS255hCgtsJR5/hm/109cEtQ8lTmrNNNTyTdj/p/wwYrP2y qdHQ== 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=VYDxu7agkxJI4PvbXPb7hzG3FFKhEiHrZUcRd/JBY8M=; b=KzOL4Nw2CVfqQlVTNzR2kUn0C6gns8XYgq8zUSZGfrYo5TpJ/nB0Nh8oTrgt8KoJDN gJDMEd0DIzZQ9AC2s/Nx7JjwRQsDTtXEqEt1mmowvrTBv2M6PRwvkXjO07OOr0waWzUP F1ZUzfVI16syQjtU70lEjl+HC6fUGQgClFyH0K9d2mqxkG3HfKhNad6cXWAw6ZVIJ0rH kw7MWdVn/wYuZjFtry3znM1Li2oKaTV3Q9BFN7aZwetPrdEjhderhXYAj3mkHS4kfZ6H eqUT1mtvnAgeDBibS6QNCbRmh3orIHIVGbi3IPec6VE5dF7c+QxtcoaoJVZ4AGsfh0ua LucA== X-Gm-Message-State: AOAM532A3VmOdUnAQha/MYxb/iVssNsbmjpUX4nJHgVQJOjSkXeMGKtO LZEVxMGoy/htelmj6JTtJ09V20DIOxHxBXSdIPq5hpCp2A4= X-Google-Smtp-Source: ABdhPJw0U+Egq2x/lm0qDPCiJVyqXjVZL4oMUjKcdUsczbExHxSAA48qM7F6zV2vsfJtyN6oxvtYDn4pBbCtsXcdykc= X-Received: by 2002:a05:6402:354:: with SMTP id r20mr19078970edw.32.1593467301638; Mon, 29 Jun 2020 14:48:21 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:11 +0100 Message-ID: Subject: [PATCH 1/9] Enabling BSD symbols To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=devnexen@gmail.com; helo=mail-ed1-x541.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:17 -0400 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 5c6022f21289eb6e78e93d584c766db82165dced Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:13:35 +0000 Subject: [PATCH 1/9] Enabling BSD symbols. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.26.0 diff --git a/configure b/configure index 4a22dcd563..d81931ba5e 100755 --- a/configure +++ b/configure @@ -903,8 +903,8 @@ SunOS) ;; Haiku) haiku="yes" - QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS" - LIBS="-lposix_error_mapper -lnetwork $LIBS" + QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS" + LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS" ;; Linux) audio_drv_list="try-pa oss" From patchwork Mon Jun 29 21:48:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319433 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=ouDyQaus; 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 49wlxZ1cmtz9sQx for ; Tue, 30 Jun 2020 10:44:50 +1000 (AEST) Received: from localhost ([::1]:44250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4OF-0001oU-UC for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:44:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1db-0007Eh-Lq; Mon, 29 Jun 2020 17:48:27 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:36574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dZ-00084U-VR; Mon, 29 Jun 2020 17:48:27 -0400 Received: by mail-ed1-x52f.google.com with SMTP id dg28so14305093edb.3; Mon, 29 Jun 2020 14:48:25 -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=byQ9N2ZfflWwiqWzsFO9snWApO2wcknUiGacMsjqgYM=; b=ouDyQauswtwobKbIUgsp0x3/XmOeUDGLw4zw/Z5a4kKhcho6th1xHtW/Htz4+aeQFI D5uPtc2gcyuuAac0tO6eSZ/7UPlK7J1ZxxPgSgx//ss55qvtcsAs5U1xXzjJufsoY4Z2 qUOQo1MhSCcb3StB1lQ6dmvz9QbZowdEcrCIU3yX8zEm4aoMXzwvytpjTpDrilh4o8qm VhHqaPpaigJg8wNNhYh1aXbmZ7SE1qTMe2iCZ60pxbqpZnqHNVzescLQwhcWIMoLDhIi rVCYSKzFlJJ3wIi/7udxQfKbInvE9UhIw6+o1pOLjWKa9WflZp12nL0i2LVEtD0ZLm7b d1cA== 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=byQ9N2ZfflWwiqWzsFO9snWApO2wcknUiGacMsjqgYM=; b=QEgmONsrNhIoDwSjAT1xcKgaTA21qBRscqCnjVw5t4f2PmM7a+zjiJ6xjPo9ttgN0t HMNm+OvUr2kyHltOqSjwd5iUStUJXYDIhKYyDCqzBNYPLXfLqkZsRT7FwzSNp5+tBxPe Nc+V1A+tdm0UDOYFgU/R0ii6vKkZ6wRQgMmor0gQ85REdh/PadETKHtUBBxEyRYc5eHN aEWHq2B/OujbuB8qt44i6cJTJ8gKpkXERFy6lWGDv2NGQoVofrXl7S6/xD6mndGoO2e2 wTB405xUaAj/sbXahlJpIszBZaz3dIo2yqH46Nfon1vs4fSSvZMIJPoj5LqMrhguR0Ow qtOg== X-Gm-Message-State: AOAM533EMNdUnnskH/N+zwZRsXU7+/B6ho6nLqn0RqRerFM4gBHNQVU4 3ob2THfjaYihwnILDw4MUHpPb/HsY0THjL0avILvXc3fBMc= X-Google-Smtp-Source: ABdhPJwrF6PbU/+r2gcXyaeDPiuDGqd0Xullz7uVbtV1PfWc6TWv3t8dlF2L83K3d/iosJpvWY/LwJSEx0omU2wtP7U= X-Received: by 2002:a50:f05d:: with SMTP id u29mr20429662edl.137.1593467304056; Mon, 29 Jun 2020 14:48:24 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:13 +0100 Message-ID: Subject: [PATCH 2/9] Enabling *pty api 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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 8b205a027dacad08ce9187474d9490667904a4e2 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:14:53 +0000 Subject: [PATCH 2/9] Enabling *pty api Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- configure | 9 +++++++++ util/qemu-openpty.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- 2.26.0 diff --git a/configure b/configure index d81931ba5e..50b559238f 100755 --- a/configure +++ b/configure @@ -2386,6 +2386,12 @@ else l2tpv3=no fi +if check_include "pty.h" ; then + pty_h=yes +else + pty_h=no +fi + ######################################### # vhost interdependencies and host support @@ -7856,6 +7862,9 @@ fi if test "$sheepdog" = "yes" ; then echo "CONFIG_SHEEPDOG=y" >> $config_host_mak fi +if test "$pty_h" = "yes" ; then + echo "CONFIG_PTY=y" >> $config_host_mak +fi if test "$fuzzing" = "yes" ; then if test "$have_fuzzer" = "yes"; then FUZZ_LDFLAGS=" -fsanitize=address,fuzzer" diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 2e8b43bdf5..9d8ad6905e 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#if defined(__GLIBC__) +#if defined CONFIG_PTY # include #elif defined CONFIG_BSD # include From patchwork Mon Jun 29 21:48:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319430 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=eKPrl9Fd; 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 49wlvF10Mxz9sSS for ; Tue, 30 Jun 2020 10:42:47 +1000 (AEST) Received: from localhost ([::1]:35908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4MG-0006pi-QN for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dh-0007MY-3A; Mon, 29 Jun 2020 17:48:33 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:41237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dc-000854-Ts; Mon, 29 Jun 2020 17:48:32 -0400 Received: by mail-ed1-x542.google.com with SMTP id e22so14297854edq.8; Mon, 29 Jun 2020 14:48:28 -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=O++SecfjGgP0FVmkVuIgRRw4l8+URq7SlnZnl9/xoSE=; b=eKPrl9FdtW/4zEJsY8c9E5+z7T86IhhMOtEVLMFcRNn7XGkWMdoyQgxZ4CH0IwY6Au qsYSEZBslUx/W3u9z2c3SlQUGaw8ftYHa3vMONuvV6XbkgEpH4v2fZp418SzferHgyCZ vkQUywaV9VNziXucPjct6zBsNKE3CxvXN2FHQB0mt8DrslkatLV7+yUqLFroZ/2Fs3py b/tXtCuAH59Depq9hQCvaf/CPtWSl0LdKKxfug8XL7OnVhqOT307WLsD4+QmtMIYoqpD tFT4j3HOc9ck+woNI6w1INZmhLkPl7xAriivcU2ROECfn8dlwooDWlpiLWp9H3DTtN+I EBUw== 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=O++SecfjGgP0FVmkVuIgRRw4l8+URq7SlnZnl9/xoSE=; b=DN2VNt/lO+zBKWbQg5e9/gag8BXMUUubnrpvv6EsJiontQIPUGYpK2i9C9uEeJUzWb 9yjO8H/ad96valCqw3gPlquj1JxftGMRI61chPdrr6ahDHaJ6DsOGzTuH9rFm3shkCVz /PO3gkZrxX4q6462Aals6tLG9anMV/DZqun8Xso/O4DptsldS25/4sBhdoL22Bv75W4d rIzlTmQYgaQ/N9IhYlZo92Fibh+N+8/wklvinWmVGduZaEMs+q72rJMDqOe1NZNEd0Tw 5GpfIdaZSR+PfMXL1NAu9GS3HWox1f4/3KwQotW43Ah+AmmglXx4FE2hQD2yHBH2cyfK mQdA== X-Gm-Message-State: AOAM533sJtyariq1838YKYHXmiknc7EeF37NezjU989tkKzGvU/4wA+d wlQj+S36dwGaxr68f8acQ+ZRtUGDvKFYUgr6ObbZD2JZKH0= X-Google-Smtp-Source: ABdhPJx7oEFhUHiJAXHzke6le3FXwH20oBHk0lnmQpenLELY6DL8X4xSK6NgXZhGyNueJForn2CmzqfLrerjAEz4IE4= X-Received: by 2002:a05:6402:3049:: with SMTP id bu9mr5818559edb.232.1593467307086; Mon, 29 Jun 2020 14:48:27 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:16 +0100 Message-ID: Subject: [PATCH 3/9] Checking mlockall symbol presence To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::542; envelope-from=devnexen@gmail.com; helo=mail-ed1-x542.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 ac450c4abe03e0e461fede18727500e616d9f7e2 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:15:21 +0000 Subject: [PATCH 3/9] Checking mlockall symbol presence. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- configure | 15 +++++++++++++++ os-posix.c | 4 ++++ 2 files changed, 19 insertions(+) -- 2.26.0 diff --git a/configure b/configure index 50b559238f..0b278f1646 100755 --- a/configure +++ b/configure @@ -2392,6 +2392,18 @@ else pty_h=no fi +cat > $TMPC < +int main(int argc, char *argv[]) { + return mlockall(MCL_FUTURE); +} +EOF +if compile_prog "" "" ; then + have_mlockall=yes +else + have_mlockall=no +fi + ######################################### # vhost interdependencies and host support @@ -7865,6 +7877,9 @@ fi if test "$pty_h" = "yes" ; then echo "CONFIG_PTY=y" >> $config_host_mak fi +if test "$have_mlockall" = "yes" ; then + echo "CONFIG_MLOCKALL=y" >> $config_host_mak +fi if test "$fuzzing" = "yes" ; then if test "$have_fuzzer" = "yes"; then FUZZ_LDFLAGS=" -fsanitize=address,fuzzer" diff --git a/os-posix.c b/os-posix.c index 3cd52e1e70..e02b566940 100644 --- a/os-posix.c +++ b/os-posix.c @@ -337,6 +337,7 @@ bool is_daemonized(void) int os_mlock(void) { +#if defined CONFIG_MLOCKALL int ret = 0; ret = mlockall(MCL_CURRENT | MCL_FUTURE); @@ -345,4 +346,7 @@ int os_mlock(void) } return ret; +#else + return -ENOSYS; +#endif } From patchwork Mon Jun 29 21:48:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319435 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=U8/tBNYh; 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 49wlxb33pXz9sRk for ; Tue, 30 Jun 2020 10:44:51 +1000 (AEST) Received: from localhost ([::1]:44296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4OG-0001pc-Up for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:44:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1di-0007Q3-RE; Mon, 29 Jun 2020 17:48:34 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:34884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1df-00085m-Lr; Mon, 29 Jun 2020 17:48:34 -0400 Received: by mail-ej1-x62d.google.com with SMTP id rk21so18386792ejb.2; Mon, 29 Jun 2020 14:48:30 -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=35g12xHVXZcCNi5/Umeoe37I7tRdY6+Vc3QDHRqhA8E=; b=U8/tBNYhtsR7LSLM7aiGIqUWst4OpNiXoqtJvctrCHK0taetvksJqhY/S0mnyu1Oh0 N/kub4fh5Mf1ML3k+g0+c2gqFa2Fi3d0L4DqJGHGZM8knskxK+5ugCtcCWr+/WuFLB0H 9ah7s9dKsRponeucBah6kzonb8S0PyVdLHoFI3C9u8N4+TWL/uGDWPKE1EnNbtm2mfSB ooGdYdidiX8RScVFriv3mNWrSYzy2BQeL9mRPjy9tud2n0UTpCBaJc29IelODXcP7c5d RQdXMHn/BfH3ayaRa+pp8wMkfpA4xXuSBeFeg41bJJ/0Z4HEa6viMase0gHPk3SOMrYi y9lQ== 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=35g12xHVXZcCNi5/Umeoe37I7tRdY6+Vc3QDHRqhA8E=; b=c+sbnRn4zN0GhSgiETQkVLGpVUwT+X774K4O9AuiBV+D44iFTCo/sKqP9nUT+cYxRu 9ioVdaadgIrNDvgsx8S+MdjuGXLdbNbbC2DXFAS7uxhPRBPn6xRHPJyGuJ8MEMbTToEc 3gzm5QVsN1KT2pOTh9DZJ4OdvQMGLQu28v+q/pA8+TURYzGa5gwVrv5AtijcALoVkgqu U0LcOic/SknrpfVIKKziNemGD3dCrJaFcZXGZDHbigkF7/UJRzvNMvuDY0p6YDhQB1g3 +LeoVaQ88cDJjiAWLjfB4WwjBX9dDMWS7iNx7hJAzEW1Qw/WrTA6bj9majg0SgjejR6j ftXA== X-Gm-Message-State: AOAM533dY5aZ6qquwTi4mVVPQu8xrVFAgph9o1x38wymGV0zbB/3Hgav 8ylndmT2WEn9ureB292bOHFmR/I9i6t5BuxUJuJC9s59+zQ= X-Google-Smtp-Source: ABdhPJxUTvPEPQUK1D+dNnmh+zD8dLsMfwgdfuaVRNGAjqNzwsvP5Ak37eUSkjEJHfXuFWgOYWFsD554jZT6TAhyBS8= X-Received: by 2002:a17:906:9244:: with SMTP id c4mr15456316ejx.60.1593467309788; Mon, 29 Jun 2020 14:48:29 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:19 +0100 Message-ID: Subject: [PATCH 4/9] Checking sys/signal.h presence. To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=devnexen@gmail.com; helo=mail-ej1-x62d.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 9d43c8cd1611d0347db9066b1df1dc34431b2028 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:17:53 +0000 Subject: [PATCH 4/9] Checking sys/signal.h presence. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- 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(-) -- 2.26.0 diff --git a/configure b/configure index 0b278f1646..83d8365d23 100755 --- a/configure +++ b/configure @@ -3212,6 +3212,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 @@ -7398,6 +7403,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 0d26a1b9bd..6e0cf9132d 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 Mon Jun 29 21:48:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319437 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=FTxaI2kG; 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 49wlzr3y3Vz9sQx for ; Tue, 30 Jun 2020 10:46:48 +1000 (AEST) Received: from localhost ([::1]:52746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4QA-0005NC-9b for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:46:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dj-0007SP-UQ; Mon, 29 Jun 2020 17:48:36 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1di-00086J-Ae; Mon, 29 Jun 2020 17:48:35 -0400 Received: by mail-ej1-x634.google.com with SMTP id o18so13923730eje.7; Mon, 29 Jun 2020 14:48:33 -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=5JW7XhAd9PoeujhWI0tmLjXYrg+1Y7BEZ6l7rd1Kig0=; b=FTxaI2kG5IK3qYFHM2UgT6Yl2u57tm9PLrZH6VsSrNga3BsbedSnECIoDFDKtta9rO F+N3iYw9d8HCthuJX8+Gp5fi/ClymQni7xvUvtSSgcnDQBMFg1ta6FlIsdxr36esYGvq Zq69lgfDlNeEbZ0VYUHZSNzxmQG9F3mQuDl4CaADFxRMUqctJbGQw/CRBe8Mg2aVu+7L xA5KhFV8/EjYyXJ9Z6tRKLfyWZInh4jPjk6uAsoiL33YUPUb3DH0B1bx6pUeLgxERoVq 4NzzOevM/ms57Bb9UHA9QUxYElW67JPpQnHaZYUGqZZXsSjEa7iORiPWZUYy0EZ/KfjV 5KcA== 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=5JW7XhAd9PoeujhWI0tmLjXYrg+1Y7BEZ6l7rd1Kig0=; b=LU+8l/zNwtbYOY7OPHeTCaxS0IqfzmiIQCyH16RK1OvaAZTfYynpZtUtrsowslIY9g bGETymGFRbM/QduNwVvatRicJJuorOpN/Lwz53ez818S0Xysmxp4XoKvLJyrD/di472z ngEEq0pq+B/1+J3HNPvImhPX1C0cg/VIYwAaQxLzigrt6KmGFGH0lf3c06uEfDWQYDT/ x0ud5JYZ3uhK9Xgpxj1Q0zGjlcUsumqMN+JtlHP7OdPQJB1ZX+qM3UJ7d5W9xxaS8+jt yoV8M9AYt8dk96Y+AJpeWdq8MvDGDJQp1gmjdY/WbvZhp2f+5K9Es/A2fZTrw6Ude/cp Vpkw== X-Gm-Message-State: AOAM533Vg1nWHcoJIoQjPukgATYmvzPriLHZ0IUwlg3jobUYhsiabG8Y rIjdsHEENIpgD1JYk0e8xjWJ227ZktG9uvBvi4uBSPGDIXA= X-Google-Smtp-Source: ABdhPJyrUi0VpLdgW+p5Terkr1pGKvBiL7BpHlDt7ORDP7KqKiAJaGbqtObvBbUMINPGBvcDcgLdSvJkrMvtWNbrbc8= X-Received: by 2002:a17:906:33ca:: with SMTP id w10mr7936711eja.171.1593467312452; Mon, 29 Jun 2020 14:48:32 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:22 +0100 Message-ID: Subject: [PATCH 5/9] Define SIGIO constant with SIGPOLL equivalence To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=devnexen@gmail.com; helo=mail-ej1-x634.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 93c001e7da19c76a73a687dc6584bc31385a2693 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:18:32 +0000 Subject: [PATCH 5/9] Define SIGIO constant with SIGPOLL equivalence, Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- include/qemu/osdep.h | 4 ++++ 1 file changed, 4 insertions(+) -- 2.26.0 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 6e0cf9132d..e090ead826 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -425,6 +425,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 From patchwork Mon Jun 29 21:48:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319434 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=pMuL/Mbp; 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 49wlxb2YdNz9sQx for ; Tue, 30 Jun 2020 10:44:51 +1000 (AEST) Received: from localhost ([::1]:44270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4OH-0001p2-2P for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dn-0007Yi-Ah; Mon, 29 Jun 2020 17:48:39 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:41281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dl-00086k-0N; Mon, 29 Jun 2020 17:48:38 -0400 Received: by mail-ej1-x62f.google.com with SMTP id dp18so18373358ejc.8; Mon, 29 Jun 2020 14:48:36 -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=EcjXyZClBQDI6g/qulm6+AdcW0n0dE3vmvE1TCbQQjI=; b=pMuL/MbpQ+Cd1vZizVp5J0g4dHKhBqmkdVyON/i0gCUa0SblHR4SbvzM++OWdSeakX IgMMP1SH5jPCTbfrNeWXR3q0xdGxPkDk6iiXL5wFrNsaNNeft8RlEF+tpWM1pNXPLvM5 gwCVFw+suvY2X5u/wjpmopWaL6E3H3ZPfoull1GK7CBFaIVBoD/ZcKNyiKD2pm7iRkmv I+kVdEbfX+pXlioRwCngPXOAuREB86WBjmjAZ+fV3MTtVy04cE6oTvFMsgzc5d1bdvFc 6iNZ8SLI3fos+BaP0BsIZIJOnqIOGQD4w7D8m+F/obKdQ0ztQatWARKbrAtokeiIJUUJ aCqA== 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=EcjXyZClBQDI6g/qulm6+AdcW0n0dE3vmvE1TCbQQjI=; b=YygYuSVkaAzB6HIrvEhEaoCpCb6Na40Ik/Yy7w535Ycmpzi3v+2HK6TwZjGXROq93x 0eFdQLTM5veyAlmBJ8MYm4jMesmltZso+29RUjQJYSybTV0s79tJ4tL1L9PizRjby1Aq wc+Ynt/E/Lqvp3KExkoB7LBLtp21GCwD3h20aUiTeLEJxG7UiebvAo7V2CLF4bZEaChG 7RgHRNmrtnswH/h/pv647Ynjs95yiDUjwjwH5IHZuF1Xm7d1tcgJu0S52voHQ7utTTFu 82TxlECV9PQFNBI5n8AWWsM+Uqlsy9J1EQKOPFRKfA2cKKfOU/Zj2h+VpZtBzLP4Gmlw kDRw== X-Gm-Message-State: AOAM533mOKEbmwKcIVhCWR0ul0+tevTt6r5cfvPxybhPdtgPwhVcjE3y bgdfROxAmLMtNspdEhje5Q54msuybsTNlqdlEjSO4qKFx150oQ== X-Google-Smtp-Source: ABdhPJxzO2H3vbcaIqXLJIWTcCW+5OHfFKZdz/R6rvoFa4n92emecD0BR2QtGVwRXvwhNIRBJtZYD6ZcUgnsFNfVJ6Q= X-Received: by 2002:a17:906:c083:: with SMTP id f3mr10083290ejz.530.1593467315100; Mon, 29 Jun 2020 14:48:35 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:24 +0100 Message-ID: Subject: [PATCH 6/9] Including endian.h for bswap operations 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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 2f65cab41a8f4508532b3893815f222bf2293463 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:19:34 +0000 Subject: [PATCH 6/9] Including endian.h for bswap operations. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- include/qemu/bswap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 2a9f3fe783..1d3e4c24e4 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -8,6 +8,8 @@ # include #elif defined(__FreeBSD__) # include +#elif defined(__HAIKU__) +# include #elif defined(CONFIG_BYTESWAP_H) # include From patchwork Mon Jun 29 21:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319431 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=oTQvgvVi; 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 49wlvF0RJbz9sSF for ; Tue, 30 Jun 2020 10:42:47 +1000 (AEST) Received: from localhost ([::1]:35948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4MG-0006rM-Hu for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dp-0007dy-Qx; Mon, 29 Jun 2020 17:48:41 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:42871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1do-00087V-5w; Mon, 29 Jun 2020 17:48:41 -0400 Received: by mail-ed1-x531.google.com with SMTP id z17so14316641edr.9; Mon, 29 Jun 2020 14:48: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=f5RanH9zq7dtLaGBYZRKWZh3DJKJJzVJqKalIINzzcQ=; b=oTQvgvVieFZVtwNZfM9tX/gERr9IlNPOSMHQg5fw2bZnctomk67Xp7TqShxaAuFaQu FLAfXqmbxZqxABVTyMK1vS0kMoS7on8bzcg43Mb3LzGwSm2ktvNyeGhEXFP5SyIQn5dc kgZGkXcgnm2F9PhdaPiF8YcwQ1jyMf1KEA1kjAQG1BAdKtj+6VAMKjthQnTmp6i+yito b0l23ZPN2ylOB5BSN7te7EJ9kEs0HJGYe8CGc0n3pUQjZn+2BwijnEalTWys52eyhLYo S5X6k19IoPUddGJekSumskzLnmm1j+use5QFAZIj100cK3+5alE3TybK38zlYaXT7ioc XNUw== 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=f5RanH9zq7dtLaGBYZRKWZh3DJKJJzVJqKalIINzzcQ=; b=b1EZWfvRYBbpvTH3imGSLyv7wk7ZKVr1p+eXkflGpUhXLYI/nc4nqUX2FMTamYFUuz RnBLW26jyk4AlBIkX7m8jnDOTj37eX1SbeTwDCaNzP1pdCfwocHjHpnoozbHCVqXtirS JpNWuKwy72OI15A9byeFIKTUlao+z5rY3cI4wTMrPWa2lZUzyLb8yyMUiDo8OWKbhhnN /2bxKIAaGfxoiZ/at8O0jT7vBHf7M3HYxtNdgEp4zB4zR2sRZS+S7aPrJjFn4haBnXou L5eLgVJNwuzB66aBn3U/onqfWOnw7Kh0MbYTGHea/JkuNBMRADuUBFICUUAor8b+9Jie SX/Q== X-Gm-Message-State: AOAM533TDGLfZFlfHCDLmxxsxOTS/EEu+8CLX8Xx7srPIgFCad9WcaBB f33E7Uu6nSfzR3eWYSEYIgGP2faXw1e7jlKhP0yvwGqQRew= X-Google-Smtp-Source: ABdhPJxEWSrszet9RbwL+IucQ5tiCdbKq0ExxtBKr0KDn4hjFun9J2sIWjuUBxaDln52DMWt3lTrizvU/SfhBWGsjjU= X-Received: by 2002:aa7:d297:: with SMTP id w23mr18971688edq.49.1593467318297; Mon, 29 Jun 2020 14:48:38 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:27 +0100 Message-ID: Subject: [PATC 7/9] Skipping drm build, unsupported To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=devnexen@gmail.com; helo=mail-ed1-x531.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 157a0374093371719de42e99364352d64190f52a Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:20:06 +0000 Subject: [PATCH 7/9] Skipping drm build, unsupported. Signed-off-by: David Carlier Reviewed-by: Philippe Mathieu-Daudé --- util/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.0 diff --git a/util/Makefile.objs b/util/Makefile.objs index cc5e37177a..faebc13fac 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -39,7 +39,7 @@ util-obj-y += qsp.o util-obj-y += range.o util-obj-y += stats64.o util-obj-y += systemd.o -util-obj-$(CONFIG_POSIX) += drm.o +util-obj-$(CONFIG_LINUX) += drm.o util-obj-y += guest-random.o util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) From patchwork Mon Jun 29 21:48:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319442 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=RuO7wiig; 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 49wm1r4YRFz9sQx for ; Tue, 30 Jun 2020 10:48:30 +1000 (AEST) Received: from localhost ([::1]:57524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4Rn-0007Kj-Cj for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:48:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1ds-0007h7-Jg; Mon, 29 Jun 2020 17:48:44 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:34858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dq-000887-Ta; Mon, 29 Jun 2020 17:48:44 -0400 Received: by mail-ed1-x544.google.com with SMTP id e15so14337137edr.2; Mon, 29 Jun 2020 14:48:41 -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=Pz6xAlQLysREZhnvq2M/sf0ysYF+TT9ZKiYqFaLQuTA=; b=RuO7wiighU8jJ7v2DItF5htekTBYqNmpK3TfeI+yOdvy5xXrogamRNiPU/emPplxFb YzGVb1P+GYzPch1GI+RvDE0MIc8P0kZV2JYBKMXkfuDxJwLxPH8iA/dGlpLzY+imJ33u b/DaiPs5v9aemgoOPRGmGNtBRwUq9gLLAc3s32rtVfAaPhqzmr2pM5wUaG5EW5LjNM72 qGDQY0gUePETjMIn6xR+szWSh8jeR8Qp+2nUsVoqrNaXCWuHVwvVrREz65qAisZalMZg s3DGYf7J6GSVd8Qa7H4FFRSLBFdVKbP4wOmP8mRW2Z1xlhsMgN2wRf8KqjAqUZfqzVYP RgUw== 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=Pz6xAlQLysREZhnvq2M/sf0ysYF+TT9ZKiYqFaLQuTA=; b=Ce6aq4yHdF+mQioyP5bejh0vnuHY1820vRrEskMEgSeiDiipNq01zOF7LsfGU36C0i piprVXfYbcyhxxrDtyMEirwqXkB4CLla4LxAL6nu9GOfvIq0WjbraWCvo1prRidi09o5 IWXdsklhdS0tbs/Llqwyz3TOlKMNOaqAm1PbuliOgjMFJQ096abaFQ7l0BnxaPkURxvp cKVCzIc8J9Jd3lvLf7J2BL1LLSBc7TrKMfGK0S6EBRAcK2/nV5mdXJp+kkxgBtANi2Ft 7b4ZsUGgSVYaeVQW7Q8HLn2J26/828yMZEbCVsobuVgSLo7tsXVtfLzcdX8QmWsKUSvl HmRA== X-Gm-Message-State: AOAM5339kKuwlpXuDhfftyH8kX86B0Xx0KXIFvlA4UNSQ1CG19Tvw/mU /iheG4/bI8b3MzTIWp+PBrWM+kbMUElUxgUrF1d1JGMoV3w= X-Google-Smtp-Source: ABdhPJwvMYtpctIcPAvjg9DjJvKf++9u1NhWLfQ/o7Lz3ux2dgjMmTGK6bjDRl9rVKxF9FYFmiOy3oY9h+LYQLz/XS8= X-Received: by 2002:a50:9a82:: with SMTP id p2mr19393094edb.130.1593467320905; Mon, 29 Jun 2020 14:48:40 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:30 +0100 Message-ID: Subject: [PATCH 8/9] Skipping sys/syscall.h inclusion as only used in qemu_signalfd anyway To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=devnexen@gmail.com; helo=mail-ed1-x544.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 b821b7e9bbf1f327058ee858a92c7a7ee6740e63 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:20:39 +0000 Subject: [PATCH 8/9] Skipping sys/syscall.h inclusion as only used in qemu_signalfd anyway. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- util/compatfd.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.26.0 diff --git a/util/compatfd.c b/util/compatfd.c index c296f55d14..ee47dd8089 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qemu/thread.h" +#if defined(CONFIG_SIGNALFD) #include +#endif struct sigfd_compat_info { From patchwork Mon Jun 29 21:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David CARLIER X-Patchwork-Id: 1319436 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=kKOXdLhb; 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 49wlxb5KhHz9sSF for ; Tue, 30 Jun 2020 10:44:51 +1000 (AEST) Received: from localhost ([::1]:44356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq4OH-0001r0-FS for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2020 20:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq1dv-0007jp-Ew; Mon, 29 Jun 2020 17:48:47 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:42442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq1dt-00088g-QD; Mon, 29 Jun 2020 17:48:47 -0400 Received: by mail-ej1-x642.google.com with SMTP id i14so18367516ejr.9; Mon, 29 Jun 2020 14:48:45 -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=7jJjssFU/PP2r5mJjLoPZrHhXjRyO0Aifak5gnKePUM=; b=kKOXdLhbX1+OtsYdNpmm/cgz0Ks+YNFM1H0aSO52Ay9yIDpbiB2cugthYA8zMXc5t8 ORn5ECnaMOl687qpUHQ2fzgly0pKdYiykVV6loqhsmNlK9MT+jx0u3ovOmSsDZfPo887 C1zuiwjjnoNZZsaQrAPmysbTRz/tH1+2fhOHFWLBkNEfn3D0iYzOphR8FMeNXPs5Jryd 8MejH84aufGOi5uWxJdOF9QBnMpPxrelCJl6w1h/IgF1hT8OBh5SVMGoA2oHX3C9YvYX CTMrDXEVZkiVUwYe1U1nE8qzJrnewFJtGFT7ly6f5WiC622a2ZT5f2jzd6omgvFJnbjB Jyzw== 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=7jJjssFU/PP2r5mJjLoPZrHhXjRyO0Aifak5gnKePUM=; b=GPawDCT9G4fsK0xHtWeFWpjaGQGJYV3C87H2RXF5OH7eqytT8tGEVAAnoiLVx/U9WB JgttaO2RYpEX0CS++ScSvz0Jr+oWAnZicMErBkIfKJ3d2xtozdI2+hGWFz9dG0pe/6Ti uHsaG3hZn/QvLNjioiPUD7g5q8ura2slXgQ50QauYZIjNt0J3rNi3F92mRQMaId5/+B9 oW8EOX/Pbct6u2eZdxxU38KA1DK4AFLXQ5R0Y79xGhFpv9TY0GUs94+3W2pJobD6CInF nHQRW6jn4DnlR/nzT/LHmOSrNs5tDyNrw0m6+E3yAsE5XkNRC2EZTr3Pd9S8a0YI/2ZR JVtA== X-Gm-Message-State: AOAM530TjNTThhpEI9g2NjCdSFtJu+K5q+D83qiPDER95BL6sUWkLVpg jLDk3ELHJkfWnEvLjldYkggjttK/Cx3pDBKbsz8N1uG21Ho= X-Google-Smtp-Source: ABdhPJwuBnm2oXTS3y7yncphMNAvb1eBjmctU/sgHxhlTUVu2pF8rezUuIXJ0FvDzTFYFJiSRpDfsymHcIyzLJHxZQ0= X-Received: by 2002:a17:907:100a:: with SMTP id ox10mr15206686ejb.351.1593467323961; Mon, 29 Jun 2020 14:48:43 -0700 (PDT) MIME-Version: 1.0 From: David CARLIER Date: Mon, 29 Jun 2020 22:48:33 +0100 Message-ID: Subject: [PATCH 9/9] Implementing qemu_init_exec_dir. To: QEMU Trivial , qemu-devel Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=devnexen@gmail.com; helo=mail-ej1-x642.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-Mailman-Approved-At: Mon, 29 Jun 2020 20:42:18 -0400 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 fcdb25804af98329b52a04e7a4e5191135aac4f6 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 29 Jun 2020 22:36:03 +0000 Subject: [PATCH 9/9] Implementing qemu_init_exec_dir. Signed-off-by: David Carlier Reviewed-by: Peter Maydell --- util/oslib-posix.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.26.0 diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 7ad9195c44..72907d4d7f 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -60,6 +60,10 @@ #include #endif +#ifdef __HAIKU__ +#include +#endif + #include "qemu/mmap-alloc.h" #ifdef CONFIG_DEBUG_STACK_USAGE @@ -389,6 +393,21 @@ void qemu_init_exec_dir(const char *argv0) } } } +#elif defined(__HAIKU__) + { + image_info ii; + int32_t c = 0; + + *buf = '\0'; + while (get_next_image_info(0, &c, &ii) == B_OK) { + if (ii.type == B_APP_IMAGE) { + strncpy(buf, ii.name, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + p = buf; + break; + } + } + } #endif /* If we don't have any way of figuring out the actual executable location then try argv[0]. */