From 114e0af84ecc08cdb4bd7b871d34be104ca4c59b Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 8 Aug 2017 19:01:56 +0300 Subject: [PATCH 1/5] acpi-test: update expected DSDT files Signed-off-by: Michael S. Tsirkin --- tests/acpi-test-data/q35/DSDT | Bin 7782 -> 7782 bytes tests/acpi-test-data/q35/DSDT.bridge | Bin 7799 -> 7799 bytes tests/acpi-test-data/q35/DSDT.cphp | Bin 8245 -> 8245 bytes tests/acpi-test-data/q35/DSDT.ipmibt | Bin 7857 -> 7857 bytes tests/acpi-test-data/q35/DSDT.memhp | Bin 9147 -> 9147 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT index a6138c829142265255ac6f7bedd44757e944eb2f..a080e2ace20ce9b88d5a61078d8caa0262617eed 100644 GIT binary patch delta 24 fcmaE6^UQ|JCDO_uFLwW|0UR diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge index 6b90f606f8b76f71ea9c569f4e606aeecd9e239d..31a76732e563dde32e6d976670baa732a6b91807 100644 GIT binary patch delta 24 gcmexv^WBEaCDD~z%m@83}Z0A|w&lK=n! From cde0a63ad721dbb538419a00f9405587680be436 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 23 Jun 2017 22:25:03 +0300 Subject: [PATCH 2/5] Revert "cpu: add APIs to allocate/free CPU environment" This reverts commit e2a7f28693aea7e194ec1435697ec4feb24f8a6f. This was not supposed to go upstream yet. Reverting. Signed-off-by: Michael S. Tsirkin --- include/qom/cpu.h | 31 ------------------------------- qom/cpu.c | 34 ---------------------------------- 2 files changed, 65 deletions(-) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index e9d30c52b4..25eefea7ab 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -162,10 +162,6 @@ typedef struct CPUClass { void (*dump_statistics)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); int64_t (*get_arch_id)(CPUState *cpu); - void * (*alloc_env)(CPUState *cpu); - void (*get_env)(CPUState *cpu, void *env); - void (*set_env)(CPUState *cpu, void *env); - void (*free_env)(CPUState *cpu, void *env); bool (*get_paging_enabled)(const CPUState *cpu); void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); @@ -443,33 +439,6 @@ static inline void cpu_tb_jmp_cache_clear(CPUState *cpu) extern bool mttcg_enabled; #define qemu_tcg_mttcg_enabled() (mttcg_enabled) -/** - * cpu_alloc_env: allocate CPU environment structure - * @cpu: allocate environment structure for this CPU - */ -void *cpu_alloc_env(CPUState *cpu); - -/** - * cpu_get_env: retrieve CPU environment structure - * @cpu: CPU to use - * @env: environment structure to use - */ -void cpu_get_env(CPUState *cpu, void *env); - -/** - * cpu_set_env: switch to given CPU environment - * @cpu: CPU to use - * @env: environment structure to use - */ -void cpu_set_env(CPUState *cpu, void *env); - -/** - * cpu_free_env: free CPU environment structure - * @cpu: free environment structure for this CPU - * @env: structure to free - */ -void cpu_free_env(CPUState *cpu, void *env); - /** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected. diff --git a/qom/cpu.c b/qom/cpu.c index 9201fd9807..4f38db0dac 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -89,40 +89,6 @@ out: return cpu; } -void *cpu_alloc_env(CPUState *cpu) -{ - CPUClass *cc = CPU_GET_CLASS(cpu); - - return cc->alloc_env ? cc->alloc_env(cpu) : NULL; -} - -void cpu_get_env(CPUState *cpu, void *env) -{ - CPUClass *cc = CPU_GET_CLASS(cpu); - - if (cc->get_env) { - cc->get_env(cpu, env); - } -} - -void cpu_set_env(CPUState *cpu, void *env) -{ - CPUClass *cc = CPU_GET_CLASS(cpu); - - if (cc->set_env) { - cc->set_env(cpu, env); - } -} - -void cpu_free_env(CPUState *cpu, void *env) -{ - CPUClass *cc = CPU_GET_CLASS(cpu); - - if (cc->free_env) { - cc->free_env(cpu, env); - } -} - bool cpu_paging_enabled(const CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); From 0f8c289ad539feb5135c545bea947b310a893f4b Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Tue, 8 Aug 2017 22:38:57 +0200 Subject: [PATCH 3/5] net: fix -netdev socket,fd= for UDP sockets This patch fixes -netdev socket,fd= for UDP sockets Currently -netdev socket,fd=<...> results in qemu: error: specified mcastaddr "127.0.0.1" (0x7f000001) does not contain a multicast address qemu-system-x86_64: -netdev socket,id=n1,fd=3: Device 'socket' could not be initialized To fix these we need to allow specifying multicast and fd arguments for the same netdev. With this the user can specify "-netdev fd=3,mcast=" Cc: Jason Wang Fixes: 3d830459b1eccdb61b75e2712fd364012ce5a115 Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- net/socket.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/net/socket.c b/net/socket.c index f85ef7d61b..18af2ab5f3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -320,11 +320,11 @@ static NetClientInfo net_dgram_socket_info = { static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer, const char *model, const char *name, - int fd, int is_connected) + int fd, int is_connected, + const char *mcast) { struct sockaddr_in saddr; int newfd; - socklen_t saddr_len = sizeof(saddr); NetClientState *nc; NetSocketState *s; @@ -333,8 +333,13 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer, * by ONLY ONE process: we must "clone" this dgram socket --jjo */ - if (is_connected) { - if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) { + if (is_connected && mcast != NULL) { + if (parse_host_port(&saddr, mcast) < 0) { + fprintf(stderr, + "qemu: error: init_dgram: fd=%d failed parse_host_port()\n", + fd); + goto err; + } /* must be bound */ if (saddr.sin_addr.s_addr == 0) { fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, " @@ -351,12 +356,6 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer, dup2(newfd, fd); close(newfd); - } else { - fprintf(stderr, - "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n", - fd, strerror(errno)); - goto err; - } } nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name); @@ -432,7 +431,7 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer, static NetSocketState *net_socket_fd_init(NetClientState *peer, const char *model, const char *name, - int fd, int is_connected) + int fd, int is_connected, const char *mc) { int so_type = -1, optlen=sizeof(so_type); @@ -445,7 +444,7 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer, } switch(so_type) { case SOCK_DGRAM: - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected); + return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, mc); case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connected); default: @@ -567,7 +566,7 @@ static int net_socket_connect_init(NetClientState *peer, break; } } - s = net_socket_fd_init(peer, model, name, fd, connected); + s = net_socket_fd_init(peer, model, name, fd, connected, NULL); if (!s) return -1; snprintf(s->nc.info_str, sizeof(s->nc.info_str), @@ -602,7 +601,7 @@ static int net_socket_mcast_init(NetClientState *peer, if (fd < 0) return -1; - s = net_socket_fd_init(peer, model, name, fd, 0); + s = net_socket_fd_init(peer, model, name, fd, 0, NULL); if (!s) return -1; @@ -652,7 +651,7 @@ static int net_socket_udp_init(NetClientState *peer, } qemu_set_nonblock(fd); - s = net_socket_fd_init(peer, model, name, fd, 0); + s = net_socket_fd_init(peer, model, name, fd, 0, NULL); if (!s) { return -1; } @@ -675,9 +674,9 @@ int net_init_socket(const Netdev *netdev, const char *name, assert(netdev->type == NET_CLIENT_DRIVER_SOCKET); sock = &netdev->u.socket; - if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast + - sock->has_udp != 1) { - error_report("exactly one of fd=, listen=, connect=, mcast= or udp=" + if (sock->has_listen + sock->has_connect + sock->has_mcast + + sock->has_udp > 1) { + error_report("exactly one of listen=, connect=, mcast= or udp=" " is required"); return -1; } @@ -696,7 +695,7 @@ int net_init_socket(const Netdev *netdev, const char *name, return -1; } qemu_set_nonblock(fd); - if (!net_socket_fd_init(peer, "socket", name, fd, 1)) { + if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast)) { return -1; } return 0; From 2566378d6d13bf4d28c7770bdbda5f7682594bbe Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Tue, 8 Aug 2017 22:38:58 +0200 Subject: [PATCH 4/5] libvhost-user: quit when no more data received End processing of messages when VHOST_USER_NONE is received. Without this we run into a vubr_panic() call and get "PANIC: Unhandled request: 0" Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- contrib/libvhost-user/libvhost-user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c index 9efb9dac0e..35fa0c5e56 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -161,7 +161,7 @@ vu_message_read(VuDev *dev, int conn_fd, VhostUserMsg *vmsg) rc = recvmsg(conn_fd, &msg, 0); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); - if (rc <= 0) { + if (rc < 0) { vu_panic(dev, "Error while recvmsg: %s", strerror(errno)); return false; } @@ -806,6 +806,8 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) return vu_get_queue_num_exec(dev, vmsg); case VHOST_USER_SET_VRING_ENABLE: return vu_set_vring_enable_exec(dev, vmsg); + case VHOST_USER_NONE: + break; default: vmsg_close_fds(vmsg); vu_panic(dev, "Unhandled request: %d", vmsg->request); From 24dd1e17696fbd11b3df50718dddcbdfe2c45f24 Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Tue, 8 Aug 2017 22:38:59 +0200 Subject: [PATCH 5/5] libqtest: always set up signal handler for SIGABRT Currently abort handlers only work for the first test function in a testcase, because the list of abort handlers is not properly cleared when qtest_quit() is called. qtest_quit() only deletes the kill_qemu_hook but doesn't completely clear the abrt_hooks list. The effect is that abrt_hooks.is_setup is never set to false and in a following test the abrt_hooks list is not initialized and setup_sigabrt_handler() is not called. One way to solve this is to clear the list in qtest_quit(), but that means only asserts between qtest_start and qtest_quit will be catched by the abort handler. We can make abort handlers work in all cases if we always setup the signal handler for SIGABRT in qtest_init. Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/libqtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a5492a603..b9a1f180e1 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -140,8 +140,8 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data) /* Only install SIGABRT handler once */ if (!abrt_hooks.is_setup) { g_hook_list_init(&abrt_hooks, sizeof(GHook)); - setup_sigabrt_handler(); } + setup_sigabrt_handler(); hook = g_hook_alloc(&abrt_hooks); hook->func = fn;