From nobody Mon May 13 21:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652002494; cv=none; d=zohomail.com; s=zohoarc; b=d9URpwYgm8k7MhZ2pFDzGhpBKigMyta6p0ONXc8zEP27h7tsQTZdVGBcASexrB4Rd2jj/acBv2M6uCGOqRxB9ihoniqDxB1yqXBFZjoPUsYlzidrhGYcH1S0GTt7e4S97BBDSd5yAW3fXE7oMWbLiUnSMcx86iiyP//ZFTHsAlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652002494; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KDxZIIy0ZVQ63u+8+EkQx6/vezGGY5jxyJVtnMk3BE=; b=iMx19Eboq6tlK6p8KDBewHoAgZqA7gDTrHQc+beQhubfYXO/eVRZGQL/olv+QJPr7vUpxc7I+9c5AMvcVUMwgpFPX0ZNRjW8E7QI8EMt/8sNHPFNqQHWNotWGfVxE9EJsJY2nUZbtuPEkQp1CbfwolvwejsQJaBmPuSfWmEotMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652002494251472.84437219961046; Sun, 8 May 2022 02:34:54 -0700 (PDT) Received: from localhost ([::1]:32808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nndJV-0004HL-2G for importer@patchew.org; Sun, 08 May 2022 05:34:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGK-0001S5-4W for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGI-0008P6-3y for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:35 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-efmAK3f1O-yyhENuMzFPiw-1; Sun, 08 May 2022 05:31:32 -0400 Received: by mail-ej1-f69.google.com with SMTP id t4-20020a170906608400b006f8687b8884so498853ejj.0 for ; Sun, 08 May 2022 02:31:31 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:e3ec:5559:7c5c:1928]) by smtp.gmail.com with ESMTPSA id x13-20020a1709064a8d00b006f3ef214db3sm3898271eju.25.2022.05.08.02.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 02:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652002293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0KDxZIIy0ZVQ63u+8+EkQx6/vezGGY5jxyJVtnMk3BE=; b=QdtIPp3TeP0a9lVjc3S+Hp8SwFhh5hT42d20TezE9Wmr7zkMLMdHuMuwuoMMyW8TgBa5xo bCDJLbnGkeFGpnwEkKIL9+s+5nIY/2KAM3sPjx88RvuwjsN1NII6JIvJqLuOWrU4vnIYIF AtA66NW7Mcfcjy/+IDtXC5n/pw9ArFs= X-MC-Unique: efmAK3f1O-yyhENuMzFPiw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0KDxZIIy0ZVQ63u+8+EkQx6/vezGGY5jxyJVtnMk3BE=; b=KYcIbHmFI+wr1Z127DOgQ0lpjeackPaZrJQwnjIIw8Dtkr9mNfhSVZs2XRn2YyGxUn ofzkohrgxOJIPAfyo6VFydOCndcb/ihJZIjSrv6ejvXVXARoOuAFf8GX5SCSc1heE7PP MIRU2Tpqm0SDljmbjklGQ2KdaMy1f0qRIo2yRF+xcE8d3zwhfjyTZqoW8yzBlJHKSD+Q 6SdZW9bXwirojc0M6MKHa1swyHizwyyMZkbsUsG0S4QXuD9YX4PyRLnkq7/WcXuPpc5y rVcQNnj7ZRuA7u4RV/p4CiEH+q6HhZPS+/umCOeI4yeoSV4u2RMKZ9n+TXB50k+5Exd8 2AZQ== X-Gm-Message-State: AOAM531THIAEhilyf+rPrziB99S7JXulUheEvoqM+0BSdwe4QUDCQvkB MflMMXBr2/vmAMFQjszNt4Srcp+VMVciCV9lxa1LvPscI62CVGoN+q/XToPBONjM0xuuDic4vIW 1BWIycA4wRSKKMN39aaC6mg7Xv0o71jtg0UnCnUEREkOTp+1uQLNhLOJGrF+wkGs0NL4= X-Received: by 2002:a05:6402:50d2:b0:428:b39:5c08 with SMTP id h18-20020a05640250d200b004280b395c08mr11988469edb.146.1652002290583; Sun, 08 May 2022 02:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeuTXzmAeuKbfFjaq7E5DVWuRazBBRM2zJ7QgmvjNQp60vUNdK9QVmZw+ZdNcKhYLFLmGQDg== X-Received: by 2002:a05:6402:50d2:b0:428:b39:5c08 with SMTP id h18-20020a05640250d200b004280b395c08mr11988454edb.146.1652002290336; Sun, 08 May 2022 02:31:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, malureau@redhat.com Subject: [PATCH v2 1/5] slirp: bump submodule past 4.7 release Date: Sun, 8 May 2022 11:31:16 +0200 Message-Id: <20220508093120.173131-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220508093120.173131-1-pbonzini@redhat.com> References: <20220508093120.173131-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652002495063100005 Version 4.7 of slirp provides a new timer API that works better with CFI, together with several other improvements: * Allow disabling the internal DHCP server !22 * Support Unix sockets in hostfwd !103 * IPv6 DNS proxying support !110 * bootp: add support for UEFI HTTP boot !111 and bugfixes. The submodule update also includes 2 commits to fix warnings in the Win32 build. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- slirp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp b/slirp index a88d9ace23..9d59bb775d 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0 +Subproject commit 9d59bb775d6294c8b447a88512f7bb43f12a25a8 --=20 2.35.1 From nobody Mon May 13 21:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652002490; cv=none; d=zohomail.com; s=zohoarc; b=T70L/XIRMlW1BlrOdbvNG/JOmoW5WH4YzEBVZNexvwLtKGg9/tTdhVvfdUIWFUvSbS7hgf8gdr75nWIpQ6PFQX2OgX2hTuLm/YVNV2aOk+TwMaZHf140IhkaprUw2QGVja2f3dE7exYQgT6uZMbKwrU3QryGcvv040CKJqng7dU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652002490; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Edd3So3TMxja3Z4zgQxs9DpKzS8fV2s9+BBNNKuvyfo=; b=G38+Xl0sq+ApyQBwS/q0nz/iCjOdkaLdxt5KJB+5X4vNDqKn6fEM9qObXhyc/tyRtEUH6qNlCRq2jUINvW0GkNzUeikGGwYjBJjvuGsgGlM6O73DEJru4r1+i14jX9Ywb9cPel7lKkz0d6R1yYZ3FwLBo9l20OMonnhuLVHXUd0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652002490913419.03037965072633; Sun, 8 May 2022 02:34:50 -0700 (PDT) Received: from localhost ([::1]:60974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nndJR-0004Ea-KB for importer@patchew.org; Sun, 08 May 2022 05:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGM-0001Wj-KX for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGL-0008PV-5C for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:38 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-491-AidJnATtMOCR8B7tKmRPHw-1; Sun, 08 May 2022 05:31:35 -0400 Received: by mail-ed1-f71.google.com with SMTP id eg38-20020a05640228a600b00425d61d0302so6535607edb.17 for ; Sun, 08 May 2022 02:31:34 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:e3ec:5559:7c5c:1928]) by smtp.gmail.com with ESMTPSA id p9-20020a170906140900b006f3ef214dcdsm3870017ejc.51.2022.05.08.02.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 02:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652002296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Edd3So3TMxja3Z4zgQxs9DpKzS8fV2s9+BBNNKuvyfo=; b=DnIR4WUpF9/OvnFKRaj08bm73aRZNSalY2HjtcZ2UtBTsCaJo3VtUifoPABPXHRAs1RqEE wy2m6UsS41ohgDfAaNC+6EvZhyz0aA191DHFlo1wYsZhUqTJbercbMTb3RpHc0n57knWSY Ft4fDV0gthp6d1fp+/wkgB9qw3x7YIE= X-MC-Unique: AidJnATtMOCR8B7tKmRPHw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Edd3So3TMxja3Z4zgQxs9DpKzS8fV2s9+BBNNKuvyfo=; b=b/1PtT6NGs9AZp9SlCDPX3WvTdtsaS5Zu1gkMh5WIvKZ4JU1xiTqRv0UJa/92tkGI3 xE4P6qdO9ucRpJGsOxChAsJhIkYpNxPzis58fWVtZwezAIWAgJyfQ+ILXWYKkLPHIa+b HmTlbFSn43EFk9eCmhdVVWlwOekll+YKyqJc3DKbo6ql0kstUMxoMlBWzMkoGXKPMAKY OROZEHfOWhCzkoGXj0RAopot0ki8zxShknlsa3c1Zfon9fJpxMVvbOo30uWSZVM/Te2S jFSrkjr/TrwMO/r4r0gxeu3iyFz4p3YtB6MwZZ3xv89a0fDJjXwWcduCDwNqJ+3/l8LO bnLQ== X-Gm-Message-State: AOAM531R8ek+kCEBJ/jSFA+GYAmnJKSbkQyjmnRHsOhjrXk73qMDDvkS GdkNkaShYD0H8KT9fRrlYaH8taEJb2zvo8+ocJfCI782MwDBO1k02gq8L7nFm61zLSeRFAoDw5d uj3DynLvjo9liKjW831e6aXKITJT53d8jh3efpBzqV2QIpqz99oWY7sdy7qLRwTLsJWc= X-Received: by 2002:a17:907:1c8a:b0:6e9:2a0d:d7b7 with SMTP id nb10-20020a1709071c8a00b006e92a0dd7b7mr9779966ejc.572.1652002293691; Sun, 08 May 2022 02:31:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHNNJF/l0lHNw3Yh31phJbf9ba+m6sFb2We4rD3E6cCUETsNCuwTWkgTM+VzorC6TW+qBfPg== X-Received: by 2002:a17:907:1c8a:b0:6e9:2a0d:d7b7 with SMTP id nb10-20020a1709071c8a00b006e92a0dd7b7mr9779945ejc.572.1652002293397; Sun, 08 May 2022 02:31:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, malureau@redhat.com, Samuel Thibault Subject: [PATCH v2 2/5] net: slirp: introduce a wrapper struct for QemuTimer Date: Sun, 8 May 2022 11:31:17 +0200 Message-Id: <20220508093120.173131-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220508093120.173131-1-pbonzini@redhat.com> References: <20220508093120.173131-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652002493319100002 This struct will be extended in the next few patches to support the new slirp_handle_timer() call. For that we need to store an additional "int" for each SLIRP timer, in addition to the cb_opaque. Reviewed-by: Samuel Thibault Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- net/slirp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index bc5e9e4f77..f1e25d741f 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -184,23 +184,32 @@ static int64_t net_slirp_clock_get_ns(void *opaque) return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } =20 +struct SlirpTimer { + QEMUTimer timer; +} + static void *net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, void *opaque) { - return timer_new_full(NULL, QEMU_CLOCK_VIRTUAL, - SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, - cb, cb_opaque); + SlirpTimer *t =3D g_new(SlirpTimer, 1); + timer_init_full(&t->timer, NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + cb, cb_opaque); + return t; } =20 static void net_slirp_timer_free(void *timer, void *opaque) { - timer_free(timer); + SlirpTimer *t =3D timer; + timer_del(&t->timer); + g_free(t); } =20 static void net_slirp_timer_mod(void *timer, int64_t expire_timer, void *opaque) { - timer_mod(timer, expire_timer); + SlirpTimer *t =3D timer; + timer_mod(&t->timer, expire_timer); } =20 static void net_slirp_register_poll_fd(int fd, void *opaque) --=20 2.35.1 From nobody Mon May 13 21:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652002663; cv=none; d=zohomail.com; s=zohoarc; b=gXwPTo+EOO4iVZj4J7567fELo1D5yxxPrVzLnksND4YZW1V5KL+3Fp3Z1i+4htK/rPYWmenXz2zUNpjfor5nDJwL3KVmvWyA2B4H6A5Oi4VVELl52+HrXnByrrtaBVSHRhvhxmQGUc5d0vIusQ+KwIUFULtPf3MB4w/eqTGMGU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652002663; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Uv+wMdkn8fKZ5tfLdhBHRhBzVWdj1htzdQqNI2/aivk=; b=oE71Zsofo0D5w5JeiBKt5+xjeEeTsjum7Esiaf+XEfmsmWsJo3DjpDPn80mW8iYoTxwHGWuDYd9GBITptRWLS2TkCB6ev1UMB8xB8SsysLQgahe3I/AhXtTz4ZNgbTfVyexptCcqV1xTwvIiIkIE/FxV/NK6mdvA9SPn+74nU/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652002663966985.4694686321791; Sun, 8 May 2022 02:37:43 -0700 (PDT) Received: from localhost ([::1]:40512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nndME-0001Aa-IT for importer@patchew.org; Sun, 08 May 2022 05:37:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGP-0001ec-JP for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGN-0008Pt-Vm for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:41 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-c2dpe1-dOVqhrDfjYel6-g-1; Sun, 08 May 2022 05:31:38 -0400 Received: by mail-ed1-f72.google.com with SMTP id l24-20020a056402231800b00410f19a3103so6550496eda.5 for ; Sun, 08 May 2022 02:31:38 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:e3ec:5559:7c5c:1928]) by smtp.gmail.com with ESMTPSA id vf20-20020a170907239400b006f3ef214dabsm3829117ejb.17.2022.05.08.02.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 02:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652002299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uv+wMdkn8fKZ5tfLdhBHRhBzVWdj1htzdQqNI2/aivk=; b=MtL2+znj1fsftslcGWCt8xiaysyUEJZARnxnUn61ycVjuhWZfiL3P17tKL0SWbD9uSN//g yE0B00cmfUVZgFtGlIlloAIRHr1+ieZs8Lu0k8jvhw3dbSY7qEJeK28uvEFz8S1c51OEUq Rjs6UpksnfkfVh0LzmjagxEpN1iFQe4= X-MC-Unique: c2dpe1-dOVqhrDfjYel6-g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uv+wMdkn8fKZ5tfLdhBHRhBzVWdj1htzdQqNI2/aivk=; b=Pda2zY95rdCH6T3RDFs1kfKGnsSwbS9evkiNBdCXhOXL4LaAFfDCXmrfyb36WCVGfN sn2GJic2WS4g4V66lrhlN6iz9jb7JJkjxRFYMU5dKF1erF/VQhS4Lt+Xc0OV54/uBNeq +jhFlbZ9mSIAYbS+sfCPHoKXRu8Ryeq23hDUuh+XaYMFQihjOQvOe+8/n9tk3tm1+9Dv /MAM/1u9wU0jb4ZuGocH+7nx7Wk90xbkpzmfUZ/+5LtQ5DKoBmljUw6eS2gF75yqUeEz UeDoJJhOBLznaEcbDT4O/ZhKieX4kPFG3nm25tnMkdU+7oZJTcuwNFYS2116BLCLpuml Dx+A== X-Gm-Message-State: AOAM532PEh1RNdG3a8N4B3YgwEzkyxDbqz2pW6pyYcLBGpdbHJVgGm31 gAg+d19BjEaEaz7HGVgCigI2NXjYFX1VNE4Q6R43lh+a8wcc00sfZM3zF6g9iOfl7quIYtDalZT 6eG2uDFW9cYqZdqADBUprk3U+zetJhZzKMVEZ4qLsAF3+ALZAr1lw4Ewljy3Dq2Fort0= X-Received: by 2002:a05:6402:4414:b0:419:28bc:55dc with SMTP id y20-20020a056402441400b0041928bc55dcmr12241248eda.130.1652002296703; Sun, 08 May 2022 02:31:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxm0PUOGB+YUnEq6W1eShEhzWHO7UnokoDYBkn5b0igLeQxmnApkSb+gByrNfwmzfhhdKfbxQ== X-Received: by 2002:a05:6402:4414:b0:419:28bc:55dc with SMTP id y20-20020a056402441400b0041928bc55dcmr12241236eda.130.1652002296489; Sun, 08 May 2022 02:31:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, malureau@redhat.com Subject: [PATCH v2 3/5] net: slirp: switch to slirp_new Date: Sun, 8 May 2022 11:31:18 +0200 Message-Id: <20220508093120.173131-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220508093120.173131-1-pbonzini@redhat.com> References: <20220508093120.173131-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652002665826100001 Content-Type: text/plain; charset="utf-8" Replace slirp_init with slirp_new, so that a more recent cfg.version can be specified. Only support version 3 of the configuration for simplicity, corresponding to a minimum slirp version of 4.3.0. Signed-off-by: Paolo Bonzini --- meson.build | 2 +- net/slirp.c | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 1712ea9e46..264a5fb5ed 100644 --- a/meson.build +++ b/meson.build @@ -2638,7 +2638,7 @@ if have_system if slirp_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') slirp =3D dependency('slirp', kwargs: static_kwargs, - method: 'pkg-config', + method: 'pkg-config', version: '>=3D4.1.0', required: slirp_opt =3D=3D 'system' or slirp_opt =3D=3D 'enabled' and not have_i= nternal) if slirp.found() diff --git a/net/slirp.c b/net/slirp.c index f1e25d741f..b7464be86b 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -389,6 +389,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, #if defined(CONFIG_SMBD_COMMAND) struct in_addr smbsrv =3D { .s_addr =3D 0 }; #endif + SlirpConfig cfg =3D { 0 }; NetClientState *nc; SlirpState *s; char buf[20]; @@ -577,12 +578,26 @@ static int net_slirp_init(NetClientState *peer, const= char *model, =20 s =3D DO_UPCAST(SlirpState, nc, nc); =20 - s->slirp =3D slirp_init(restricted, ipv4, net, mask, host, - ipv6, ip6_prefix, vprefix6_len, ip6_host, - vhostname, tftp_server_name, - tftp_export, bootfile, dhcp, - dns, ip6_dns, dnssearch, vdomainname, - &slirp_cb, s); + cfg.version =3D 1; + cfg.restricted =3D restricted; + cfg.in_enabled =3D ipv4; + cfg.vnetwork =3D net; + cfg.vnetmask =3D mask; + cfg.vhost =3D host; + cfg.in6_enabled =3D ipv6; + cfg.vprefix_addr6 =3D ip6_prefix; + cfg.vprefix_len =3D vprefix6_len; + cfg.vhost6 =3D ip6_host; + cfg.vhostname =3D vhostname; + cfg.tftp_server_name =3D tftp_server_name; + cfg.tftp_path =3D tftp_export; + cfg.bootfile =3D bootfile; + cfg.vdhcp_start =3D dhcp; + cfg.vnameserver =3D dns; + cfg.vnameserver6 =3D ip6_dns; + cfg.vdnssearch =3D dnssearch; + cfg.vdomainname =3D vdomainname; + s->slirp =3D slirp_new(&cfg, &slirp_cb, s); QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry); =20 /* --=20 2.35.1 From nobody Mon May 13 21:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652002620; cv=none; d=zohomail.com; s=zohoarc; b=RSL9TBcOXL48cqy5TQL9iSZVAtWeu3c7gAu2EZhsBSE1g+cebqWC8MXNAw4uen9ftUIlXRQnuldCrMqn6A7pYlIXU9kZu1VMjO8CsOo7ZzMCgQ+eAt4qVj9Kw3fRMSChdOAS6Jl20X4eOK+WvhU6dFYIL1i5efx0g7nWNxjjm7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652002620; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/Q0oZqb6yj0OcLtD/ZphSKvdIEW4L+ncCKHPCunEiwQ=; b=M290iYs+RLjYTkTwp+YugYmDd8rjkcDErMAOiKw0Yo9jkL1Cs+6XIe7TAGUN2trHEGew80hIXfvUAbjWQlZ+Nvzm8ywreY2nMAdPcLe5oH6aaVhfX+SxBd08IaemqJ9FclAR03yiabXk6mX3xBl/P2aq4fOhphirTV/+DbhqxhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165200262098220.940535537006213; Sun, 8 May 2022 02:37:00 -0700 (PDT) Received: from localhost ([::1]:37506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nndLX-0007aV-Uc for importer@patchew.org; Sun, 08 May 2022 05:36:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGS-0001jD-IB for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:51899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGP-0008Q3-NJ for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:42 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-159-xBjjHiKXMyOLU2dVNlv_sA-1; Sun, 08 May 2022 05:31:40 -0400 Received: by mail-ed1-f69.google.com with SMTP id r26-20020a50aada000000b00425afa72622so6486464edc.19 for ; Sun, 08 May 2022 02:31:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:e3ec:5559:7c5c:1928]) by smtp.gmail.com with ESMTPSA id gc35-20020a1709072b2300b006f3ef214db7sm3849744ejc.29.2022.05.08.02.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 02:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652002301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Q0oZqb6yj0OcLtD/ZphSKvdIEW4L+ncCKHPCunEiwQ=; b=L74wbjpBKBFr15EbEFgoteDkAtmQXtWF6wUIfN1B/+ACroliqSaAIizaMqYWf9vltxQfE2 FGk8VeZFnZXi0wyaS1C0DtkzaX5tHRAviiCoT6lAYh80FGZMi8k3Z696dhh9Xv8kLLYw2D y5BXa6LVlas/CBqZ3qDykXFGrqVGAh4= X-MC-Unique: xBjjHiKXMyOLU2dVNlv_sA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/Q0oZqb6yj0OcLtD/ZphSKvdIEW4L+ncCKHPCunEiwQ=; b=uOToo4JqdX1Sj4d2GHF8veQqo4kvmLUdtlMMwLD6smYdSaTVKsld3jigkXu6VEjJja 7nZRp1b9WXOyp/XbemJmSthvSoHZ5T0ZtYeQAKaIFNcCi5O15Hq2pPcXmM8j8ZzLA65k 2YA3X7g7TDMaWIJpJmJEL6E6maKNnGVoE5TYA+CNRhInAWVXvRlKuNQas5FIUYvtlAru rEw1T16tqBxNWsZpdXy7qLDsE8fmar6opZHl0Tvxk+thZKpNdaEbDIMHFxKzibpmqmD1 B+ReCfRr3AIJZpoZG+SBmeCvomtbTS8q8qvTcCsPjxxilbSVWr1c6p/VL6Ai8mPi6oyW pIIQ== X-Gm-Message-State: AOAM533Prz3kzigDJ20syarRbjA2WwHGRymEeVKBEHgf6FZj3ok+yYou wOPjys22pKPmC1napajYsWnFGGHXEnNV5lU9oUx+ywRuLAMi1Vysu+5RT15g813W3azijtLEm33 BkQIxlT6ZzMSFF68FNmP5CBN3J5HTgwBpnq8LA7hqbhKJkCLKw1hJ0Px8IvBgpWgEMjI= X-Received: by 2002:a05:6402:3485:b0:427:cde4:2097 with SMTP id v5-20020a056402348500b00427cde42097mr11678877edc.264.1652002298598; Sun, 08 May 2022 02:31:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQyhxHzDtEwijVmZhPQMzUGyAWwDcVsJBFoTinWJu2BegRixmnf75O6HZDU6WKsI3aid020Q== X-Received: by 2002:a05:6402:3485:b0:427:cde4:2097 with SMTP id v5-20020a056402348500b00427cde42097mr11678845edc.264.1652002298252; Sun, 08 May 2022 02:31:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, malureau@redhat.com, Samuel Thibault Subject: [PATCH v2 4/5] net: slirp: add support for CFI-friendly timer API Date: Sun, 8 May 2022 11:31:19 +0200 Message-Id: <20220508093120.173131-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220508093120.173131-1-pbonzini@redhat.com> References: <20220508093120.173131-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652002621631100001 libslirp 4.7 introduces a CFI-friendly version of the .timer_new callback. The new callback replaces the function pointer with an enum; invoking the callback is done with a new function slirp_handle_timer. Support the new API so that CFI can be made compatible with using a system libslirp. Reviewed-by: Samuel Thibault Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- net/slirp.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/net/slirp.c b/net/slirp.c index b7464be86b..8679be6444 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -184,10 +184,43 @@ static int64_t net_slirp_clock_get_ns(void *opaque) return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } =20 +typedef struct SlirpTimer SlirpTimer; struct SlirpTimer { QEMUTimer timer; +#if SLIRP_CHECK_VERSION(4,7,0) + Slirp *slirp; + SlirpTimerId id; + void *cb_opaque; +#endif +}; + +#if SLIRP_CHECK_VERSION(4,7,0) +static void net_slirp_init_completed(Slirp *slirp, void *opaque) +{ + SlirpState *s =3D opaque; + s->slirp =3D slirp; } =20 +static void net_slirp_timer_cb(void *opaque) +{ + SlirpTimer *t =3D opaque; + slirp_handle_timer(t->slirp, t->id, t->cb_opaque); +} + +static void *net_slirp_timer_new_opaque(SlirpTimerId id, + void *cb_opaque, void *opaque) +{ + SlirpState *s =3D opaque; + SlirpTimer *t =3D g_new(SlirpTimer, 1); + t->slirp =3D s->slirp; + t->id =3D id; + t->cb_opaque =3D cb_opaque; + timer_init_full(&t->timer, NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + net_slirp_timer_cb, t); + return t; +} +#else static void *net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, void *opaque) { @@ -197,6 +230,7 @@ static void *net_slirp_timer_new(SlirpTimerCb cb, cb, cb_opaque); return t; } +#endif =20 static void net_slirp_timer_free(void *timer, void *opaque) { @@ -231,7 +265,12 @@ static const SlirpCb slirp_cb =3D { .send_packet =3D net_slirp_send_packet, .guest_error =3D net_slirp_guest_error, .clock_get_ns =3D net_slirp_clock_get_ns, +#if SLIRP_CHECK_VERSION(4,7,0) + .init_completed =3D net_slirp_init_completed, + .timer_new_opaque =3D net_slirp_timer_new_opaque, +#else .timer_new =3D net_slirp_timer_new, +#endif .timer_free =3D net_slirp_timer_free, .timer_mod =3D net_slirp_timer_mod, .register_poll_fd =3D net_slirp_register_poll_fd, @@ -578,7 +617,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, =20 s =3D DO_UPCAST(SlirpState, nc, nc); =20 - cfg.version =3D 1; + cfg.version =3D SLIRP_CHECK_VERSION(4,7,0) ? 4 : 1; cfg.restricted =3D restricted; cfg.in_enabled =3D ipv4; cfg.vnetwork =3D net; --=20 2.35.1 From nobody Mon May 13 21:46:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652002661; cv=none; d=zohomail.com; s=zohoarc; b=daY11O5VxlhMCXtUtHMWgrxUe8ttZdQOm5ND6y5ZbYy22f7mSXnZb++rWx+Awj1Mbw/4PZRlfqHL4jReH9jX+ZCfXwJ00FdD3ZRPm8O54ZKCJXe9ACnhd5hHrBNmteXnp0aRwT/OTqmrtbtHZlnxswJpf0vwNo39zpbgnryB46E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652002661; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KJFHzBbFoIUCDuff+JNfKtPCj2Q+glCsV9uQ09Zjsyg=; b=kTDWPm5rJa2wCDbd6naCBY8Gsiu1sRUQBzmqI+Tnof2M6PzjJMRJTfEm+Dm1Wtp/Z5kWzu/GoK+ZEUSWsDKWs3fWtErPJe878yWwByQvaG5KZCm2ZvovbYvZIT0V7W4zieVggSRrWznpBGtIH5q1IhF5n7hyaV7rxDZQWiL00q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652002661251226.5376123698702; Sun, 8 May 2022 02:37:41 -0700 (PDT) Received: from localhost ([::1]:40316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nndMB-00012R-UT for importer@patchew.org; Sun, 08 May 2022 05:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGT-0001qF-Tj for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:33029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nndGS-0008QI-9C for qemu-devel@nongnu.org; Sun, 08 May 2022 05:31:45 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-oFBw9kWDNBOnqTcqNCAqhw-1; Sun, 08 May 2022 05:31:42 -0400 Received: by mail-ed1-f69.google.com with SMTP id ec44-20020a0564020d6c00b00425b136662eso6579177edb.12 for ; Sun, 08 May 2022 02:31:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:e3ec:5559:7c5c:1928]) by smtp.gmail.com with ESMTPSA id p21-20020a17090653d500b006f3ef214e3csm3752866ejo.162.2022.05.08.02.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 02:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652002303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KJFHzBbFoIUCDuff+JNfKtPCj2Q+glCsV9uQ09Zjsyg=; b=LeucBs4ChCKqWq+flAdDnO7ziwHAhVjANLn/+LOzEYSfCHwhPqECxrkN5lz+hDU+c/tZIG gEe9jS802ebL+9GxyJ7VdRclBDCC93JmfREJ2TqfFjImNGJnLUqrIBysh/YSOzhZBmZMvn Cmp1TvpMhCKLXO8JaQH4x7R5siKe2jg= X-MC-Unique: oFBw9kWDNBOnqTcqNCAqhw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KJFHzBbFoIUCDuff+JNfKtPCj2Q+glCsV9uQ09Zjsyg=; b=saBBtrJ3QYeLyt8NBolXb2SW42ug+xSukSorg8QjT3n4m4teu7Eo7IOUwRUYPmboUP YRBDxX2FHQMO1EydYB6y/FFDmjVwSs5zGQPX+db0LQIAvSdacSnTEN9zh5h5cCzelR9K GNgmIXYuwksSGUpqf3vlWuK8kvLfpF+PBAF10RO5378fXQHm7MfOyQgZSrORKQv+WlkW XVAULz56qbPhYMndX7dSWq2qSl9NyCqWlwVJw1rMumhar9AdDvSEJUgk0NbsxWtZrQhz WzS46Zwf26rIDhpwXaJIIXLBXg3AU1Y3Y7uE/8V/VM0ycTX//LTdvwxEpjd3X5HkpAzf IslA== X-Gm-Message-State: AOAM533aWhh1m1ltkoyndLB971uCkDh6Ta+OHCy1CiCwLS/1CIxjtZ3m 4tTpCvPYbJeNB+DxwojYc0znAP2RbT1x1I0djSzzKmeOh4MrbV0D+kh5zy6Gbx8H+F2iieUe2bw gXZ8r+Cnrrq6cIm8sgxObrnSuKMVOmGcVvaZtQukH++TYpF/NNOSG70aDqWzUvk2HY2I= X-Received: by 2002:a17:906:c114:b0:6f5:db6f:71a1 with SMTP id do20-20020a170906c11400b006f5db6f71a1mr7551011ejc.338.1652002300670; Sun, 08 May 2022 02:31:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqpLyZ2sip2xYKA2bL5C7T4I4PHHbXjbKaUIC6P4lMJh9kQwVGmkYbNWqdyOjBkpTQ/Nld+g== X-Received: by 2002:a17:906:c114:b0:6f5:db6f:71a1 with SMTP id do20-20020a170906c11400b006f5db6f71a1mr7550989ejc.338.1652002300361; Sun, 08 May 2022 02:31:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, malureau@redhat.com, Samuel Thibault Subject: [PATCH v2 5/5] net: slirp: allow CFI with libslirp >= 4.7 Date: Sun, 8 May 2022 11:31:20 +0200 Message-Id: <20220508093120.173131-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220508093120.173131-1-pbonzini@redhat.com> References: <20220508093120.173131-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652002661897100001 slirp 4.7 introduces a new CFI-friendly timer callback that does not pass function pointers within libslirp as callbacks for timers. Check the version number and, if it is new enough, allow using CFI even with a system libslirp. Reviewed-by: Samuel Thibault Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 264a5fb5ed..59ca709078 100644 --- a/meson.build +++ b/meson.build @@ -2637,10 +2637,25 @@ if have_system slirp_opt =3D get_option('slirp') if slirp_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') + slirp_dep_required =3D (slirp_opt =3D=3D 'system' or + slirp_opt =3D=3D 'enabled' and not have_internal) slirp =3D dependency('slirp', kwargs: static_kwargs, method: 'pkg-config', version: '>=3D4.1.0', - required: slirp_opt =3D=3D 'system' or - slirp_opt =3D=3D 'enabled' and not have_i= nternal) + required: slirp_dep_required) + # slirp <4.7 is incompatible with CFI support in QEMU. This is because + # it passes function pointers within libslirp as callbacks for timers. + # When using a system-wide shared libslirp, the type information for t= he + # callback is missing and the timer call produces a false positive wit= h CFI. + # Do not use the "version" keyword argument to produce a better error. + # with control-flow integrity. + if get_option('cfi') and slirp.found() and slirp.version().version_com= pare('<4.7') + if slirp_dep_required + error('Control-Flow Integrity requires libslirp 4.7.') + else + warning('Control-Flow Integrity requires libslirp 4.7, not using s= ystem-wide libslirp.') + slirp =3D not_found + endif + endif if slirp.found() slirp_opt =3D 'system' elif have_internal @@ -2713,18 +2728,6 @@ if have_system endif endif =20 -# For CFI, we need to compile slirp as a static library together with qemu. -# This is because we register slirp functions as callbacks for QEMU Timers. -# When using a system-wide shared libslirp, the type information for the -# callback is missing and the timer call produces a false positive with CF= I. -# -# Now that slirp_opt has been defined, check if the selected slirp is comp= atible -# with control-flow integrity. -if get_option('cfi') and slirp_opt =3D=3D 'system' - error('Control-Flow Integrity is not compatible with system-wide slirp.'= \ - + ' Please configure with --enable-slirp=3Dgit') -endif - fdt =3D not_found if have_system fdt_opt =3D get_option('fdt') --=20 2.35.1