From patchwork Sun Apr 14 21:26:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 236477 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 CD65F2C00A5 for ; Mon, 15 Apr 2013 07:28:37 +1000 (EST) Received: from localhost ([::1]:37529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URUTU-0006MD-0c for incoming@patchwork.ozlabs.org; Sun, 14 Apr 2013 17:28:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URURo-0004Dr-Dv for qemu-devel@nongnu.org; Sun, 14 Apr 2013 17:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URURn-00052F-2q for qemu-devel@nongnu.org; Sun, 14 Apr 2013 17:26:52 -0400 Received: from greensocs.com ([87.106.252.221]:42647 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URURm-000527-Pu for qemu-devel@nongnu.org; Sun, 14 Apr 2013 17:26:51 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id EA1A240EC63; Sun, 14 Apr 2013 21:26:49 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lxEziWVocnJX; Sun, 14 Apr 2013 23:26:46 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 44F5440EC61; Sun, 14 Apr 2013 23:26:46 +0200 (CEST) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 227E040B250; Sun, 14 Apr 2013 23:26:45 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Sun, 14 Apr 2013 23:26:31 +0200 Message-Id: <1365974797-13217-3-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1365974797-13217-1-git-send-email-fred.konrad@greensocs.com> References: <1365974797-13217-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, Alexander Graf , cornelia.huck@de.ibm.com, fred.konrad@greensocs.com, Richard Henderson Subject: [Qemu-devel] [PATCH v3 2/8] virtio-bus: make virtio_x_bus_new static. 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 From: KONRAD Frederic virtio_x_bus_new are only used in file scope. So this make them static. Signed-off-by: KONRAD Frederic --- hw/s390x/s390-virtio-bus.c | 4 +++- hw/s390x/s390-virtio-bus.h | 2 -- hw/s390x/virtio-ccw.c | 4 +++- hw/s390x/virtio-ccw.h | 2 -- hw/virtio/virtio-pci.c | 4 +++- hw/virtio/virtio-pci.h | 1 - 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 4d9f2ec..495f9c5 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -46,6 +46,8 @@ #define VIRTIO_EXT_CODE 0x2603 +static void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev); + static const TypeInfo s390_virtio_bus_info = { .name = TYPE_S390_VIRTIO_BUS, .parent = TYPE_BUS, @@ -615,7 +617,7 @@ static const TypeInfo s390_virtio_bridge_info = { /* virtio-s390-bus */ -void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev) +static void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index ba1fb85..23c6e18 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -76,8 +76,6 @@ typedef struct VirtioBusClass VirtioS390BusClass; typedef struct VirtIOS390Device VirtIOS390Device; -void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev); - typedef struct VirtIOS390DeviceClass { DeviceClass qdev; int (*init)(VirtIOS390Device *dev); diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 93a0c9c..5d62606 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -27,6 +27,8 @@ #include "virtio-ccw.h" #include "trace.h" +static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev); + static int virtual_css_bus_reset(BusState *qbus) { /* This should actually be modelled via the generic css */ @@ -976,7 +978,7 @@ static const TypeInfo virtual_css_bridge_info = { /* virtio-ccw-bus */ -void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev) +static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index fea9208..debf77a 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -57,8 +57,6 @@ typedef struct VirtioBusClass VirtioCcwBusClass; typedef struct VirtioCcwDevice VirtioCcwDevice; -void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev); - typedef struct VirtIOCCWDeviceClass { DeviceClass parent_class; int (*init)(VirtioCcwDevice *dev); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 2929971..6ea0a17 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -97,6 +97,8 @@ /* HACK for virtio to determine if it's running a big endian guest */ bool virtio_is_big_endian(void); +static void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev); + /* virtio device */ /* DeviceState to VirtIOPCIProxy. For use off data-path. TODO: use QOM. */ static inline VirtIOPCIProxy *to_virtio_pci_proxy(DeviceState *d) @@ -1430,7 +1432,7 @@ static const TypeInfo virtio_rng_pci_info = { /* virtio-pci-bus */ -void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev) +static void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 44f2fb3..4305774 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -183,7 +183,6 @@ struct VirtIORngPCI { }; void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); -void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev); /* Virtio ABI version, if we increment this, we break the guest driver. */ #define VIRTIO_PCI_ABI_VERSION 0