Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
e3745602
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e3745602
编写于
7月 29, 2011
作者:
A
Anthony Liguori
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'kraxel/migration.2' into staging
上级
c62f6d1d
98e51ec9
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
52 addition
and
0 deletion
+52
-0
hw/hw.h
hw/hw.h
+1
-0
hw/ide/ich.c
hw/ide/ich.c
+6
-0
hw/usb-bt.c
hw/usb-bt.c
+6
-0
hw/usb-ehci.c
hw/usb-ehci.c
+7
-0
hw/usb-msd.c
hw/usb-msd.c
+12
-0
hw/usb-net.c
hw/usb-net.c
+6
-0
hw/usb-serial.c
hw/usb-serial.c
+7
-0
hw/usb-wacom.c
hw/usb-wacom.c
+6
-0
savevm.c
savevm.c
+1
-0
未找到文件。
hw/hw.h
浏览文件 @
e3745602
...
@@ -324,6 +324,7 @@ typedef struct VMStateSubsection {
...
@@ -324,6 +324,7 @@ typedef struct VMStateSubsection {
struct
VMStateDescription
{
struct
VMStateDescription
{
const
char
*
name
;
const
char
*
name
;
int
unmigratable
;
int
version_id
;
int
version_id
;
int
minimum_version_id
;
int
minimum_version_id
;
int
minimum_version_id_old
;
int
minimum_version_id_old
;
...
...
hw/ide/ich.c
浏览文件 @
e3745602
...
@@ -72,6 +72,11 @@
...
@@ -72,6 +72,11 @@
#include <hw/ide/pci.h>
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
#include <hw/ide/ahci.h>
static
const
VMStateDescription
vmstate_ahci
=
{
.
name
=
"ahci"
,
.
unmigratable
=
1
,
};
static
int
pci_ich9_ahci_init
(
PCIDevice
*
dev
)
static
int
pci_ich9_ahci_init
(
PCIDevice
*
dev
)
{
{
struct
AHCIPCIState
*
d
;
struct
AHCIPCIState
*
d
;
...
@@ -123,6 +128,7 @@ static PCIDeviceInfo ich_ahci_info[] = {
...
@@ -123,6 +128,7 @@ static PCIDeviceInfo ich_ahci_info[] = {
.
qdev
.
name
=
"ich9-ahci"
,
.
qdev
.
name
=
"ich9-ahci"
,
.
qdev
.
alias
=
"ahci"
,
.
qdev
.
alias
=
"ahci"
,
.
qdev
.
size
=
sizeof
(
AHCIPCIState
),
.
qdev
.
size
=
sizeof
(
AHCIPCIState
),
.
qdev
.
vmsd
=
&
vmstate_ahci
,
.
init
=
pci_ich9_ahci_init
,
.
init
=
pci_ich9_ahci_init
,
.
exit
=
pci_ich9_uninit
,
.
exit
=
pci_ich9_uninit
,
.
config_write
=
pci_ich9_write_config
,
.
config_write
=
pci_ich9_write_config
,
...
...
hw/usb-bt.c
浏览文件 @
e3745602
...
@@ -548,10 +548,16 @@ USBDevice *usb_bt_init(HCIInfo *hci)
...
@@ -548,10 +548,16 @@ USBDevice *usb_bt_init(HCIInfo *hci)
return
dev
;
return
dev
;
}
}
static
const
VMStateDescription
vmstate_usb_bt
=
{
.
name
=
"usb-bt"
,
.
unmigratable
=
1
,
};
static
struct
USBDeviceInfo
bt_info
=
{
static
struct
USBDeviceInfo
bt_info
=
{
.
product_desc
=
"QEMU BT dongle"
,
.
product_desc
=
"QEMU BT dongle"
,
.
qdev
.
name
=
"usb-bt-dongle"
,
.
qdev
.
name
=
"usb-bt-dongle"
,
.
qdev
.
size
=
sizeof
(
struct
USBBtState
),
.
qdev
.
size
=
sizeof
(
struct
USBBtState
),
.
qdev
.
vmsd
=
&
vmstate_usb_bt
,
.
usb_desc
=
&
desc_bluetooth
,
.
usb_desc
=
&
desc_bluetooth
,
.
init
=
usb_bt_initfn
,
.
init
=
usb_bt_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
...
...
hw/usb-ehci.c
浏览文件 @
e3745602
...
@@ -2244,6 +2244,11 @@ static USBBusOps ehci_bus_ops = {
...
@@ -2244,6 +2244,11 @@ static USBBusOps ehci_bus_ops = {
.
register_companion
=
ehci_register_companion
,
.
register_companion
=
ehci_register_companion
,
};
};
static
const
VMStateDescription
vmstate_ehci
=
{
.
name
=
"ehci"
,
.
unmigratable
=
1
,
};
static
Property
ehci_properties
[]
=
{
static
Property
ehci_properties
[]
=
{
DEFINE_PROP_UINT32
(
"freq"
,
EHCIState
,
freq
,
FRAME_TIMER_FREQ
),
DEFINE_PROP_UINT32
(
"freq"
,
EHCIState
,
freq
,
FRAME_TIMER_FREQ
),
DEFINE_PROP_UINT32
(
"maxframes"
,
EHCIState
,
maxframes
,
128
),
DEFINE_PROP_UINT32
(
"maxframes"
,
EHCIState
,
maxframes
,
128
),
...
@@ -2254,6 +2259,7 @@ static PCIDeviceInfo ehci_info[] = {
...
@@ -2254,6 +2259,7 @@ static PCIDeviceInfo ehci_info[] = {
{
{
.
qdev
.
name
=
"usb-ehci"
,
.
qdev
.
name
=
"usb-ehci"
,
.
qdev
.
size
=
sizeof
(
EHCIState
),
.
qdev
.
size
=
sizeof
(
EHCIState
),
.
qdev
.
vmsd
=
&
vmstate_ehci
,
.
init
=
usb_ehci_initfn
,
.
init
=
usb_ehci_initfn
,
.
vendor_id
=
PCI_VENDOR_ID_INTEL
,
.
vendor_id
=
PCI_VENDOR_ID_INTEL
,
.
device_id
=
PCI_DEVICE_ID_INTEL_82801D
,
/* ich4 */
.
device_id
=
PCI_DEVICE_ID_INTEL_82801D
,
/* ich4 */
...
@@ -2263,6 +2269,7 @@ static PCIDeviceInfo ehci_info[] = {
...
@@ -2263,6 +2269,7 @@ static PCIDeviceInfo ehci_info[] = {
},{
},{
.
qdev
.
name
=
"ich9-usb-ehci1"
,
.
qdev
.
name
=
"ich9-usb-ehci1"
,
.
qdev
.
size
=
sizeof
(
EHCIState
),
.
qdev
.
size
=
sizeof
(
EHCIState
),
.
qdev
.
vmsd
=
&
vmstate_ehci
,
.
init
=
usb_ehci_initfn
,
.
init
=
usb_ehci_initfn
,
.
vendor_id
=
PCI_VENDOR_ID_INTEL
,
.
vendor_id
=
PCI_VENDOR_ID_INTEL
,
.
device_id
=
PCI_DEVICE_ID_INTEL_82801I_EHCI1
,
.
device_id
=
PCI_DEVICE_ID_INTEL_82801I_EHCI1
,
...
...
hw/usb-msd.c
浏览文件 @
e3745602
...
@@ -616,11 +616,23 @@ static USBDevice *usb_msd_init(const char *filename)
...
@@ -616,11 +616,23 @@ static USBDevice *usb_msd_init(const char *filename)
return
dev
;
return
dev
;
}
}
static
const
VMStateDescription
vmstate_usb_msd
=
{
.
name
=
"usb-storage"
,
.
unmigratable
=
1
,
/* FIXME: handle transactions which are in flight */
.
version_id
=
1
,
.
minimum_version_id
=
1
,
.
fields
=
(
VMStateField
[])
{
VMSTATE_USB_DEVICE
(
dev
,
MSDState
),
VMSTATE_END_OF_LIST
()
}
};
static
struct
USBDeviceInfo
msd_info
=
{
static
struct
USBDeviceInfo
msd_info
=
{
.
product_desc
=
"QEMU USB MSD"
,
.
product_desc
=
"QEMU USB MSD"
,
.
qdev
.
name
=
"usb-storage"
,
.
qdev
.
name
=
"usb-storage"
,
.
qdev
.
fw_name
=
"storage"
,
.
qdev
.
fw_name
=
"storage"
,
.
qdev
.
size
=
sizeof
(
MSDState
),
.
qdev
.
size
=
sizeof
(
MSDState
),
.
qdev
.
vmsd
=
&
vmstate_usb_msd
,
.
usb_desc
=
&
desc
,
.
usb_desc
=
&
desc
,
.
init
=
usb_msd_initfn
,
.
init
=
usb_msd_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
...
...
hw/usb-net.c
浏览文件 @
e3745602
...
@@ -1414,11 +1414,17 @@ static USBDevice *usb_net_init(const char *cmdline)
...
@@ -1414,11 +1414,17 @@ static USBDevice *usb_net_init(const char *cmdline)
return
dev
;
return
dev
;
}
}
static
const
VMStateDescription
vmstate_usb_net
=
{
.
name
=
"usb-net"
,
.
unmigratable
=
1
,
};
static
struct
USBDeviceInfo
net_info
=
{
static
struct
USBDeviceInfo
net_info
=
{
.
product_desc
=
"QEMU USB Network Interface"
,
.
product_desc
=
"QEMU USB Network Interface"
,
.
qdev
.
name
=
"usb-net"
,
.
qdev
.
name
=
"usb-net"
,
.
qdev
.
fw_name
=
"network"
,
.
qdev
.
fw_name
=
"network"
,
.
qdev
.
size
=
sizeof
(
USBNetState
),
.
qdev
.
size
=
sizeof
(
USBNetState
),
.
qdev
.
vmsd
=
&
vmstate_usb_net
,
.
usb_desc
=
&
desc_net
,
.
usb_desc
=
&
desc_net
,
.
init
=
usb_net_initfn
,
.
init
=
usb_net_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
...
...
hw/usb-serial.c
浏览文件 @
e3745602
...
@@ -566,10 +566,16 @@ static USBDevice *usb_braille_init(const char *unused)
...
@@ -566,10 +566,16 @@ static USBDevice *usb_braille_init(const char *unused)
return
dev
;
return
dev
;
}
}
static
const
VMStateDescription
vmstate_usb_serial
=
{
.
name
=
"usb-serial"
,
.
unmigratable
=
1
,
};
static
struct
USBDeviceInfo
serial_info
=
{
static
struct
USBDeviceInfo
serial_info
=
{
.
product_desc
=
"QEMU USB Serial"
,
.
product_desc
=
"QEMU USB Serial"
,
.
qdev
.
name
=
"usb-serial"
,
.
qdev
.
name
=
"usb-serial"
,
.
qdev
.
size
=
sizeof
(
USBSerialState
),
.
qdev
.
size
=
sizeof
(
USBSerialState
),
.
qdev
.
vmsd
=
&
vmstate_usb_serial
,
.
usb_desc
=
&
desc_serial
,
.
usb_desc
=
&
desc_serial
,
.
init
=
usb_serial_initfn
,
.
init
=
usb_serial_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
...
@@ -589,6 +595,7 @@ static struct USBDeviceInfo braille_info = {
...
@@ -589,6 +595,7 @@ static struct USBDeviceInfo braille_info = {
.
product_desc
=
"QEMU USB Braille"
,
.
product_desc
=
"QEMU USB Braille"
,
.
qdev
.
name
=
"usb-braille"
,
.
qdev
.
name
=
"usb-braille"
,
.
qdev
.
size
=
sizeof
(
USBSerialState
),
.
qdev
.
size
=
sizeof
(
USBSerialState
),
.
qdev
.
vmsd
=
&
vmstate_usb_serial
,
.
usb_desc
=
&
desc_braille
,
.
usb_desc
=
&
desc_braille
,
.
init
=
usb_serial_initfn
,
.
init
=
usb_serial_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
...
...
hw/usb-wacom.c
浏览文件 @
e3745602
...
@@ -349,6 +349,11 @@ static int usb_wacom_initfn(USBDevice *dev)
...
@@ -349,6 +349,11 @@ static int usb_wacom_initfn(USBDevice *dev)
return
0
;
return
0
;
}
}
static
const
VMStateDescription
vmstate_usb_wacom
=
{
.
name
=
"usb-wacom"
,
.
unmigratable
=
1
,
};
static
struct
USBDeviceInfo
wacom_info
=
{
static
struct
USBDeviceInfo
wacom_info
=
{
.
product_desc
=
"QEMU PenPartner Tablet"
,
.
product_desc
=
"QEMU PenPartner Tablet"
,
.
qdev
.
name
=
"usb-wacom-tablet"
,
.
qdev
.
name
=
"usb-wacom-tablet"
,
...
@@ -356,6 +361,7 @@ static struct USBDeviceInfo wacom_info = {
...
@@ -356,6 +361,7 @@ static struct USBDeviceInfo wacom_info = {
.
usbdevice_name
=
"wacom-tablet"
,
.
usbdevice_name
=
"wacom-tablet"
,
.
usb_desc
=
&
desc_wacom
,
.
usb_desc
=
&
desc_wacom
,
.
qdev
.
size
=
sizeof
(
USBWacomState
),
.
qdev
.
size
=
sizeof
(
USBWacomState
),
.
qdev
.
vmsd
=
&
vmstate_usb_wacom
,
.
init
=
usb_wacom_initfn
,
.
init
=
usb_wacom_initfn
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_packet
=
usb_generic_handle_packet
,
.
handle_reset
=
usb_wacom_handle_reset
,
.
handle_reset
=
usb_wacom_handle_reset
,
...
...
savevm.c
浏览文件 @
e3745602
...
@@ -1234,6 +1234,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
...
@@ -1234,6 +1234,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
se
->
opaque
=
opaque
;
se
->
opaque
=
opaque
;
se
->
vmsd
=
vmsd
;
se
->
vmsd
=
vmsd
;
se
->
alias_id
=
alias_id
;
se
->
alias_id
=
alias_id
;
se
->
no_migrate
=
vmsd
->
unmigratable
;
if
(
dev
&&
dev
->
parent_bus
&&
dev
->
parent_bus
->
info
->
get_dev_path
)
{
if
(
dev
&&
dev
->
parent_bus
&&
dev
->
parent_bus
->
info
->
get_dev_path
)
{
char
*
id
=
dev
->
parent_bus
->
info
->
get_dev_path
(
dev
);
char
*
id
=
dev
->
parent_bus
->
info
->
get_dev_path
(
dev
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录