Changeset 132 in vbox

Timestamp:

Jan 18, 2007 12:35:35 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

17582

Message:

Main:

• Prototyped IConsoleCallback::onRuntimeError();
• All size parameters in IHardDisk are now ULONG64.

Frontends:

• Updated according to the above.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxNewHDWzd.ui (modified) (2 diffs)
• Frontends/VirtualBox/ui/VBoxNewHDWzd.ui.h (modified) (2 diffs)
• Main/HardDiskImpl.cpp (modified) (7 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)
• Main/include/HardDiskImpl.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1960 +1960 @@
     HRESULT rc;
     Bstr filename;
-    size_t sizeMB = 0;
+    uint64_t sizeMB = 0;
     bool fStatic = false;
     Bstr comment;
@@ -1985 +1985 @@
             }
             i++;
-            sizeMB = atoi(argv[i]);
+            sizeMB = RTStrToUInt64(argv[i]);
         }
         else if (strcmp(argv[i], "-static") == 0)
@@ -4434 +4434 @@
         }
 
-        ULONG size;
+        ULONG64 size;
         hardDisk->COMGETTER(Size)(&size);
-        RTPrintf("Size:                 %lu MBytes\n", size);
+        RTPrintf("Size:                 %llu MBytes\n", size);
         ULONG64 actualSize;
         hardDisk->COMGETTER(ActualSize)(&actualSize);
-        RTPrintf("Current size on disk: %lu MBytes\n", actualSize >> 20);
+        RTPrintf("Current size on disk: %llu MBytes\n", actualSize >> 20);
 
         HardDiskType_T type;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -470 +470 @@
         gfGuestScrollLockPressed = fScrollLock;
         gfGuestCapsLockPressed   = fCapsLock;
+        return S_OK;
+    }
+
+    STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
+    {
         return S_OK;
     }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -267 +267 @@
         Q_UNUSED( fScrollLock );
         Q_UNUSED( fCapsLock );
+        return S_OK;
+    }
+
+    STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTRPARAM id, IN_BSTRPARAM message)
+    {
         return S_OK;
     }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -585 +585 @@
         details = hardDiskTypeString (root);
     
-    details += ", " + formatSize ((unsigned long long) root.GetSize() * _1M);
+    details += ", " + formatSize (root.GetSize() * _1M);
     
     return details;

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -970 +970 @@
     QString hardDiskType = vboxGlobal().hardDiskTypeString (aHd);
     QString virtualSize = accessible ?
-        vboxGlobal().formatSize ((ULONG64)aHd.GetSize() * _1M) : QString ("--");
+        vboxGlobal().formatSize (aHd.GetSize() * _1M) : QString ("--");
     QString actualSize = accessible ?
         vboxGlobal().formatSize (aHd.GetActualSize()) : QString ("--");

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewHDWzd.ui

@@ -637 +637 @@
     <variable access="private">CHardDisk chd;</variable>
     <variable access="private">int sliderStep;</variable>
-    <variable access="private">ULONG64 MaxVDISize;</variable>
-    <variable access="private">ULONG64 currentSize;</variable>
+    <variable access="private">Q_UINT64 MaxVDISize;</variable>
+    <variable access="private">Q_UINT64 currentSize;</variable>
 </variables>
 <slots>
@@ -652 +652 @@
     <function>setRecommendedSize( ulong aSize )</function>
     <function returnType="QString">imageFileName()</function>
-    <function returnType="ULONG64">imageSize()</function>
+    <function returnType="Q_UINT64">imageSize()</function>
     <function returnType="bool">isDynamicImage()</function>
     <function returnType="CHardDisk">hardDisk() { return chd; }</function>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewHDWzd.ui.h

@@ -223 +223 @@
 
 
-ULONG64 VBoxNewHDWzd::imageSize()
+Q_UINT64 VBoxNewHDWzd::imageSize()
 {
     return currentSize;
@@ -332 +332 @@
 {
     QString src = imageFileName();
-    ulong size = imageSize();
+    Q_UINT64 size = imageSize();
 
     AssertReturn (!src.isEmpty(), false);

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -1339 +1339 @@
 }
 
-STDMETHODIMP HVirtualDiskImage::COMGETTER(Size) (ULONG *aSize)
+STDMETHODIMP HVirtualDiskImage::COMGETTER(Size) (ULONG64 *aSize)
 {
     if (!aSize)
@@ -1427 +1427 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP HVirtualDiskImage::CreateDynamicImage (ULONG aSize, IProgress **aProgress)
+STDMETHODIMP HVirtualDiskImage::CreateDynamicImage (ULONG64 aSize, IProgress **aProgress)
 {
     if (!aProgress)
@@ -1438 +1438 @@
 }
 
-STDMETHODIMP HVirtualDiskImage::CreateFixedImage (ULONG aSize, IProgress **aProgress)
+STDMETHODIMP HVirtualDiskImage::CreateFixedImage (ULONG64 aSize, IProgress **aProgress)
 {
     if (!aProgress)
@@ -2245 +2245 @@
                 uint64_t size = VDIDiskGetSize (disk);
                 /* convert to MBytes */
-                mSize = (ULONG) (size / 1024 / 1024);
+                mSize = size / 1024 / 1024;
             }
 
@@ -2285 +2285 @@
  *  @param aProgress    address of IProgress pointer to return
  */
-HRESULT HVirtualDiskImage::createImage (ULONG aSize, BOOL aDynamic,
-                                       IProgress **aProgress)
+HRESULT HVirtualDiskImage::createImage (ULONG64 aSize, BOOL aDynamic,
+                                        IProgress **aProgress)
 {
     AutoLock alock (this);
@@ -2353 +2353 @@
         if (aSize < 1 || aSize > maxVDISize)
             return setError (E_INVALIDARG,
-                tr ("Invalid VDI size %ul MB (must be in range [1, %Lu] MB)"),
+                tr ("Invalid VDI size: %llu MB (must be in range [1, %llu] MB)"),
                 aSize, maxVDISize);
     }
@@ -2682 +2682 @@
 }
 
-STDMETHODIMP HISCSIHardDisk::COMGETTER(Size) (ULONG *aSize)
+STDMETHODIMP HISCSIHardDisk::COMGETTER(Size) (ULONG64 *aSize)
 {
     if (!aSize)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2426 +2426 @@
         </method>
 
+        <method name="onRuntimeError">
+            <desc>
+                Notification when an error happens during the virtual
+                machine execution.
+                
+                There are three kinds of runtime errors:
+                <ul>
+                    <li><i>fatal</i></li>
+                    <li><i>non-fatal with retry</i></li>
+                    <li><i>non-fatal without retry</i></li>
+                </ul>
+                
+                <b>Fatal</b> errors are indicated by the @a fatal parameter set
+                to <tt>true</tt>. In case of fatal errors, the virtual machine
+                execution is always paused before calling this notification, and
+                the notification handler is supposed either to immediately save
+                the virtual machine state using <link to="IConsole::saveState()"/>
+                or power it off using <link to="IConsole::powerDown()"/>.
+                Resuming the execution can lead to unpredictable results.
+                
+                <b>Non-fatal</b> errors are indicated by the
+                @a fatal parameter set to <tt>false</tt>. If the virtual machine
+                is in the Paused state by the time the error notification is
+                received, it means that the user can retry the machine
+                execution after attempting to solve the probem that caused the
+                error. In this case, the notification handler is supposed
+                to show an appropriate message to the user (depending on the
+                value of the @a id parameter) that offers several actions such
+                as <i>Retry</i>, <i>Save</i> or <i>Power Off</i>. If the user
+                wants to retry, the notification handler should continue
+                the machine execution using the <link to="IConsole::resume()"/>
+                call. If the machine execution is not Paused during this
+                notification, then it means this notification is a warning (for
+                example, about a fatal condition that can happen very soon); no
+                any immediate action is required from the user, the machine
+                continues its normal execution.
+
+                Note that in either case the notification handler
+                <b>must not</b> perform any action directly on a thread
+                where this notification is called. Everything it is allowed to
+                do is to post a message to another thread that will then talk
+                to the user and take the corresponding action.
+                
+                Currently, the following error identificators are known:
+                <ul>
+                <li>"HostMemoryLow"</li>
+                <li>"HostAudioNotResponding"</li>
+                <li>"VDIStorageFull"</li>
+                </ul>
+
+                <note>
+                    This notification is not designed to be implemented by more
+                    than one callback at a time. If you have multiple
+                    IConsoleCallback instances registered on the given
+                    IConsole object, make sure you just return S_OK from all but
+                    one of them that does actual user notification and performs
+                    necessary actions.
+                </note>
+
+            </desc>
+            <param name="fatal" type="boolean" dir="in">
+                <desc>Whether the error is fatal or not</desc>
+            </param>
+            <param name="id" type="wstring" dir="in">
+                <desc>Error identificator</desc>
+            </param>
+            <param name="message" type="wstring" dir="in">
+                <desc>Optional error message</desc>
+            </param>
+        </method>
+
     </interface>
 
@@ -4496 +4567 @@
         </attribute>
 
-        <attribute name="size" type="unsigned long" readonly="yes">
+        <attribute name="size" type="unsigned long long" readonly="yes">
             <desc>
 
@@ -4690 +4761 @@
             </desc>
 
-            <param name="size" type="unsigned long" dir="in">
+            <param name="size" type="unsigned long long" dir="in">
                 <desc>Maximum logical size of the hard disk in megabytes.</desc>
             </param>
@@ -4713 +4784 @@
             </desc>
 
-            <param name="size" type="unsigned long" dir="in">
+            <param name="size" type="unsigned long long" dir="in">
                 <desc>Logical size of the hard disk in megabytes.</desc>
             </param>

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -102 +102 @@
     }
 
+    STDMETHOD(OnRuntimeError)(BOOL fatal, INPTR BSTR id, INPTR BSTR message)
+    {
+        return S_OK;
+    }
+
     // IDisplay properties
     STDMETHOD(COMGETTER(Width)) (ULONG *width);

trunk/src/VBox/Main/include/HardDiskImpl.h

@@ -238 +238 @@
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
     STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
-    STDMETHOD(COMGETTER(Size)) (ULONG *aSize);
+    STDMETHOD(COMGETTER(Size)) (ULONG64 *aSize);
     STDMETHOD(COMGETTER(ActualSize)) (ULONG64 *aActualSize);
 
@@ -247 +247 @@
 
     // IVirtualDiskImage methods
-    STDMETHOD(CreateDynamicImage) (ULONG aSize, IProgress **aProgress);
-    STDMETHOD(CreateFixedImage) (ULONG aSize, IProgress **aProgress);
+    STDMETHOD(CreateDynamicImage) (ULONG64 aSize, IProgress **aProgress);
+    STDMETHOD(CreateFixedImage) (ULONG64 aSize, IProgress **aProgress);
     STDMETHOD(DeleteImage)();
 
@@ -286 +286 @@
     HRESULT setFilePath (const BSTR aFilePath);
     HRESULT queryInformation (Bstr *aAccessError);
-    HRESULT createImage (ULONG aSize, BOOL aDynamic, IProgress **aProgress);
+    HRESULT createImage (ULONG64 aSize, BOOL aDynamic, IProgress **aProgress);
 
     /** VDI asynchronous operation thread function */
@@ -302 +302 @@
     Bstr mDescription;
 
-    ULONG mSize;
+    ULONG64 mSize;
     ULONG64 mActualSize;
 
@@ -357 +357 @@
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
     STDMETHOD(COMSETTER(Description)) (INPTR BSTR aDescription);
-    STDMETHOD(COMGETTER(Size)) (ULONG *aSize);
+    STDMETHOD(COMGETTER(Size)) (ULONG64 *aSize);
     STDMETHOD(COMGETTER(ActualSize)) (ULONG64 *aActualSize);
 
@@ -406 +406 @@
     Bstr mDescription;
 
-    ULONG mSize;
+    ULONG64 mSize;
     ULONG64 mActualSize;