[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropr
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately |
Date: |
Mon, 12 Oct 2015 18:41:23 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
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);
}
--
2.4.3
- [Qemu-devel] [PULL v2 13/50] ivshmem: simplify around increase_dynamic_storage(), (continued)
- [Qemu-devel] [PULL v2 13/50] ivshmem: simplify around increase_dynamic_storage(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 14/50] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 16/50] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 17/50] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 18/50] ivshmem: improve debug messages, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 20/50] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 21/50] ivshmem: simplify a bit the code, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 22/50] ivshmem: use common return, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 23/50] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 26/50] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately,
marcandre . lureau <=
- [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 33/50] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 32/50] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 34/50] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 37/50] ivshmem: add check on protocol version in QEMU, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 38/50] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 40/50] qtest: add qtest_add_abrt_handler(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 41/50] glib-compat: add 2.38/2.40/2.46 asserts, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 42/50] tests: add ivshmem qtest, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz(), marcandre . lureau, 2015/10/12