From nobody Sun May 12 12:43:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646643863; cv=none; d=zohomail.com; s=zohoarc; b=beACcvwXYPXii8vhq2pMvDBTwT/11KeoFzKp85kBqwVfpP6bOmBrawTu70pmFSxkyFpgquvY+WXY4tSHYuRYhOwG2hfQ/GDCdo5KcF4zFhwTl+/6XGL76HLbO9yThJ1z2/Rs5QH7phYqBfhkAKJgWAIj9sUv/XCTjG/kJCld+9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646643863; h=Content-Type:Content-Transfer-Encoding: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=1bcG3r/XFKHswBMm0mjm4dGyZu2uRTVl0shD3lZF95o=; b=MJQrPN0q1pJRf/sHXSa0zkPzwxZa7mwBcdscRAeiaW20OadMyDhGhPcrtcFhQEpLdJiXL1+xt+9+DC1HcnybNZ63dLhr0Gt1woK3jWqLD1jtTG82NUEA4S0++/2nmCdrfXMDQ4rnFxMtVa6tN6h+mvRsbuVW3aVD4zIm/1xfjgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646643863855142.74560968307662; Mon, 7 Mar 2022 01:04:23 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-515-kkYwtWS2N12ewiMURfz31g-1; Mon, 07 Mar 2022 04:04:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 621E01C05159; Mon, 7 Mar 2022 09:04:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D084400E43E; Mon, 7 Mar 2022 09:04:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D7731931BDC; Mon, 7 Mar 2022 09:04:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF22519305A7 for ; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 91CB12026D11; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DAF52026D7F for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FE513C174CB for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) 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-479-_CPqLMaFPym4dtZrfz7ODA-1; Mon, 07 Mar 2022 04:04:09 -0500 Received: by mail-ed1-f72.google.com with SMTP id da28-20020a056402177c00b00415ce4b20baso7322225edb.17 for ; Mon, 07 Mar 2022 01:04:09 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id u5-20020aa7d985000000b004024027e7dasm5825375eds.28.2022.03.07.01.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 01:04:07 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id A8F894F84488 for ; Mon, 7 Mar 2022 10:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646643862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1bcG3r/XFKHswBMm0mjm4dGyZu2uRTVl0shD3lZF95o=; b=gvVAFBRBEuLEWud9s8j5dZ0IVYw9DzpPqunK9H/D2ssVsBHzPXbu/NTCMUYBoyKqc7nv7l /50CK5KXwGZvkywxY/LLD0KfkKXfkxRn1pPYMTzEWKijvNv870T4mHsyoj7YVZmkcCjkmu 6ACdU+vGBApkSvxTyGAnuCm3ciieTcQ= X-MC-Unique: kkYwtWS2N12ewiMURfz31g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: _CPqLMaFPym4dtZrfz7ODA-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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1bcG3r/XFKHswBMm0mjm4dGyZu2uRTVl0shD3lZF95o=; b=X135qKEasz06M7OczOctxfjGK5iVui0dxCwtIuQd4VneAW1LgrqJiB+A3DpuDD41yU Draayt7SBItyFR2l8hSCpsEZ4q0ZDWadpFfgMLbW2HapEUhIfb/xH7/H9EF70qGzjj8Y 99iltIIsIdxBexGQQqag+m96VaxMv67cvyt+3l2r0OUf7oXCvuEfErg7JCHo/QlhtIO1 Te5kI60+qHoz0lhnZczsxUm/uokl6g8RTZCcqynKRBm2J79oXx67CUJrq7FkhD75QN4S qBzZZuBgWjhmESKhiDkDvXnnRjMXHcm3lOmW/5WlS+gNYu1FCC8ExqfGmThzW64hPg9s TyvQ== X-Gm-Message-State: AOAM533XEOBjptzv/O6U3+Ex5vZoCEpGLo7x7OkVg9r4I2InKRv3UR/u 1Ydo50O1EaLtzMsLwqnrnI16ND31KORCmoOUT6hrl3ng5SX0Rb8M2kOR0DcStT8qY55CL+Y+Z/8 E9Cm5/aaHEEdnI6sYEILmA+CLAn7EceSMdxCs0E2Q97nQf7W3MHAABToeQL3N9b6XLhlJNpg= X-Received: by 2002:a17:906:d29b:b0:6da:9e4d:bb7c with SMTP id ay27-20020a170906d29b00b006da9e4dbb7cmr8723430ejb.155.1646643848260; Mon, 07 Mar 2022 01:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQCjVqlOAC4TOJfPl7GyCYWp4FixUiH1GqkE+vouh06aYudhxvIZPnOE9Nf7Mp3OzDuPyMeQ== X-Received: by 2002:a17:906:d29b:b0:6da:9e4d:bb7c with SMTP id ay27-20020a170906d29b00b006da9e4dbb7cmr8723412ejb.155.1646643847965; Mon, 07 Mar 2022 01:04:07 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 1/5] syntax-check: Rework mock-noinline to get all files at once Date: Mon, 7 Mar 2022 10:04:02 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646643865190100003 Content-Type: text/plain; charset="utf-8" The script can break if the number of files does not fit one invocation and xargs has to split it. Instead pipe the list of files directly into the sc= ript and in the script read them from stdin instead of the arguments. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 2 +- scripts/mock-noinline.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 9407581d0eb3..a8c9153b20ae 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1549,7 +1549,7 @@ sc_spacing-check: { echo '$(ME): incorrect formatting' 1>&2; exit 1; } =20 sc_mock-noinline: - $(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[ch]$$' | $(RUNUTF8) xargs \ + $(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[ch]$$' | $(RUNUTF8) \ $(PYTHON) $(top_srcdir)/scripts/mock-noinline.py =20 sc_header-ifdef: diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py index 712550cb7a4c..13c296603d3a 100644 --- a/scripts/mock-noinline.py +++ b/scripts/mock-noinline.py @@ -63,7 +63,7 @@ def scan_overrides(filename): mocked[name] =3D "%s:%d" % (filename, lineno) =20 =20 -for filename in sys.argv[1:]: +for filename in sys.stdin.readlines(): if filename.endswith(".h"): scan_annotations(filename) elif filename.endswith("mock.c"): --=20 2.35.1 From nobody Sun May 12 12:43:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646643905; cv=none; d=zohomail.com; s=zohoarc; b=NScrdgm5RhWhovI4k8B/VtQgoQSbUIrRbxMNX+zLEM1gAHWNdxBov/EsfKpScEMQ4kGOp82oKkgmWjvOpLL8TvyFHpZNGXyHLnlAaRCZN5/RZtusa8E39R/9ArLXAllfWkuTf0l5gAIZSZI3vi+3+4uIwVfROmN10nfqSjdqrjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646643905; h=Content-Type:Content-Transfer-Encoding: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=o7zyQYPub/YLq4DEl3Dr1v27f7yzPkjogvhKNT4gEv8=; b=M72Ydk+y1VRV+5Qm0zYylXH8iTOK7ouGaU007Meq7vEV5OvKQzsSDpOpNtzoU2IqgawTroHji386WHpANEXVGxCiP+TIFvuxsnGV9hMb5lRtpML8LSe7f1cHDTYS9fi+3HyCAo4aNTijA5ZIv1GeDXbo2IX+sxhTk71RQi1V2Ck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1646643905040302.714084158019; Mon, 7 Mar 2022 01:05:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-XE1wp5xTPPSy_fnwfRfqSw-1; Mon, 07 Mar 2022 04:04:17 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5DBCE899EC5; Mon, 7 Mar 2022 09:04:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4485357ECC6; Mon, 7 Mar 2022 09:04:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 587B61931BDD; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6136D1931BD7 for ; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 514F31121330; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CC8E112132D for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5443F1C05AC2 for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-K9LumjnuMMW9WHXYXAQ0Ng-1; Mon, 07 Mar 2022 04:04:09 -0500 Received: by mail-ej1-f71.google.com with SMTP id r18-20020a17090609d200b006a6e943d09eso6650817eje.20 for ; Mon, 07 Mar 2022 01:04:09 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id m12-20020a1709060d8c00b006da972685bdsm4199623eji.215.2022.03.07.01.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 01:04:07 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id A9BFA4F84489 for ; Mon, 7 Mar 2022 10:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646643904; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o7zyQYPub/YLq4DEl3Dr1v27f7yzPkjogvhKNT4gEv8=; b=NpwJa/L6D3Dq7E6hHb7N9PBIeprxm9l41dzdK39MIjjrAYB4eFV1/H5q/lwAd2k5y5CTg3 vm6M9BgwRSwyPkZpuE88PN0UDoMtkAqzTWu6Gb3tzinSmiOcqCFbek5+juJIe0gPRFCXDT L+oGLnJSVH5Sz2E4htLu6l9E395uwgw= X-MC-Unique: XE1wp5xTPPSy_fnwfRfqSw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: K9LumjnuMMW9WHXYXAQ0Ng-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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o7zyQYPub/YLq4DEl3Dr1v27f7yzPkjogvhKNT4gEv8=; b=Ibx4t+m7EShQZiG22a+T4xHGvbZSgQM0MFxQORyxfLeXIglCHAdUfXFNZAHuJhp6Tb E6RtJnzt7T04Ak1FIM7fIdPS2AdEVSNqvCsbWYm1dz3W3LIY7IkeNxht7Q6CJYyuhh5H kH/QVcRVbTtT4Jg6KfygH17d7cyE8TENNOZv/34RklQvW3lxQzgCAGoki9Ilfy5NQtIU oJUcYmHsWUTtnOgXCh532TIQn07sSlaPMcG/1dcDNg8sckI1Ps0z+8mX+ykuNx0Pc2lc 10s7Z386YGXEV/sa11JgrV42BSqVUuU9r89e8MniEtnU69/i5ZKbVffIfl4ivFYc50fi gwWg== X-Gm-Message-State: AOAM531KSXBvv60eazSdVwBds8aJAEXYB/p8xhprxsbzzKTjBeiDWoTS XbvX3HWs9IvnJDt2q+MDZqXyyUjHKR38o3/h2oPjym95/+G9+YuZvcjaEAyDzLaRFkRyOaoid+L 0xhx0nTjMArCduPBdFBaWbWq6KvwY0cDMgGy1Zf97nxeO4M/ASKuCBXLYjjwZ2pc7x7SM6s8= X-Received: by 2002:a17:906:c116:b0:6d6:f8b3:cd47 with SMTP id do22-20020a170906c11600b006d6f8b3cd47mr8561552ejc.501.1646643848031; Mon, 07 Mar 2022 01:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNnKk/ntPdZaZwPWxEoJ8StW9Li8xhO8qpFR4qsusSJ6gJZEMBPyJHus6KurdM8VqqQWJCNQ== X-Received: by 2002:a17:906:c116:b0:6d6:f8b3:cd47 with SMTP id do22-20020a170906c11600b006d6f8b3cd47mr8561531ejc.501.1646643847719; Mon, 07 Mar 2022 01:04:07 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 2/5] Include poll.h instead of sys/poll.h Date: Mon, 7 Mar 2022 10:04:03 +0100 Message-Id: <9695b5c6b055d316964af46691e3c0c5bc2fe740.1646643734.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646643932387100001 Content-Type: text/plain; charset="utf-8" That is the proper POSIX way. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 020ec257aef1..8c041540ab47 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -30,7 +30,7 @@ #endif =20 #include -#include +#include #include #include =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d6ae05360b24..67c5a111b350 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -22,7 +22,7 @@ #include =20 #include -#include +#include #include #include #include diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index aa1db095400b..53214586a550 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -24,7 +24,7 @@ #include =20 #include -#include +#include #include #include #include diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8337eed510d8..812a900fa8b5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22,7 +22,7 @@ #include =20 #include -#include +#include #include #include #include diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index fc91b6dddf45..fdd776282e82 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -24,7 +24,7 @@ #include =20 #include -#include +#include #include #include #include --=20 2.35.1 From nobody Sun May 12 12:43:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646643858; cv=none; d=zohomail.com; s=zohoarc; b=i5M/S/APqcaYUog2KDQVyZ0gu1T40CIaY9vvN2hf3lGOduFBP0pRZac11qpiYxvjWSrcLoxl3BfygVW7+lU7yU2j+raukSVgF613AbhrCtY9mQQ5EHqjcTMvb8pFtJoa1qMbFSJ6MDjUXBbWpDTzNlL51b3TlOthuOJJ4zPtEY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646643858; h=Content-Type:Content-Transfer-Encoding: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=NPDq2iQi4SwbEap4rM5PUZSV9Xp7JYdoX2gHvnNSaRU=; b=hPd8OLr6ovHZPEofB9Tq096VyQT2aMbTXHhwiE9EWlR0BdMGZvhwmerqND1RM3ImerdJ6jGLeKsUKfPO5yU316AyNPUIS2liw+bEQCxFLUj3jum6oE7idshN7U7GszE6QmVInUJsJ8Zb/DBVEFx0V8A75BfpcFTHFYtuWJ4fIOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164664385807269.87487288277464; Mon, 7 Mar 2022 01:04:18 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-538-4e1j08h8Opire2Gy91Re2w-1; Mon, 07 Mar 2022 04:04:15 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 201D2899EC2; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 073D440D1B9E; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 79A481931BD8; Mon, 7 Mar 2022 09:04:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B945C1931BD6 for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 99CFA141DEC9; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95BA8141DEC7 for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B6FC185A79C for ; Mon, 7 Mar 2022 09:04:10 +0000 (UTC) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-580-PeQWkid1NMSPl7CyZGgoBQ-1; Mon, 07 Mar 2022 04:04:09 -0500 Received: by mail-ej1-f72.google.com with SMTP id hr26-20020a1709073f9a00b006d6d1ee8cf8so6611346ejc.19 for ; Mon, 07 Mar 2022 01:04:09 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id u19-20020aa7d893000000b00415a0f25f33sm5877364edq.34.2022.03.07.01.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 01:04:07 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id AAC9B4F8448A for ; Mon, 7 Mar 2022 10:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646643856; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NPDq2iQi4SwbEap4rM5PUZSV9Xp7JYdoX2gHvnNSaRU=; b=PRaBE4AiNc5vu8zjRgT7HeWgFzgOiAqCqH1pQTfJ7KX29bWFROaPPGXG8wDgvv57GTVEef 0NHM7Gn8hT8/NcJxt6X6z/pa7347CbeyRyizMeMIAzi3CB0fegkJPXCMqaC9mKmfe0LIDC C6OMednPW/3A8m7mOdR/HEpxpPzdfao= X-MC-Unique: 4e1j08h8Opire2Gy91Re2w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: PeQWkid1NMSPl7CyZGgoBQ-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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NPDq2iQi4SwbEap4rM5PUZSV9Xp7JYdoX2gHvnNSaRU=; b=NF0jNTV7Qk/dap1dP43mXxHmZQ0XHOMqIAR9PbKnJkNQrV6GM6/6A6k+lRF8STF4OY WNV/IHr1bAuLTRCIiFppkyqpNzswG9GAGqMDv7TqKJ25fyX5OrH7dHnv3PbYLSXFDjYD 7BJkIkRDFen0sB1Ay71b3rLsYJ75VS+917wZ4L2BpltyehDc8GZZgyygQiQclZgDVOxb 91PWd0k583YoYWzPitrJp4U5cRpM3wRFKKtudR3XvG2dTyOZtS+lPcfNXEOIuSYAiv7W Ny18CBKE49BGmgT5E91Fs3CdE5fau798+7zxo7w7tb/ZASYb1BPg01fM+kuvwhqdfrcr /5DQ== X-Gm-Message-State: AOAM5337OES3Y1hVvjmfwPCPlY8qBx+EfVkJbmquY6kUHS1gC7q2FfwO w9Rq0SLt1tzbxkMY8JKdWnCJ7BSntsHosyXBjroJXOY+coPXMGdzBuBSXRiaNkRvafn3PQlx90R TUzbX7oa4jiQ+oOuiQTUNqRc5K3SD+ISARGixOJBr3gWFYXiPzpHVr3nYEZ2JsBWzn0/zfZE= X-Received: by 2002:a17:906:4cd8:b0:6db:372:c4ba with SMTP id q24-20020a1709064cd800b006db0372c4bamr7364634ejt.57.1646643848172; Mon, 07 Mar 2022 01:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJz18Rnp+WOh8tdCAyn78+fBLAgx/fwKPbpw+tn9RU5Lwx0cFwy8IfOA8rEYZwzswfsmaCgfDQ== X-Received: by 2002:a17:906:4cd8:b0:6db:372:c4ba with SMTP id q24-20020a1709064cd800b006db0372c4bamr7364600ejt.57.1646643847596; Mon, 07 Mar 2022 01:04:07 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] Include sys/wait.h instead of wait.h Date: Mon, 7 Mar 2022 10:04:04 +0100 Message-Id: <689e70002fca01239e362292c10b1a2cd1f7f612.1646643734.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646643859060100002 Content-Type: text/plain; charset="utf-8" That is the proper POSIX way. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/lxc/lxc_driver.c | 2 +- src/security/security_apparmor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8c041540ab47..84d1f3935863 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include =20 #include "virerror.h" #include "virlog.h" diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index d1087aa10cf8..8f7acba9800c 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include =20 #include "internal.h" =20 --=20 2.35.1 From nobody Sun May 12 12:43:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646643860; cv=none; d=zohomail.com; s=zohoarc; b=bWFyYngITctveiIepP44+D8bbRT7yvM7wDWOau9CqBrlr0YjZ3W/S9il9089H9gob5NUCpcmjFJWGoJYT3APX/xrndxaTh+heYT8XWyoPk97JTYKv23XfwIt3023OX6CmVPGTHeUT3fw0JNoVUjZ6B76p9U5nI162L1+1dQi6p0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646643860; h=Content-Type:Content-Transfer-Encoding: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=iQQaVY36MOs12hMsgS6tAS4tuSwsxvNqg475S9Ye+jw=; b=iSWMVnqKknLllYeUhAPhl6Ej5mmbaIIk9eYzxz9h6b7ranBxaGiWjpQPjwpTVFZWt0a6Ii2yW8FMydOB+qVHqbSgp13C+EByrZ6V/fdR0DIq2bn8OGVvA0OfNJMPnEOeS60Du0LUoyv88lpEieIsrvllh+fyY0YzpcxZpnX2u30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646643860757588.7186616858661; Mon, 7 Mar 2022 01:04:20 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-nNaSngt9OdycjXm3H5kUhw-1; Mon, 07 Mar 2022 04:04:17 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A358518E6C54; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F6B957ECC5; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 02BEF193059E; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D17EC1931BD6 for ; Mon, 7 Mar 2022 09:04:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A3D54401E40; Mon, 7 Mar 2022 09:04:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FA1F401E39 for ; Mon, 7 Mar 2022 09:04:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85BDB811E76 for ; Mon, 7 Mar 2022 09:04:12 +0000 (UTC) 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-479-0lP_jvs4Oiu7YK7oXMaCrg-1; Mon, 07 Mar 2022 04:04:09 -0500 Received: by mail-ej1-f69.google.com with SMTP id x2-20020a1709065ac200b006d9b316257fso6701968ejs.12 for ; Mon, 07 Mar 2022 01:04:09 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id d4-20020a1709067a0400b006d6e3ca9f71sm4554836ejo.198.2022.03.07.01.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 01:04:07 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id B5F454F8448C for ; Mon, 7 Mar 2022 10:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646643860; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iQQaVY36MOs12hMsgS6tAS4tuSwsxvNqg475S9Ye+jw=; b=AlF5jL8x3Kkhsm4D5CVljtU/euouS6PGoA9bD+CkJXkaa2dDjtHnjtIZhYxks1uFYac3AL 3FXzZKNJOkhw4zFSJHaGzGvAb9B0VzQZ4p+Lo3j0UA4Bx7QodcpfAvKwOCQ6t3mkKZmdPM nmFZtOOElYcDw/tyL3cBLxh6I0J1Ubo= X-MC-Unique: nNaSngt9OdycjXm3H5kUhw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 0lP_jvs4Oiu7YK7oXMaCrg-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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iQQaVY36MOs12hMsgS6tAS4tuSwsxvNqg475S9Ye+jw=; b=cRGyIKnpJtiiYQOoZhHP7lW2SaNHxPtzlZBEyHOr/W1ueqdgesSM3ruq+//KqMRrr1 23TOaRxdtZTeNaeXD8N/9OXloes5lUtEHdQDCdGa3RQF8pSuuYNUhuzoXw25jvPOlDDB 0wqbo4usxpBzgzzdWx7+VDuo0QhjG79smVE/EEXWrXi0yLBrYkr2qP60FqIU3Ed84Zub IMBYhZAtcI9fFOrb5sAJjK6/Xaad9bnORJSNPfh/qkmGgOGzfEYhoa78MJRRyn5+x4tV sYLLiCk0+yVydKiDd/zYye7bkpjcke0UDDg36Wnzmx7ytjA9FZbXMJd/RQKadug1gx8D Wdww== X-Gm-Message-State: AOAM530osI4l1/7ki9J2OwbKUmk85WkuisHC25lRYIBS0U90mheozOXK hD4xKqNG58Iw8z6ikstke6JUl6P2j4i6P5oiZxqouoi1Ey+5gcJR25XoGNjUBIletXMp1Qcvglc rJFMVqSpgBJk+q+vBjd8K0xqVL2PjWCaCSTQ2vbUeTxILnVYh4gl0bP8aYED+UDhcUpcNRHg= X-Received: by 2002:a17:906:8488:b0:6da:bebf:98b with SMTP id m8-20020a170906848800b006dabebf098bmr8280610ejx.587.1646643848056; Mon, 07 Mar 2022 01:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb7KYeHO5pfEQvO5iSI/nnkJyGNL1rCK2YGeOsBDHGoXu9QU5rbsEA8+h2FnT1aOD+I1i8Uw== X-Received: by 2002:a17:906:8488:b0:6da:bebf:98b with SMTP id m8-20020a170906848800b006dabebf098bmr8280595ejx.587.1646643847834; Mon, 07 Mar 2022 01:04:07 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] nwfilter: Avoid memory alignment issues Date: Mon, 7 Mar 2022 10:04:05 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646643872052100001 Content-Type: text/plain; charset="utf-8" The returned packet can have less strict alignment (u_char) than the struct (ether_header) we are casting it to, so to avoid alignment issues just copy= the header into the struct on the stack. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/nwfilter/nwfilter_learnipaddr.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index fb552bd1e60e..99bffdc4fbdb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -384,7 +384,7 @@ learnIPAddressThread(void *arg) struct bpf_program fp; struct pcap_pkthdr header; const u_char *packet; - struct ether_header *ether_hdr; + struct ether_header ether_hdr; struct ether_vlan_header *vlan_hdr; virNWFilterIPAddrLearnReq *req =3D arg; uint32_t vmaddr =3D 0, bcastaddr =3D 0; @@ -506,13 +506,14 @@ learnIPAddressThread(void *arg) } =20 if (header.len >=3D sizeof(struct ether_header)) { - ether_hdr =3D (struct ether_header*)packet; + /* Avoid alignment issues */ + memcpy(ðer_hdr, packet, sizeof(struct ether_header)); =20 - switch (ntohs(ether_hdr->ether_type)) { + switch (ntohs(ether_hdr.ether_type)) { =20 case ETHERTYPE_IP: ethHdrSize =3D sizeof(struct ether_header); - etherType =3D ntohs(ether_hdr->ether_type); + etherType =3D ntohs(ether_hdr.ether_type); break; =20 case ETHERTYPE_VLAN: @@ -528,7 +529,7 @@ learnIPAddressThread(void *arg) continue; } =20 - if (virMacAddrCmpRaw(&req->binding->mac, ether_hdr->ether_shos= t) =3D=3D 0) { + if (virMacAddrCmpRaw(&req->binding->mac, ether_hdr.ether_shost= ) =3D=3D 0) { /* packets from the VM */ =20 if (etherType =3D=3D ETHERTYPE_IP && @@ -568,9 +569,9 @@ learnIPAddressThread(void *arg) } } } else if (virMacAddrCmpRaw(&req->binding->mac, - ether_hdr->ether_dhost) =3D=3D 0 || + ether_hdr.ether_dhost) =3D=3D 0 || /* allow Broadcast replies from DHCP server */ - virMacAddrIsBroadcastRaw(ether_hdr->ether_dhost)) { + virMacAddrIsBroadcastRaw(ether_hdr.ether_dhost)) { /* packets to the VM */ if (etherType =3D=3D ETHERTYPE_IP && (header.len >=3D ethHdrSize + --=20 2.35.1 From nobody Sun May 12 12:43:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646643860; cv=none; d=zohomail.com; s=zohoarc; b=X20V9g3eYquuR4eCZA07v8o0Ks8gfsuouKn5l/QRDM9LYKTRURdy5ZWP425hC9wni5nNCZVxpDqKM8GLjOmxuVLUIPchzMdoZ3IZasYOE1mpVP63/TeMrAAwUiTP2W8F4a+RFjszE2hOaDKwTYjXW0O0yosB7f+Tc018PZfTMss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646643860; h=Content-Type:Content-Transfer-Encoding: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=jiQK1OZQxmHMY+dQU7Kri8748EhNvmYHLalaUTi5lLs=; b=DBGZvLFLxMPsSc1NXUAvWB4MQTfmylAglvhRDur8eNhi3F9M21raU3qQU3N2AsspCiTAYCZdhMZ0TuPRIQr7+0APOZEks/0H4b14UE+ErFow6t5b7t9CC+TKLEo3nslAHKnjOia89qV7MvzuJwdwvKzBdyMe5Q9FR6LxevxTFWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 164664386089010.416414313347559; Mon, 7 Mar 2022 01:04:20 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-q-lnhtN_PJmVcOTI9Fgmeg-1; Mon, 07 Mar 2022 04:04:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C37D3806703; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 457DEC0809C; Mon, 7 Mar 2022 09:04:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BDECA1931BF3; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6138C1931BD8 for ; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 51446112132E; Mon, 7 Mar 2022 09:04:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C8041121325 for ; Mon, 7 Mar 2022 09:04:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 72843811E75 for ; Mon, 7 Mar 2022 09:04:11 +0000 (UTC) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-UDSsWMoEMdSuB9h_sPfotw-1; Mon, 07 Mar 2022 04:04:10 -0500 Received: by mail-ej1-f70.google.com with SMTP id i14-20020a17090639ce00b006dabe6a112fso2935116eje.13 for ; Mon, 07 Mar 2022 01:04:09 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id zb5-20020a17090687c500b006ce2a98f715sm4447484ejb.117.2022.03.07.01.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 01:04:08 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id B71014F8448D for ; Mon, 7 Mar 2022 10:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646643860; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jiQK1OZQxmHMY+dQU7Kri8748EhNvmYHLalaUTi5lLs=; b=gYadeTKx08C87zcFgpOimVpGbmatQywEMzWjcom5x8LPBLeFZ99mLMrdwhnQqpRRfCBnjj Sre3jYJ3y/5nmdsoPH4yNrjWn1xychtfbtKXtcm0wuBzuPvoSFZtmTG2jJOTbH4/PefT4k WpXXqQCQrapTW8jbmjvxCIpTBUWiWAo= X-MC-Unique: q-lnhtN_PJmVcOTI9Fgmeg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: UDSsWMoEMdSuB9h_sPfotw-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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jiQK1OZQxmHMY+dQU7Kri8748EhNvmYHLalaUTi5lLs=; b=1zbiLBGB4SsVjEQqkcKySgw08Q/FVp52ffraXdxLkiVyUPbInjSjlQH2tg0DNdTapr OXXVDe37L4d93RV69VIKfKmguySke3VDeKJSCKBSk8hBNWTpjK8E5sI2wOpThUirPyMd AmIxfbxPNfpfr4uP2/B4s/nPdtxGTjCZQiSjoP0h1FeiDPOwi+rWRtVEtY/c0ZrDqVO8 UgCQTP3PWvQ10cwIt7k3AJN8NGy89+xG68gSWoWZv0OCT0QR5m7xhnAFB7ACdLfjDIXf vHeC5MJ/uFBUP8SC+a8TkkpSLkYmfyq3QMfTk7CF2euzKxRdqvBTwn+GfQZsPOe1pLX6 gPLA== X-Gm-Message-State: AOAM532NEEHwAqVHsqD7aMuD1nUowcthRceb4jNgO+ZytaHtUarkNQuI gNNGtALUAjuDUNnkNWibpdkMs73pu8DeGUBUoNwrCziz9aLW7Ugzzb9uTZBX0NBpaIgd4pc1/jn kLK8qOTPPFvRGt/AeGxaHfMbjwXzLUd7XfJMuaffao1q8j+AFOiKjSt4Xp+coRKiA04lCBlk= X-Received: by 2002:a05:6402:2382:b0:416:5f6c:e257 with SMTP id j2-20020a056402238200b004165f6ce257mr515859eda.297.1646643848582; Mon, 07 Mar 2022 01:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2MctzNq5aTWO+HtbvR3HVpIFSV7oHEKCyCyJuRG+yfXQbi24elk8vWiFMPnegPZ8HbKOhxw== X-Received: by 2002:a05:6402:2382:b0:416:5f6c:e257 with SMTP id j2-20020a056402238200b004165f6ce257mr515847eda.297.1646643848337; Mon, 07 Mar 2022 01:04:08 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 5/5] tests: Allow expansion of mocked stat symbols Date: Mon, 7 Mar 2022 10:04:06 +0100 Message-Id: <6ef34923eaec0a2b3907459c3f05081c8d3f44d4.1646643734.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646643863292100001 Content-Type: text/plain; charset="utf-8" When libc uses a define to rewrite stat64 to stat our mocks do not work if = they are chained because the symbol that we are looking up is being stringified = and therefore preventing the stat64->stat expansion per C-preprocessor rules. = One stringification macro is just enough to make it work. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/virmock.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virmock.h b/tests/virmock.h index 5250e733a156..300ba17174d4 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -296,12 +296,14 @@ do {} while (0) #endif =20 +#define VIR_MOCK_STRINGIFY_SYMBOL(name) #name + #define VIR_MOCK_REAL_INIT(name) \ do { \ VIR_MOCK_REAL_INIT_MAIN(name, #name); \ if (real_##name =3D=3D NULL && \ !(real_##name =3D dlsym(RTLD_NEXT, \ - #name))) { \ + VIR_MOCK_STRINGIFY_SYMBOL(name)))) { \ fprintf(stderr, "Missing symbol '" #name "'\n"); \ abort(); \ } \ --=20 2.35.1