diff --git a/src/driver.h b/src/driver.h
index 08fe816e05177ebefd8827b74cbad202b24dce7c..fe21ea39bf944ffa2bc41f921c3330603f1cf29e 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -367,6 +367,11 @@ typedef int
     (*virDrvCPUCompare)(virConnectPtr conn,
                         const char *cpu,
                         unsigned int flags);
+typedef char *
+    (*virDrvCPUBaseline)(virConnectPtr conn,
+                         const char **xmlCPUs,
+                         unsigned int ncpus,
+                         unsigned int flags);
 
 /**
  * _virDriver:
@@ -458,6 +463,7 @@ struct _virDriver {
     virDrvDomainIsActive       domainIsActive;
     virDrvDomainIsPersistent   domainIsPersistent;
     virDrvCPUCompare            cpuCompare;
+    virDrvCPUBaseline           cpuBaseline;
 };
 
 typedef int
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 535ec43f245a068d6ad826e7ef96e7d6059d3929..e125a09b25e9f8a76c5ced3679cf3180928aec72 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -3403,6 +3403,7 @@ static virDriver esxDriver = {
     esxDomainIsActive,               /* domainIsActive */
     esxDomainIsPersistent,           /* domainIsPersistent */
     NULL,                            /* cpuCompare */
+    NULL,                            /* cpuBaseline */
 };
 
 
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 1a73ca64160bd0c27d06bdafb321d4d156e4dbff..679e93664813e4e690265a05ab42197090898542 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2449,6 +2449,7 @@ static virDriver lxcDriver = {
     lxcDomainIsActive,
     lxcDomainIsPersistent,
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 static virStateDriver lxcStateDriver = {
diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c
index b41c41885ebbce9bc51eaeb2c350dbef2d9aec18..57825d5a346a74a60add60f1e9c15395144b463b 100644
--- a/src/opennebula/one_driver.c
+++ b/src/opennebula/one_driver.c
@@ -785,6 +785,7 @@ static virDriver oneDriver = {
     NULL, /* domainIsActive */
     NULL, /* domainIsPersistent */
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 static virStateDriver oneStateDriver = {
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 5c0785781022c562341136f3f3b49ca993af0730..68d03980dbebef6cb0d3338aede50361e0a2e951 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1537,6 +1537,7 @@ static virDriver openvzDriver = {
     openvzDomainIsActive,
     openvzDomainIsPersistent,
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 int openvzRegister(void) {
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index eef1cc7a206511d155854b5130a43dc78e961411..1e8ed3020cc9b12c27540210a75ae0e6190c4386 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1653,6 +1653,7 @@ virDriver phypDriver = {
     NULL,                       /* domainIsActive */
     NULL,                       /* domainIsPersistent */
     NULL,                       /* cpuCompare */
+    NULL,                       /* cpuBaseline */
 };
 
 int
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9ff712cae6b6da2b7405c5e895aa6219dbe80f34..f666d3435df321da03bc89726bcc7f081599e3a2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8587,6 +8587,7 @@ static virDriver qemuDriver = {
     qemuDomainIsActive,
     qemuDomainIsPersistent,
     qemuCPUCompare, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index cc543fc419be289a9510ba3f0d71f49a06b92732..6dc54ece6f4dafc213b87aa6ecb26aeeda618c40 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -8980,6 +8980,7 @@ static virDriver remote_driver = {
     remoteDomainIsActive, /* domainIsActive */
     remoteDomainIsPersistent, /* domainIsPersistent */
     remoteCPUCompare, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 static virNetworkDriver network_driver = {
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d552f032b7d0e522edccc4a4b7a1872ed94411be..e4720efcbf579c117e07983ae90ab23c035387b8 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5242,6 +5242,7 @@ static virDriver testDriver = {
     testDomainIsActive, /* domainIsActive */
     testDomainIsPersistent, /* domainIsPersistent */
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 static virNetworkDriver testNetworkDriver = {
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 541ff9a0beb92e5972e076104609f8d5a2d49052..5049c929191c883880b2dc81c78aaec824efd865 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -1916,6 +1916,7 @@ static virDriver umlDriver = {
     umlDomainIsActive,
     umlDomainIsPersistent,
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 096502125082135821e8adf4e6241baae85ec96a..68dffd2bd75269eba96546189e692b747734c624 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -7060,6 +7060,7 @@ virDriver NAME(Driver) = {
     vboxDomainIsActive,
     vboxDomainIsPersistent,
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 virNetworkDriver NAME(NetworkDriver) = {
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index d5a0d0037befc22fd817fe2004df8305cbce44ca..700682cec7a28da7bc821d085f5f6f5393b7ffc3 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -1903,6 +1903,7 @@ static virDriver xenUnifiedDriver = {
     xenUnifiedDomainIsActive,
     xenUnifiedDomainisPersistent,
     NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
 };
 
 /**