mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-14 01:59:14 +00:00
6700062fb0
Historically the argv -> xml convertor wanted the same default machine as we'd set when parsing xml. The latter has now changed, however, to use a default defined by libvirt. The former needs fixing to again honour the default QEMU machine. This exposed a bug in handling for the aarch64 target, as QEMU does not define any default machine. Thus we should not having been accepting argv without a -machine provided. Reviewed-by: John Ferlan <jferlan@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
63 lines
2.3 KiB
C
63 lines
2.3 KiB
C
/*
|
|
* qemu_parse_command.h: QEMU command parser
|
|
*
|
|
* Copyright (C) 2006-2016 Red Hat, Inc.
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
|
*
|
|
* 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/>.
|
|
*
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#ifndef __QEMU_PARSE_COMMAND_H__
|
|
# define __QEMU_PARSE_COMMAND_H__
|
|
|
|
# include "virfilecache.h"
|
|
|
|
# define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024
|
|
|
|
/*
|
|
* NB: def->name can be NULL upon return and the caller
|
|
* *must* decide how to fill in a name in this case
|
|
*/
|
|
virDomainDefPtr qemuParseCommandLineString(virFileCachePtr capsCache,
|
|
virCapsPtr caps,
|
|
virDomainXMLOptionPtr xmlopt,
|
|
const char *args,
|
|
char **pidfile,
|
|
virDomainChrSourceDefPtr *monConfig,
|
|
bool *monJSON);
|
|
virDomainDefPtr qemuParseCommandLinePid(virFileCachePtr capsCache,
|
|
virCapsPtr caps,
|
|
virDomainXMLOptionPtr xmlopt,
|
|
pid_t pid,
|
|
char **pidfile,
|
|
virDomainChrSourceDefPtr *monConfig,
|
|
bool *monJSON);
|
|
|
|
void
|
|
qemuParseKeywordsFree(int nkeywords,
|
|
char **keywords,
|
|
char **values);
|
|
|
|
int
|
|
qemuParseKeywords(const char *str,
|
|
char ***retkeywords,
|
|
char ***retvalues,
|
|
int *retnkeywords,
|
|
int allowEmptyValue);
|
|
|
|
#endif /* __QEMU_PARSE_COMMAND_H__*/
|