adds xen and hvm guest types to test driver capabilities

* src/test.c: patch from Cole Robinson adding xen and hvm guest types
  to the test driver's capabilities.
Daniel
This commit is contained in:
Daniel Veillard 2008-04-08 09:26:24 +00:00
parent 2579443e21
commit 801a8f2e7b
2 changed files with 28 additions and 20 deletions

View File

@ -1,3 +1,8 @@
Tue Apr 8 11:24:28 CEST 2008 Daniel Veillard <daniel@veillard.com>
* src/test.c: patch from Cole Robinson adding xen and hvm guest types
to the test driver's capabilities.
Tue Apr 8 10:19:01 CEST 2008 Daniel Veillard <daniel@veillard.com>
* python/generator.py: fix an infinite loop bug

View File

@ -1006,6 +1006,7 @@ static char *testGetCapabilities (virConnectPtr conn)
virCapsPtr caps;
virCapsGuestPtr guest;
char *xml;
const char *guest_types[] = { "hvm", "xen" };
int i;
GET_CONNECTION(conn, -1);
@ -1024,29 +1025,31 @@ static char *testGetCapabilities (virConnectPtr conn)
goto no_memory;
}
if ((guest = virCapabilitiesAddGuest(caps,
"linux",
TEST_MODEL,
TEST_MODEL_WORDSIZE,
NULL,
NULL,
0,
NULL)) == NULL)
goto no_memory;
for (i = 0; i < (sizeof(guest_types)/sizeof(guest_types[0])); ++i) {
if (virCapabilitiesAddGuestDomain(guest,
"test",
NULL,
NULL,
0,
NULL) == NULL)
goto no_memory;
if ((guest = virCapabilitiesAddGuest(caps,
guest_types[i],
TEST_MODEL,
TEST_MODEL_WORDSIZE,
NULL,
NULL,
0,
NULL)) == NULL)
goto no_memory;
if (virCapabilitiesAddGuestDomain(guest,
"test",
NULL,
NULL,
0,
NULL) == NULL)
goto no_memory;
if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL)
goto no_memory;
if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL)
goto no_memory;
if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL)
goto no_memory;
if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL)
goto no_memory;
}
if ((xml = virCapabilitiesFormatXML(caps)) == NULL)
goto no_memory;