summaryrefslogtreecommitdiff
path: root/vdservice
diff options
context:
space:
mode:
authorArnon Gilboa <agilboa@redhat.com>2010-11-09 20:50:21 +0200
committerArnon Gilboa <agilboa@redhat.com>2010-11-09 20:50:21 +0200
commit35d1b7c835561d44f631e2e1777a13b3573c3ccf (patch)
tree4f934447e133cab5ff910c3d5c13547a35fc0672 /vdservice
parent1e7f9e85a78be3a6d70557de43f968387278bd05 (diff)
Revert "vdservice: don't start when no qxl device present"
This reverts commit 349e6a5bf8804b25c3af6e1f439122a7cc269cc2 which breaks vsdervice on Windows 7
Diffstat (limited to 'vdservice')
-rw-r--r--vdservice/vdservice.cpp31
-rw-r--r--vdservice/vdservice.vcproj4
2 files changed, 2 insertions, 33 deletions
diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp
index 1e63694..ae5ad87 100644
--- a/vdservice/vdservice.cpp
+++ b/vdservice/vdservice.cpp
@@ -140,27 +140,6 @@ int supported_system_version()
return 0;
}
-bool has_qxl_device()
-{
- DISPLAY_DEVICE dev_info;
- bool ret = false;
- DWORD dev_id = 0;
- DWORD qxl_id;
-
- ZeroMemory(&dev_info, sizeof(dev_info));
- dev_info.cb = sizeof(dev_info);
- while (EnumDisplayDevices(NULL, dev_id, &dev_info, 0)) {
- if (wcsstr(dev_info.DeviceString, L"QXL") != NULL
- && get_qxl_device_id(dev_info.DeviceKey, &qxl_id)) {
- vd_printf("found QXL device at id %d, qxl_id %d", dev_id, qxl_id);
- ret = true;
- break;
- }
- dev_id++;
- }
- return ret;
-}
-
VDService::VDService()
: _status_handle (0)
, _vdi_port (NULL)
@@ -359,10 +338,8 @@ VOID WINAPI VDService::main(DWORD argc, TCHAR* argv[])
swprintf_s(log_path, MAX_PATH, VD_SERVICE_LOG_PATH, temp_path);
s->_log = VDLog::get(log_path);
}
-
vd_printf("***Service started***");
log_version();
-
if (!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS)) {
vd_printf("SetPriorityClass failed %u", GetLastError());
}
@@ -392,12 +369,8 @@ VOID WINAPI VDService::main(DWORD argc, TCHAR* argv[])
status->dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(s->_status_handle, status);
- if (has_qxl_device()) {
- s->_running = true;
- s->execute();
- } else {
- vd_printf("didn't find any qxl devices\n");
- }
+ s->_running = true;
+ s->execute();
// service was stopped
status->dwCurrentState = SERVICE_STOP_PENDING;
diff --git a/vdservice/vdservice.vcproj b/vdservice/vdservice.vcproj
index e23d235..32ec7c8 100644
--- a/vdservice/vdservice.vcproj
+++ b/vdservice/vdservice.vcproj
@@ -375,10 +375,6 @@
>
</File>
<File
- RelativePath="..\common\vdcommon.cpp"
- >
- </File>
- <File
RelativePath=".\vdservice.cpp"
>
</File>