diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-05 12:44:34 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-05 20:01:15 +0100 |
| commit | 9e7c6a548353bde925c16434711bcc6208038d83 (patch) | |
| tree | b1b46b05e7319a36c38813a3b1eb15eb277ed948 /inspector | |
| parent | 9b945cfa781a0f25c3b81239e2fcddceeede6e44 (diff) | |
| download | libguestfs-9e7c6a548353bde925c16434711bcc6208038d83.tar.gz libguestfs-9e7c6a548353bde925c16434711bcc6208038d83.tar.xz libguestfs-9e7c6a548353bde925c16434711bcc6208038d83.zip | |
New API: inspect-get-windows-current-control-set
This returns the actual registry key corresponding to
CurrentControlSet (eg. it might be "ControlSet001").
Previously the inspection code was hard-coding ControlSet001. Now we
use the correct control set, and also make it available to callers
through the API.
This commit also updates the virt-dhcp-address example so it uses this
new API.
virt-inspector displays the current control set when available.
Diffstat (limited to 'inspector')
| -rw-r--r-- | inspector/example-windows.xml | 1 | ||||
| -rw-r--r-- | inspector/virt-inspector.c | 8 | ||||
| -rw-r--r-- | inspector/virt-inspector.rng | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/inspector/example-windows.xml b/inspector/example-windows.xml index 7b3ae743..8e53159a 100644 --- a/inspector/example-windows.xml +++ b/inspector/example-windows.xml @@ -10,6 +10,7 @@ <major_version>6</major_version> <minor_version>1</minor_version> <windows_systemroot>/Windows</windows_systemroot> + <windows_current_control_set>ControlSet001</windows_current_control_set> <format>installed</format> <mountpoints> <mountpoint dev="/dev/sda2">/</mountpoint> diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c index 4d8e3adc..d016b2dd 100644 --- a/inspector/virt-inspector.c +++ b/inspector/virt-inspector.c @@ -416,6 +416,14 @@ output_root (xmlTextWriterPtr xo, char *root) BAD_CAST str)); free (str); ); + DISABLE_GUESTFS_ERRORS_FOR ( + str = guestfs_inspect_get_windows_current_control_set (g, root); + if (str) + XMLERROR (-1, + xmlTextWriterWriteElement (xo, BAD_CAST "windows_current_control_set", + BAD_CAST str)); + free (str); + ); str = guestfs_inspect_get_format (g, root); if (!str) exit (EXIT_FAILURE); diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index 8d54facd..7a822e68 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -37,7 +37,7 @@ <element name="major_version"><text/></element> <element name="minor_version"><text/></element> <optional><element name="windows_systemroot"><text/></element></optional> - + <optional><element name="windows_current_control_set"><text/></element></optional> <optional><element name="package_format"><text/></element></optional> <optional><element name="package_management"><text/></element></optional> <optional><element name="format"><text/></element></optional> |