Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On 19/10/2018 22:23, Eduardo Habkost wrote:
On Fri, Oct 19, 2018 at 09:53:45PM +0200, Igor Mammedov wrote:
On Fri, 19 Oct 2018 15:44:08 -0300
Eduardo Habkost wrote:
On Fri, Oct 19, 2018 at 03:12:31PM +0100, Peter Maydell wrote:
On 18 October 2018 at 21:03, Eduardo Habkost wrote:
The following changes since commit 09558375a634e17cea6cfbfec883ac2376d2dc7f:
Merge remote-tracking branch
'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging (2018-10-16
17:42:56 +0100)
are available in the Git repository at:
git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
for you to fetch changes up to 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc:
numa: Clean up error reporting in parse_numa() (2018-10-17 16:33:40 -0300)
Machine queue, 2018-10-18
* sysbus init/realize cleanups
(Cédric Le Goater, Philippe Mathieu-Daudé)
* memory-device refactoring (David Hildenbrand)
* -smp: deprecate incorrect CPUs topology (Igor Mammedov)
* -numa parsing cleanups (Markus Armbruster)
* Fix hostmem-file memory leak (Zhang Yi)
* Typo fix (Li Qiang)
Hi. This had some problems in merge testing, I'm afraid:
On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390 targets:
TEST: tests/cpu-plug-test... (pid=12602)
/i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12:
qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
(1) * cores (3) * threads (2) != maxcpus (12)
[...]
(plus similar ppc64, x86_64 targets)
Ouch. Apologies.
Can we please do something make sure "make check" will fail on
these cases? I'd like to be able to trust CI systems like
travis-ci.
we probably don't want make check fail on warning.
I disagree. If a warning is blocking a pull request from being
merged, it must make CI systems fail too. Otherwise we're
defeating the purpose of CI systems.
We can, we also have the hardware (courtesy of Packet), we just need to
make time to set it up.
QEMU Summit is a good place where to talk about this.
Test was written with assumption that s/c/t tuples matches initially present
CPUs, hence a warning.
Would something like following fix the issue (local x86 build/test looks fixed
with it)?
It works for me. I will queue it on machine-next, thanks!
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index 3e93c8e..f4a677d 100644
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -32,12 +32,12 @@ static void test_plug_with_cpu_add(gconstpointer data)
unsigned int i;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
s->machine, s->cpu_model,
s->sockets, s->cores, s->threads, s->maxcpus);
qtest_start(args);
-for (i = s->sockets * s->cores * s->threads; i < s->maxcpus; i++) {
+for (i = 1; i < s->maxcpus; i++) {
response = qmp("{ 'execute': 'cpu-add',"
" 'arguments': { 'id': %d } }", i);
g_assert(response);
@@ -56,7 +56,7 @@ static void test_plug_without_cpu_add(gconstpointer data)
QDict *response;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
s->machine, s->cpu_model,
s->sockets, s->cores, s->threads, s->maxcpus);
qtest_start(args);
@@ -79,12 +79,12 @@ static void test_plug_with_device_add_x86(gconstpointer
data)
unsigned int s, c, t;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
td->machine, td->cpu_model,
td->sockets, td->cores, td->threads, td->maxcpus);
qtest_start(args);
-for (s = td->sockets; s < td->maxcpus / td->cores / td->threads; s++) {
+for (s = 1; s < td->sockets; s++) {
for (c = 0; c < td->cores; c++) {
for (t = 0; t < td->threads; t++) {
char *id = g_strdup_printf("id-%i-%i-%i", s, c, t);
@@ -113,7 +113,7 @@ static void test_plug_with_device_add_coreid(gconstpointer
data)
td->sockets, td->cores, td->threads, td->maxcpus);
qtest_start(args);
-for (c = td->cores; c < td->maxcpus / td->sockets / td->threads; c++) {
+for (c = 1; c < td->cores; c++) {
char *id = g_strdup_printf("id-%i", c);
qtest_qmp_device_add(td->device_model, id, "{'core-id':%u}", c);
g_free(id);
@@ -148,7 +148,7 @@ static void add_pc_test_case(const char *mname)
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On Fri, Oct 19, 2018 at 7:00 PM Philippe Mathieu-Daudé
wrote:
> On 19/10/2018 16:12, Peter Maydell wrote:
...
> >>
> >>
> >
> > Hi. This had some problems in merge testing, I'm afraid:
> >
> > On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390
> > targets:
> >
> > TEST: tests/cpu-plug-test... (pid=12602)
> > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12:
> > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (2) != maxcpus (12)
> > OK
> > /i386/cpu-plug/pc-i440fx-3.0/device-add/1x3x2=12:
> > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (2) != maxcpus (12)
> > OK
> > /i386/cpu-plug/pc-q35-3.0/cpu-add/1x3x2=12:
> > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (2) != maxcpus (12)
> > OK
> > /i386/cpu-plug/pc-q35-3.0/device-add/1x3x2=12:
> > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (2) != maxcpus (12)
> > OK
> > /arm/qom/n800: OK
> > PASS: tests/cpu-plug-test
> > [...]
> > TEST: tests/cpu-plug-test... (pid=15040)
> > /s390x/cpu-plug/s390-ccw-virtio-3.1/cpu-add/1x3x1=6:
> > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (1) != maxcpus (6)
> > OK
> > /s390x/cpu-plug/s390-ccw-virtio-3.1/device-add/1x3x1=6:
> > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (1) != maxcpus (6)
> > OK
> > /s390x/cpu-plug/s390-ccw-virtio-3.0/cpu-add/1x3x1=6:
> > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (1) != maxcpus (6)
> > OK
> > /s390x/cpu-plug/s390-ccw-virtio-3.0/device-add/1x3x1=6:
> > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (1) != maxcpus (6)
> > OK
> > PASS: tests/cpu-plug-test
> >
> > (plus similar ppc64, x86_64 targets)
> >
> > I see similar warnings on hosts SPARC, PPC64BE, S390, 32-bit Arm
> > and x86 FreeBSD.
> >
> > I also got a build failure on one of my configs, but I think that
> > is caused by some latent bug in our makefiles where we don't
> > correctly rebuild x86_64-softmmu/config-devices.mak when a
> > change is made to default-configs/i386-softmmu.mak -- doing a
> > hand rm of the config-devices.mak fixed it.
>
> bisected to:
>
> 23d0571a24559b867fa47410aa8ec0519b0a1edd is the first bad commit
> commit 23d0571a24559b867fa47410aa8ec0519b0a1edd
> Author: Igor Mammedov
> Date: Thu Sep 13 13:06:01 2018 +0200
>
> vl.c deprecate incorrect CPUs topology
>
> -smp [cpus],sockets/cores/threads[,maxcpus] should describe topology
> so that total number of logical CPUs [sockets * cores * threads]
> would be equal to [maxcpus], however historically we didn't have
> such check in QEMU and it is possible to start VM with an invalid
> topology.
> Deprecate invalid options combination so we can make sure that
> the topology VM started with is always correct in the future.
> Users with an invalid sockets/cores/threads/maxcpus values should
> fix their CLI to make sure that
>[sockets * cores * threads] == [maxcpus]
Per the commit message, I understand the tests need to be upgraded,
they only test it is <= maxcpus while now we want == maxcpus:
static void add_s390x_test_case(const char *mname)
{
...
data->sockets = 1;
data->cores = 3;
data->threads = 1;
data->maxcpus = data->sockets * data->cores * data->threads * 2;
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On 19/10/2018 16:12, Peter Maydell wrote: > On 18 October 2018 at 21:03, Eduardo Habkost wrote: >> The following changes since commit 09558375a634e17cea6cfbfec883ac2376d2dc7f: >> >> Merge remote-tracking branch >> 'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging (2018-10-16 >> 17:42:56 +0100) >> >> are available in the Git repository at: >> >> git://github.com/ehabkost/qemu.git tags/machine-next-pull-request >> >> for you to fetch changes up to 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc: >> >> numa: Clean up error reporting in parse_numa() (2018-10-17 16:33:40 -0300) >> >> >> Machine queue, 2018-10-18 >> >> * sysbus init/realize cleanups >> (Cédric Le Goater, Philippe Mathieu-Daudé) >> * memory-device refactoring (David Hildenbrand) >> * -smp: deprecate incorrect CPUs topology (Igor Mammedov) >> * -numa parsing cleanups (Markus Armbruster) >> * Fix hostmem-file memory leak (Zhang Yi) >> * Typo fix (Li Qiang) >> >> >> > > Hi. This had some problems in merge testing, I'm afraid: > > On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390 > targets: > > TEST: tests/cpu-plug-test... (pid=12602) > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12: > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (2) != maxcpus (12) > OK > /i386/cpu-plug/pc-i440fx-3.0/device-add/1x3x2=12: > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (2) != maxcpus (12) > OK > /i386/cpu-plug/pc-q35-3.0/cpu-add/1x3x2=12: > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (2) != maxcpus (12) > OK > /i386/cpu-plug/pc-q35-3.0/device-add/1x3x2=12: > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (2) != maxcpus (12) > OK > /arm/qom/n800: OK > PASS: tests/cpu-plug-test > [...] > TEST: tests/cpu-plug-test... (pid=15040) > /s390x/cpu-plug/s390-ccw-virtio-3.1/cpu-add/1x3x1=6: > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (1) != maxcpus (6) > OK > /s390x/cpu-plug/s390-ccw-virtio-3.1/device-add/1x3x1=6: > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (1) != maxcpus (6) > OK > /s390x/cpu-plug/s390-ccw-virtio-3.0/cpu-add/1x3x1=6: > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (1) != maxcpus (6) > OK > /s390x/cpu-plug/s390-ccw-virtio-3.0/device-add/1x3x1=6: > qemu-system-s390x: warning: Invalid CPU topology deprecated: sockets > (1) * cores (3) * threads (1) != maxcpus (6) > OK > PASS: tests/cpu-plug-test > > (plus similar ppc64, x86_64 targets) > > I see similar warnings on hosts SPARC, PPC64BE, S390, 32-bit Arm > and x86 FreeBSD. > > I also got a build failure on one of my configs, but I think that > is caused by some latent bug in our makefiles where we don't > correctly rebuild x86_64-softmmu/config-devices.mak when a > change is made to default-configs/i386-softmmu.mak -- doing a > hand rm of the config-devices.mak fixed it. bisected to: 23d0571a24559b867fa47410aa8ec0519b0a1edd is the first bad commit commit 23d0571a24559b867fa47410aa8ec0519b0a1edd Author: Igor Mammedov Date: Thu Sep 13 13:06:01 2018 +0200 vl.c deprecate incorrect CPUs topology -smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] > > > thanks > -- PMM > -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
Igor Mammedov writes: > On Fri, 19 Oct 2018 17:23:21 -0300 > Eduardo Habkost wrote: > >> On Fri, Oct 19, 2018 at 09:53:45PM +0200, Igor Mammedov wrote: >> > On Fri, 19 Oct 2018 15:44:08 -0300 >> > Eduardo Habkost wrote: >> > >> > > On Fri, Oct 19, 2018 at 03:12:31PM +0100, Peter Maydell wrote: >> > > > On 18 October 2018 at 21:03, Eduardo Habkost >> > > > wrote: >> > > > > The following changes since commit >> > > > > 09558375a634e17cea6cfbfec883ac2376d2dc7f: >> > > > > >> > > > > Merge remote-tracking branch >> > > > > 'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging >> > > > > (2018-10-16 17:42:56 +0100) >> > > > > >> > > > > are available in the Git repository at: >> > > > > >> > > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request >> > > > > >> > > > > for you to fetch changes up to >> > > > > 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc: >> > > > > >> > > > > numa: Clean up error reporting in parse_numa() (2018-10-17 >> > > > > 16:33:40 -0300) >> > > > > >> > > > > >> > > > > Machine queue, 2018-10-18 >> > > > > >> > > > > * sysbus init/realize cleanups >> > > > > (Cédric Le Goater, Philippe Mathieu-Daudé) >> > > > > * memory-device refactoring (David Hildenbrand) >> > > > > * -smp: deprecate incorrect CPUs topology (Igor Mammedov) >> > > > > * -numa parsing cleanups (Markus Armbruster) >> > > > > * Fix hostmem-file memory leak (Zhang Yi) >> > > > > * Typo fix (Li Qiang) >> > > > > >> > > > > >> > > > > >> > > > >> > > > Hi. This had some problems in merge testing, I'm afraid: >> > > > >> > > > On aarch64 host, warnings running tests/cpu-plug-test for i386 and >> > > > s390 targets: >> > > > >> > > > TEST: tests/cpu-plug-test... (pid=12602) >> > > > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12: >> > > > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets >> > > > (1) * cores (3) * threads (2) != maxcpus (12) >> > > [...] >> > > > >> > > > (plus similar ppc64, x86_64 targets) >> > > >> > > Ouch. Apologies. >> > > >> > > Can we please do something make sure "make check" will fail on >> > > these cases? I'd like to be able to trust CI systems like >> > > travis-ci. >> > > >> > >> > we probably don't want make check fail on warning. >> >> I disagree. If a warning is blocking a pull request from being >> merged, it must make CI systems fail too. Otherwise we're >> defeating the purpose of CI systems. > > When we deprecate options we are bound to trigger warning which are not errors > and are meant to be there until deprecated options are removed/tested by make > check. > So what would you suggest to do wrt tests that use deprecated features, > drop testing for it? We commonly suppress the warning when testing. Search for 'if (qtest_enabled())'. -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On Fri, 19 Oct 2018 17:23:21 -0300 Eduardo Habkost wrote: > On Fri, Oct 19, 2018 at 09:53:45PM +0200, Igor Mammedov wrote: > > On Fri, 19 Oct 2018 15:44:08 -0300 > > Eduardo Habkost wrote: > > > > > On Fri, Oct 19, 2018 at 03:12:31PM +0100, Peter Maydell wrote: > > > > On 18 October 2018 at 21:03, Eduardo Habkost > > > > wrote: > > > > > The following changes since commit > > > > > 09558375a634e17cea6cfbfec883ac2376d2dc7f: > > > > > > > > > > Merge remote-tracking branch > > > > > 'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging > > > > > (2018-10-16 17:42:56 +0100) > > > > > > > > > > are available in the Git repository at: > > > > > > > > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request > > > > > > > > > > for you to fetch changes up to > > > > > 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc: > > > > > > > > > > numa: Clean up error reporting in parse_numa() (2018-10-17 16:33:40 > > > > > -0300) > > > > > > > > > > > > > > > Machine queue, 2018-10-18 > > > > > > > > > > * sysbus init/realize cleanups > > > > > (Cédric Le Goater, Philippe Mathieu-Daudé) > > > > > * memory-device refactoring (David Hildenbrand) > > > > > * -smp: deprecate incorrect CPUs topology (Igor Mammedov) > > > > > * -numa parsing cleanups (Markus Armbruster) > > > > > * Fix hostmem-file memory leak (Zhang Yi) > > > > > * Typo fix (Li Qiang) > > > > > > > > > > > > > > > > > > > > > > > Hi. This had some problems in merge testing, I'm afraid: > > > > > > > > On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390 > > > > targets: > > > > > > > > TEST: tests/cpu-plug-test... (pid=12602) > > > > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12: > > > > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets > > > > (1) * cores (3) * threads (2) != maxcpus (12) > > > [...] > > > > > > > > (plus similar ppc64, x86_64 targets) > > > > > > Ouch. Apologies. > > > > > > Can we please do something make sure "make check" will fail on > > > these cases? I'd like to be able to trust CI systems like > > > travis-ci. > > > > > > > we probably don't want make check fail on warning. > > I disagree. If a warning is blocking a pull request from being > merged, it must make CI systems fail too. Otherwise we're > defeating the purpose of CI systems. When we deprecate options we are bound to trigger warning which are not errors and are meant to be there until deprecated options are removed/tested by make check. So what would you suggest to do wrt tests that use deprecated features, drop testing for it? [...] -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On Fri, Oct 19, 2018 at 09:53:45PM +0200, Igor Mammedov wrote:
> On Fri, 19 Oct 2018 15:44:08 -0300
> Eduardo Habkost wrote:
>
> > On Fri, Oct 19, 2018 at 03:12:31PM +0100, Peter Maydell wrote:
> > > On 18 October 2018 at 21:03, Eduardo Habkost wrote:
> > > > The following changes since commit
> > > > 09558375a634e17cea6cfbfec883ac2376d2dc7f:
> > > >
> > > > Merge remote-tracking branch
> > > > 'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging
> > > > (2018-10-16 17:42:56 +0100)
> > > >
> > > > are available in the Git repository at:
> > > >
> > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
> > > >
> > > > for you to fetch changes up to 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc:
> > > >
> > > > numa: Clean up error reporting in parse_numa() (2018-10-17 16:33:40
> > > > -0300)
> > > >
> > > >
> > > > Machine queue, 2018-10-18
> > > >
> > > > * sysbus init/realize cleanups
> > > > (Cédric Le Goater, Philippe Mathieu-Daudé)
> > > > * memory-device refactoring (David Hildenbrand)
> > > > * -smp: deprecate incorrect CPUs topology (Igor Mammedov)
> > > > * -numa parsing cleanups (Markus Armbruster)
> > > > * Fix hostmem-file memory leak (Zhang Yi)
> > > > * Typo fix (Li Qiang)
> > > >
> > > >
> > > >
> > >
> > > Hi. This had some problems in merge testing, I'm afraid:
> > >
> > > On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390
> > > targets:
> > >
> > > TEST: tests/cpu-plug-test... (pid=12602)
> > > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12:
> > > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > > (1) * cores (3) * threads (2) != maxcpus (12)
> > [...]
> > >
> > > (plus similar ppc64, x86_64 targets)
> >
> > Ouch. Apologies.
> >
> > Can we please do something make sure "make check" will fail on
> > these cases? I'd like to be able to trust CI systems like
> > travis-ci.
> >
>
> we probably don't want make check fail on warning.
I disagree. If a warning is blocking a pull request from being
merged, it must make CI systems fail too. Otherwise we're
defeating the purpose of CI systems.
> Test was written with assumption that s/c/t tuples matches initially present
> CPUs, hence a warning.
> Would something like following fix the issue (local x86 build/test looks
> fixed with it)?
It works for me. I will queue it on machine-next, thanks!
>
> diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
> index 3e93c8e..f4a677d 100644
> --- a/tests/cpu-plug-test.c
> +++ b/tests/cpu-plug-test.c
> @@ -32,12 +32,12 @@ static void test_plug_with_cpu_add(gconstpointer data)
> unsigned int i;
>
> args = g_strdup_printf("-machine %s -cpu %s "
> - "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> + "-smp
> 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> s->machine, s->cpu_model,
> s->sockets, s->cores, s->threads, s->maxcpus);
> qtest_start(args);
>
> -for (i = s->sockets * s->cores * s->threads; i < s->maxcpus; i++) {
> +for (i = 1; i < s->maxcpus; i++) {
> response = qmp("{ 'execute': 'cpu-add',"
> " 'arguments': { 'id': %d } }", i);
> g_assert(response);
> @@ -56,7 +56,7 @@ static void test_plug_without_cpu_add(gconstpointer data)
> QDict *response;
>
> args = g_strdup_printf("-machine %s -cpu %s "
> - "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> + "-smp
> 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> s->machine, s->cpu_model,
> s->sockets, s->cores, s->threads, s->maxcpus);
> qtest_start(args);
> @@ -79,12 +79,12 @@ static void test_plug_with_device_add_x86(gconstpointer
> data)
> unsigned int s, c, t;
>
> args = g_strdup_printf("-machine %s -cpu %s "
> - "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> + "-smp
> 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
> td->machine, td->cpu_model,
> td->sockets, td->cores, td->threads, td->maxcpus);
> qtest_start(args);
>
> -for (s = td->sockets; s < td->maxcpus / td->cores / td->threads; s++) {
> +for (s = 1; s < td->sockets; s++) {
> for (c = 0; c < td->cores; c++) {
> for (t = 0; t < td->threads; t++) {
> char *id = g_strdup_printf("id-%i-%i-%i", s, c, t);
> @@ -113,7 +113,7 @@ static void
> test_plug_with_device_add_coreid(gconstpointer data)
> td->sockets, td->cores, td->threads, td->maxcpus);
> qtest_start(args);
>
> -for (c = td->cores; c < td->maxcpus / td->sockets / td->threads; c++) {
> +for
Re: [libvirt] [Qemu-devel] [PULL 00/45] Machine queue, 2018-10-18
On Fri, 19 Oct 2018 15:44:08 -0300
Eduardo Habkost wrote:
> On Fri, Oct 19, 2018 at 03:12:31PM +0100, Peter Maydell wrote:
> > On 18 October 2018 at 21:03, Eduardo Habkost wrote:
> > > The following changes since commit
> > > 09558375a634e17cea6cfbfec883ac2376d2dc7f:
> > >
> > > Merge remote-tracking branch
> > > 'remotes/pmaydell/tags/pull-target-arm-20181016-1' into staging
> > > (2018-10-16 17:42:56 +0100)
> > >
> > > are available in the Git repository at:
> > >
> > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
> > >
> > > for you to fetch changes up to 6d8e1bcc7dd5e819ce81e6a87fffe23e39c700cc:
> > >
> > > numa: Clean up error reporting in parse_numa() (2018-10-17 16:33:40
> > > -0300)
> > >
> > >
> > > Machine queue, 2018-10-18
> > >
> > > * sysbus init/realize cleanups
> > > (Cédric Le Goater, Philippe Mathieu-Daudé)
> > > * memory-device refactoring (David Hildenbrand)
> > > * -smp: deprecate incorrect CPUs topology (Igor Mammedov)
> > > * -numa parsing cleanups (Markus Armbruster)
> > > * Fix hostmem-file memory leak (Zhang Yi)
> > > * Typo fix (Li Qiang)
> > >
> > >
> > >
> >
> > Hi. This had some problems in merge testing, I'm afraid:
> >
> > On aarch64 host, warnings running tests/cpu-plug-test for i386 and s390
> > targets:
> >
> > TEST: tests/cpu-plug-test... (pid=12602)
> > /i386/cpu-plug/pc-i440fx-3.0/cpu-add/1x3x2=12:
> > qemu-system-i386: warning: Invalid CPU topology deprecated: sockets
> > (1) * cores (3) * threads (2) != maxcpus (12)
> [...]
> >
> > (plus similar ppc64, x86_64 targets)
>
> Ouch. Apologies.
>
> Can we please do something make sure "make check" will fail on
> these cases? I'd like to be able to trust CI systems like
> travis-ci.
>
we probably don't want make check fail on warning.
Test was written with assumption that s/c/t tuples matches initially present
CPUs, hence a warning.
Would something like following fix the issue (local x86 build/test looks fixed
with it)?
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index 3e93c8e..f4a677d 100644
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -32,12 +32,12 @@ static void test_plug_with_cpu_add(gconstpointer data)
unsigned int i;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
s->machine, s->cpu_model,
s->sockets, s->cores, s->threads, s->maxcpus);
qtest_start(args);
-for (i = s->sockets * s->cores * s->threads; i < s->maxcpus; i++) {
+for (i = 1; i < s->maxcpus; i++) {
response = qmp("{ 'execute': 'cpu-add',"
" 'arguments': { 'id': %d } }", i);
g_assert(response);
@@ -56,7 +56,7 @@ static void test_plug_without_cpu_add(gconstpointer data)
QDict *response;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
s->machine, s->cpu_model,
s->sockets, s->cores, s->threads, s->maxcpus);
qtest_start(args);
@@ -79,12 +79,12 @@ static void test_plug_with_device_add_x86(gconstpointer
data)
unsigned int s, c, t;
args = g_strdup_printf("-machine %s -cpu %s "
- "-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u",
+ "-smp 1,sockets=%u,cores=%u,threads=%u,maxcpus=%u",
td->machine, td->cpu_model,
td->sockets, td->cores, td->threads, td->maxcpus);
qtest_start(args);
-for (s = td->sockets; s < td->maxcpus / td->cores / td->threads; s++) {
+for (s = 1; s < td->sockets; s++) {
for (c = 0; c < td->cores; c++) {
for (t = 0; t < td->threads; t++) {
char *id = g_strdup_printf("id-%i-%i-%i", s, c, t);
@@ -113,7 +113,7 @@ static void test_plug_with_device_add_coreid(gconstpointer
data)
td->sockets, td->cores, td->threads, td->maxcpus);
qtest_start(args);
-for (c = td->cores; c < td->maxcpus / td->sockets / td->threads; c++) {
+for (c = 1; c < td->cores; c++) {
char *id = g_strdup_printf("id-%i", c);
qtest_qmp_device_add(td->device_model, id, "{'core-id':%u}", c);
g_free(id);
@@ -148,7 +148,7 @@ static void add_pc_test_case(const char *mname)
data->sockets = 1;
data->cores = 3;
data->threads = 2;
-data->maxcpus = data->sockets * data->cores * data->threads * 2;
+data->maxcpus = data->sockets * data->cores * data->threads;
if (g_str_has_suffix(mname, "-1.4") ||
(strcmp(mname,
