wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : quartz/tests: Add some tests for querying video renderer pin information.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: d1ce610e8113237c96b05320c63b4487114f439a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ce610e8113237c96b05320… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:04 2019 -0500 quartz/tests: Add some tests for querying video renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7315d8d..3d3d939 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -207,6 +207,53 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + static const WCHAR sink_name[] = {'I','n','p','u','t',0}; + IBaseFilter *filter = create_video_renderer(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); +todo_wine + ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -270,6 +317,7 @@ START_TEST(videorenderer) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_FindPin() on the video renderer.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 70803a4d228d128d05c7071bb9671d4126a95840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70803a4d228d128d05c7071b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:03 2019 -0500 quartz/tests: Add some tests for IBaseFilter_FindPin() on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c4e64ec..7315d8d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; + static IBaseFilter *create_video_renderer(void) { IBaseFilter *filter = NULL; @@ -176,6 +178,35 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_video_renderer(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -238,6 +269,7 @@ START_TEST(videorenderer) test_interfaces(); test_enum_pins(); + test_find_pin(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_EnumPins() on the video renderer.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 146c188477166869fd30438856cf1865d5334019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=146c188477166869fd304388… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:02 2019 -0500 quartz/tests: Add some tests for IBaseFilter_EnumPins() on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 102 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e487e65..c4e64ec 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -31,6 +31,13 @@ static IBaseFilter *create_video_renderer(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #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) { @@ -75,6 +82,100 @@ static void test_interfaces(void) IBaseFilter_Release(filter); } + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_video_renderer(); + IEnumPins *enum1, *enum2; + IPin *pins[2]; + ULONG count; + HRESULT hr; + ULONG ref; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -136,6 +237,7 @@ START_TEST(videorenderer) CoInitialize(NULL); test_interfaces(); + test_enum_pins(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Clean up tests for video renderer filter interfaces.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: d8f54a710453ec643114629a38745c2abbbc54b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f54a710453ec643114629a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 20:28:01 2019 -0500 quartz/tests: Clean up tests for video renderer filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 35e6f10..e487e65 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(); }

1 0

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

01 Apr '19

Module: tools Branch: master Commit: c83123416c0f3e9d103bf9c3757c6b9a62e9479e URL: https://source.winehq.org/git/tools.git/?a=commit;h=c83123416c0f3e9d103bf9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:44:12 2019 +0200 testbot/RestoreVM: A script to restore a Libirt/QEmu VM. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/RestoreVM | 711 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 711 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=c83123416c0f3e9d103…

1 0

Francois Gouget : testbot/BackupVM: A script for backing up a Libvirt/ QEmu VM.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: tools Branch: master Commit: 4061512746c8829a5eaaf62c85e604906704714f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4061512746c8829a5eaaf62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:43:53 2019 +0200 testbot/BackupVM: A script for backing up a Libvirt/QEmu VM. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 362 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 362 insertions(+) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM new file mode 100755 index 0000000..2cf3320 --- /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

1 0

Francois Gouget : testbot: Document the Net::OpenSSH dependency.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: tools Branch: master Commit: a6338685571a035b291bf4ed8d9997402b65681a URL: https://source.winehq.org/git/tools.git/?a=commit;h=a6338685571a035b291bf4e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 1 03:43:17 2019 +0200 testbot: Document the Net::OpenSSH dependency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 bae1e82..456ffe6 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

1 0

Józef Kucia : vkd3d: Add helpers for getting root signature parameters.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: vkd3d Branch: master Commit: 4408816e24a07a58e4eb3f4ee36930f16b3e0258 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4408816e24a07a58e4eb3f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:49 2019 +0200 vkd3d: Add helpers for getting root signature parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8868a72..936e965 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -334,6 +334,39 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, return S_OK; } +static const struct d3d12_root_parameter *root_signature_get_parameter( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + assert(index < root_signature->parameter_count); + return &root_signature->parameters[index]; +} + +static const struct d3d12_root_descriptor_table *root_signature_get_descriptor_table( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + return &p->u.descriptor_table; +} + +static const struct d3d12_root_constant *root_signature_get_32bit_constants( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); + return &p->u.constant; +} + +static const struct d3d12_root_parameter *root_signature_get_root_descriptor( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + return p; +} + /* ID3D12Fence */ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) { @@ -2037,8 +2070,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); - descriptor_table = &root_signature->parameters[index].u.descriptor_table; + descriptor_table = root_signature_get_descriptor_table(root_signature, index); descriptor_count = 0; for (i = 0; i < descriptor_table->range_count; ++i) @@ -2120,7 +2152,7 @@ static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *v vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; break; default: - ERR("Invalid root descriptor.\n"); + ERR("Invalid root descriptor %#x.\n", root_parameter->parameter_type); return false; } @@ -2172,7 +2204,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (!(bindings->push_descriptor_dirty_mask & (1u << i))) continue; - root_parameter = &root_signature->parameters[i]; + root_parameter = root_signature_get_root_descriptor(root_signature, i); push_descriptor = &bindings->push_descriptors[i]; if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) @@ -3385,7 +3417,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + assert(root_signature_get_descriptor_table(root_signature, index)); assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; @@ -3425,8 +3457,7 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_constant *c; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); - c = &root_signature->parameters[index].u.constant; + c = root_signature_get_32bit_constants(root_signature, index); VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout, c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); } @@ -3491,7 +3522,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, struct VkDescriptorBufferInfo buffer_info; struct d3d12_resource *resource; - root_parameter = &root_signature->parameters[index]; + root_parameter = root_signature_get_root_descriptor(root_signature, index); assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); @@ -3556,9 +3587,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li VkDevice vk_device = list->device->vk_device; VkBufferView vk_buffer_view; - root_parameter = &root_signature->parameters[index]; - assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV - || root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + root_parameter = root_signature_get_root_descriptor(root_signature, index); + assert(root_parameter->parameter_type != D3D12_ROOT_PARAMETER_TYPE_CBV); /* FIXME: Re-use buffer views. */ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view))

1 0

Józef Kucia : vkd3d: Clear descriptor dirty masks when setting root signature.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: vkd3d Branch: master Commit: 74fbfee61101901666069f1f7e868e0205266c10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74fbfee61101901666069f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:48 2019 +0200 vkd3d: Clear descriptor dirty masks when setting root signature. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d39458f..8868a72 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3351,7 +3351,9 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_table_dirty_mask = 0; bindings->descriptor_table_active_mask = 0; + bindings->push_descriptor_dirty_mask = 0; bindings->push_descriptor_active_mask = 0; }

1 0

Józef Kucia : tests: Skip some tests when VKD3D_VULKAN_DEVICE is set.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: vkd3d Branch: master Commit: a6e482aa88f91658f13f2745dd242487db124aec URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6e482aa88f91658f13f274… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 1 11:19:47 2019 +0200 tests: Skip some tests when VKD3D_VULKAN_DEVICE is set. Allows running tests with VKD3D_VULKAN_DEVICE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 89b388f..0bc4817 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -559,18 +559,25 @@ static void test_physical_device(void) vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - for (i = 0; i < count; ++i) + if (!getenv("VKD3D_VULKAN_DEVICE")) + { + for (i = 0; i < count; ++i) + { + trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); + + create_info.vk_physical_device = vk_physical_devices[i]; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + ok(vk_physical_device == vk_physical_devices[i], + "Got unexpected Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + } + else { - trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); - - create_info.vk_physical_device = vk_physical_devices[i]; - hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); - vk_physical_device = vkd3d_get_vk_physical_device(device); - ok(vk_physical_device == vk_physical_devices[i], - "Got unexpected Vulkan physical device %p.\n", vk_physical_device); - refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + skip("VKD3D_VULKAN_DEVICE is set.\n"); } free(vk_physical_devices);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019