66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
|
From 161668ec1a5e6b5cba0136ef50926b5c53802941 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <161668ec1a5e6b5cba0136ef50926b5c53802941@dist-git>
|
||
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Date: Fri, 21 Jun 2019 09:25:04 +0200
|
||
|
|
Subject: [PATCH] qemu_capabilities: Introduce virQEMUCapsGetCPUModelInfo
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This is a simple wrapper around virQEMUCapsGetHostCPUData usable in
|
||
|
|
tests for getting qemuMonitorCPUModelInfoPtr from QEMU caps.
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit 8aa47cc072fb9a3a8e8b15c6509aae648f5c24e0)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1686895
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Message-Id: <4e467c308f24313e69e21c637663f6744482b266.1561068591.git.jdenemar@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_capabilities.c | 10 ++++++++++
|
||
|
|
src/qemu/qemu_capspriv.h | 4 ++++
|
||
|
|
2 files changed, 14 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
||
|
|
index 5a7160d02e..942cbf272d 100644
|
||
|
|
--- a/src/qemu/qemu_capabilities.c
|
||
|
|
+++ b/src/qemu/qemu_capabilities.c
|
||
|
|
@@ -3049,6 +3049,16 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+qemuMonitorCPUModelInfoPtr
|
||
|
|
+virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
||
|
|
+ virDomainVirtType type)
|
||
|
|
+{
|
||
|
|
+ virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
|
||
|
|
+
|
||
|
|
+ return cpuData->info;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+
|
||
|
|
void
|
||
|
|
virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
||
|
|
virDomainVirtType type,
|
||
|
|
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
|
||
|
|
index 70cdbbc504..c3b7f934a9 100644
|
||
|
|
--- a/src/qemu/qemu_capspriv.h
|
||
|
|
+++ b/src/qemu/qemu_capspriv.h
|
||
|
|
@@ -75,6 +75,10 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
|
||
|
|
void
|
||
|
|
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps);
|
||
|
|
|
||
|
|
+qemuMonitorCPUModelInfoPtr
|
||
|
|
+virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
||
|
|
+ virDomainVirtType type);
|
||
|
|
+
|
||
|
|
void
|
||
|
|
virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
||
|
|
virDomainVirtType type,
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|