From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2rVA-0000Wh-BK for qemu-devel@nongnu.org; Tue, 17 May 2016 22:46:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2rV7-00038c-4d for qemu-devel@nongnu.org; Tue, 17 May 2016 22:46:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2rV6-00038V-SC for qemu-devel@nongnu.org; Tue, 17 May 2016 22:46:21 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93AE2116086 for ; Wed, 18 May 2016 02:46:19 +0000 (UTC) References: <1463062636-22340-1-git-send-email-ehabkost@redhat.com> <5739E56D.3080408@redhat.com> From: Jason Wang Message-ID: <573BD776.102@redhat.com> Date: Wed, 18 May 2016 10:46:14 +0800 MIME-Version: 1.0 In-Reply-To: <5739E56D.3080408@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] net: vl: Move default_net to vl.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , Eduardo Habkost , qemu-devel@nongnu.org On 2016=E5=B9=B405=E6=9C=8816=E6=97=A5 23:21, Paolo Bonzini wrote: > > On 12/05/2016 16:17, Eduardo Habkost wrote: >> All handling of defaults (default_* variables) is inside vl.c, >> move default_net there too, so we can more easily refactor that >> code later. >> >> Signed-off-by: Eduardo Habkost >> --- >> include/net/net.h | 1 - >> net/net.c | 23 ----------------------- >> vl.c | 24 +++++++++++++++++++++++- >> 3 files changed, 23 insertions(+), 25 deletions(-) >> >> diff --git a/include/net/net.h b/include/net/net.h >> index 73e4c46..059a464 100644 >> --- a/include/net/net.h >> +++ b/include/net/net.h >> @@ -178,7 +178,6 @@ struct NICInfo { >> =20 >> extern int nb_nics; >> extern NICInfo nd_table[MAX_NICS]; >> -extern int default_net; >> extern const char *host_net_devices[]; >> =20 >> /* from net.c */ >> diff --git a/net/net.c b/net/net.c >> index 0ad6217..1680b68 100644 >> --- a/net/net.c >> +++ b/net/net.c >> @@ -76,8 +76,6 @@ const char *host_net_devices[] =3D { >> NULL, >> }; >> =20 >> -int default_net =3D 1; >> - >> /***********************************************************/ >> /* network device redirectors */ >> =20 >> @@ -1415,18 +1413,6 @@ void net_check_clients(void) >> NetClientState *nc; >> int i; >> =20 >> - /* Don't warn about the default network setup that you get if >> - * no command line -net or -netdev options are specified. There >> - * are two cases that we would otherwise complain about: >> - * (1) board doesn't support a NIC but the implicit "-net nic" >> - * requested one >> - * (2) CONFIG_SLIRP not set, in which case the implicit "-net nic= " >> - * sets up a nic that isn't connected to anything. >> - */ >> - if (default_net) { >> - return; >> - } >> - >> net_hub_check_clients(); >> =20 >> QTAILQ_FOREACH(nc, &net_clients, next) { >> @@ -1483,14 +1469,6 @@ int net_init_clients(void) >> { >> QemuOptsList *net =3D qemu_find_opts("net"); >> =20 >> - if (default_net) { >> - /* if no clients, we use a default config */ >> - qemu_opts_set(net, NULL, "type", "nic", &error_abort); >> -#ifdef CONFIG_SLIRP >> - qemu_opts_set(net, NULL, "type", "user", &error_abort); >> -#endif >> - } >> - >> net_change_state_entry =3D >> qemu_add_vm_change_state_handler(net_vm_change_state_handler= , NULL); >> =20 >> @@ -1521,7 +1499,6 @@ int net_client_parse(QemuOptsList *opts_list, co= nst char *optarg) >> return -1; >> } >> =20 >> - default_net =3D 0; >> return 0; >> } >> =20 >> diff --git a/vl.c b/vl.c >> index 5fd22cb..56d7bc1 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -209,6 +209,7 @@ static int default_floppy =3D 1; >> static int default_cdrom =3D 1; >> static int default_sdcard =3D 1; >> static int default_vga =3D 1; >> +static int default_net =3D 1; >> =20 >> static struct { >> const char *driver; >> @@ -3282,11 +3283,13 @@ int main(int argc, char **argv, char **envp) >> fd_bootchk =3D 0; >> break; >> case QEMU_OPTION_netdev: >> + default_net =3D 0; >> if (net_client_parse(qemu_find_opts("netdev"), optar= g) =3D=3D -1) { >> exit(1); >> } >> break; >> case QEMU_OPTION_net: >> + default_net =3D 0; >> if (net_client_parse(qemu_find_opts("net"), optarg) = =3D=3D -1) { >> exit(1); >> } >> @@ -4403,6 +4406,14 @@ int main(int argc, char **argv, char **envp) >> /* clean up network at qemu process termination */ >> atexit(&net_cleanup); >> =20 >> + if (default_net) { >> + QemuOptsList *net =3D qemu_find_opts("net"); >> + qemu_opts_set(net, NULL, "type", "nic", &error_abort); >> +#ifdef CONFIG_SLIRP >> + qemu_opts_set(net, NULL, "type", "user", &error_abort); >> +#endif >> + } >> + >> if (net_init_clients() < 0) { >> exit(1); >> } >> @@ -4547,7 +4558,18 @@ int main(int argc, char **argv, char **envp) >> /* Did we create any drives that we failed to create a device fo= r? */ >> drive_check_orphaned(); >> =20 >> - net_check_clients(); >> + /* Don't warn about the default network setup that you get if >> + * no command line -net or -netdev options are specified. There >> + * are two cases that we would otherwise complain about: >> + * (1) board doesn't support a NIC but the implicit "-net nic" >> + * requested one >> + * (2) CONFIG_SLIRP not set, in which case the implicit "-net nic= " >> + * sets up a nic that isn't connected to anything. >> + */ >> + if (!default_net) { >> + net_check_clients(); >> + } >> + >> =20 >> if (boot_once) { >> qemu_boot_set(boot_once, &error_fatal); >> > Keeping magic confined to vl.c is always a nice improvement. > > Reviewed-by: Paolo Bonzini > > Paolo > Applied to -net. Thanks