From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEzpi-0007aG-6K for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:05:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEzpb-0006sK-Ia for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:05:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEzpb-0006re-4M for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:05:39 -0400 From: Stefan Hajnoczi Date: Mon, 20 Jun 2016 15:05:13 +0100 Message-Id: <1466431531-17806-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1466431531-17806-1-git-send-email-stefanha@redhat.com> References: <1466431531-17806-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 02/20] libqos: drop duplicated PCI vendor ID definition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi Message-id: 1462798061-30382-3-git-send-email-stefanha@redhat.com --- 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 9d45e20..dc867d7 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -16,6 +16,7 @@ #include "libqos/malloc.h" #include "libqos/malloc-pc.h" +#include "hw/pci/pci.h" #include "hw/pci/pci_regs.h" typedef struct QVirtioPCIForeachData { @@ -263,7 +264,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 -- 2.5.5