[PULL 0/1] Net patches

[PULL 0/1] Net patches

[Jason Wang]

The following changes since commit 0f397dcfecc9211d12c2c720c01eb32f0eaa7d23:

  Merge tag 'pull-nbd-2024-08-08' of https://repo.or.cz/qemu/ericb into staging (2024-08-09 08:40:37 +1000)

are available in the Git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to fa62cb989a9146c82f8f172715042852f5d36200:

  net: Fix '-net nic,model=' for non-help arguments (2024-08-12 13:36:42 +0800)

----------------------------------------------------------------
-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAma5uNkACgkQ7wSWWzmN
YhFpLwf+J9+cBWKUze7FZkxNHU78GJ/b+oVQfLYPnrCRrVKoyTr9yiKfMDS8qf5/
tPd+xFABwcHb8UL3EeAe9w5aB0QCqqdmZMFRkWuaZ7HEbZkYNt9cJck5iMdNaPBm
cKiFRLb8FDVA3aegCcsBqnwCxgFW+3P3rrnHQz1C+GQAOm7FER+HiFnYucjrrLSM
SaXZYIH/LPqL01gbZcbixQkhgL5XFWUToFXQEYECGS07uZZ1WSJkxIP6WZDchJ4+
vYO8/fWXVdrjvDirraZQRYnurWQGpTUk0Ocn2R8MaJsF8TK031MrMRJ3YP9zXp4n
wMe0BZO/YG5oi2gFrJpYL2AZqh2MgQ==
=DhS+
-----END PGP SIGNATURE-----

----------------------------------------------------------------
David Woodhouse (1):
      net: Fix '-net nic,model=' for non-help arguments

 net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PULL 1/1] net: Fix '-net nic,model=' for non-help arguments

[Jason Wang]

From: David Woodhouse <dwmw@amazon.co.uk>

Oops, don't *delete* the model option when checking for 'help'.

Fixes: 64f75f57f9d2 ("net: Reinstate '-net nic, model=help' output as documented in man page")
Reported-by: Hans <sungdgdhtryrt@gmail.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: qemu-stable@nongnu.org
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/net.c b/net/net.c
index 2eb8bc9c0b..fc1125111c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1737,7 +1737,7 @@ void net_check_clients(void)
 
 static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
 {
-    const char *model = qemu_opt_get_del(opts, "model");
+    const char *model = qemu_opt_get(opts, "model");
 
     if (is_nic_model_help_option(model)) {
         return 0;
-- 
2.42.0

Re: [PULL 1/1] net: Fix '-net nic,model=' for non-help arguments

[Peter Maydell]

On Mon, 12 Aug 2024 at 08:29, Jason Wang <jasowang@redhat.com> wrote:
>
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> Oops, don't *delete* the model option when checking for 'help'.
>
> Fixes: 64f75f57f9d2 ("net: Reinstate '-net nic, model=help' output as documented in man page")
> Reported-by: Hans <sungdgdhtryrt@gmail.com>
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> Cc: qemu-stable@nongnu.org
> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
>  net/net.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/net.c b/net/net.c
> index 2eb8bc9c0b..fc1125111c 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1737,7 +1737,7 @@ void net_check_clients(void)
>
>  static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
>  {
> -    const char *model = qemu_opt_get_del(opts, "model");
> +    const char *model = qemu_opt_get(opts, "model");
>
>      if (is_nic_model_help_option(model)) {
>          return 0;

Will this also fix https://gitlab.com/qemu-project/qemu/-/issues/2496 ?

thanks
-- PMM

Re: [PULL 1/1] net: Fix '-net nic,model=' for non-help arguments

[David Woodhouse]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

On Mon, 2024-08-12 at 11:25 +0100, Peter Maydell wrote:
> 
> Will this also fix
> https://gitlab.com/qemu-project/qemu/-/issues/2496 ?

Almost certainly, yes.

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]

Re: [PULL 0/1] Net patches

[Richard Henderson]

On 8/12/24 17:28, Jason Wang wrote:
> The following changes since commit 0f397dcfecc9211d12c2c720c01eb32f0eaa7d23:
> 
>    Merge tag 'pull-nbd-2024-08-08' ofhttps://repo.or.cz/qemu/ericb into staging (2024-08-09 08:40:37 +1000)
> 
> are available in the Git repository at:
> 
>    https://github.com/jasowang/qemu.git tags/net-pull-request
> 
> for you to fetch changes up to fa62cb989a9146c82f8f172715042852f5d36200:
> 
>    net: Fix '-net nic,model=' for non-help arguments (2024-08-12 13:36:42 +0800)

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.

r~