From patchwork Thu Feb 12 13:08:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 439176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3DD851400EA for ; Fri, 13 Feb 2015 00:09:47 +1100 (AEDT) Received: from localhost ([::1]:50116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtWY-00020U-Kr for incoming@patchwork.ozlabs.org; Thu, 12 Feb 2015 08:09:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtW2-00014c-Nc for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLtVy-0002dP-FZ for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:10 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:52369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtVy-0002bF-5w for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:06 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Feb 2015 13:09:03 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Feb 2015 13:09:01 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 794CF17D8059 for ; Thu, 12 Feb 2015 13:09:12 +0000 (GMT) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1CD91dL3015044 for ; Thu, 12 Feb 2015 13:09:01 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1CD90Dp017728 for ; Thu, 12 Feb 2015 06:09:00 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t1CD90ZV017711; Thu, 12 Feb 2015 06:09:00 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id 054671224458; Thu, 12 Feb 2015 14:08:59 +0100 (CET) From: Jens Freimann To: "Michael S. Tsirkin" , Paolo Bonzini Date: Thu, 12 Feb 2015 14:08:53 +0100 Message-Id: <1423746533-45739-3-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423746533-45739-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1423746533-45739-1-git-send-email-jfrei@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15021213-0025-0000-0000-000003D964C4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.112 Cc: Jens Freimann , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We have defines for VIRTIO_TRANSPORT_F_START/_END in two places. In include/hw/virtio/virtio.h and in linux-headers/linux/virtio_config.h Since we already get virtio_config.h via update-linux-headers.sh, there's no need to have duplicate defines in QEMU headers files. Let's remove this define from include/hw/virtio/virtio.h Signed-off-by: Jens Freimann --- include/hw/virtio/virtio.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index f24997d..f0350db 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -35,11 +35,6 @@ /* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 -/* Some virtio feature bits (currently bits 28 through 31) are reserved for the - * transport being used (eg. virtio_ring), the rest are per-device feature bits. */ -#define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 32 - /* We notify when the ring is completely used, even if the guest is suppressing * callbacks */ #define VIRTIO_F_NOTIFY_ON_EMPTY 24