From patchwork Wed Sep 21 13:18:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 672878 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfL1T4Tljz9sCg for ; Wed, 21 Sep 2016 23:23:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qDkMqn/t; dkim-atps=neutral Received: from localhost ([::1]:42407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmhVD-0001tY-3s for incoming@patchwork.ozlabs.org; Wed, 21 Sep 2016 09:23:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmhRd-0007Ed-5y for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmhRX-000151-Fo for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:12 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmhRX-00013y-6a for qemu-devel@nongnu.org; Wed, 21 Sep 2016 09:20:07 -0400 Received: by mail-wm0-f66.google.com with SMTP id b184so8567436wma.3 for ; Wed, 21 Sep 2016 06:20:07 -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:in-reply-to:references; bh=LaFO55ICUuQ+cV6ADCr3KSQlBJjnAdWCjSw4UMwH/2Q=; b=qDkMqn/tfC+vc0mHOTV7v4nY6OlRowKwUltMiyWg4E6Gq+yagEiK/aq8spD2vu0ID4 tP0Peudbbh1b39E5eSw+m6OeaUTmawz4B2T0WnvukNPtX0snTMXCzfkoP23B7j6SrbXn 1fqLH1wXAhCSGHWZPoMsj1Mqmg81xF/P3MW2Jce1ZZyHHL+XRVj5abhapZ4trrMSJLxH fnjsyDEVoh5XipCFUkwgHb1Ro3G+gRnj/RoTMDN2DK7Y9J08S4oZoflhhhj5GUt1hOiY NRjuPIxF+q0dr3idVadtUlZMLHHy/F1xSEeM5tBDHnqiM9AVFoxTMG4gwKTFKPbJEeMf uXsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=LaFO55ICUuQ+cV6ADCr3KSQlBJjnAdWCjSw4UMwH/2Q=; b=AZl48N/ly5rTHSoXQB+Qe7pOyOL6EdCIjtuBV94Cys7+k6UoXc42D2Yt81I6krVo8P EvL41NutQAPC/oBrc4QaN6A52vhuGDRd39DvNyVsHIjuDhJI4fSzaRvf2tXEakZIDdg4 Guaox+WQP4uNiBCl42LbGzSqEbWS/nYZkk5xTIOtpnsOwIjUKhKO1ahCm1mYUK1HG6Yg AiHNset02ydnWWSWb0gWrrVIlXOdnPbV9zErzJl5yr1lF12QusPFSh8Q3EifBU6k0Nwc 1I8I+LFyiw1TskRW1dYce6L8vDBmUt/t6MjnkEUDwKmI+gAIBaHlv5lbBBu3RWWQUuJf 86SQ== X-Gm-Message-State: AE9vXwPUdu28rxoihACM5jfF6YdggBOCe2KW7k+FtvXwIXoiyK3vZQL/UPKWOml81pP9fw== X-Received: by 10.194.158.40 with SMTP id wr8mr32221624wjb.109.1474463946331; Wed, 21 Sep 2016 06:19:06 -0700 (PDT) Received: from donizetti.lan (94-39-176-182.adsl-ull.clienti.tiscali.it. [94.39.176.182]) by smtp.gmail.com with ESMTPSA id lz5sm33404492wjb.24.2016.09.21.06.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 06:19:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 21 Sep 2016 15:18:48 +0200 Message-Id: <1474463939-12223-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474463939-12223-1-git-send-email-pbonzini@redhat.com> References: <1474463939-12223-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.66 Subject: [Qemu-devel] [PATCH 01/12] virtio: move ioeventfd_disabled flag to VirtioBusState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, famz@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This simplifies the code and removes the ioeventfd_set_disabled callback. Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- hw/s390x/virtio-ccw.c | 11 +---------- hw/s390x/virtio-ccw.h | 1 - hw/virtio/virtio-bus.c | 4 ++-- hw/virtio/virtio-mmio.c | 13 +------------ hw/virtio/virtio-pci.c | 11 +---------- hw/virtio/virtio-pci.h | 1 - include/hw/virtio/virtio-bus.h | 8 ++++++-- 7 files changed, 11 insertions(+), 38 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a554a24..f3ed9ab 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -82,15 +82,7 @@ static bool virtio_ccw_ioeventfd_disabled(DeviceState *d) { VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d); - return dev->ioeventfd_disabled || - !(dev->flags & VIRTIO_CCW_FLAG_USE_IOEVENTFD); -} - -static void virtio_ccw_ioeventfd_set_disabled(DeviceState *d, bool disabled) -{ - VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d); - - dev->ioeventfd_disabled = disabled; + return !(dev->flags & VIRTIO_CCW_FLAG_USE_IOEVENTFD); } static int virtio_ccw_ioeventfd_assign(DeviceState *d, EventNotifier *notifier, @@ -1599,7 +1591,6 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) k->ioeventfd_started = virtio_ccw_ioeventfd_started; k->ioeventfd_set_started = virtio_ccw_ioeventfd_set_started; k->ioeventfd_disabled = virtio_ccw_ioeventfd_disabled; - k->ioeventfd_set_disabled = virtio_ccw_ioeventfd_set_disabled; k->ioeventfd_assign = virtio_ccw_ioeventfd_assign; } diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 1c6bc86..1f5fce0 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -83,7 +83,6 @@ struct VirtioCcwDevice { uint32_t max_rev; VirtioBusState bus; bool ioeventfd_started; - bool ioeventfd_disabled; uint32_t flags; uint8_t thinint_isc; AdapterRoutes routes; diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index a85b7c8..859b53f 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -193,7 +193,7 @@ void virtio_bus_start_ioeventfd(VirtioBusState *bus) if (!k->ioeventfd_started || k->ioeventfd_started(proxy)) { return; } - if (k->ioeventfd_disabled(proxy)) { + if (bus->ioeventfd_disabled || k->ioeventfd_disabled(proxy)) { return; } vdev = virtio_bus_get_device(bus); @@ -255,7 +255,7 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign) if (!k->ioeventfd_started) { return -ENOSYS; } - k->ioeventfd_set_disabled(proxy, assign); + bus->ioeventfd_disabled = assign; if (assign) { /* * Stop using the generic ioeventfd, we are doing eventfd handling diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 13798b3..12a9e79 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -89,7 +89,6 @@ typedef struct { uint32_t guest_page_shift; /* virtio-bus */ VirtioBusState bus; - bool ioeventfd_disabled; bool ioeventfd_started; bool format_transport_address; } VirtIOMMIOProxy; @@ -111,16 +110,7 @@ static void virtio_mmio_ioeventfd_set_started(DeviceState *d, bool started, static bool virtio_mmio_ioeventfd_disabled(DeviceState *d) { - VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); - - return !kvm_eventfds_enabled() || proxy->ioeventfd_disabled; -} - -static void virtio_mmio_ioeventfd_set_disabled(DeviceState *d, bool disabled) -{ - VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); - - proxy->ioeventfd_disabled = disabled; + return !kvm_eventfds_enabled(); } static int virtio_mmio_ioeventfd_assign(DeviceState *d, @@ -560,7 +550,6 @@ static void virtio_mmio_bus_class_init(ObjectClass *klass, void *data) k->ioeventfd_started = virtio_mmio_ioeventfd_started; k->ioeventfd_set_started = virtio_mmio_ioeventfd_set_started; k->ioeventfd_disabled = virtio_mmio_ioeventfd_disabled; - k->ioeventfd_set_disabled = virtio_mmio_ioeventfd_set_disabled; k->ioeventfd_assign = virtio_mmio_ioeventfd_assign; k->has_variable_vring_alignment = true; bus_class->max_dev = 1; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 755f921..67a0824 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -281,15 +281,7 @@ static bool virtio_pci_ioeventfd_disabled(DeviceState *d) { VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); - return proxy->ioeventfd_disabled || - !(proxy->flags & VIRTIO_PCI_FLAG_USE_IOEVENTFD); -} - -static void virtio_pci_ioeventfd_set_disabled(DeviceState *d, bool disabled) -{ - VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); - - proxy->ioeventfd_disabled = disabled; + return !(proxy->flags & VIRTIO_PCI_FLAG_USE_IOEVENTFD); } #define QEMU_VIRTIO_PCI_QUEUE_MEM_MULT 0x1000 @@ -2450,7 +2442,6 @@ static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) k->ioeventfd_started = virtio_pci_ioeventfd_started; k->ioeventfd_set_started = virtio_pci_ioeventfd_set_started; k->ioeventfd_disabled = virtio_pci_ioeventfd_disabled; - k->ioeventfd_set_disabled = virtio_pci_ioeventfd_set_disabled; k->ioeventfd_assign = virtio_pci_ioeventfd_assign; } diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 25fbf8a..1212ac8 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { uint32_t guest_features[2]; VirtIOPCIQueue vqs[VIRTIO_QUEUE_MAX]; - bool ioeventfd_disabled; bool ioeventfd_started; VirtIOIRQFD *vector_irqfd; int nvqs_with_notifiers; diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index f3e5ef3..03a708a 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -83,8 +83,6 @@ typedef struct VirtioBusClass { void (*ioeventfd_set_started)(DeviceState *d, bool started, bool err); /* Returns true if the ioeventfd has been disabled for the device. */ bool (*ioeventfd_disabled)(DeviceState *d); - /* Sets the 'ioeventfd disabled' state for the device. */ - void (*ioeventfd_set_disabled)(DeviceState *d, bool disabled); /* * Assigns/deassigns the ioeventfd backing for the transport on * the device for queue number n. Returns an error value on @@ -102,6 +100,12 @@ typedef struct VirtioBusClass { struct VirtioBusState { BusState parent_obj; + + /* + * Set if the default ioeventfd handlers are disabled by vhost + * or dataplane. + */ + bool ioeventfd_disabled; }; void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp);