Skip to content

KVM #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fepitre wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

KVM #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ddf92a
HACK: DONTMERGE: Allow building (not usable) with BACKEND_VMM=kvm
shawnanastasio Feb 6, 2021
137107e
spec: update backend_vmm equal checks
fepitre Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions rpm_spec/gui-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ URL: http://www.qubes-os.org

%define pa_ver_full %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1)
%define pa_ver_major_minor %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1 | cut -d "." -f 1,2)
%define backend_vmm @BACKEND_VMM@

BuildRequires: gcc
BuildRequires: libX11-devel
Expand All @@ -52,7 +53,9 @@ BuildRequires: pam-devel
BuildRequires: qubes-libvchan-devel
BuildRequires: qubes-gui-common-devel >= 4.1.0
BuildRequires: qubes-db-devel
%if "%{?backend_vmm}" == "xen"
BuildRequires: xen-devel
%endif
Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires videodrv)
Requires: libXfixes
Expand Down
4 changes: 2 additions & 2 deletions xf86-video-dummy/src/dummy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "compat-api.h"

#include <xengnttab.h>
//#include <xengnttab.h>
#include "../../xf86-qubes-common/include/xf86-qubes-common.h"

#define DUMMY_MAX_SCREENS 16
Expand Down Expand Up @@ -86,7 +86,7 @@ typedef struct dummyRec
Bool (*CreateWindow)() ; /* wrapped CreateWindow */
Bool prop;

xengntshr_handle *xgs;
//xengntshr_handle *xgs;
uint32_t gui_domid;
} DUMMYRec, *DUMMYPtr;

Expand Down
4 changes: 4 additions & 0 deletions xf86-video-dummy/src/dummy_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
*/

#if 0

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Expand Down Expand Up @@ -1283,3 +1285,5 @@ dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
return FALSE;
}
}

#endif