Skip to contentSkip to conversation

tools/libs: final cleanup removing old mini-os callbacks

PATCH New Juergen Gross 1 participant 4 messages Jan 19, 2022

lore
Share & tools
lore
#0 lore raw

v2 cover tools/libs: final cleanup removing old mini-os callbacks

This is a final patch series removing the library callbacks referenced directly by Mini-OS.

Changes in V2:
- added patch 1
- rebase

Juergen Gross (3):
config: use more recent mini-os commit
tools/libs/evtchn: remove old mini-os callback
tools/libs/gnttab: remove old mini-os callback

 Config.mk                  |  2 +-
 tools/libs/evtchn/minios.c | 11 -----------
 tools/libs/gnttab/minios.c |  9 ---------
 3 files changed, 1 insertion(+), 21 deletions(-)
Signature · 1 line
2.31.1
#3 lore raw

PATCH v2 3/3 tools/libs/gnttab: remove old mini-os callback

It is possible now to delete minios_gnttab_close_fd().

---
V2:
- rebase

---
 tools/libs/gnttab/minios.c | 9 ---------
 1 file changed, 9 deletions(-)
tools/libs/gnttab/minios.c +0 -9
index f59fad3577..cac89f0ba6 100644
@@ -33,8 +33,6 @@
 
 #include "private.h"
 
-void minios_gnttab_close_fd(int fd);
-
 static int gnttab_close_fd(struct file *file)
 {
     gntmap_fini(file->dev);
@@ -89,13 +87,6 @@ int osdep_gnttab_close(xengnttab_handle *xgt)
     return close(xgt->fd);
 }
 
-void minios_gnttab_close_fd(int fd)
-{
-    struct file *file = get_file_from_fd(fd);
-
-    gnttab_close_fd(file);
-}
-
 void *osdep_gnttab_grant_map(xengnttab_handle *xgt,
                              uint32_t count, int flags, int prot,
                              uint32_t *domids, uint32_t *refs,
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/3 config: use more recent mini-os commit

In reply to Juergen Gross

In order to be able to use the recent Mini-OS features switch to the most recent commit.

---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Config.mk +1 -1
index 5c8c737fe4..168273e157 100644
@@ -231,7 +231,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
 QEMU_UPSTREAM_REVISION ?= master
-MINIOS_UPSTREAM_REVISION ?= a91161eb0f92dac4ad6d41f91117268bc23ef28d
+MINIOS_UPSTREAM_REVISION ?= 83ff43bff4bdd6879539fcb2b3d6ba5e61a64135
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
 
Signature · 1 line
2.31.1
#2 lore raw

PATCH v2 2/3 tools/libs/evtchn: remove old mini-os callback

In reply to Juergen Gross

It is possible now to delete minios_evtchn_close_fd() and the extern declaration of event_queue.

---
V2:
- rebase

---
 tools/libs/evtchn/minios.c | 11 -----------
 1 file changed, 11 deletions(-)
tools/libs/evtchn/minios.c +0 -11
index ee3da9f8fe..30f98bc7e4 100644
@@ -47,10 +47,6 @@ struct port_info {
     bool bound;
 };
 
-extern struct wait_queue_head event_queue;
-
-void minios_evtchn_close_fd(int fd);
-
 /* XXX Note: This is not threadsafe */
 static struct port_info *port_alloc(xenevtchn_handle *xce)
 {
@@ -152,13 +148,6 @@ int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid)
     return -1;
 }
 
-void minios_evtchn_close_fd(int fd)
-{
-    struct file *file = get_file_from_fd(fd);
-
-    evtchn_close_fd(file);
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int ret;
Signature · 1 line
2.31.1