External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-19 20:49:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert QEMU command line builder to virArch APIs

Browse Source 
Use virArch APIs to determine host architecture when launching
QEMU.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-12-10 22:02:41 +00:00
parent 5a217e84c4
commit 2f4a139a4c
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_command.c
View File

@ -32,6 +32,7 @@
#include "logging.h" #include "logging.h"
#include "virterror_internal.h" #include "virterror_internal.h"
#include "util.h" #include "util.h"
#include "virarch.h"
#include "virfile.h" #include "virfile.h"
#include "uuid.h" #include "uuid.h"
#include "c-ctype.h" #include "c-ctype.h"
@ -131,21 +132,6 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"handle"); "handle");
static void
uname_normalize(struct utsname *ut)
{
uname(ut);
/* Map i386, i486, i586 to i686. */
if (ut->machine[0] == 'i' &&
ut->machine[1] != '\0' &&
ut->machine[2] == '8' &&
ut->machine[3] == '6' &&
ut->machine[4] == '\0')
ut->machine[1] = '6';
}
/** /**
* qemuPhysIfaceConnect: * qemuPhysIfaceConnect:
* @def: the definition of the VM (needed by 802.1Qbh and audit) * @def: the definition of the VM (needed by 802.1Qbh and audit)
@ -4332,7 +4318,7 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver,
const virDomainDefPtr def, const virDomainDefPtr def,
const char *emulator, const char *emulator,
qemuCapsPtr caps, qemuCapsPtr caps,
const struct utsname *ut, virArch hostarch,
char **opt, char **opt,
bool *hasHwVirt, bool *hasHwVirt,
bool migrating) bool migrating)
@ -4465,7 +4451,7 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver,
* 2. emulator is qemu-system-x86_64 * 2. emulator is qemu-system-x86_64
*/ */
if (STREQ(def->os.arch, "i686") && if (STREQ(def->os.arch, "i686") &&
((STREQ(ut->machine, "x86_64") && ((hostarch == VIR_ARCH_X86_64 &&
strstr(emulator, "kvm")) || strstr(emulator, "kvm")) ||
strstr(emulator, "x86_64"))) { strstr(emulator, "x86_64"))) {
virBufferAdd(&buf, default_model, -1); virBufferAdd(&buf, default_model, -1);
@ -5010,7 +4996,6 @@ qemuBuildCommandLine(virConnectPtr conn,
enum virNetDevVPortProfileOp vmop) enum virNetDevVPortProfileOp vmop)
{ {
int i, j; int i, j;
struct utsname ut;
int disableKQEMU = 0; int disableKQEMU = 0;
int enableKQEMU = 0; int enableKQEMU = 0;
int disableKVM = 0; int disableKVM = 0;
@ -5028,7 +5013,6 @@ qemuBuildCommandLine(virConnectPtr conn,
int spice = 0; int spice = 0;
int usbcontroller = 0; int usbcontroller = 0;
bool usblegacy = false; bool usblegacy = false;
uname_normalize(&ut);
int contOrder[] = { int contOrder[] = {
/* We don't add an explicit IDE or FD controller because the /* We don't add an explicit IDE or FD controller because the
* provided PIIX4 device already includes one. It isn't possible to * provided PIIX4 device already includes one. It isn't possible to
@ -5039,6 +5023,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
VIR_DOMAIN_CONTROLLER_TYPE_CCID, VIR_DOMAIN_CONTROLLER_TYPE_CCID,
}; };
virArch hostarch = virArchFromHost();
VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d "
"caps=%p migrateFrom=%s migrateFD=%d " "caps=%p migrateFrom=%s migrateFD=%d "
@ -5125,7 +5110,7 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error; goto error;
if (qemuBuildCpuArgStr(driver, def, emulator, caps, if (qemuBuildCpuArgStr(driver, def, emulator, caps,
&ut, &cpu, &hasHwVirt, !!migrateFrom) < 0) hostarch, &cpu, &hasHwVirt, !!migrateFrom) < 0)
goto error; goto error;
if (cpu) { if (cpu) {