From patchwork Mon Apr 25 12:46:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 8927581 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8E86DBF29F for ; Mon, 25 Apr 2016 12:46:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 099BD201BB for ; Mon, 25 Apr 2016 12:46:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A2C620120 for ; Mon, 25 Apr 2016 12:46:38 +0000 (UTC) Received: from localhost ([::1]:59690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aufuP-0000hf-KO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Apr 2016 08:46:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aufu9-0000Y4-2Q for qemu-devel@nongnu.org; Mon, 25 Apr 2016 08:46:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aufu7-00058q-Vg for qemu-devel@nongnu.org; Mon, 25 Apr 2016 08:46:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56783) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aufu7-00058g-Qa for qemu-devel@nongnu.org; Mon, 25 Apr 2016 08:46:19 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6CB3DC049D67; Mon, 25 Apr 2016 12:46:19 +0000 (UTC) Received: from localhost (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3PCkHPU023437; Mon, 25 Apr 2016 08:46:18 -0400 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 25 Apr 2016 13:46:07 +0100 Message-Id: <1461588373-26486-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1461588373-26486-1-git-send-email-stefanha@redhat.com> References: <1461588373-26486-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.7 2/8] libqos: drop duplicated PCI vendor ID definition X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.mari.barcelo@gmail.com, Paolo Bonzini , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Stefan Hajnoczi --- tests/libqos/virtio-pci.c | 3 ++- tests/libqos/virtio.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index fde2ff0..275c14d 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -17,6 +17,7 @@ #include "libqos/malloc.h" #include "libqos/malloc-pc.h" +#include "hw/pci/pci.h" #include "hw/pci/pci_regs.h" typedef struct QVirtioPCIForeachData { @@ -264,7 +265,7 @@ void qvirtio_pci_foreach(QPCIBus *bus, uint16_t device_type, .device_type = device_type, .user_data = data }; - qpci_device_foreach(bus, QVIRTIO_VENDOR_ID, -1, + qpci_device_foreach(bus, PCI_VENDOR_ID_REDHAT_QUMRANET, -1, qvirtio_pci_foreach_callback, &d); } diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index af03793..e663bcf 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -12,8 +12,6 @@ #include "libqos/malloc.h" -#define QVIRTIO_VENDOR_ID 0x1AF4 - #define QVIRTIO_RESET 0x0 #define QVIRTIO_ACKNOWLEDGE 0x1 #define QVIRTIO_DRIVER 0x2