External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix parsing 'info chardev'

Browse Source 
If qemu supports -chardev, our char frontend aliases are ex. 'charserial0'
not just 'serial0'. Typically we don't use this code path because the
pty's are scraped from stdout.
This commit is contained in:
Cole Robinson 2011-06-08 12:25:11 -04:00
parent d0b1a9a087
commit c0980a3a6e
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_process.c
View File

@ -880,18 +880,20 @@ qemuProcessExtractTTYPath(const char *haystack,
static int static int
qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
int count, int count,
const char *prefix, virHashTablePtr paths,
virHashTablePtr paths) bool chardevfmt)
{ {
int i; int i;
const char *prefix = chardevfmt ? "char" : "";
for (i = 0 ; i < count ; i++) { for (i = 0 ; i < count ; i++) {
virDomainChrDefPtr chr = devices[i]; virDomainChrDefPtr chr = devices[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
char id[16]; char id[32];
const char *path; const char *path;
if (snprintf(id, sizeof(id), "%s%d", prefix, i) >= sizeof(id)) if (snprintf(id, sizeof(id), "%s%s",
prefix, chr->info.alias) >= sizeof(id))
return -1; return -1;
path = (const char *) virHashLookup(paths, id); path = (const char *) virHashLookup(paths, id);
@ -926,22 +928,25 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
static int static int
qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm,
virBitmapPtr qemuCaps,
virHashTablePtr paths) virHashTablePtr paths)
{ {
bool chardevfmt = qemuCapsGet(qemuCaps, QEMU_CAPS_CHARDEV);
if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials,
"serial", paths) < 0) paths, chardevfmt) < 0)
return -1; return -1;
if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels, if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels,
"parallel", paths) < 0) paths, chardevfmt) < 0)
return -1; return -1;
if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels,
"channel", paths) < 0) paths, chardevfmt) < 0)
return -1; return -1;
if (vm->def->console && if (vm->def->console &&
qemuProcessLookupPTYs(&vm->def->console, 1, "console", paths) < 0) qemuProcessLookupPTYs(&vm->def->console, 1, paths, chardevfmt) < 0)
return -1; return -1;
return 0; return 0;
@ -1023,7 +1028,9 @@ qemuProcessReadLogFD(int logfd, char *buf, int maxlen, int off)
static int static int
qemuProcessWaitForMonitor(struct qemud_driver* driver, qemuProcessWaitForMonitor(struct qemud_driver* driver,
virDomainObjPtr vm, off_t pos) virDomainObjPtr vm,
virBitmapPtr qemuCaps,
off_t pos)
{ {
char *buf; char *buf;
size_t buf_size = 4096; /* Plenty of space to get startup greeting */ size_t buf_size = 4096; /* Plenty of space to get startup greeting */
@ -1065,7 +1072,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver,
VIR_DEBUG("qemuMonitorGetPtyPaths returned %i", ret); VIR_DEBUG("qemuMonitorGetPtyPaths returned %i", ret);
if (ret == 0) if (ret == 0)
ret = qemuProcessFindCharDevicePTYsMonitor(vm, paths); ret = qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps, paths);
cleanup: cleanup:
virHashFree(paths); virHashFree(paths);
@ -2444,7 +2451,7 @@ int qemuProcessStart(virConnectPtr conn,
goto cleanup; goto cleanup;
VIR_DEBUG("Waiting for monitor to show up"); VIR_DEBUG("Waiting for monitor to show up");
if (qemuProcessWaitForMonitor(driver, vm, pos) < 0) if (qemuProcessWaitForMonitor(driver, vm, priv->qemuCaps, pos) < 0)
goto cleanup; goto cleanup;
VIR_DEBUG("Detecting VCPU PIDs"); VIR_DEBUG("Detecting VCPU PIDs");