Message ID | 20170714152820.24034-1-dgilbert@redhat.com |
---|---|
State | New |
Headers | show |
On 07/14/2017 11:28 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > The migration tests used two VMs each with -m 1024 this caused > problems when run in some small, pessimistic test VMs (netbsd). > We can just be meaner with the amount of RAM in the test and use -m 384 > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/ahci-test.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/ahci-test.c b/tests/ahci-test.c > index ef17629345..999121bb7c 100644 > --- a/tests/ahci-test.c > +++ b/tests/ahci-test.c > @@ -1132,9 +1132,9 @@ static void test_migrate_sanity(void) > AHCIQState *src, *dst; > char *uri = g_strdup_printf("unix:%s", mig_socket); > > - src = ahci_boot("-m 1024 -M q35 " > + src = ahci_boot("-m 384 -M q35 " > "-drive if=ide,file=%s,format=%s ", tmp_path, imgfmt); > - dst = ahci_boot("-m 1024 -M q35 " > + dst = ahci_boot("-m 384 -M q35 " > "-drive if=ide,file=%s,format=%s " > "-incoming %s", tmp_path, imgfmt, uri); > > @@ -1157,10 +1157,10 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write) > unsigned char *rx = g_malloc0(bufsize); > char *uri = g_strdup_printf("unix:%s", mig_socket); > > - src = ahci_boot_and_enable("-m 1024 -M q35 " > + src = ahci_boot_and_enable("-m 384 -M q35 " > "-drive if=ide,format=%s,file=%s ", > imgfmt, tmp_path); > - dst = ahci_boot("-m 1024 -M q35 " > + dst = ahci_boot("-m 384 -M q35 " > "-drive if=ide,format=%s,file=%s " > "-incoming %s", imgfmt, tmp_path, uri); > > Totally. Reviewed-by: John Snow <jsnow@redhat.com> Thanks, applied to my IDE tree: https://github.com/jnsnow/qemu/commits/ide https://github.com/jnsnow/qemu.git --js
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index ef17629345..999121bb7c 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1132,9 +1132,9 @@ static void test_migrate_sanity(void) AHCIQState *src, *dst; char *uri = g_strdup_printf("unix:%s", mig_socket); - src = ahci_boot("-m 1024 -M q35 " + src = ahci_boot("-m 384 -M q35 " "-drive if=ide,file=%s,format=%s ", tmp_path, imgfmt); - dst = ahci_boot("-m 1024 -M q35 " + dst = ahci_boot("-m 384 -M q35 " "-drive if=ide,file=%s,format=%s " "-incoming %s", tmp_path, imgfmt, uri); @@ -1157,10 +1157,10 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write) unsigned char *rx = g_malloc0(bufsize); char *uri = g_strdup_printf("unix:%s", mig_socket); - src = ahci_boot_and_enable("-m 1024 -M q35 " + src = ahci_boot_and_enable("-m 384 -M q35 " "-drive if=ide,format=%s,file=%s ", imgfmt, tmp_path); - dst = ahci_boot("-m 1024 -M q35 " + dst = ahci_boot("-m 384 -M q35 " "-drive if=ide,format=%s,file=%s " "-incoming %s", imgfmt, tmp_path, uri);