From patchwork Tue Dec 28 16:24:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Herbszt X-Patchwork-Id: 76847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 25B771007D2 for ; Wed, 29 Dec 2010 03:26:21 +1100 (EST) Received: from localhost ([127.0.0.1]:45989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PXcNN-000451-Nf for incoming@patchwork.ozlabs.org; Tue, 28 Dec 2010 11:26:17 -0500 Received: from [140.186.70.92] (port=45147 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PXcLm-0003Z1-AH for qemu-devel@nongnu.org; Tue, 28 Dec 2010 11:24:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PXcLl-0004b6-4M for qemu-devel@nongnu.org; Tue, 28 Dec 2010 11:24:38 -0500 Received: from mailout-de.gmx.net ([213.165.64.22]:50422 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PXcLk-0004aV-M3 for qemu-devel@nongnu.org; Tue, 28 Dec 2010 11:24:37 -0500 Received: (qmail invoked by alias); 28 Dec 2010 16:24:34 -0000 Received: from g226049244.adsl.alicedsl.de (HELO FSCPC) [92.226.49.244] by mail.gmx.net (mp038) with SMTP; 28 Dec 2010 17:24:34 +0100 X-Authenticated: #310364 X-Provags-ID: V01U2FsdGVkX1/f+KE8iWnfwFhG1TUX5KUkQjZujnZr0dG8X1Mlw1 xBDTW0LWZdYn7O Message-ID: <5C6885C942B1469F90662F3DC1C2D8A1@FSCPC> From: "Sebastian Herbszt" To: "Michael S. Tsirkin" References: <1292879881$2997@local> <20101227140136.GA27055@redhat.com> In-Reply-To: <20101227140136.GA27055@redhat.com> Date: Tue, 28 Dec 2010 17:24:06 +0100 MIME-Version: 1.0 X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Windows Mail 6.0.6001.18416 X-MimeOLE: Produced By Microsoft MimeOLE V6.0.6001.18483 X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH] piix: use pci_config_set_prog_interface() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Michael S. Tsirkin wrote: > On Mon, Dec 20, 2010 at 10:18:01PM +0100, Sebastian Herbszt wrote: >> Use pci_config_set_prog_interface(). >> >> Signed-off-by: Sebastian Herbszt > > Since I was asked explicitly - I don't have a problem > with these changes: both class and prog interface. > However, they aren't all that useful in themselves. > > For class, what I would like to see is a system where > the device class is put in the qdev info table, > and where -device ? > (and hopefully the legacy -help, -nic etc as well) > use this information. I am not sure if you mean something like the patch below. > pci_config_set_prog_interface can then have an assert to > verify that value. > Maybe we can even make e.g. -device nic work. > > In a similar way, pci_config_set_prog_interface > would really become useful if we put the handling > for the legacy classes in a central place > (e.g. pci_class.c) Which are "legacy classes"? > Any chance of doing something like the above? > I'd be happy to apply such patches. Sebastian diff --git a/hw/e1000.c b/hw/e1000.c index af101bd..88ace8f 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1117,7 +1117,6 @@ static int pci_e1000_init(PCIDevice *pci_dev) /* TODO: we have no capabilities, so why is this bit set? */ pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST); pci_conf[PCI_REVISION_ID] = 0x03; - pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); /* TODO: RST# value should be 0, PCI spec 6.2.4 */ pci_conf[PCI_CACHE_LINE_SIZE] = 0x10; @@ -1169,6 +1168,7 @@ static PCIDeviceInfo e1000_info = { .init = pci_e1000_init, .exit = pci_e1000_uninit, .romfile = "pxe-e1000.bin", + .class = PCI_CLASS_NETWORK_ETHERNET, .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(E1000State, conf), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/pci.c b/hw/pci.c index ef00d20..de0038c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1620,6 +1620,11 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) info->is_bridge); if (pci_dev == NULL) return -1; + + if (info->class) { + pci_config_set_class(pci_dev->config, info->class); + } + rc = info->init(pci_dev); if (rc != 0) { do_pci_unregister_device(pci_dev); diff --git a/hw/pci.h b/hw/pci.h index 17744dc..29b9280 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -436,6 +436,9 @@ typedef struct { /* rom bar */ const char *romfile; + + /* class */ + uint16_t class; } PCIDeviceInfo; void pci_qdev_register(PCIDeviceInfo *info);