From patchwork Fri May 29 06:15:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 477583 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 981BD14012C for ; Fri, 29 May 2015 16:18:15 +1000 (AEST) Received: from localhost ([::1]:33757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDcT-0001YW-H1 for incoming@patchwork.ozlabs.org; Fri, 29 May 2015 02:18:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDa8-0005bs-Kv for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyDa7-0004Og-FJ for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDa7-0004OF-0E for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:47 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id A6EE13674DB; Fri, 29 May 2015 06:15:46 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (vpn1-6-113.pek2.redhat.com [10.72.6.113]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4T6Fbwi019734; Fri, 29 May 2015 02:15:44 -0400 From: Jason Wang To: qemu-devel@nongnu.org Date: Fri, 29 May 2015 14:15:25 +0800 Message-Id: <1432880132-28477-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1432880132-28477-1-git-send-email-jasowang@redhat.com> References: <1432880132-28477-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com, Jason Wang , Alexander Graf , Christian Borntraeger , cornelia.huck@de.ibm.com, Richard Henderson Subject: [Qemu-devel] [PATCH V8 2/9] virtio: device_plugged() can fail 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 This patch passes error pointer to transport specific device_plugged() callback. Through this way, device_plugged() can do some transport specific check and fail. This will be uesd by following patches that check the number of virtqueues against the transport limitation. Cc: Cornelia Huck Cc: Christian Borntraeger Cc: Richard Henderson Cc: Alexander Graf Signed-off-by: Jason Wang --- hw/s390x/virtio-ccw.c | 2 +- hw/virtio/virtio-bus.c | 6 ++---- hw/virtio/virtio-mmio.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/virtio/virtio.c | 7 ++++++- include/hw/virtio/virtio-bus.h | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index c96101a..994284c 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1413,7 +1413,7 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f) } /* This is called by virtio-bus just after the device is plugged. */ -static void virtio_ccw_device_plugged(DeviceState *d) +static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) { VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d); SubchDev *sch = dev->sch; diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index be886e7..ceabe99 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -38,7 +38,7 @@ do { printf("virtio_bus: " fmt , ## __VA_ARGS__); } while (0) #endif /* A VirtIODevice is being plugged */ -int virtio_bus_device_plugged(VirtIODevice *vdev) +void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp) { DeviceState *qdev = DEVICE(vdev); BusState *qbus = BUS(qdev_get_parent_bus(qdev)); @@ -47,10 +47,8 @@ int virtio_bus_device_plugged(VirtIODevice *vdev) DPRINTF("%s: plug device.\n", qbus->name); if (klass->device_plugged != NULL) { - klass->device_plugged(qbus->parent); + klass->device_plugged(qbus->parent, errp); } - - return 0; } /* Reset the virtio_bus */ diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 10123f3..dd3f80b 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -345,7 +345,7 @@ static void virtio_mmio_reset(DeviceState *d) /* virtio-mmio device */ /* This is called by virtio-bus just after the device is plugged. */ -static void virtio_mmio_device_plugged(DeviceState *opaque) +static void virtio_mmio_device_plugged(DeviceState *opaque, Error **errp) { VirtIOMMIOProxy *proxy = VIRTIO_MMIO(opaque); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 867c9d1..b88c8e0 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -918,7 +918,7 @@ static int virtio_pci_query_nvectors(DeviceState *d) } /* This is called by virtio-bus just after the device is plugged. */ -static void virtio_pci_device_plugged(DeviceState *d) +static void virtio_pci_device_plugged(DeviceState *d, Error **errp) { VirtIOPCIProxy *proxy = VIRTIO_PCI(d); VirtioBusState *bus = &proxy->bus; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 6985e76..0b50f9d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1328,7 +1328,12 @@ static void virtio_device_realize(DeviceState *dev, Error **errp) return; } } - virtio_bus_device_plugged(vdev); + + virtio_bus_device_plugged(vdev, &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } } static void virtio_device_unrealize(DeviceState *dev, Error **errp) diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index a4588ca..e5bbfbf 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -56,7 +56,7 @@ typedef struct VirtioBusClass { * transport independent init function. * This is called by virtio-bus just after the device is plugged. */ - void (*device_plugged)(DeviceState *d); + void (*device_plugged)(DeviceState *d, Error **errp); /* * transport independent exit function. * This is called by virtio-bus just before the device is unplugged. @@ -75,7 +75,7 @@ struct VirtioBusState { BusState parent_obj; }; -int virtio_bus_device_plugged(VirtIODevice *vdev); +void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp); void virtio_bus_reset(VirtioBusState *bus); void virtio_bus_device_unplugged(VirtIODevice *bus); /* Get the device id of the plugged device. */