External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 04:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Let tests override waiting time for device unplug

Browse Source 
We don't want tests to wait 5 seconds for an event which we know will
never come.
This commit is contained in:
Jiri Denemark 2013-07-26 12:18:01 +02:00
parent b2f76cd20e
commit 419489e618
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -636,6 +636,7 @@ QEMU_DRIVER_SOURCES = \
qemu/qemu_cgroup.c qemu/qemu_cgroup.h \
qemu/qemu_hostdev.c qemu/qemu_hostdev.h \
qemu/qemu_hotplug.c qemu/qemu_hotplug.h \
qemu/qemu_hotplugpriv.h \
qemu/qemu_conf.c qemu/qemu_conf.h \
qemu/qemu_process.c qemu/qemu_process.h \
qemu/qemu_processpriv.h \

10
src/qemu/qemu_hotplug.c
View File

@ -25,6 +25,7 @@
#include <config.h>
#include "qemu_hotplug.h"
#include "qemu_hotplugpriv.h"
#include "qemu_capabilities.h"
#include "qemu_domain.h"
#include "qemu_command.h"
@ -53,6 +54,10 @@
#define VIR_FROM_THIS VIR_FROM_QEMU
#define CHANGE_MEDIA_RETRIES 10
/* Wait up to 5 seconds for device removal to finish. */
unsigned long long qemuDomainRemoveDeviceWaitTime = 1000ull * 5;
int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainDiskDefPtr disk,
@ -2682,9 +2687,6 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver,
}
/* Wait up to 5 seconds for device removal to finish. */
#define QEMU_REMOVAL_WAIT_TIME (1000ull * 5)
static void
qemuDomainMarkDeviceForRemoval(virDomainObjPtr vm,
virDomainDeviceInfoPtr info)
@ -2721,7 +2723,7 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm)
if (virTimeMillisNow(&until) < 0)
return -1;
until += QEMU_REMOVAL_WAIT_TIME;
until += qemuDomainRemoveDeviceWaitTime;
while (priv->unpluggingDevice) {
if (virCondWaitUntil(&priv->unplugFinished,

31
src/qemu/qemu_hotplugpriv.h Normal file
View File

@ -0,0 +1,31 @@
/*
* qemu_hotplugpriv.h: private declarations for QEMU device hotplug management
*
* Copyright (C) 2013 Red Hat, Inc.
*
* 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, see
* <http://www.gnu.org/licenses/>.
*
*/
#ifndef __QEMU_HOTPLUGPRIV_H__
# define __QEMU_HOTPLUGPRIV_H__
/*
* This header file should never be used outside unit tests.
*/
extern unsigned long long qemuDomainRemoveDeviceWaitTime;
#endif /* __QEMU_HOTPLUGPRIV_H__ */