File 0102-include-revert-part-of-the-linux-he.patch of Package qemu.15021

Overview Repositories Revisions Requests Users Attributes Meta

File 0102-include-revert-part-of-the-linux-he.patch of Package qemu.15021

From: Bruce Rogers <brogers@suse.com>
Date: Wed, 13 Nov 2019 13:48:33 -0700
Subject: include: revert part of the linux header update

It's problematic to include the recent linux header for the
virtio-balloon device because it extends the size of the
virtio_balloon_config structure, which our older qemu code relies on for
determining the virtio-ballon device config size. This change breaks
migration.

Revert this portion of the linux header update to maintain the previous
config size for this device. (bsc#1156642)

Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 include/standard-headers/linux/virtio_balloon.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/standard-headers/linux/virtio_balloon.h b/include/standard-headers/linux/virtio_balloon.h
index 9375ca2a70..4dbb7dc6c0 100644
--- a/include/standard-headers/linux/virtio_balloon.h
+++ b/include/standard-headers/linux/virtio_balloon.h
@@ -34,23 +34,15 @@
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST	0 /* Tell before reclaiming pages */
 #define VIRTIO_BALLOON_F_STATS_VQ	1 /* Memory Stats virtqueue */
 #define VIRTIO_BALLOON_F_DEFLATE_ON_OOM	2 /* Deflate balloon on OOM */
-#define VIRTIO_BALLOON_F_FREE_PAGE_HINT	3 /* VQ to report free pages */
-#define VIRTIO_BALLOON_F_PAGE_POISON	4 /* Guest is using page poisoning */
 
 /* Size of a PFN in the balloon interface. */
 #define VIRTIO_BALLOON_PFN_SHIFT 12
 
-#define VIRTIO_BALLOON_CMD_ID_STOP	0
-#define VIRTIO_BALLOON_CMD_ID_DONE	1
 struct virtio_balloon_config {
 	/* Number of pages host wants Guest to give up. */
 	uint32_t num_pages;
 	/* Number of pages we've actually got in balloon. */
 	uint32_t actual;
-	/* Free page report command id, readonly by guest */
-	uint32_t free_page_report_cmd_id;
-	/* Stores PAGE_POISON if page poisoning is in use */
-	uint32_t poison_val;
 };
 
 #define VIRTIO_BALLOON_S_SWAP_IN  0   /* Amount of memory swapped in */

Places

File 0102-include-revert-part-of-the-linux-he.patch of Package qemu.15021

Places