[Libguestfs] [p2v PATCH 5/6] copy fully populated vCPU topology by default

[Laszlo Ersek]

Such a default seems reasonable for most phys-to-virt conversions.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1590721
Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 generate-p2v-config.pl   | 2 +-
 main.c                   | 2 +-
 test-virt-p2v-cmdline.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generate-p2v-config.pl b/generate-p2v-config.pl
index 5c33f814e3e7..bc8e63e0f7bc 100755
--- a/generate-p2v-config.pl
+++ b/generate-p2v-config.pl
@@ -238,7 +238,7 @@ use a randomly generated name.",
     shortopt => "", # ignored for booleans
     description => "
 Copy the physical machine's CPU topology, densely populated, to the
-guest.  Disabled by default.  If disabled, the C<p2v.vcpu.cores> setting
+guest.  This is the default.  If disabled, the C<p2v.vcpu.cores> setting
 takes effect.",
   ),
   "p2v.vcpu.cores" => manual_entry->new(
diff --git a/main.c b/main.c
index 6ac94fcb5f8e..1101f790f401 100644
--- a/main.c
+++ b/main.c
@@ -291,7 +291,7 @@ set_config_defaults (struct config *config)
   }
   config->guestname = strdup (hostname);
 
-  config->vcpu.dense_topo = false;
+  config->vcpu.dense_topo = true;
 
   /* Defaults for #vcpus and memory are taken from the physical machine. */
   i = sysconf (_SC_NPROCESSORS_ONLN);
diff --git a/test-virt-p2v-cmdline.sh b/test-virt-p2v-cmdline.sh
index 37dc1662a593..8f131b98f786 100755
--- a/test-virt-p2v-cmdline.sh
+++ b/test-virt-p2v-cmdline.sh
@@ -26,7 +26,7 @@ out=test-virt-p2v-cmdline.out
 rm -f $out
 
 # The Linux kernel command line.
-$VG virt-p2v --cmdline='p2v.server=localhost p2v.port=123 p2v.username=user p2v.password=secret p2v.skip_test_connection p2v.name=test p2v.vcpu.cores=4 p2v.memory=1G p2v.disks=sda,sdb,sdc p2v.removable=sdd p2v.interfaces=eth0,eth1 p2v.o=local p2v.oa=sparse p2v.oc=qemu:///session p2v.of=raw p2v.os=/var/tmp p2v.network=em1:wired,other p2v.dump_config_and_exit' > $out
+$VG virt-p2v --cmdline='p2v.server=localhost p2v.port=123 p2v.username=user p2v.password=secret p2v.skip_test_connection p2v.name=test p2v.vcpu.dense_topo=false p2v.vcpu.cores=4 p2v.memory=1G p2v.disks=sda,sdb,sdc p2v.removable=sdd p2v.interfaces=eth0,eth1 p2v.o=local p2v.oa=sparse p2v.oc=qemu:///session p2v.of=raw p2v.os=/var/tmp p2v.network=em1:wired,other p2v.dump_config_and_exit' > $out
 
 # For debugging purposes.
 cat $out