External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove qemu_hotplugpriv.h and qemuDomainRemoveDeviceWaitTime

Browse Source 
qemu_hotplugpriv.h is a header file created to share a global variable
called 'qemuDomainRemoveDeviceWaitTime', declared in qemu_hotplug.c,
to other files that would want to change the timeout value
(currently, only tests/qemuhotplugtest.c).

Previous patch deprecated the variable, using qemu_driver->unplugTimeout
to set the timeout instead. This means that the header file is now
unused, and can be safely discarded.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2019-10-18 15:36:33 -03:00 committed by Cole Robinson
parent e03e27ee08
commit 2fe78a833e
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/Makefile.inc.am
View File

@ -29,7 +29,6 @@ QEMU_DRIVER_SOURCES = \
qemu/qemu_hostdev.h \ qemu/qemu_hostdev.h \
qemu/qemu_hotplug.c \ qemu/qemu_hotplug.c \
qemu/qemu_hotplug.h \ qemu/qemu_hotplug.h \
qemu/qemu_hotplugpriv.h \
qemu/qemu_conf.c \ qemu/qemu_conf.c \
qemu/qemu_conf.h \ qemu/qemu_conf.h \
qemu/qemu_interop_config.c \ qemu/qemu_interop_config.c \

5
src/qemu/qemu_hotplug.c
View File

@ -23,8 +23,6 @@
#include <config.h> #include <config.h>
#include "qemu_hotplug.h" #include "qemu_hotplug.h"
#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
#include "qemu_hotplugpriv.h"
#include "qemu_alias.h" #include "qemu_alias.h"
#include "qemu_capabilities.h" #include "qemu_capabilities.h"
#include "qemu_domain.h" #include "qemu_domain.h"
@ -70,9 +68,6 @@ VIR_LOG_INIT("qemu.qemu_hotplug");
#define QEMU_UNPLUG_TIMEOUT 1000ull * 5 #define QEMU_UNPLUG_TIMEOUT 1000ull * 5
#define QEMU_UNPLUG_TIMEOUT_PPC64 1000ull * 10 #define QEMU_UNPLUG_TIMEOUT_PPC64 1000ull * 10
/* Wait up to 5 seconds for device removal to finish. */
unsigned long long qemuDomainRemoveDeviceWaitTime = 1000ull * 5;
static void static void
qemuDomainResetDeviceRemoval(virDomainObjPtr vm); qemuDomainResetDeviceRemoval(virDomainObjPtr vm);

32
src/qemu/qemu_hotplugpriv.h
View File

@ -1,32 +0,0 @@
/*
* 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 LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
# error "qemu_hotplugpriv.h may only be included by qemu_hotplug.c or test suites"
#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW */
#pragma once
/*
* This header file should never be used outside unit tests.
*/
extern unsigned long long qemuDomainRemoveDeviceWaitTime;

4
tests/qemuhotplugtest.c
View File

@ -22,8 +22,6 @@
#include "qemu/qemu_alias.h" #include "qemu/qemu_alias.h"
#include "qemu/qemu_conf.h" #include "qemu/qemu_conf.h"
#include "qemu/qemu_hotplug.h" #include "qemu/qemu_hotplug.h"
#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
#include "qemu/qemu_hotplugpriv.h"
#include "qemumonitortestutils.h" #include "qemumonitortestutils.h"
#include "testutils.h" #include "testutils.h"
#include "testutilsqemu.h" #include "testutilsqemu.h"
@ -635,8 +633,6 @@ mymain(void)
driver.hostdevMgr = virHostdevManagerGetDefault(); driver.hostdevMgr = virHostdevManagerGetDefault();
/* wait only 100ms for DEVICE_DELETED event */
qemuDomainRemoveDeviceWaitTime = 100;
#define DO_TEST(file, ACTION, dev, fial, kep, ...) \ #define DO_TEST(file, ACTION, dev, fial, kep, ...) \
do { \ do { \