April 2019 - Wine-devel - list.winehq.org

[PATCH] ntoskrnl:improve stub for MmAllocateContiguousMemorySpecifyCache
by Louis Lenders 01 Apr '19

01 Apr '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46760 This let`s Nox player run tiny bit further to run into another unimplemented function ..... Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 77a610d7db..67e8bd38b9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2665,8 +2665,24 @@ PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size, PHYSICAL_ADDRESS BoundaryAddressMultiple, MEMORY_CACHING_TYPE CacheType ) { - FIXME(": stub\n"); - return NULL; + DWORD protect; + + FIXME( "%lu, %s %s %s %d stub\n", size, wine_dbgstr_longlong(lowest_valid_address.QuadPart), + wine_dbgstr_longlong(highest_valid_address.QuadPart), + wine_dbgstr_longlong(BoundaryAddressMultiple.QuadPart), CacheType ); + + protect = PAGE_READWRITE; + + switch( CacheType ) + { + case MmNonCached: + protect |= PAGE_NOCACHE; + break; + default: + break; + } + + return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, protect ); } /*********************************************************************** -- 2.20.1

1 0

[PATCH] taskmgr: Use system font instead of special bitmap font.
by Vijay Kiran Kamuju 01 Apr '19

01 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/taskmgr/font.bmp | Bin 646 -> 0 bytes programs/taskmgr/graph.c | 14 ++++++++++++-- programs/taskmgr/resource.h | 1 - programs/taskmgr/taskmgr.c | 29 ----------------------------- programs/taskmgr/taskmgr.rc | 3 --- 5 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 programs/taskmgr/font.bmp diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp deleted file mode 100644 index c1f8410c93273f4bc7013014561c35ef84faa182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcma)(!4U#62u0EH6fcfdSci9eun5QVo~(m&sz_(+`>@G4J060-haZBlxj#Nf3wh&j z*b_Tr2Rq(a)-E}XxvX+aFPn4z{T33x(lt${jNLv39ZVf;klYOQWo0y8!j?qiD3aA3(K zIq{C$VS%n9(V2QTr);{O_DntBpT=8p%%lCvw&%ZnE9Lyb=%2T9J{pLZxOXEEt2{0S rj&qR`_imbB3(wY5`TKp;OQ!n~kRUw=3;lV4-TOj~_w9QN#T)VkBip4W diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index e6819cfbb4..7e978e16f7 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph @@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cd43f156e9..4153f66c32 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -35,7 +35,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b99d238814..d3337d2960 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); } -void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT)); - hOldBitmap = SelectObject(hFontDC, hFontBitmap); - - for (i = 0; lpwszText[i]; i++) { - if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpwszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpwszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - static BOOL OnCreate(HWND hWnd) { HMENU hMenu; diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index e6742a7544..ffd0699f80 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -609,6 +609,3 @@ IDB_TRAYMASK BITMAP traymask.bmp /* @makedep: trayicon.bmp */ IDB_TRAYICON BITMAP trayicon.bmp - -/* @makedep: font.bmp */ -IDB_FONT BITMAP font.bmp -- 2.21.0

1 0

[PATCH] shlwapi: SHMapHandle should not set error when NULL is passed as hShared.
by Vijay Kiran Kamuju 01 Apr '19

01 Apr '19

From: Sebastian Lackner <sebastian(a)fds-team.de> From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shlwapi/ordinal.c | 6 ++++++ dlls/shlwapi/tests/ordinal.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 4118d4b308..657c33fffa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -97,6 +97,12 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); + if (!hShared) + { + TRACE("Returning handle NULL\n"); + return NULL; + } + /* Get dest process handle */ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 97e4606443..6781b09432 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -556,7 +556,6 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) SetLastError(0xdeadbeef); hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); ok(hmem2 == NULL, "expected NULL, got new handle\n"); -todo_wine ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); -- 2.21.0

1 0

Re: TestBot job 50182 results: [PATCH 1/2] kernel32: Partially implement VirtualAllocExNuma
by Fabian Maurer 01 Apr '19

01 Apr '19

This is unrelated since I didn't touch the tests, or code that the tests used. PS: Still don't know why the PATCH is marked as OK on https:// source.winehq.org/patches/, when the testbot says it failed. Regards, Fabian Maurer > VM Status Failures Command > debian9 failed 2 > debian9 failed 2 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=50182 > > > === debian9 (32 bit report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit Chinese:China report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebd785d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90502 bytes) > > === debian9 (64 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 64-bit code > (0x00007f9902d9e8a1). > > Report errors: > kernel32:virtual prints too much data (87157 bytes)

2 1

[PATCH] virtdisk: Add stub for OpenVirtualDisk
by Vijay Kiran Kamuju 01 Apr '19

01 Apr '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 7 ++++++ include/virtdisk.h | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 6bd5f146db..f35b8df524 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -15,7 +15,7 @@ @ stub GetVirtualDiskPhysicalPath @ stub MergeVirtualDisk @ stub MirrorVirtualDisk -@ stub OpenVirtualDisk +@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr) @ stub ResizeVirtualDisk @ stub SetVirtualDiskInformation @ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 3e6c5c14dc..1523fd42a4 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -65,3 +65,10 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ return ERROR_SUCCESS; } + +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle) +{ + FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index b4c07f3b69..7c207dd879 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -37,6 +37,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 } ATTACH_VIRTUAL_DISK_FLAG; +typedef enum _OPEN_VIRTUAL_DISK_FLAG { + OPEN_VIRTUAL_DISK_FLAG_NONE = 0x00, + OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS = 0x01, + OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE = 0x02, + OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE = 0x04, + OPEN_VIRTUAL_DISK_FLAG_CACHED_IO = 0x08, + OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN = 0x10, + OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO = 0x20, + OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY = 0x40, + OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80, + OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING = 0x100 +} OPEN_VIRTUAL_DISK_FLAG; + +typedef enum _OPEN_VIRTUAL_DISK_VERSION { + OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED, + OPEN_VIRTUAL_DISK_VERSION_1, + OPEN_VIRTUAL_DISK_VERSION_2, + OPEN_VIRTUAL_DISK_VERSION_3 +} OPEN_VIRTUAL_DISK_VERSION; + typedef enum _ATTACH_VIRTUAL_DISK_VERSION { ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, ATTACH_VIRTUAL_DISK_VERSION_1 @@ -156,6 +176,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { } DUMMYUNIONNAME; } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; +typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS +{ + OPEN_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG RWDepth; + } Version1; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + } Version2; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + GUID SnapshotId; + } Version3; + } DUMMYUNIONNAME; +} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS; + typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 { DEPENDENT_DISK_FLAG DependencyTypeFlags; @@ -196,6 +237,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS { DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle); + #ifdef __cplusplus } #endif -- 2.21.0

1 0

[PATCH 1/8] rpcrt4: Detect enums and aliases in get_base_type().
by Zebediah Figura 01 Apr '19

01 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_typelib.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 8a08ad9918..d8c429ba11 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -106,9 +106,13 @@ static unsigned short write_oleaut_tfs(VARTYPE vt) return 0; } -static unsigned char get_base_type(VARTYPE vt) +static unsigned char get_basetype(ITypeInfo *typeinfo, TYPEDESC *desc) { - switch (vt) + ITypeInfo *refinfo; + unsigned char ret; + TYPEATTR *attr; + + switch (desc->vt) { case VT_I1: return FC_SMALL; case VT_BOOL: @@ -126,6 +130,18 @@ static unsigned char get_base_type(VARTYPE vt) case VT_R4: return FC_FLOAT; case VT_DATE: case VT_R8: return FC_DOUBLE; + case VT_USERDEFINED: + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + if (attr->typekind == TKIND_ENUM) + ret = FC_ENUM32; + else if (attr->typekind == TKIND_ALIAS) + ret = get_basetype(refinfo, &attr->tdescAlias); + else + ret = 0; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + return ret; default: return 0; } } @@ -210,7 +226,7 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) fc = FC_BOGUS_STRUCT; break; default: - if (!get_base_type(vt)) + if (!get_basetype(typeinfo, &desc->elemdescVar.tdesc)) { FIXME("unhandled type %u\n", vt); fc = FC_BOGUS_STRUCT; @@ -226,7 +242,7 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) { - if (get_base_type(desc->vt)) + if (get_basetype(typeinfo, desc)) return FC_LGFARRAY; else if (desc->vt == VT_USERDEFINED) { @@ -283,7 +299,7 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, if (fc != FC_LGFARRAY) FIXME("complex arrays not implemented\n"); - if (!(basetype = get_base_type(desc->tdescElem.vt))) + if (!(basetype = get_basetype(typeinfo, &desc->tdescElem))) ref = write_type_tfs(typeinfo, str, len, &desc->tdescElem, FALSE, FALSE); /* In theory arrays should be nested, but there's no reason not to marshal @@ -401,7 +417,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); } - else if ((basetype = get_base_type(desc->vt))) + else if ((basetype = get_basetype(typeinfo, desc))) { assert(!toplevel); /* toplevel base-type pointers should use IsSimpleRef */ WRITE_CHAR(str, *len, FC_UP); @@ -466,7 +482,7 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, break; default: /* base types are always embedded directly */ - assert(!get_base_type(desc->vt)); + assert(!get_basetype(typeinfo, desc)); FIXME("unhandled type %u\n", desc->vt); off = *len; WRITE_SHORT(str, *len, 0); @@ -584,7 +600,7 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int *tfs_tdesc = tdesc; if (!is_in && is_out) *server_size = type_memsize(typeinfo, tdesc); - if ((*basetype = get_base_type(tdesc->vt))) + if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; break; } @@ -662,7 +678,7 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, ITypeInfo_Release(refinfo); break; default: - if ((*basetype = get_base_type(tdesc->vt))) + if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; else { @@ -749,7 +765,7 @@ static void write_proc_func_header(ITypeInfo *typeinfo, FUNCDESC *desc, WRITE_SHORT(proc, *proclen, 0); /* NotifyIndex */ for (param_idx = 0; param_idx < desc->cParams && param_idx < 3; param_idx++) { - basetype = get_base_type(desc->lprgelemdescParam[param_idx].tdesc.vt); + basetype = get_basetype(typeinfo, &desc->lprgelemdescParam[param_idx].tdesc); if (basetype == FC_FLOAT) float_mask |= (1 << ((param_idx + 1) * 2)); else if (basetype == FC_DOUBLE) -- 2.20.1

1 7

[PATCH] include: Wrap D3DX10 functions in extern "C".
by Alistair Leslie-Hughes 01 Apr '19

01 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d3dx10core.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index c99ab82..afd77e9 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -65,6 +65,9 @@ interface ID3DX10ThreadPump : IUnknown HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); } +cpp_quote("#ifdef __cplusplus") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") @@ -72,3 +75,6 @@ cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);") +cpp_quote("#ifdef __cplusplus") +cpp_quote("}") +cpp_quote("#endif") -- 1.9.1

1 0

[PATCH v2] setupapi: Also check devices not in the set when using DICD_GENERATE_ID.
by Zebediah Figura 01 Apr '19

01 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6acee0aa54..8e616e0281 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1543,6 +1543,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const HKEY enum_hkey; HKEY instance_hkey; struct device *device; + LONG l; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", devinfo, debugstr_w(name), debugstr_guid(class), debugstr_w(description), @@ -1570,8 +1571,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } if ((flags & DICD_GENERATE_ID)) { - static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - int instance_id, highest_id = -1; + static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','u',0}; + unsigned int instance_id; if (strchrW(name, '\\')) { @@ -1579,25 +1580,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) + for (instance_id = 0; ; ++instance_id) { - const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); - WCHAR *endptr; - - if (instance_str) - instance_str++; - else - instance_str = device->instanceId; - - instance_id = strtoulW(instance_str, &endptr, 10); - if (*instance_str && !*endptr) - highest_id = max(highest_id, instance_id); - } + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, instance_id) == -1) + { + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; + } - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) - { - SetLastError(ERROR_INVALID_DEVINST_NAME); - return FALSE; + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!(l = RegOpenKeyExW(enum_hkey, id, 0, KEY_READ, &instance_hkey))) + RegCloseKey(instance_hkey); + if (l == ERROR_FILE_NOT_FOUND) + break; + RegCloseKey(enum_hkey); } } else -- 2.20.1

1 0

[PATCH] setupapi: Also check devices not in the set when using DICD_GENERATE_ID.
by Zebediah Figura 01 Apr '19

01 Apr '19

See also 1fa7782c080e5d4719bb230110992a0705f9b224. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6acee0aa54..1d091640f1 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1543,6 +1543,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const HKEY enum_hkey; HKEY instance_hkey; struct device *device; + LONG l; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", devinfo, debugstr_w(name), debugstr_guid(class), debugstr_w(description), @@ -1570,8 +1571,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } if ((flags & DICD_GENERATE_ID)) { - static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - int instance_id, highest_id = -1; + static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','u',0}; + unsigned int instance_id; if (strchrW(name, '\\')) { @@ -1579,25 +1580,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) + for (instance_id = 0; ; ++instance_id) { - const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); - WCHAR *endptr; - - if (instance_str) - instance_str++; - else - instance_str = device->instanceId; - - instance_id = strtoulW(instance_str, &endptr, 10); - if (*instance_str && !*endptr) - highest_id = max(highest_id, instance_id); - } + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, instance_id) == -1) + { + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; + } - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) - { - SetLastError(ERROR_INVALID_DEVINST_NAME); - return FALSE; + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!(l = RegOpenKeyExW(enum_hkey, name, 0, KEY_READ, &instance_hkey))) + RegCloseKey(instance_hkey); + if (l == ERROR_FILE_NOT_FOUND) + break; + RegCloseKey(enum_hkey); } } else -- 2.20.1

2 1

[PATCH] testbot/RestoreVM: A script to restore a Libirt/QEmu VM.
by Francois Gouget 01 Apr '19

01 Apr '19

This allows restoring a VM from either a borg repository (potentially remote), a set of compressed tar files or a directory created by the --extract-only option. RestoreVM automatically waits for the VM to not be in use before restoring it, and minimises the time it takes to perform the final step. RestoreVM --disk-only verifies that none of the Libvirt configuration files changed and then only replaces the disks. This can be useful to remove accumulated cruft from the qcow2 image files. The VM can be renamed during restoration, in which case its uuid and MAC address are also modified to avoid conflicts (but the guest configuration such as hostname and IP address must be changed manually). With --extract-only RestoreVM will just extract the files to a temporary directory and show the commands to use to manually put them into place. The --extract-only option can be combined with renaming the VM and the directory will contain both sets of Libvirt configuration files which allows comparing and verifying them. In case of an error (such as if the VM is running and does not stop within the imparted time) RestoreVM automatically switches to the --extract-only mode. This allows continuing the restoration by passing that directory as an argument once the issue has been resolved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 711 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 711 insertions(+) create mode 100755 testbot/scripts/RestoreVM diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM new file mode 100755 index 00000000..a31f3ea7 --- /dev/null +++ b/testbot/scripts/RestoreVM @@ -0,0 +1,711 @@ +#!/bin/sh +# +# Restores a QEMU/LibVirt VM from backup. +# +# Copyright 2013-2019 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +name0=`basename "$0"` + +etcdir="etc/libvirt/qemu" +snapdir="var/lib/libvirt/qemu/snapshot" +imgdir="var/lib/libvirt/images" + + +# +# Generic helpers +# + +error() +{ + echo "$name0:error:" "$@" >&2 +} + +warning() +{ + echo "$name0:warning:" "$@" >&2 +} + +opt_dry_run="" +opt_verbose="" +dry_run() +{ + # Redirect to stderr to avoid issues with stdout redirects + [ -n "$opt_verbose$opt_dry_run" ] && echo "$@" >&2 + if [ -z "$opt_dry_run" ] + then + "$@" + fi +} + + +# +# Process the command line +# + +check_opt_val() +{ + option="$1" + var="$2" + argc="$3" + + if [ -n "$var" ] + then + error "$option can only be specified once" + usage=2 # but continue processing options + fi + if [ $argc -eq 0 ] + then + error "missing value for $option" + usage=2 + return 1 + fi + return 0 +} + +opt_borg="" +opt_tar="" +opt_src="" +opt_vm="" +opt_disk_only="" +opt_extract_only="" +opt_dir="" +usage="" +while [ $# -gt 0 ] +do + arg="$1" + shift + case "$arg" in + --as) + if check_opt_val "$arg" "$opt_vm" $# + then + opt_vm="$1" + shift + fi + ;; + --disk-only) + opt_disk_only="1" + ;; + --extract-only) + opt_extract_only="1" + ;; + --dir) + if check_opt_val "$arg" "$opt_dir" $# + then + opt_dir="$1" + shift + fi + ;; + --verbose) + opt_verbose="1" + ;; + --dry-run) + opt_dry_run="1" + ;; + -\?|-h|--help) + usage=0 + ;; + -*) + error "unknown option '$arg'" + usage=2 + break + ;; + *::*) + if [ -n "$opt_src" ] + then + error "only one backup can be specified." + usage=2 + fi + opt_src="$arg" + opt_borg="$opt_src" + ;; + *.bz2*) + if [ -n "$opt_src" ] + then + error "only one backup can be specified." + usage=2 + fi + opt_src="$arg" + opt_tar="$opt_src" + ;; + *) + if [ -n "$opt_src" ] + then + error "only one backup can be specified." + usage=2 + fi + opt_src="$arg" + [ -f "$opt_src" ] && opt_tar="$opt_src" + ;; + esac +done + +if [ -z "$usage" ] +then + if [ -z "$opt_extract_only" ] + then + if [ ! -d "/$etcdir" -o ! -w "/$etcdir" -o \ + ! -d "/$snapdir" -o ! -w "/$snapdir" -o \ + ! -d "/$imgdir" -o ! -w "/$imgdir" ] + then + error "one or more libvirt directory is missing or not writable. Use --extract-only to extract the VM in the current directory." + usage=2 + fi + fi + + if [ -n "$opt_borg" ] + then + opt_src="" + case "$opt_borg" in + *:/*) ;; # Remote repository + /*) ;; # Absolute path + *) opt_borg="`pwd`/$opt_borg" ;; + esac + + elif [ -n "$opt_tar" ] + then + opt_src="" + opt_tar=`echo $opt_tar | sed -e 's/\.[0-9]*$//'` + if [ -f "$opt_tar.00" ] + then + opt_tar="$opt_tar.??" + elif [ ! -f "$opt_tar" ] + then + error "could not find the '$opt_tar' files" + usage=2 + fi + case "$opt_tar" in + *\ *) + error "the backup filenames must not contain spaces." + usage=2 + ;; + /*) ;; + *) opt_tar="`pwd`/$opt_tar" ;; + esac + + elif [ -n "$opt_src" ] + then + if [ ! -f "$opt_src/$name0.vm" ] + then + error "'$opt_src' is not a valid $name0 --extract-only directory" + usage=2 + fi + + else + error "you must specify a backup to restore." + usage=2 + fi + if [ -n "$opt_disk_only" -a -n "$opt_extract_only" ] + then + error "--disk-only and --extract-only are mutually exclusive" + usage=2 + elif [ -n "$opt_disk_only" -a -n "$opt_vm" ] && + ! virsh --connect "$opt_connect" domstate "$opt_vm" >/dev/null + then + error "cannot replace the disk of the non-existent '$opt_vm' VM" + usage=2 + fi + [ -n "$opt_connect" ] || opt_connect="qemu:///system" +fi + +if [ -n "$usage" ] +then + if [ "$usage" != "0" ] + then + error "try '$name0 --help' for more information" + exit $usage + fi + cat <<EOF +Usage: $name0 [--as VMNAME] [--disk-only] [--extract-only] [--dir DIR] + [--connect URI] [--dry-run] [--verbose] [--help] + BORG|TAR|EXTRACTDIR + +Restores a VM from the specified backup files. +This must be run as root on the VM host. + +Where: + BORG The borg repository::archive containing the VM backup. + TAR The stem of the files containing the VM backup. + EXTRACTDIR A directory created by $name0 --extract-only. + --as VMNAME Rename the VM when restoring it. Note that this also changes its + UUID, MAC address, etc so it can be used side-by-side with the + original VM. + --disk-only Only replace the disk images. Note that this will fail if the + backup VM settings and snapshots differ from the existing VM. + --extract-only Extract the VM and check if it matches the existing VM, but + do not replace it. This leaves the files around for further + inspection. + --dir DIR Extract the VM files in the specified directory. + --connect URI Connect to the specified Libvirt server. + --verbose Show all the commands as they are being run. + --dry-run Show what would happen but do not extract or change anything. + --help, -h Shows this help message. +EOF + exit 0 +fi + + +# +# Create the temporary directory +# + +tmpdir="" + +cleanup() +{ + cd / + if [ -z "$opt_dry_run" -a -n "$tmpdir" ] + then + if [ -z "$opt_extract_only" -a -f "$tmpdir/$name0.vm" ] + then + rm -rf "$tmpdir" + elif [ -d "$tmpdir" ] && ! rmdir "$tmpdir" 2>/dev/null + then + echo "not deleting '$tmpdir'" + fi + fi +} + +fatal() +{ + error "$@" + cleanup + exit 1 +} + +fatal_no_cleanup() +{ + [ $# -gt 0 ] && error "$@" + echo "the VM files are in '$tmpdir'" + exit 1 +} + +get_vm_disk_images() +{ + _root="$1" + _vm="$2" + sed -e "s~^ *<source file='$[^']*$' */> *\$~\\1~" -e t -e d "$_root$etcdir/$_vm.xml" "$_root$snapdir/$_vm"/*.xml | sort | uniq +} + +get_symlink_closure() +{ + while read file + do + echo "$file" + while [ -h "$file" ] + do + target=`readlink "$file"` + case "$target" in + /*) file="$target" ;; + *) file=`dirname "$file"`"/$target" ;; + esac + echo "$file" + done + done +} + +get_file_sizes() +{ + while read file + do + du -k "$file" + done +} + +if [ -n "$opt_src" ] +then + tmpdir="$opt_src" +else + if [ -z "$opt_dir" ] + then + if [ -z "$opt_extract_only" ] + then + # Extract the temporary files in the same directory as the biggest + # disk image to speed up the final move. This also avoids getting + # waylaid by the symbolic links. + img=`get_vm_disk_images "/" "$vm" 2>/dev/null | get_symlink_closure | sort | uniq | get_file_sizes | sort -n -r | cut -f2 | head -n 1` + if [ -n "$img" -a -f "$img" -a -w "$img" ] + then + opt_dir=`dirname "$img"` + else + opt_dir="/$imgdir" + fi + else + opt_dir=`pwd` + fi + fi + if [ -n "$opt_borg" ] + then + tmpdir=`echo "$opt_borg" | sed -e 's/^.*:://'` + else + tmpdir=`basename "$opt_tar" | sed -e 's~\.tar\.\?[^/]*$~~'` + fi + tmpdir="$opt_dir/$tmpdir" + [ -n "$opt_extract_only" ] || tmpdir="$tmpdir.$$" + if [ -d "$tmpdir" ] + then + fatal_no_cleanup "'$tmpdir' already exists. Please clean up!" + fi + dry_run mkdir "$tmpdir" || fatal_no_cleanup "could not create the '$tmpdir' directory" +fi + +# $tmpdir must be an absolute path for the cleanup +case "$tmpdir" in +/*) ;; # Absolute path +*) tmpdir="`pwd`/$tmpdir" ;; +esac +if [ -z "$opt_dry_run" -o -d "$tmpdir" ] +then + cd "$tmpdir" || fatal "could not chdir to '$tmpdir'" +else + dry_run cd "$tmpdir" +fi + + +# +# Extract the VM +# + +nice="" +which ionice >/dev/null && nice="ionice" +which nice >/dev/null && nice="nice $nice" + +vm="" +if [ -n "$opt_borg" ] +then + borg_opts="" + [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" + dry_run $nice borg extract --sparse $borg_opts "$opt_borg" + rc_borg=$? + if [ $rc_borg -ne 0 ] + then + fatal "an error occurred while extracting the VM (borg=$rc_borg)" + fi +elif [ -n "$opt_tar" ] +then + zipcmd=pbzip2 + which pbzip2 >/dev/null || zipcmd=bzip2 + tar_opts="" + [ -n "$opt_verbose" ] && tar_opts="-v" + if [ -n "$opt_verbose$opt_dry_run" ] + then + echo "$nice cat $opt_tar | $nice $zipcmd -c -d | $nice tar xf - $tar_opts" + fi + + if [ -n "$opt_dry_run" ] + then + rc_tar=0 + rc_zip=0 + rc_cat=0 + else + ($nice cat $opt_tar; echo $? >"$tmpdir/rc_cat") | \ + ($nice $zipcmd -c -d; echo $? >"$tmpdir/rc_zip") | \ + $nice tar xf - $tar_opts + rc_tar=$? + rc_zip=`cat "$tmpdir/rc_zip"` + rc_cat=`cat "$tmpdir/rc_cat"` + fi + if [ "$rc_cat" != "0" -o "$rc_zip" != "0" -o "$rc_tar" != "0" ] + then + fatal "an error occurred while extracting the VM (cat=$rc_cat zip=$rc_zip tar=$rc_tar)" + fi +else + vm=`cat "$tmpdir/$name0.vm"` +fi + +if [ ! -d "$tmpdir" ] +then + vm="dry-run-vm" # dry-run mode +elif [ -z "$vm" ] +then + for conffile in "$etcdir"/*.xml + do + conffile=`basename "$conffile" .xml` + if [ -z "$vm" ] + then + vm="$conffile" + else + fatal_no_cleanup "found more than one VM in the backup: $vm and $conffile" + fi + done + [ -z "$opt_dry_run" ] && echo "$vm" >"$tmpdir/$name0.vm" +fi + + +# +# Rename the VM +# + +if [ -z "$opt_vm" -o "$opt_vm" = "$vm" ] +then + opt_vm="$vm" +elif [ -n "$opt_dry_run" ] +then + warning "skipping the renaming step in dry-run mode" + [ -n "$opt_vm" ] || opt_vm="$vm" +else + conffile="$etcdir/$vm.xml" + old_uuid=`sed -e 's~^.*<uuid> *$[0-9a-f-]*$ *</uuid>.*$~\1~' -e t -e d "$conffile" | head -n 1` + new_uuid=`uuidgen` + old_mac=`sed -e "s~^.*<mac *address='\$[0-9a-f:]*\$'.*$~\\1~" -e t -e d "$conffile" | head -n 1` + new_mac=`echo "$old_mac" | cut -c1-9``uuidgen | sed -e 's~^$[0-9a-f][0-9a-f]$$[0-9a-f][0-9a-f]$$[0-9a-f][0-9a-f]$.*$~\1:\2:\3~'` + + update_config() + { + sed -e "s~<name>$vm</name>~<name>$opt_vm</name>~" \ + -e "s~$old_uuid~$new_uuid~" \ + -e "s~$old_mac~$new_mac~" \ + -e "s~/$imgdir/$vm~/$imgdir/$opt_vm~" + } + + # Update the VM configuration + failed="" + update_config <"$conffile" >"$etcdir/$opt_vm.xml" || failed=1 + + # Update the VM snapshots + if [ -d "$snapdir/$vm" ] + then + mkdir "$snapdir/$opt_vm" + for conffile in "$snapdir/$vm"/*.xml + do + if [ -f "$conffile" ] + then + snapshot=`basename "$conffile"` + update_config <"$conffile" >"$snapdir/$opt_vm/$snapshot" || failed=1 + fi + done + fi + + # Rename the disk(s) + # Note: Remove the leading '/' from the symlink targets + for src_disk in `get_vm_disk_images "" "$vm" | get_symlink_closure | sed -e 's~^/~~' | sort | uniq` + do + dst_disk=`echo "$src_disk" | sed -e "s/$vm/$opt_vm/g"` + dst_dir=`dirname "$dst_disk"` + mkdir -p "$dst_dir" + if [ -h "$src_disk" ] + then + src_target=`readlink "$src_disk"` + dst_target=`echo "$src_target" | sed -e "s/$vm/$opt_vm/g"` + rm "$src_disk" + ln -s "$dst_target" "$dst_disk" || failed=1 + else + mv "$src_disk" "$dst_disk" || failed=1 + fi + done + [ -z "$failed" ] || fatal_no_cleanup +fi +[ -z "$opt_dry_run" ] && echo "$opt_vm" >"$tmpdir/$name0.vm" + + +# +# Verify that the VM exists +# + +wait_for_vm() +{ + _vm="$1" + _timeout="$2" + + while true + do + _state=`(virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` + [ -z "$opt_dry_run" ] || _state="shut off" + case "$_state" in + "error") + echo "nolibvirt" + return + ;; + "") + echo "novm" + return + ;; + "shut off") + echo "off" + return + ;; + esac + + echo "$_vm is not powered off ($_state). Waiting for up to ${_timeout}s..." >&2 + _timeout=`expr $_timeout - 10` + if [ $_timeout -le 0 ] + then + echo "running" + return + fi + sleep 10 + done +} + +has_vm=1 +if [ -z "$opt_extract_only" ] +then + error="" + case `wait_for_vm "$opt_vm" 120` in + running) error "$opt_vm did not power off"; error=1 ;; + nolibvirt) error "Could not connect to libvirt"; error=1 ;; + novm) + if [ -n "$opt_disk_only" ] + then + error "$opt_vm does not exist" + error=1 + fi + has_vm="" + ;; + esac + if [ -n "$error" ] + then + warning "Continuing in --extract-only mode" + opt_extract_only=1 + fi +fi + + +# +# Check that the backup matches the current VM +# + +if [ -z "$opt_disk_only" -o -n "$opt_extract_only" ] +then + true # nothing to do +elif [ -n "$opt_dry_run" ] +then + warning "not checking that the '$opt_vm' VM matches the backup in dry-run mode" +else + failed="" + for vmconf in "/$etcdir/$opt_vm.xml" "/$snapdir/$opt_vm"/*.xml + do + [ -f "$vmconf" ] || continue + + bakconf=`echo "$vmconf" | sed -e 's~^/~~' -e 's~/$opt_vm~/$vm~'` + if [ ! -f "$bakconf" ] + then + error "the backup is missing '$vmconf'" + failed=1 + elif ! diff -u "$vmconf" "$bakconf" + then + error "the backup's copy of '$vmconf' does not match" + failed=1 + fi + done + for bakconf in "$etcdir/$opt_vm.xml" "$snapdir/$opt_vm"/*.xml + do + [ -f "$backconf" ] || continue + + vmconf=`echo "/$bakconf" | sed -e 's~/$vm~/$opt_vm~'` + if [ ! -f "$vmconf" ] + then + error "the backup has an extra file: $bakconf" + failed=1 + fi + done + [ -z "$failed" ] || fatal_no_cleanup +fi + +if [ -n "$opt_extract_only" ] +then + [ -n "$opt_verbose" ] && echo + echo "The $opt_vm files are in '$tmpdir'" + echo "To install it run the following commands:" + echo + echo "cd '$tmpdir'" + + # Run the replacement commands as if in --dry-run mode + # so the user sees how to put the files in place. + opt_dry_run="1" +fi + + +# +# Delete the existing VM +# + +if [ -z "$opt_disk_only" -a -n "$has_vm" ] +then + olddisks=`get_vm_disk_images "/" "$opt_vm" 2>/dev/null | get_symlink_closure | sort | uniq` + if ! dry_run virsh --connect "$opt_connect" undefine "$opt_vm" \ + --snapshots-metadata --remove-all-storage + then + fatal_no_cleanup "could not remove the existing '$opt_vm' VM" + fi + [ -z "$olddisks" ] || dry_run rm $olddisks +fi + + +# +# Create the new VM ($opt_dry_run takes care of $opt_extract_only) +# + +# Replace the disk images +if [ -f "$tmpdir/$etcdir/$opt_vm.xml" ] +then + # Note: Remove the leading '/' for both the symlink paths and their targets + disks=`get_vm_disk_images "" "$opt_vm" 2>/dev/null | sed -e 's~^/~~' | get_symlink_closure | sed -e 's~^/~~' | sort | uniq` +else + disks="$imgdir/dry-run-disk.qcow2" +fi + +failed="" +for disk in $disks +do + dir=`dirname "$disk"` + [ -d "/$dir" ] || dry_run mkdir -p "/$dir" + dry_run mv "$disk" "/$disk" || failed=1 +done + +if [ -z "$opt_disk_only" ] +then + # Create the VM + dry_run virsh --connect "$opt_connect" define "$etcdir/$opt_vm.xml" || failed=1 + + # Get the snapshots in their dependency order (or creation order) + get_snapshot_creationtime() + { + _dir="$1" + for snapxml in "$_dir"/*.xml + do + name=`basename "$snapxml" .xml` + ctime=`sed -e 's~^.*<creationTime>$[0-9][0-9]*$</creationTime>.*$~\1~' -e t -e d "$snapxml"` + echo "$ctime $name" + done + } + + # Create the snapshots + if [ -d "$tmpdir" -a $ -z "$opt_dry_run" -o "$opt_vm" = "$vm" $ ] + then + snapshots=`get_snapshot_creationtime "$snapdir/$opt_vm" | sort -n | cut -d' ' -f2` + else + snapshots="dry-run-snapshot" # dry-run mode + fi + for snapshot in $snapshots + do + dry_run virsh --connect "$opt_connect" snapshot-create "$opt_vm" \ + "$snapdir/$opt_vm/$snapshot.xml" --redefine || failed=1 + done +fi + +[ -z "$failed" ] || fatal_no_cleanup + + +# +# Clean up +# + +[ -z "$opt_extract_only" ] || tmpdir="" + +cleanup + +exit 0 -- 2.20.1

1 0