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

[PATCH] virtdisk: Add stub for OpenVirtualDisk
by Vijay Kiran Kamuju April 1, 2019

April 1, 2019

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 April 1, 2019

April 1, 2019

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 April 1, 2019

April 1, 2019

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 April 1, 2019

April 1, 2019

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 April 1, 2019

April 1, 2019

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 April 1, 2019

April 1, 2019

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

[PATCH] testbot/BackupVM: A script for backing up a Libvirt/QEmu VM.
by Francois Gouget April 1, 2019

April 1, 2019

The script supports backing up to either a borg repository, possibly remote, the deduplication makes this ideal for backups; or tar files, which is more suited for archival. By default the script will refuse to perform the backup if it foundi no snapshots. If that's expected pass the --no-snapshot option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/BackupVM | 362 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 362 insertions(+) create mode 100755 testbot/scripts/BackupVM diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM new file mode 100755 index 00000000..2cf3320d --- /dev/null +++ b/testbot/scripts/BackupVM @@ -0,0 +1,362 @@ +#!/bin/sh +# +# Creates a backup of a QEMU/LibVirt VM. +# +# 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" + + +# +# Generic helpers +# + +error() +{ + echo "$name0:error:" "$@" >&2 +} + +warning() +{ + echo "$name0:warning:" "$@" >&2 +} + +opt_dry_run="" +opt_verbose="" +dry_run() +{ + [ -n "$opt_verbose$opt_dry_run" ] && echo "$@" + 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_vm="" +opt_suffix="" +opt_snapshot="1" +opt_borg="" +opt_connect="" +usage="" +while [ $# -gt 0 ] +do + arg="$1" + shift + case "$arg" in + --borg) + if check_opt_val "$arg" "$opt_borg" $# + then + opt_borg="$1" + shift + fi + ;; + --snapshot) + opt_snapshot="1" + ;; + --no-snapshot) + opt_snapshot="" + ;; + --connect) + if check_opt_val "$arg" "$opt_connect" $# + then + opt_connect="$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 [ -z "$opt_vm" ] + then + opt_vm="$arg" + elif [ -z "$opt_suffix" ] + then + opt_suffix="$arg" + else + error "only one VM and suffix can be specified." + usage=2 + fi + ;; + esac +done + +if [ -z "$usage" ] +then + if [ -z "$opt_vm" ] + then + error "you must specify the name of the VM to backup." + 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 [--no-snapshot] [--verbose] [--dry-run] [--help] [--borg REPO] + [--connect URI] VMNAME [SUFFIX] + +Creates a backup of the specified VM. +This must be run as root on the VM host. + +Where: + VMNAME The name of the VM to backup. + SUFFIX A (short) string to add to the backup name. This can help + provide an indication of what features were added to this + backup. + --borg REPO The borg repository to backup to. + --no-snapshot It is ok for the VM to have no snapshot. + --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 + + +# +# Prepare the backup +# + +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 +} + +if [ ! -r "/$etcdir/$opt_vm.xml" ] +then + error "the '/$etcdir/$opt_vm.xml' configuration file is not readable" + exit 2 +fi + +snapshots=`echo "/$snapdir/$opt_vm"/*.xml` +if [ -n "$opt_snapshot" -a "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] +then + error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." + exit 2 +fi + +# Backup the symbolic links but also their targets! +disks=`get_vm_disk_images "/" "$opt_vm" 2>/dev/null | get_symlink_closure | sort | uniq` +if [ -z "$disks" ] +then + error "could not find the disk images." + exit 2 +fi + +confs=`for file in "/$etcdir/$opt_vm.xml" $snapshots; do echo $file; done | get_symlink_closure` + +errors="" +all_paths="" +echo "$opt_vm uses the following files and directories:" +for file in $confs $disks +do + all_paths="$all_paths $file" + echo " $file" + if [ ! -r "$file" ] + then + error "'$file' is not readable." + errors=1 + fi +done +[ -z "$errors" ] || exit 1 +echo + + +# +# Wait for the VM +# + +fatal() +{ + error "$@" + exit 1 +} + +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 +} + +# Note that we don't actually care whether libvirt knows about the VM since +# we know which files to backup anyway. +case `wait_for_vm "$opt_vm" 120` in +nolibvirt) + warning "Could not connect to libvirt. Assuming $opt_vm is not running." + ;; +running) + fatal "$opt_vm is running. Try again when it has been powered off." + ;; +esac + + +# +# Do the backup +# + +nice="" +which ionice >/dev/null && nice="ionice" +which nice >/dev/null && nice="nice $nice" + +backup="libvirt-$opt_vm-`date +%Y%m%d`" +[ -n "$opt_suffix" ] && backup="$backup-$opt_suffix" + +if [ -n "$opt_borg" ] +then + borg_opts="" + [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" + dry_run $nice borg create --progress --stats -C lzma,9 \ + "$opt_borg::$backup" $all_paths + rc_borg=$? + if [ $rc_borg -ne 0 ] + then + fatal "an error occurred while saving the VM (borg=$rc_borg)" + fi + echo "Saved $opt_vm to '$opt_borg::$backup'" + +else + 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 tar cf - $tar_opts $all_paths | $nice $zipcmd -9 | $nice split -d -b 2146435072 - '$backup.tar.bz2.'" + fi + + if [ -n "$opt_dry_run" ] + then + rc_tar=0 + rc_zip=0 + rc_split=0 + else + ($nice tar cf - $tar_opts $all_paths; echo $? >"rc_tar" ) | \ + ($nice $zipcmd -9; echo $? >"rc_zip") | \ + $nice split -d -b 2146435072 - "$backup.tar.bz2." + rc_split=$? + rc_zip=`cat "rc_zip"` + rc_tar=`cat "rc_tar"` + rm -f "rc_tar" "rc_zip" + fi + if [ "$rc_tar" != "0" -o "$rc_zip" != "0" -o "$rc_split" != "0" ] + then + fatal "an error occurred while saving the VM (tar=$rc_tar zip=$rc_zip split=$rc_split)" + fi + echo "Saved $opt_vm to '$backup.tar.bz2.*'" +fi + +case `wait_for_vm "$opt_vm" 0` in +running) + fatal "$opt_vm is running. The backup may be bad." + ;; +esac -- 2.20.1

1 0

[PATCH] testbot: Document the Net::OpenSSH dependency.
by Francois Gouget April 1, 2019

April 1, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index bae1e825..456ffe69 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -9,7 +9,7 @@ Dependencies: - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) -- Optional: Net::SSH2 (for SSH tunneling, libnet-ssh2-perl) +- Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl) MySQL setup: - Create a new 'winetestbot' database and its tables using the -- 2.20.1

1 0

[PATCH 1/5] quartz/tests: Clean up tests for video renderer filter interfaces.
by Zebediah Figura April 1, 2019

April 1, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 115 ++++++++++++------------------ 1 file changed, 46 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 35e6f10185..e487e65ef6 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -19,71 +19,60 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" +#include "wine/test.h" -#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ - ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ - ok(ppv != NULL, "Pointer is NULL\n"); - -#define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release((IUnknown*)iface); \ - ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ -} - -static IUnknown *pVideoRenderer = NULL; - -static int create_video_renderer(void) +static IBaseFilter *create_video_renderer(void) { - HRESULT hr; - - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (LPVOID*)&pVideoRenderer); - return (hr == S_OK && pVideoRenderer != NULL); + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void release_video_renderer(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - HRESULT hr; + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; - hr = IUnknown_Release(pVideoRenderer); - ok(hr == 0, "IUnknown_Release failed with %x\n", hr); + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); } -static void test_query_interface(void) +static void test_interfaces(void) { - HRESULT hr; - IBaseFilter *pBaseFilter = NULL; - IBasicVideo *pBasicVideo = NULL; - IDirectDrawVideo *pDirectDrawVideo = NULL; - IKsPropertySet *pKsPropertySet = NULL; - IMediaPosition *pMediaPosition = NULL; - IMediaSeeking *pMediaSeeking = NULL; - IQualityControl *pQualityControl = NULL; - IQualProp *pQualProp = NULL; - IVideoWindow *pVideoWindow = NULL; - - QI_SUCCEED(pVideoRenderer, IID_IBaseFilter, pBaseFilter); - RELEASE_EXPECT(pBaseFilter, 1); - QI_SUCCEED(pVideoRenderer, IID_IBasicVideo, pBasicVideo); - RELEASE_EXPECT(pBasicVideo, 1); - QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); - RELEASE_EXPECT(pMediaSeeking, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); - todo_wine { - QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); - RELEASE_EXPECT(pDirectDrawVideo, 1); - QI_SUCCEED(pVideoRenderer, IID_IKsPropertySet, pKsPropertySet); - RELEASE_EXPECT(pKsPropertySet, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); - RELEASE_EXPECT(pQualProp, 1); - } - QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); - RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IVideoWindow, pVideoWindow); - RELEASE_EXPECT(pVideoWindow, 1); + IBaseFilter *filter = create_video_renderer(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IDirectDrawVideo, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDispatch, FALSE); + check_interface(filter, &IID_IOverlay, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + + IBaseFilter_Release(filter); } static void test_pin(IPin *pin) @@ -105,19 +94,11 @@ static void test_pin(IPin *pin) static void test_basefilter(void) { IEnumPins *pin_enum = NULL; - IBaseFilter *base = NULL; + IBaseFilter *base = create_video_renderer(); IPin *pins[2]; ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void **)&base); - if (base == NULL) - { - /* test_query_interface handles this case */ - skip("No IBaseFilter\n"); - return; - } - hr = IBaseFilter_EnumPins(base, NULL); ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); @@ -153,13 +134,9 @@ static void test_basefilter(void) START_TEST(videorenderer) { CoInitialize(NULL); - if (!create_video_renderer()) - return; - test_query_interface(); + test_interfaces(); test_basefilter(); - release_video_renderer(); - CoUninitialize(); } -- 2.20.1

1 4