From patchwork Sun Jun 26 13:19:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 102052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51A9FB6F82 for ; Sun, 26 Jun 2011 23:21:42 +1000 (EST) Received: from localhost ([::1]:39925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QapHP-0006NN-3F for incoming@patchwork.ozlabs.org; Sun, 26 Jun 2011 09:21:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:45055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QapEm-0006Lv-6c for qemu-devel@nongnu.org; Sun, 26 Jun 2011 09:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QapEj-0003TO-E9 for qemu-devel@nongnu.org; Sun, 26 Jun 2011 09:18:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QapEj-0003T0-19 for qemu-devel@nongnu.org; Sun, 26 Jun 2011 09:18:53 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5QDIngm026540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 26 Jun 2011 09:18:49 -0400 Received: from redhat.com (vpn-202-163.tlv.redhat.com [10.35.202.163]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p5QDIk5F030878; Sun, 26 Jun 2011 09:18:47 -0400 Date: Sun, 26 Jun 2011 16:19:01 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20110626131901.GA7654@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Anthony PERARD , Steven Smith , Alexander Graf , Stefano Stabellini Subject: [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h 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 Sync xen names to ones used by linux. Add xen platform device id as well. Signed-off-by: Michael S. Tsirkin --- hw/pci_ids.h | 3 ++- hw/xen_platform.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/pci_ids.h b/hw/pci_ids.h index d94578c..b49c602 100644 --- a/hw/pci_ids.h +++ b/hw/pci_ids.h @@ -110,4 +110,5 @@ #define PCI_DEVICE_ID_INTEL_82371AB_2 0x7112 #define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113 -#define PCI_VENDOR_ID_XENSOURCE 0x5853 +#define PCI_VENDOR_ID_XEN 0x5853 +#define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 diff --git a/hw/xen_platform.c b/hw/xen_platform.c index b167eee..9a01735 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -290,10 +290,10 @@ static int xen_platform_initfn(PCIDevice *dev) pci_conf = d->pci_dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_XENSOURCE); - pci_config_set_device_id(pci_conf, 0x0001); - pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_XENSOURCE); - pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, 0x0001); + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_XEN); + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_XEN_PLATFORM); + pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_XEN); + pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, PCI_DEVICE_ID_XEN_PLATFORM); pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY);