qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Andrew Jones" <drjones@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Yanan Wang" <wangyanan55@huawei.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH-for-6.2 v3 1/6] tests/unit/test-smp-parse: Restore MachineClass fields after modifying
Date: Thu, 11 Nov 2021 11:03:46 +0100	[thread overview]
Message-ID: <20211111100351.2153662-2-philmd@redhat.com> (raw)
In-Reply-To: <20211111100351.2153662-1-philmd@redhat.com>

There is a single MachineClass object, registered with
type_register_static(&smp_machine_info). Since the same
object is used multiple times (an MachineState object
is instantiated in both test_generic and test_with_dies),
we should restore its internal state after modifying for
the test purpose.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/unit/test-smp-parse.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index cbe0c990494..bd11fbe91de 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -512,7 +512,7 @@ static void test_generic(void)
         smp_parse_test(ms, data, true);
     }
 
-    /* Reset the supported min CPUs and max CPUs */
+    /* Force invalid min CPUs and max CPUs */
     mc->min_cpus = 2;
     mc->max_cpus = 511;
 
@@ -523,6 +523,10 @@ static void test_generic(void)
         smp_parse_test(ms, data, false);
     }
 
+    /* Reset the supported min CPUs and max CPUs */
+    mc->min_cpus = MIN_CPUS;
+    mc->max_cpus = MAX_CPUS;
+
     object_unref(obj);
 }
 
-- 
2.31.1



  reply	other threads:[~2021-11-11 10:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-11 10:03 [PATCH-for-6.2 v3 0/6] tests/unit: Fix test-smp-parse Philippe Mathieu-Daudé
2021-11-11 10:03 ` Philippe Mathieu-Daudé [this message]
2021-11-11 14:16   ` [PATCH-for-6.2 v3 1/6] tests/unit/test-smp-parse: Restore MachineClass fields after modifying Richard Henderson
2021-11-12  2:04   ` wangyanan (Y)
2021-11-15 10:24     ` Philippe Mathieu-Daudé
2021-11-16 11:06       ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 2/6] tests/unit/test-smp-parse: QOM'ify smp_machine_class_init() Philippe Mathieu-Daudé
2021-11-11 14:18   ` Richard Henderson
2021-11-12  2:05   ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 3/6] tests/unit/test-smp-parse: Explicit MachineClass name Philippe Mathieu-Daudé
2021-11-11 12:56   ` Andrew Jones
2021-11-11 14:18   ` Richard Henderson
2021-11-12  2:28   ` wangyanan (Y)
2021-11-15 10:16     ` Philippe Mathieu-Daudé
2021-11-16 11:15       ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 4/6] tests/unit/test-smp-parse: Simplify pointer to compound literal use Philippe Mathieu-Daudé
2021-11-11 14:19   ` Richard Henderson
2021-11-12  2:46   ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 5/6] tests/unit/test-smp-parse: Constify some pointer/struct Philippe Mathieu-Daudé
2021-11-11 14:20   ` Richard Henderson
2021-11-12  3:12   ` wangyanan (Y)
2021-11-11 10:03 ` [PATCH-for-6.2 v3 6/6] hw/core: Rename smp_parse() -> machine_parse_smp_config() Philippe Mathieu-Daudé
2021-11-11 14:20   ` Richard Henderson
2021-11-12  3:22   ` wangyanan (Y)
2021-11-11 12:57 ` [PATCH-for-6.2 v3 0/6] tests/unit: Fix test-smp-parse Andrew Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211111100351.2153662-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=armbru@redhat.com \
    --cc=drjones@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wangyanan55@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).