From patchwork Tue Jun 16 08:24:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 484856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A084714018C for ; Tue, 16 Jun 2015 18:56:40 +1000 (AEST) Received: from localhost ([::1]:38792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4mfe-0006Mj-Mo for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 04:56:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4mBJ-0008DN-7n for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:25:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4mBF-0002G8-FU for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:25:16 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:33068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4mBF-0002FF-6U for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:25:13 -0400 Received: by wiwd19 with SMTP id d19so96424065wiw.0 for ; Tue, 16 Jun 2015 01:25:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Kaq3cNwVw6axDhmm1SA6ulXzzBwQ/MpzbH5uokZGCek=; b=K8uP3uVK5xMvOndFeJ7Hf5RDhDrSl1P3FxGNP+lLfI6OJy4JYfJqwmhUZyKTh7bAGs 7nsjqxDIRdhJ8dwMKpEKM7OW884IEbaTOv5vWI8bUZnFcIGa2qsCkM/EgRIqtQPYILBI NfUM7ODG0N/9v2VpK+jHgH4KTZoWRvp+hAGkHcs5IoZmFbJa2mG1cbyG/qk2g6xr/bJs /fQ3XErcyRTb7ErGQT9Qz8+Kbsl9H1H68TXHsTgCPUQqkWO2mtGLLTFuB/65xpeWP+wN yeBITVF8N+2ayVef4nlxQRZgs+497BWQzGG7aryPd+rys5oorAYex70EeA46ewKqSGau aFNQ== X-Gm-Message-State: ALoCoQmlm2AKKCLO6X1e4Aq4Z6hTWMI8tPE3T9nuB4w+RXRS/TjDe/yKhnoq+cjWjsNKu/t13PX4 X-Received: by 10.180.215.101 with SMTP id oh5mr4444436wic.6.1434443112355; Tue, 16 Jun 2015 01:25:12 -0700 (PDT) Received: from pixies.ravello.local ([213.57.127.2]) by mx.google.com with ESMTPSA id i14sm484448wjr.7.2015.06.16.01.25.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jun 2015 01:25:11 -0700 (PDT) From: Shmulik Ladkani To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Tue, 16 Jun 2015 11:24:39 +0300 Message-Id: <1434443079-25755-1-git-send-email-shmulik.ladkani@ravellosystems.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.180 X-Mailman-Approved-At: Tue, 16 Jun 2015 04:56:20 -0400 Cc: Leonid Shatz , Idan Brown , Hannes Reinecke , Shmulik Ladkani Subject: [Qemu-devel] [PATCH v1] pci: Don't register a specialized 'config_write' if default behavior is intended 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 Few devices have their specialized 'config_write' methods which simply call 'pci_default_write_config' followed by a 'msix_write_config' or 'msi_write_config' calls, using exact same arguments. This is unnecessary as 'pci_default_write_config' already invokes 'msi_write_config' and 'msix_write_config'. Also, since 'pci_default_write_config' is the default 'config_write' handler, we can simply avoid the registration of these specialized versions. Cc: Leonid Shatz Signed-off-by: Shmulik Ladkani Reviewed-by: Marcel Apfelbaum --- NOTE: Not sure if my statement regarding ommitting 'config_write' holds for the megasas case: It's parent is TYPE_MEGASAS_BASE whose parent is TYPE_PCI_DEVICE. Can we assume 'config_write' will be set to 'pci_default_write_config' in this case? hw/misc/ivshmem.c | 1 - hw/net/vmxnet3.c | 9 --------- hw/scsi/megasas.c | 8 -------- hw/scsi/vmw_pvscsi.c | 8 -------- 4 files changed, 26 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 5d272c8..231c35f 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -698,7 +698,6 @@ static void ivshmem_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { pci_default_write_config(pci_dev, address, val, len); - msix_write_config(pci_dev, address, val, len); } static int pci_ivshmem_init(PCIDevice *dev) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 8bcdf3e..104a0f5 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2477,14 +2477,6 @@ static const VMStateDescription vmstate_vmxnet3 = { } }; -static void -vmxnet3_write_config(PCIDevice *pci_dev, uint32_t addr, uint32_t val, int len) -{ - pci_default_write_config(pci_dev, addr, val, len); - msix_write_config(pci_dev, addr, val, len); - msi_write_config(pci_dev, addr, val, len); -} - static Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), DEFINE_PROP_END_OF_LIST(), @@ -2503,7 +2495,6 @@ static void vmxnet3_class_init(ObjectClass *class, void *data) c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE; c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3; - c->config_write = vmxnet3_write_config, dc->desc = "VMWare Paravirtualized Ethernet v3"; dc->reset = vmxnet3_qdev_reset; dc->vmsd = &vmstate_vmxnet3; diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 91a5d97..51ba9e0 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2407,13 +2407,6 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) } } -static void -megasas_write_config(PCIDevice *pci, uint32_t addr, uint32_t val, int len) -{ - pci_default_write_config(pci, addr, val, len); - msi_write_config(pci, addr, val, len); -} - static Property megasas_properties_gen1[] = { DEFINE_PROP_UINT32("max_sge", MegasasState, fw_sge, MEGASAS_DEFAULT_SGE), @@ -2516,7 +2509,6 @@ static void megasas_class_init(ObjectClass *oc, void *data) dc->vmsd = info->vmsd; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->desc = info->desc; - pc->config_write = megasas_write_config; } static const TypeInfo megasas_info = { diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index c6148d3..9c71f31 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1174,13 +1174,6 @@ static const VMStateDescription vmstate_pvscsi = { } }; -static void -pvscsi_write_config(PCIDevice *pci, uint32_t addr, uint32_t val, int len) -{ - pci_default_write_config(pci, addr, val, len); - msi_write_config(pci, addr, val, len); -} - static Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), DEFINE_PROP_END_OF_LIST(), @@ -1202,7 +1195,6 @@ static void pvscsi_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_pvscsi; dc->props = pvscsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - k->config_write = pvscsi_write_config; hc->unplug = pvscsi_hot_unplug; hc->plug = pvscsi_hotplug; }