提交 e6d180f0 编写于 作者: M Maxim Nestratov 提交者: Dmitry Guryanov

parallels: rename all parallels files and driver directory to vz

This patch moves all src/parallels/parallels* files to vz/vz*
and fixes build accordingly.
No functional changes.
Signed-off-by: NMaxim Nestratov <mnestratov@parallels.com>
上级 df75e5f6
......@@ -106,12 +106,12 @@ src/nwfilter/nwfilter_learnipaddr.c
src/openvz/openvz_conf.c
src/openvz/openvz_driver.c
src/openvz/openvz_util.c
src/parallels/parallels_driver.c
src/parallels/parallels_network.c
src/parallels/parallels_sdk.c
src/parallels/parallels_utils.c
src/parallels/parallels_utils.h
src/parallels/parallels_storage.c
src/vz/vz_driver.c
src/vz/vz_network.c
src/vz/vz_sdk.c
src/vz/vz_utils.c
src/vz/vz_utils.h
src/vz/vz_storage.c
src/phyp/phyp_driver.c
src/qemu/qemu_agent.c
src/qemu/qemu_blockjob.c
......
......@@ -558,7 +558,7 @@ DRIVER_SOURCE_FILES = \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
$(PARALLELS_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(PHYP_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
......@@ -826,15 +826,15 @@ HYPERV_DRIVER_EXTRA_DIST = \
hyperv/hyperv_wmi_generator.py \
$(HYPERV_DRIVER_GENERATED)
PARALLELS_DRIVER_SOURCES = \
parallels/parallels_driver.h \
parallels/parallels_driver.c \
parallels/parallels_utils.c \
parallels/parallels_utils.h \
parallels/parallels_storage.c \
parallels/parallels_network.c \
parallels/parallels_sdk.h \
parallels/parallels_sdk.c
VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
vz/vz_utils.c \
vz/vz_utils.h \
vz/vz_storage.c \
vz/vz_network.c \
vz/vz_sdk.h \
vz/vz_sdk.c
BHYVE_DRIVER_SOURCES = \
bhyve/bhyve_capabilities.c \
......@@ -1415,13 +1415,13 @@ libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
endif WITH_HYPERV
if WITH_PARALLELS
noinst_LTLIBRARIES += libvirt_driver_parallels.la
libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la
libvirt_driver_parallels_la_CFLAGS = \
noinst_LTLIBRARIES += libvirt_driver_vz.la
libvirt_la_BUILT_LIBADD += libvirt_driver_vz.la
libvirt_driver_vz_la_CFLAGS = \
-I$(srcdir)/conf $(AM_CFLAGS) \
$(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS)
libvirt_driver_parallels_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES)
libvirt_driver_vz_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
libvirt_driver_vz_la_SOURCES = $(VZ_DRIVER_SOURCES)
endif WITH_PARALLELS
if WITH_BHYVE
......@@ -1787,7 +1787,7 @@ EXTRA_DIST += \
$(ESX_DRIVER_EXTRA_DIST) \
$(HYPERV_DRIVER_SOURCES) \
$(HYPERV_DRIVER_EXTRA_DIST) \
$(PARALLELS_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(BHYVE_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
......
......@@ -93,7 +93,7 @@
# include "xenapi/xenapi_driver.h"
#endif
#ifdef WITH_PARALLELS
# include "parallels/parallels_driver.h"
# include "vz/vz_driver.h"
#endif
#ifdef WITH_BHYVE
# include "bhyve/bhyve_driver.h"
......
/*
* parallels_driver.c: core driver functions for managing
* vz_driver.c: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2014-2015 Red Hat, Inc.
......@@ -53,9 +53,9 @@
#include "cpu/cpu.h"
#include "virtypedparam.h"
#include "parallels_driver.h"
#include "parallels_utils.h"
#include "parallels_sdk.h"
#include "vz_driver.h"
#include "vz_utils.h"
#include "vz_sdk.h"
#define VIR_FROM_THIS VIR_FROM_PARALLELS
......
/*
* parallels_driver.h: core driver functions for managing
* vz_driver.h: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2012 Parallels, Inc.
......
/*
* parallels_network.c: core privconn functions for managing
* vz_network.c: core privconn functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2013-2014 Red Hat, Inc.
......@@ -30,7 +30,7 @@
#include "virfile.h"
#include "virnetdev.h"
#include "md5.h"
#include "parallels_utils.h"
#include "vz_utils.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_PARALLELS
......
/*
* parallels_sdk.c: core driver functions for managing
* vz_sdk.c: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2014 Parallels, Inc.
......@@ -32,7 +32,7 @@
#include "domain_conf.h"
#include "virtime.h"
#include "parallels_sdk.h"
#include "vz_sdk.h"
#define VIR_FROM_THIS VIR_FROM_PARALLELS
#define JOB_INFINIT_WAIT_TIMEOUT UINT_MAX
......
/*
* parallels_sdk.h: core driver functions for managing
* vz_sdk.h: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2014 Parallels, Inc.
......@@ -22,7 +22,7 @@
#include <Parallels.h>
#include "parallels_utils.h"
#include "vz_utils.h"
int prlsdkInit(void);
void prlsdkDeinit(void);
......
/*
* parallels_storage.c: core driver functions for managing
* vz_storage.c: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2013-2014 Red Hat, Inc.
......@@ -37,7 +37,7 @@
#include "virstoragefile.h"
#include "virerror.h"
#include "virfile.h"
#include "parallels_utils.h"
#include "vz_utils.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_PARALLELS
......
/*
* parallels_utils.c: core driver functions for managing
* vz_utils.c: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2012 Parallels, Inc.
......@@ -28,7 +28,7 @@
#include "virerror.h"
#include "viralloc.h"
#include "virjson.h"
#include "parallels_utils.h"
#include "vz_utils.h"
#include "virstring.h"
#include "datatypes.h"
......
/*
* parallels_utils.h: core driver functions for managing
* vz_utils.h: core driver functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2012 Parallels, Inc.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册