On 12/03/2019 17.57, Paolo Bonzini wrote: > This removes the duplicated initialization code. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > tests/Makefile.include | 3 -- > tests/test-announce-self.c | 82 -------------------------------------- > tests/virtio-net-test.c | 30 ++++++++++++++ > 3 files changed, 30 insertions(+), 85 deletions(-) > delete mode 100644 tests/test-announce-self.c > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index a5719551dd..56764c7543 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -195,7 +195,6 @@ check-qtest-i386-$(CONFIG_SLIRP) += > tests/test-netfilter$(EXESUF) > check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) > check-qtest-i386-$(CONFIG_RTL8139_PCI) += > tests/test-filter-redirector$(EXESUF) > check-qtest-i386-y += tests/migration-test$(EXESUF) > -check-qtest-i386-y += tests/test-announce-self$(EXESUF) > check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) > check-qtest-i386-y += tests/numa-test$(EXESUF) > check-qtest-x86_64-y += $(check-qtest-i386-y) > @@ -232,7 +231,6 @@ check-qtest-ppc64-y += $(check-qtest-ppc-y) > check-qtest-ppc64-$(CONFIG_PSERIES) += tests/device-plug-test$(EXESUF) > check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF) > check-qtest-ppc64-y += tests/migration-test$(EXESUF) > -check-qtest-ppc64-y += tests/test-announce-self$(EXESUF) > check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF) > check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) > check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF) > @@ -817,7 +815,6 @@ tests/usb-hcd-ehci-test$(EXESUF): > tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) > tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o > $(libqos-usb-obj-y) > tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o > tests/migration-test$(EXESUF): tests/migration-test.o > -tests/test-announce-self$(EXESUF): tests/test-announce-self.o > tests/qemu-iotests/socket_scm_helper$(EXESUF): > tests/qemu-iotests/socket_scm_helper.o > tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) > tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) > $(test-qapi-obj-y) > diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c > deleted file mode 100644 > index 1644d34a3f..0000000000 > --- a/tests/test-announce-self.c > +++ /dev/null > @@ -1,82 +0,0 @@ > -/* > - * QTest testcase for qemu_announce_self > - * > - * Copyright (c) 2017 Red hat, Inc. > - * Copyright (c) 2014 SUSE LINUX Products GmbH > - * > - * This work is licensed under the terms of the GNU GPL, version 2 or later. > - * See the COPYING file in the top-level directory. > - */ > - > -#include "qemu/osdep.h" > -#include "libqtest.h" > -#include "qapi/qmp/qdict.h" > -#include "qemu-common.h" > -#include "qemu/sockets.h" > -#include "qemu/iov.h" > -#include "libqos/libqos-pc.h" > -#include "libqos/libqos-spapr.h" > - > -#ifndef ETH_P_RARP > -#define ETH_P_RARP 0x8035 > -#endif > - > -static QTestState *test_init(int socket) > -{ > - char *args; > - > - args = g_strdup_printf("-netdev socket,fd=%d,id=hs0 -device " > - "virtio-net-pci,netdev=hs0", socket); > - > - return qtest_start(args); > -}
This function has recently been removed to fix the memory leak here. Could you please rebase your patch? Thomas