From patchwork Thu Nov 1 13:04:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0EE122C01FD for ; Fri, 2 Nov 2012 02:06:12 +1100 (EST) Received: from localhost ([::1]:56084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTwLS-0003tz-63 for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 11:06:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSE-0004vU-SS for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSC-0006Eh-Kz for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:02 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:62691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSC-00064D-Fk for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:00 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so3616429iea.4 for ; Thu, 01 Nov 2012 06:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tHVuQB4TEfBIzAwo6JK9sdPVUb/TiXdB6sdOs5NPaQ0=; b=pgWbHB491jDdjeSkCOqrffDOzwn0V3xrOpJlFb/trhiK//K1xQFjjZJ/8hBRXHsYHj w9CBg/2BWHI4XICfTqUJp6HyoXnanrKST2VfFDIBiroqDlagOBspSPWbbTWy8Xk7vnkU yxfbkxGk+Y3/+Gx+NhrdfOJniNRiWdSJKeDZONy+FVB6uaqvTroIw8nX6ra7mGHju1SY LftGquf1w6EaPNTszHdDeA+F1p1c4Dsl6uCvk/ceXM2L9Vddih/XUPEmffvd9sUxAgOO SnF4L/1jZW7Ih731++pOPRNtF7bfOIspdpemfyI/TQ4p/BD26qj5s892wQBaCNmJYvZ8 yobw== Received: by 10.50.151.238 with SMTP id ut14mr1090687igb.72.1351775100250; Thu, 01 Nov 2012 06:05:00 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id dq9sm5734584igc.5.2012.11.01.06.04.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:04:59 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 08:04:10 -0500 Message-Id: <1351775071-7644-9-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 08/29] pci: use qidl_declare'd properties for TYPE_PCI_DEVICE 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 Signed-off-by: Michael Roth --- hw/pci.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index cfef76a..271ca2f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -52,17 +52,6 @@ static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev); static int pcibus_reset(BusState *qbus); -static Property pci_props[] = { - DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), - DEFINE_PROP_STRING("romfile", PCIDevice, romfile), - DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1), - DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present, - QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), - DEFINE_PROP_BIT("command_serr_enable", PCIDevice, cap_present, - QEMU_PCI_CAP_SERR_BITNR, true), - DEFINE_PROP_END_OF_LIST() -}; - static void pci_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); @@ -2142,7 +2131,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data) k->unplug = pci_unplug_device; k->exit = pci_unregister_device; k->bus_type = TYPE_PCI_BUS; - k->props = pci_props; + k->props = QIDL_PROPERTIES(PCIDevice); } void pci_setup_iommu(PCIBus *bus, PCIDMAContextFunc fn, void *opaque)