diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e9803b8514..abea23542a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2089,11 +2089,9 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
     if (hostcpus < 0)
         return -1;
 
-    if (!(allcpumap = virBitmapNew(hostcpus)))
+    if (!(allcpumap = virHostCPUGetAvailableCPUsBitmap()))
         return -1;
 
-    virBitmapSetAll(allcpumap);
-
     for (i = 0; i < maxvcpus && i < ncpumaps; i++) {
         virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(def, i);
         virBitmapPtr bitmap = NULL;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 350e6f5368..f361795709 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5425,7 +5425,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
     virDomainDefPtr def;
     bool live;
     int ret = -1;
-    int hostcpus;
     virBitmapPtr cpumask = NULL;
     g_autoptr(virBitmap) bitmap = NULL;
     virBitmapPtr autoCpuset = NULL;
@@ -5442,9 +5441,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
     if (!(def = virDomainObjGetOneDefState(vm, flags, &live)))
         goto cleanup;
 
-    if ((hostcpus = virHostCPUGetCount()) < 0)
-        goto cleanup;
-
     if (live)
         autoCpuset = QEMU_DOMAIN_PRIVATE(vm)->autoCpuset;
 
@@ -5456,9 +5452,8 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
                autoCpuset) {
         cpumask = autoCpuset;
     } else {
-        if (!(bitmap = virBitmapNew(hostcpus)))
+        if (!(bitmap = virHostCPUGetAvailableCPUsBitmap()))
             goto cleanup;
-        virBitmapSetAll(bitmap);
         cpumask = bitmap;
     }