From patchwork Tue Oct 13 14:25:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 529785 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 0CAAC1402A1 for ; Wed, 14 Oct 2015 01:45:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=aQJCNVoH; dkim-atps=neutral Received: from localhost ([::1]:36403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm0pt-00032y-Di for incoming@patchwork.ozlabs.org; Tue, 13 Oct 2015 10:45:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm0Yu-0001Ev-Mg for qemu-devel@nongnu.org; Tue, 13 Oct 2015 10:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zm0Yt-000126-L3 for qemu-devel@nongnu.org; Tue, 13 Oct 2015 10:28:20 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:35264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm0Yt-000121-Dj for qemu-devel@nongnu.org; Tue, 13 Oct 2015 10:28:19 -0400 Received: by pabve7 with SMTP id ve7so23362688pab.2 for ; Tue, 13 Oct 2015 07:28:19 -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 :mime-version:content-type:content-transfer-encoding; bh=9K7c4vkhh9vEMi1mDvfLJPwSBrJeSdr9BIcxMCre3Z0=; b=aQJCNVoHIv3YdGCUH6J7M+Dz7XVrs4P80YgQDtB5lB9XKwh73RwZIoxYOcPyWuzYiw MQfwpaTypKvZbtb8riOnvI248+2LD1uqBBca8u7Zv4WuIgwQHEhkaDvwfGXWMnTxzlM8 6NYjjdFuwlsAefcH61LqjKfJ7anpl9mQEwyFFMCl+5Ch9widLzLMvS0i4ehrOCFnaBQ4 VvPKONGzjQfyGaBzJofI2yb3G0a0lmzFg0rRj5DzwJk2ivuY/AwojT7YurFHJtwuCIXT 1OCfoTVcwOFGgqhbXGDHIbWGaE4MJA07IlJKRJ8D7+IDrRTf14J24U3zg9eNDP+0OO0g rh3g== X-Received: by 10.66.252.2 with SMTP id zo2mr19084254pac.89.1444746499136; Tue, 13 Oct 2015 07:28:19 -0700 (PDT) Received: from localhost ([2a01:e35:8a71:51f0:3ea9:f4ff:fe4c:6bac]) by smtp.gmail.com with ESMTPSA id yz3sm4278620pbb.37.2015.10.13.07.28.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2015 07:28:18 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 13 Oct 2015 16:25:56 +0200 Message-Id: <1444746378-12338-30-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444746378-12338-1-git-send-email-marcandre.lureau@redhat.com> References: <1444746378-12338-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22b Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PULL v3 29/51] ivshmem: replace 'guest' for 'peer' appropriately 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: Marc-André Lureau The terms 'guest' and 'peer' are used sometime interchangeably which may be confusing. Instead, use 'peer' for the remote instances of ivshmem clients, and 'guest' for the local VM. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index d1b5d35..0e31d1d 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -89,7 +89,7 @@ typedef struct IVShmemState { int shm_fd; /* shared memory file descriptor */ Peer *peers; - int nb_peers; /* how many guests we have space for */ + int nb_peers; /* how many peers we have space for */ int vm_id; uint32_t vectors; @@ -387,9 +387,9 @@ static void ivshmem_del_eventfd(IVShmemState *s, int posn, int i) &s->peers[posn].eventfds[i]); } -static void close_guest_eventfds(IVShmemState *s, int posn) +static void close_peer_eventfds(IVShmemState *s, int posn) { - int i, guest_curr_max; + int i, n; if (!ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) { return; @@ -399,14 +399,14 @@ static void close_guest_eventfds(IVShmemState *s, int posn) return; } - guest_curr_max = s->peers[posn].nb_eventfds; + n = s->peers[posn].nb_eventfds; memory_region_transaction_begin(); - for (i = 0; i < guest_curr_max; i++) { + for (i = 0; i < n; i++) { ivshmem_del_eventfd(s, posn, i); } memory_region_transaction_commit(); - for (i = 0; i < guest_curr_max; i++) { + for (i = 0; i < n; i++) { event_notifier_cleanup(&s->peers[posn].eventfds[i]); } @@ -415,7 +415,7 @@ static void close_guest_eventfds(IVShmemState *s, int posn) } /* this function increase the dynamic storage need to store data about other - * guests */ + * peers */ static int resize_peers(IVShmemState *s, int new_min_size) { @@ -432,7 +432,7 @@ static int resize_peers(IVShmemState *s, int new_min_size) old_size = s->nb_peers; s->nb_peers = new_min_size; - IVSHMEM_DPRINTF("bumping storage to %d guests\n", s->nb_peers); + IVSHMEM_DPRINTF("bumping storage to %d peers\n", s->nb_peers); s->peers = g_realloc(s->peers, s->nb_peers * sizeof(Peer)); @@ -503,7 +503,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) incoming_fd = qemu_chr_fe_get_msgfd(s->server_chr); IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, incoming_fd); - /* make sure we have enough space for this guest */ + /* make sure we have enough space for this peer */ if (incoming_posn >= s->nb_peers) { if (resize_peers(s, incoming_posn + 1) < 0) { error_report("failed to resize peers array"); @@ -522,9 +522,9 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) /* receive our posn */ s->vm_id = incoming_posn; } else { - /* otherwise an fd == -1 means an existing guest has gone away */ + /* otherwise an fd == -1 means an existing peer has gone away */ IVSHMEM_DPRINTF("posn %ld has gone away\n", incoming_posn); - close_guest_eventfds(s, incoming_posn); + close_peer_eventfds(s, incoming_posn); } return; } @@ -573,7 +573,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) /* get a new eventfd: */ new_eventfd = peer->nb_eventfds++; - /* this is an eventfd for a particular guest VM */ + /* this is an eventfd for a particular peer VM */ IVSHMEM_DPRINTF("eventfds[%ld][%d] = %d\n", incoming_posn, new_eventfd, incoming_fd); event_notifier_init_fd(&peer->eventfds[new_eventfd], incoming_fd); @@ -753,7 +753,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) return; } - /* we allocate enough space for 16 guests and grow as needed */ + /* we allocate enough space for 16 peers and grow as needed */ resize_peers(s, 16); s->vm_id = -1; @@ -831,7 +831,7 @@ static void pci_ivshmem_exit(PCIDevice *dev) if (s->peers) { for (i = 0; i < s->nb_peers; i++) { - close_guest_eventfds(s, i); + close_peer_eventfds(s, i); } g_free(s->peers); }