From f2ed1a2c937aaa54d1cc98b00841943d48ce41ea Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 26 Mar 2024 18:31:47 -0600 Subject: qemu: Remove versions older then 8.1, no longer compatible Versions older then 8.1 are no longer compatible with the runqemu. Signed-off-by: Mark Hatle --- ...ove-x86-specific-fields-out-of-XenIOState.patch | 180 --------------------- 1 file changed, 180 deletions(-) delete mode 100644 meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch (limited to 'meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch') diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch deleted file mode 100644 index 4337e0c8..00000000 --- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 2a01fa06d267f68148d3a6df50675edfe090601a Mon Sep 17 00:00:00 2001 -From: Stefano Stabellini -Date: Fri, 1 Jul 2022 18:16:52 -0700 -Subject: [PATCH 04/16] xen-hvm: move x86-specific fields out of XenIOState - -Move: -- shared_vmport_page -- log_for_dirtybit -- dirty_bitmap -- suspend -- wakeup - -out of XenIOState as they are only used on x86, especially the ones -related to dirty logging. - -Remove free_phys_offset that was unused. - -Signed-off-by: Stefano Stabellini ---- - hw/i386/xen/xen-hvm.c | 58 ++++++++++++++++++++----------------------- - 1 file changed, 27 insertions(+), 31 deletions(-) - -diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c -index b27484ad22..225cfdf8b7 100644 ---- a/hw/i386/xen/xen-hvm.c -+++ b/hw/i386/xen/xen-hvm.c -@@ -73,6 +73,7 @@ struct shared_vmport_iopage { - }; - typedef struct shared_vmport_iopage shared_vmport_iopage_t; - #endif -+static shared_vmport_iopage_t *shared_vmport_page; - - static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i) - { -@@ -95,6 +96,11 @@ typedef struct XenPhysmap { - } XenPhysmap; - - static QLIST_HEAD(, XenPhysmap) xen_physmap; -+static const XenPhysmap *log_for_dirtybit = NULL; -+/* Buffer used by xen_sync_dirty_bitmap */ -+static unsigned long *dirty_bitmap = NULL; -+static Notifier suspend; -+static Notifier wakeup; - - typedef struct XenPciDevice { - PCIDevice *pci_dev; -@@ -105,7 +111,6 @@ typedef struct XenPciDevice { - typedef struct XenIOState { - ioservid_t ioservid; - shared_iopage_t *shared_page; -- shared_vmport_iopage_t *shared_vmport_page; - buffered_iopage_t *buffered_io_page; - xenforeignmemory_resource_handle *fres; - QEMUTimer *buffered_io_timer; -@@ -125,14 +130,8 @@ typedef struct XenIOState { - MemoryListener io_listener; - QLIST_HEAD(, XenPciDevice) dev_list; - DeviceListener device_listener; -- hwaddr free_phys_offset; -- const XenPhysmap *log_for_dirtybit; -- /* Buffer used by xen_sync_dirty_bitmap */ -- unsigned long *dirty_bitmap; - - Notifier exit; -- Notifier suspend; -- Notifier wakeup; - } XenIOState; - - /* Xen specific function for piix pci */ -@@ -462,10 +461,10 @@ static int xen_remove_from_physmap(XenIOState *state, - } - - QLIST_REMOVE(physmap, list); -- if (state->log_for_dirtybit == physmap) { -- state->log_for_dirtybit = NULL; -- g_free(state->dirty_bitmap); -- state->dirty_bitmap = NULL; -+ if (log_for_dirtybit == physmap) { -+ log_for_dirtybit = NULL; -+ g_free(dirty_bitmap); -+ dirty_bitmap = NULL; - } - g_free(physmap); - -@@ -626,16 +625,16 @@ static void xen_sync_dirty_bitmap(XenIOState *state, - return; - } - -- if (state->log_for_dirtybit == NULL) { -- state->log_for_dirtybit = physmap; -- state->dirty_bitmap = g_new(unsigned long, bitmap_size); -- } else if (state->log_for_dirtybit != physmap) { -+ if (log_for_dirtybit == NULL) { -+ log_for_dirtybit = physmap; -+ dirty_bitmap = g_new(unsigned long, bitmap_size); -+ } else if (log_for_dirtybit != physmap) { - /* Only one range for dirty bitmap can be tracked. */ - return; - } - - rc = xen_track_dirty_vram(xen_domid, start_addr >> TARGET_PAGE_BITS, -- npages, state->dirty_bitmap); -+ npages, dirty_bitmap); - if (rc < 0) { - #ifndef ENODATA - #define ENODATA ENOENT -@@ -650,7 +649,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state, - } - - for (i = 0; i < bitmap_size; i++) { -- unsigned long map = state->dirty_bitmap[i]; -+ unsigned long map = dirty_bitmap[i]; - while (map != 0) { - j = ctzl(map); - map &= ~(1ul << j); -@@ -676,12 +675,10 @@ static void xen_log_start(MemoryListener *listener, - static void xen_log_stop(MemoryListener *listener, MemoryRegionSection *section, - int old, int new) - { -- XenIOState *state = container_of(listener, XenIOState, memory_listener); -- - if (old & ~new & (1 << DIRTY_MEMORY_VGA)) { -- state->log_for_dirtybit = NULL; -- g_free(state->dirty_bitmap); -- state->dirty_bitmap = NULL; -+ log_for_dirtybit = NULL; -+ g_free(dirty_bitmap); -+ dirty_bitmap = NULL; - /* Disable dirty bit tracking */ - xen_track_dirty_vram(xen_domid, 0, 0, NULL); - } -@@ -1021,9 +1018,9 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) - { - vmware_regs_t *vmport_regs; - -- assert(state->shared_vmport_page); -+ assert(shared_vmport_page); - vmport_regs = -- &state->shared_vmport_page->vcpu_vmport_regs[state->send_vcpu]; -+ &shared_vmport_page->vcpu_vmport_regs[state->send_vcpu]; - QEMU_BUILD_BUG_ON(sizeof(*req) < sizeof(*vmport_regs)); - - current_cpu = state->cpu_by_vcpu_id[state->send_vcpu]; -@@ -1468,7 +1465,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) - - state->memory_listener = xen_memory_listener; - memory_listener_register(&state->memory_listener, &address_space_memory); -- state->log_for_dirtybit = NULL; - - state->io_listener = xen_io_listener; - memory_listener_register(&state->io_listener, &address_space_io); -@@ -1489,19 +1485,19 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) - QLIST_INIT(&xen_physmap); - xen_read_physmap(state); - -- state->suspend.notify = xen_suspend_notifier; -- qemu_register_suspend_notifier(&state->suspend); -+ suspend.notify = xen_suspend_notifier; -+ qemu_register_suspend_notifier(&suspend); - -- state->wakeup.notify = xen_wakeup_notifier; -- qemu_register_wakeup_notifier(&state->wakeup); -+ wakeup.notify = xen_wakeup_notifier; -+ qemu_register_wakeup_notifier(&wakeup); - - rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn); - if (!rc) { - DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn); -- state->shared_vmport_page = -+ shared_vmport_page = - xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE, - 1, &ioreq_pfn, NULL); -- if (state->shared_vmport_page == NULL) { -+ if (shared_vmport_page == NULL) { - error_report("map shared vmport IO page returned error %d handle=%p", - errno, xen_xc); - goto err; --- -2.17.1 - -- cgit v1.2.3-54-g00ecf