pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 682298 from home:jfehlig:branches:Virtualization

Browse Source 
- qemu: s390: show correct CPU status after guest crash
  0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch
  bsc#1127841

OBS-URL: https://build.opensuse.org/request/show/682298
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=736
This commit is contained in:
James Fehlig 2019-03-06 22:27:20 +00:00 committed by Git OBS Bridge
parent c50e323c11
commit 88680c1000
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch Normal file
View File

@ -0,0 +1,40 @@
From 85001fd799deb33338aed627b3c3a6870cb70d2d Mon Sep 17 00:00:00 2001
From: Viktor Mihajlovski <mihajlov@linux.ibm.com>
Date: Fri, 1 Mar 2019 11:29:51 +0100
Subject: [PATCH] qemu: Fix query-cpus-fast target architecture detection
Since qemu 2.13 reports the target architecture in a property called
'target' additionally to the property 'arch', that has been used in
qemu 2.12 in the response data of 'query-cpus-fast'.
Libvirts monitor code prefers the 'target' property over 'arch'.
At least for s390(x), target is reported as 's390x' while arch is 's390'.
In a later step a comparison is performed against 's390' which fails for
qemu 2.13 and later.
In consequence the architecture specific data for s390 won't be extracted
from the returned data, leading to incorrect values being reported by
virsh domstats --vcpu.
Changing to check explicitly for 's390' and 's390x'.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
---
src/qemu/qemu_monitor_json.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libvirt-5.1.0/src/qemu/qemu_monitor_json.c
===================================================================
--- libvirt-5.1.0.orig/src/qemu/qemu_monitor_json.c
+++ libvirt-5.1.0/src/qemu/qemu_monitor_json.c
@@ -1772,7 +1772,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONVal
goto cleanup;
/* process optional architecture-specific data */
- if (STREQ_NULLABLE(arch, "s390"))
+ if (STREQ_NULLABLE(arch, "s390") || STREQ_NULLABLE(arch, "s390x"))
qemuMonitorJSONExtractCPUS390Info(entry, cpus + i);
}

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 6 20:34:53 UTC 2019 - James Fehlig <jfehlig@suse.com>
- qemu: s390: show correct CPU status after guest crash
0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch
bsc#1127841
-------------------------------------------------------------------
Wed Mar 6 17:11:49 UTC 2019 - James Fehlig <jfehlig@suse.com>

2
libvirt.spec
View File

@ -338,6 +338,7 @@ Patch0: 4ec3cf9a-apparmor-rules.patch
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
Patch102: 0001-apparmor-Check-libvirtd-profile-status-by-name.patch
Patch103: 0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch
# Need to go upstream
Patch150: xen-pv-cdrom.patch
Patch151: blockcopy-check-dst-identical-device.patch
@ -872,6 +873,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1