From nobody Fri Dec 19 18:41:51 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AC8E33032E for ; Thu, 4 Dec 2025 18:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764873998; cv=none; b=k1CWvVpfS/n9lgF5ECZfuBpxJwBEhT5oLSnEv4k6Oi7div+iBrl0DdLrEW8DHTIWpfI8hJNpU6I3DzFtsdoovLi//AXx1LjlDCGByZSrsBlVzJV2cVfIWiogtD7B+8JDgxe8LmZaNefCCc60jvgyzwkXdnyXmw3MUSai+QvwZGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764873998; c=relaxed/simple; bh=IEtXuDI05kjah7HjVuRtixkvphhBYOmv8vR/RvO5sXQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZBgM5RNTWJIuN2N4rUK2om7OGF2zaslc/7YTZxsD1YkZlcl8oXJYqbkJHSebtJOErrVnHHlOcO0KRMOUM4cQDcr1ReD87mgXaxc2en+zdzuh1zE6KxlvRaBJ6jJL3PQ26JBzOTVowZkOaqcZRO3KTqDgyKeCbXoWWZwZ0j7won0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DpZoaJKF; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=W73pn79t; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DpZoaJKF"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="W73pn79t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764873996; 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: in-reply-to:in-reply-to:references:references; bh=zDIzAT7spvOSoiJwYYzX0+cw80wGi4yD1jO1sJyzphs=; b=DpZoaJKFcNDvC5QOXJ40DY6S8wKmlbCvdGBhEoUbTTthcXoCY5Jmj2U9diRvk+j8wzxjXg AQ3oljqJOJDk9ltEcjd6HYV2ItkGs7p/3RX00/eHNBBsLSLsaAj/Y8J36iBBqNOJUpcRlc uUGiIIWbOQMhQr6mwELte47G6u4OWU8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-JyTslO7aOEWvdlDnCQ0Tfg-1; Thu, 04 Dec 2025 13:46:34 -0500 X-MC-Unique: JyTslO7aOEWvdlDnCQ0Tfg-1 X-Mimecast-MFC-AGG-ID: JyTslO7aOEWvdlDnCQ0Tfg_1764873993 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4779b3749a8so9932815e9.1 for ; Thu, 04 Dec 2025 10:46:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764873992; x=1765478792; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=zDIzAT7spvOSoiJwYYzX0+cw80wGi4yD1jO1sJyzphs=; b=W73pn79tlyxKUi6ob0K3nxrZMara4UiBpK6fV3HfofmCgm9nB1WOpEk5LZ7UsHg/hm gIwIVq0FSx6/yMIYdh1Be8TSCfl4ajspOrqCzPTTGcffEDkeL6vjGo8es848JIFMLop8 4uXJC2gaTFxL+kx6Jr7tDFpVm9a+p8cGTin42s04FRUVB5VtXR94c8K8/njxnhkXRcO+ Fa7ADgWS74oNcAAVp+HcRAXPuQRhVoO+EZbZtJTe69T+Mcw723Wzk4oFlxw5b+C+aKja qP2WlEFzzCyEYVn8aQaeqFIrtyxj8re7A0+3UhZz2Qovm2eTJU05NbbMeD5ZKIQlmaCL rdZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764873992; x=1765478792; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zDIzAT7spvOSoiJwYYzX0+cw80wGi4yD1jO1sJyzphs=; b=A8ZVVzuT8rQ1YwucHFvWDTE/SPQ9lKECYGtVBtwQS6PckwcP/c8pPYw6O5sc5y61q5 3rOGrmgfgW4QYHziDtugR7LpLn6wI9Hg3Prn4egPU/du1oNpxxRhJWvzi8Aa15rff8FO ZxB6tCzZeMZr8eS/sgdujH9xI0JUlugNVcUVMfvP9OWWOBv3X3PCFUPQcVeZcTjxHakN WOay/98+2Rk+IUO/8Iu+ABPEKHNFyMlLXJ5KCHe1JE69bbT8dqCEcbeEaY0DLD2DAtCS 9O/dNu4GlMClO7ddJBZNzfU+r5hJBvWUdnB48dB+gR31g9bg+eAeFTg5jC2jGEaztlWP Uxlw== X-Gm-Message-State: AOJu0YwTJfVK5zcMnFAD4Vf7QyQ1m6Q32ngzaUf5hYpezbj5KXg0mg+R khqX/9HDrJT+Nl4d3rXDXjMsjFyFahCiiZUPYc/+jLRWiw/2/Rv9iipk/HBBfsppI7WepnsqMqt 0dMbI3tzaxYNKNO9lmxMQAfXimp6n7Zi34bdqS/FhrFpL2ff9eHS6tOMN5uH+usdFAkPZZIQTat Wk6AOciFJdK/B8bG9delQ853ctriQItF5jyzzKwnDFeoA= X-Gm-Gg: ASbGncuunc3SrcUjdswpo1rZ3fy7n2fNXXUeBU1jeLJMA12gxuZzb21vjMeIsjMt9/k ENls1S5lUATtDs9+GoELpoT1GLgK+fXkCg5bePvMdkCifClikvv9CExPTvmt0Q5GfORH9mhdeE2 WlQ3A1H2l0tK/BQnfsqb+IC6lMdZHj1ebntBpAvrOU50r4yW+elaaSPRxkGkPmsGPg7dqVBK8wi pcupqchWi2rTSkNMPifxatrISuyAdRF8cCdFNu880y175SCsnxSu3zw3NTm8jHlXMpWUG7UOQ50 20hDfGuS6EXMpMclSza2oFzUlbOkiEVoMPBTtGPbxw8UP5EPRGQuZoPVz32P/9aYmCtWtyXRXn0 = X-Received: by 2002:a05:600c:1f1a:b0:477:7b16:5fa6 with SMTP id 5b1f17b1804b1-4792aee7ce4mr76219795e9.3.1764873992566; Thu, 04 Dec 2025 10:46:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEYKBDBMfx75UryIOe9fLQONFJGHzJqiMzQj9hyszKvigX32PExgNGBunsWaL5UZGnky8UGLg== X-Received: by 2002:a05:600c:1f1a:b0:477:7b16:5fa6 with SMTP id 5b1f17b1804b1-4792aee7ce4mr76219375e9.3.1764873991968; Thu, 04 Dec 2025 10:46:31 -0800 (PST) Received: from redhat.com ([31.187.78.57]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4792b02ba67sm53351585e9.2.2025.12.04.10.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Dec 2025 10:46:31 -0800 (PST) Date: Thu, 4 Dec 2025 13:46:30 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Jason Wang , Xuan Zhuo , Eugenio =?utf-8?B?UMOpcmV6?= , virtualization@lists.linux.dev Subject: [PATCH 13/14] tools/virtio: fix up oot build Message-ID: <33968faa7994b86d1f78057358a50b8f460c7a23.1764873799.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" oot build tends to help uncover bugs so it's worth keeping around, as long as it's low effort. add stubs for a couple of macros virtio gained recently, and disable vdpa in the test build. Signed-off-by: Michael S. Tsirkin --- tools/virtio/Makefile | 5 +++-- tools/virtio/oot-stubs.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 tools/virtio/oot-stubs.h diff --git a/tools/virtio/Makefile b/tools/virtio/Makefile index a60316211df6..2cac5fd4b979 100644 --- a/tools/virtio/Makefile +++ b/tools/virtio/Makefile @@ -38,8 +38,9 @@ OOT_CONFIGS=3D\ CONFIG_VHOST_NET=3Dn \ CONFIG_VHOST_SCSI=3Dn \ CONFIG_VHOST_VSOCK=3Dn \ - CONFIG_VHOST_RING=3Dn -OOT_BUILD=3DKCFLAGS=3D"-I "${OOT_VHOST} ${MAKE} -C ${OOT_KSRC} V=3D${V} + CONFIG_VHOST_RING=3Dn \ + CONFIG_VHOST_VDPA=3Dn +OOT_BUILD=3DKCFLAGS=3D"-include "`pwd`"/oot-stubs.h -I "${OOT_VHOST} ${MAK= E} -C ${OOT_KSRC} V=3D${V} oot-build: echo "UNSUPPORTED! Don't use the resulting modules in production!" ${OOT_BUILD} M=3D`pwd`/vhost_test diff --git a/tools/virtio/oot-stubs.h b/tools/virtio/oot-stubs.h new file mode 100644 index 000000000000..69e059cd14d6 --- /dev/null +++ b/tools/virtio/oot-stubs.h @@ -0,0 +1,10 @@ +#include +#include +#include + +#ifndef VIRTIO_FEATURES_BITS +#define VIRTIO_FEATURES_BITS 128 +#endif +#ifndef VIRTIO_U64 +#define VIRTIO_U64(b) ((b) >> 6) +#endif --=20 MST