mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
monitor: Use getter/setter functions for cur_mon
cur_mon really needs to be coroutine-local as soon as we move monitor command handlers to coroutines and let them yield. As a first step, just remove all direct accesses to cur_mon so that we can implement this in the getter function later. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201005155855.256490-4-kwolf@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
87e6f4a4d6
commit
947e47448d
21 changed files with 73 additions and 46 deletions
|
@ -700,7 +700,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
|||
if (vhostfdname) {
|
||||
int ret;
|
||||
|
||||
vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err);
|
||||
vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, &err);
|
||||
if (vhostfd == -1) {
|
||||
if (tap->has_vhostforce && tap->vhostforce) {
|
||||
error_propagate(errp, err);
|
||||
|
@ -808,7 +808,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
|||
return -1;
|
||||
}
|
||||
|
||||
fd = monitor_fd_param(cur_mon, tap->fd, errp);
|
||||
fd = monitor_fd_param(monitor_cur(), tap->fd, errp);
|
||||
if (fd == -1) {
|
||||
return -1;
|
||||
}
|
||||
|
@ -862,7 +862,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
|||
}
|
||||
|
||||
for (i = 0; i < nfds; i++) {
|
||||
fd = monitor_fd_param(cur_mon, fds[i], errp);
|
||||
fd = monitor_fd_param(monitor_cur(), fds[i], errp);
|
||||
if (fd == -1) {
|
||||
ret = -1;
|
||||
goto free_fail;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue