2 files changed, 72 insertions, 1 deletions

diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
index 534cac89a77d..c1080d9c705d 100644
--- a/include/xen/interface/physdev.h
+++ b/include/xen/interface/physdev.h
@@ -109,6 +109,7 @@ struct physdev_irq {
 #define MAP_PIRQ_TYPE_MSI               0x0
 #define MAP_PIRQ_TYPE_GSI               0x1
 #define MAP_PIRQ_TYPE_UNKNOWN           0x2
+#define MAP_PIRQ_TYPE_MSI_SEG           0x3
 
 #define PHYSDEVOP_map_pirq              13
 struct physdev_map_pirq {
@@ -119,7 +120,7 @@ struct physdev_map_pirq {
     int index;
     /* IN or OUT */
     int pirq;
-    /* IN */
+    /* IN - high 16 bits hold segment for MAP_PIRQ_TYPE_MSI_SEG */
     int bus;
     /* IN */
     int devfn;
@@ -198,6 +199,37 @@ struct physdev_get_free_pirq {
     uint32_t pirq;
 };
 
+#define XEN_PCI_DEV_EXTFN              0x1
+#define XEN_PCI_DEV_VIRTFN             0x2
+#define XEN_PCI_DEV_PXM                0x4
+
+#define PHYSDEVOP_pci_device_add        25
+struct physdev_pci_device_add {
+    /* IN */
+    uint16_t seg;
+    uint8_t bus;
+    uint8_t devfn;
+    uint32_t flags;
+    struct {
+        uint8_t bus;
+        uint8_t devfn;
+    } physfn;
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+    uint32_t optarr[];
+#elif defined(__GNUC__)
+    uint32_t optarr[0];
+#endif
+};
+
+#define PHYSDEVOP_pci_device_remove     26
+#define PHYSDEVOP_restore_msi_ext       27
+struct physdev_pci_device {
+    /* IN */
+    uint16_t seg;
+    uint8_t bus;
+    uint8_t devfn;
+};
+
 /*
  * Notify that some PIRQ-bound event channels have been unmasked.
  * ** This command is obsolete since interface version 0x00030202 and is **
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 70213b4515eb..6acd9cefd517 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -450,6 +450,45 @@ struct start_info {
         int8_t cmd_line[MAX_GUEST_CMDLINE];
 };
 
+struct dom0_vga_console_info {
+        uint8_t video_type;
+#define XEN_VGATYPE_TEXT_MODE_3 0x03
+#define XEN_VGATYPE_VESA_LFB    0x23
+
+        union {
+                struct {
+                        /* Font height, in pixels. */
+                        uint16_t font_height;
+                        /* Cursor location (column, row). */
+                        uint16_t cursor_x, cursor_y;
+                        /* Number of rows and columns (dimensions in characters). */
+                        uint16_t rows, columns;
+                } text_mode_3;
+
+                struct {
+                        /* Width and height, in pixels. */
+                        uint16_t width, height;
+                        /* Bytes per scan line. */
+                        uint16_t bytes_per_line;
+                        /* Bits per pixel. */
+                        uint16_t bits_per_pixel;
+                        /* LFB physical address, and size (in units of 64kB). */
+                        uint32_t lfb_base;
+                        uint32_t lfb_size;
+                        /* RGB mask offsets and sizes, as defined by VBE 1.2+ */
+                        uint8_t  red_pos, red_size;
+                        uint8_t  green_pos, green_size;
+                        uint8_t  blue_pos, blue_size;
+                        uint8_t  rsvd_pos, rsvd_size;
+
+                        /* VESA capabilities (offset 0xa, VESA command 0x4f00). */
+                        uint32_t gbl_caps;
+                        /* Mode attributes (offset 0x0, VESA command 0x4f01). */
+                        uint16_t mode_attrs;
+                } vesa_lfb;
+        } u;
+};
+
 /* These flags are passed in the 'flags' field of start_info_t. */
 #define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
 #define SIF_INITDOMAIN    (1<<1)  /* Is this the initial control domain? */