External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

src/xenxs: Refactor code parsing virtual time config

Browse Source 
introduce function
    xenParseXMTimeOffset(virConfPtr conf,.......);
which parses time offset config instead

Signed-off-by: Kiarie Kahurani <davidkiarie4@gmail.com>
This commit is contained in:
Kiarie Kahurani 2014-08-07 21:32:51 +03:00 committed by Jim Fehlig
parent 52c048b1f0
commit 1182dc3176
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/xenxs/xen_xm.c
View File

@ -263,7 +263,48 @@ xenParseXMMem(virConfPtr conf, virDomainDefPtr def)
} }
static int
xenParseXMTimeOffset(virConfPtr conf, virDomainDefPtr def,
int xendConfigVersion)
{
int vmlocaltime;
if (xenXMConfigGetBool(conf, "localtime", &vmlocaltime, 0) < 0)
return -1;
if (STREQ(def->os.type, "hvm")) {
/* only managed HVM domains since 3.1.0 have persistent rtc_timeoffset */
if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
if (vmlocaltime)
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
else
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
def->clock.data.utc_reset = true;
} else {
unsigned long rtc_timeoffset;
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
if (xenXMConfigGetULong(conf, "rtc_timeoffset", &rtc_timeoffset, 0) < 0)
return -1;
def->clock.data.variable.adjustment = (int)rtc_timeoffset;
def->clock.data.variable.basis = vmlocaltime ?
VIR_DOMAIN_CLOCK_BASIS_LOCALTIME :
VIR_DOMAIN_CLOCK_BASIS_UTC;
}
} else {
/* PV domains do not have an emulated RTC and the offset is fixed. */
def->clock.offset = vmlocaltime ?
VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME :
VIR_DOMAIN_CLOCK_OFFSET_UTC;
def->clock.data.utc_reset = true;
} /* !hvm */
return 0;
}
#define MAX_VFB 1024 #define MAX_VFB 1024
/* /*
* Turn a config record into a lump of XML describing the * Turn a config record into a lump of XML describing the
* domain, suitable for later feeding for virDomainCreateXML * domain, suitable for later feeding for virDomainCreateXML
@ -283,7 +324,6 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
size_t i; size_t i;
const char *defaultMachine; const char *defaultMachine;
int vmlocaltime = 0;
unsigned long count; unsigned long count;
char *script = NULL; char *script = NULL;
char *listenAddr = NULL; char *listenAddr = NULL;
@ -460,34 +500,9 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
def->clock.timers[0] = timer; def->clock.timers[0] = timer;
} }
} }
if (xenXMConfigGetBool(conf, "localtime", &vmlocaltime, 0) < 0)
goto cleanup;
if (hvm) { if (xenParseXMTimeOffset(conf, def, xendConfigVersion) < 0)
/* only managed HVM domains since 3.1.0 have persistent rtc_timeoffset */ goto cleanup;
if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
if (vmlocaltime)
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
else
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
def->clock.data.utc_reset = true;
} else {
unsigned long rtc_timeoffset;
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
if (xenXMConfigGetULong(conf, "rtc_timeoffset", &rtc_timeoffset, 0) < 0)
goto cleanup;
def->clock.data.variable.adjustment = (int)rtc_timeoffset;
def->clock.data.variable.basis = vmlocaltime ?
VIR_DOMAIN_CLOCK_BASIS_LOCALTIME :
VIR_DOMAIN_CLOCK_BASIS_UTC;
}
} else {
/* PV domains do not have an emulated RTC and the offset is fixed. */
def->clock.offset = vmlocaltime ?
VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME :
VIR_DOMAIN_CLOCK_OFFSET_UTC;
def->clock.data.utc_reset = true;
} /* !hvm */
if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0) if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0)
goto cleanup; goto cleanup;